Merge pull request #59 from cutls/WIP-(before-CI)

Wip (before ci)
2019-04-20 13:52:35 +09:00
52 changed files with 3572 additions and 4606 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 TheDesk-*
 app/build
 build
+make.js
+make_js.js
 app/.DS_Store
 .DS_Store
 .vs/*
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # TheDesk

-TheDesk Minami (19)はVueで書き直します(rewrite-vueブランチ参照)。18までのバージョンはTheDesk Kawaii (20)以降で継続します。  
-
 [![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
--- a/app/about.html
+++ b/app/about.html
@@ -87,7 +87,7 @@ a,button{
    <div class='area-name5'>Node.js</div>
    <div class='area-data5' id="node"></div>
  </div>
-  <div class="cp">Copyright &copy; <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a> 2018 All rights reserved.<br>
+  <div class="cp">Copyright &copy; <a href="https://kirishima.cloud/@Cutls" target="_blank">Cutls P</a> 2018 All rights reserved.<br>
    Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pawoo.net/@kPherox" target="_blank">kPherox</a> and all users
    <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️" title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
 <br><a href="https://thedesk.top" target="_blank">Web site</a></div>
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -138,7 +138,7 @@ iframe {
 .area-toot .emoji,.area-toot .emoji-img{
  width: 20px;
  vertical-align: middle;
-  margin:-1px 0;
+  margin: -3px 0 0;
 }
 .faicon_FTL{
  display:none;
@@ -344,7 +344,6 @@ grid-area: toot;
 p {
  margin: 0;
  margin-bottom: 0px;
-  line-height:20px;
 }
 p:not(:last-child){
  margin-bottom: 10px;
--- a/app/js/common/blurhash.js
+++ b/app/js/common/blurhash.js
@@ -1,119 +0,0 @@
-var digitCharacters = [
-    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-    "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
-    "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
-    "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d",
-    "e", "f", "g", "h", "i", "j", "k", "l", "m", "n",
-    "o", "p", "q", "r", "s", "t", "u", "v", "w", "x",
-    "y", "z", "#", "$", "%", "*", "+", ",", "-", ".",
-    ":", ";", "=", "?", "@", "[", "]", "^", "_", "{",
-    "|", "}", "~",
-];
-function decode83(str) {
-    var value = 0;
-    for (var i = 0; i < str.length; i++) {
-        var c = str[i];
-        var digit = digitCharacters.indexOf(c);
-        value = value * 83 + digit;
-    }
-    return value;
-}
-function linearTosRGB(value) {
-    var v = Math.max(0, Math.min(1, value));
-    if (v <= 0.0031308) {
-        return Math.round(v * 12.92 * 255 + 0.5);
-    }
-    else {
-        return Math.round((1.055 * Math.pow(v, 1 / 2.4) - 0.055) * 255 + 0.5);
-    }
-}
-function sRGBToLinear(value) {
-    var v = value / 255;
-    if (v <= 0.04045) {
-        return v / 12.92;
-    }
-    else {
-        return Math.pow((v + 0.055) / 1.055, 2.4);
-    }
-}
-function decodeDC(value) {
-    var intR = value >> 16;
-    var intG = (value >> 8) & 255;
-    var intB = value & 255;
-    return [sRGBToLinear(intR), sRGBToLinear(intG), sRGBToLinear(intB)];
-};
-function sign(n) { return (n < 0 ? -1 : 1); }
-function signPow(val, exp) { return sign(val) * Math.pow(Math.abs(val), exp); }
-function decodeDC2(value, maximumValue) {
-    var quantR = Math.floor(value / (19 * 19));
-    var quantG = Math.floor(value / 19) % 19;
-    var quantB = value % 19;
-    var rgb = [
-        signPow((quantR - 9) / 9, 2.0) * maximumValue,
-        signPow((quantG - 9) / 9, 2.0) * maximumValue,
-        signPow((quantB - 9) / 9, 2.0) * maximumValue,
-    ];
-    return rgb;
-};
-function decodeblur(blurhash, width, height, punch) {
-    punch = punch | 1;
-    if (blurhash.length < 6) {
-        console.error('too short blurhash');
-        return null;
-    }
-    var sizeFlag = decode83(blurhash[0]);
-    var numY = Math.floor(sizeFlag / 9) + 1;
-    var numX = (sizeFlag % 9) + 1;
-    var quantisedMaximumValue = decode83(blurhash[1]);
-    var maximumValue = (quantisedMaximumValue + 1) / 166;
-    if (blurhash.length !== 4 + 2 * numX * numY) {
-        console.error('blurhash length mismatch', blurhash.length, 4 + 2 * numX * numY);
-        return null;
-    }
-    var colors = new Array(numX * numY);
-    for (var i = 0; i < colors.length; i++) {
-        if (i === 0) {
-            var value = decode83(blurhash.substring(2, 6));
-            colors[i] = decodeDC(value);
-        }
-        else {
-            var value = decode83(blurhash.substring(4 + i * 2, 6 + i * 2));
-            colors[i] = decodeDC2(value, maximumValue * punch);
-        }
-    }
-    var bytesPerRow = width * 4;
-    var pixels = new Uint8ClampedArray(bytesPerRow * height);
-    for (var y = 0; y < height; y++) {
-        for (var x = 0; x < width; x++) {
-            var r = 0;
-            var g = 0;
-            var b = 0;
-            for (var j = 0; j < numY; j++) {
-                for (var i = 0; i < numX; i++) {
-                    var basis = Math.cos(Math.PI * x * i / width) * Math.cos(Math.PI * y * j / height);
-                    var color = colors[i + j * numX];
-                    r += color[0] * basis;
-                    g += color[1] * basis;
-                    b += color[2] * basis;
-                }
-            }
-            var intR = linearTosRGB(r);
-            var intG = linearTosRGB(g);
-            var intB = linearTosRGB(b);
-            pixels[4 * x + 0 + y * bytesPerRow] = intR;
-            pixels[4 * x + 1 + y * bytesPerRow] = intG;
-            pixels[4 * x + 2 + y * bytesPerRow] = intB;
-            pixels[4 * x + 3 + y * bytesPerRow] = 255; // alpha
-        }
-    }
-    return pixels;
-}
-function parseBlur(blur) {
-    var canvas = document.getElementById('canvas');
-    var ctx = canvas.getContext('2d');
-    var pixels = decodeblur(blur, 32, 32)
-    const imageData = new ImageData(pixels, 32, 32);
-
-    ctx.putImageData(imageData, 0, 0);
-    return canvas.toDataURL()
-}
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -190,7 +190,7 @@ function verck(ver) {
 					}
 				}
 				if(show){
-					Materialize.toast(escapeHTML(obj.Text)+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+					Materialize.toast(obj.Text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
 				}
 			}
 			
@@ -211,6 +211,9 @@ function infowebsocket(){
 		console.log(JSON.parse(mess.data));
 		var obj=JSON.parse(mess.data);
 		if(obj.type!="counter"){
+		if(obj.id*1<=localStorage.getItem("last-notice-id")){
+			
+		}else{
 			localStorage.setItem("last-notice-id",obj.id)
 			var show=true;
 			if(obj.toot!=""){
@@ -239,8 +242,9 @@ function infowebsocket(){
 				}
 			}
 			if(show){
-				Materialize.toast(escapeHTML(obj.Text)+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+				Materialize.toast(obj.text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
 			}
+		}
 	}else{
 		$("#persons").text(obj.text);
 	}
--- a/app/js/emoji/default-emoji.js
+++ b/app/js/emoji/default-emoji.js
@@ -54,13 +54,7 @@ function defEmoji(target){
    var emojiraw = newpack.filter(function(item, index){
     if (item.short_name == target) return true;
    });
-    var hex=emojiraw[0].unified.split("-");
-    if(hex.length===2){
-        emoji=twemoji.convert.fromCodePoint(hex[0])+twemoji.convert.fromCodePoint(hex[1]);
-    }else{
-        emoji=twemoji.convert.fromCodePoint(hex[0]);
-    }
-    console.log(emoji)
+    emoji=twemoji.convert.fromCodePoint(emojiraw[0].unified);
    var now = $("#textarea").val();
    var selin = localStorage.getItem("cursor");
    var now = $("#textarea").val();
--- a/app/js/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@@ -189,7 +189,7 @@ var lang={
    "lang_parse_clientmute":"muted",
    "lang_parse_mute":" will be muted. You can remove on preferences.",
    "lang_parse_voted":"Voted",
-    "lang_parse_vote":"Vote",
+    "lang_parse_vote":"Voted",
    "lang_parse_unvoted":"Show the result without voting",
    "lang_parse_endedvote":"Expired",
    "lang_parse_thread":"Show thread",
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -542,7 +542,7 @@ function getdata(domain, at) {
 		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + escapeHTML(json.error),
+			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
 				5000);
 			return;
 		}
@@ -817,7 +817,7 @@ input.addEventListener("focus", function() {
 						Object.keys(json.instances).forEach(function(key) {
 							var url = json.instances[key];
 							urls = urls + '　<a onclick="login(\'' + url.name +
-								'\')" class="pointer">' +escapeHTML(url.name)  + '</a>  ';
+								'\')" class="pointer">' + url.name + '</a>  ';
 						});
 						$("#ins-suggest").html(urls);
 					}
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -62,7 +62,7 @@ function formattime(date){
 	}else{
 		str=str+date.getMinutes()
 	}
-	return escapeHTML(str);
+	return str;
 }
 function formattimeutc(date){
 	var str=date.getUTCFullYear()+"-";
@@ -87,7 +87,7 @@ function formattimeutc(date){
 	}else{
 		str=str+date.getUTCMinutes()
 	}
-	return escapeHTML(str);
+	return str;
 }
 var electron = require("electron");
 var ipc = electron.ipcRenderer;
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@@ -35,7 +35,7 @@ function emojiToggle(reaction) {

 //絵文字リスト挿入
 function emojiGet(parse, started) {
-	$('#emoji-list').text('Loading...');
+	$('#emoji-list').html('Loading...');
 	var acct_id = $("#post-acct-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
@@ -52,7 +52,7 @@ function emojiGet(parse, started) {
 			console.error(error);
 		}).then(function (json) {
 			if (parse == "true") {
-				$('#emoji-list').text('Parsing...');
+				$('#emoji-list').html('Parsing...');
 				//絵文字をマストドン公式と同順にソート
 				json.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
@@ -96,7 +96,7 @@ function emojiGet(parse, started) {
 				})
 			});
 			if (parse == "true") {
-				$('#emoji-list').text('Parsing...');
+				$('#emoji-list').html('Parsing...');
 				//絵文字をマストドン公式と同順にソート
 				md.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
--- a/app/js/post/misskeystatus.js
+++ b/app/js/post/misskeystatus.js
@@ -234,7 +234,7 @@ function voterefresh(acct_id,id){
                    }else{
                           var myvote="";
                    }
-                    poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+escapeHTML(choice.text)+'('+choice.votes+''+myvote+')</div>';
+                    poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
                });
                $(".vote_"+json.id).html(poll)
 		    }
--- a/app/js/post/post.js
+++ b/app/js/post/post.js
@@ -298,7 +298,7 @@ function clear() {
 	$("#post-acct-sel").prop("disabled", false);
 	$("#days_poll").val(0);
  $("#hours_poll").val(0);
-	$("#mins_poll").val(6);
+	$("#mins_poll").val(0);
 	$(".mastodon-choice").map(function() {
 		$(this).val("");
 	});
--- a/app/js/post/suggest.js
+++ b/app/js/post/suggest.js
@@ -169,7 +169,7 @@ function cgNPs(q){
 						var tags = "";
 						Object.keys(json).forEach(function(key4) {
 							var tag = json[key4];
-							tags = tags + '<a onclick="cgNP(\''+json[key4]+'\')" class="pointer">' + escapeHTML(json[key4]) + '</a>  ';
+							tags = tags + '<a onclick="cgNP(\''+json[key4]+'\')" class="pointer">' + json[key4] + '</a>  ';
 						});
 						$("#suggest").html("Cinderella NowPlaying:" + tags);
 					}else{
--- a/app/js/tl/card.js
+++ b/app/js/tl/card.js
@@ -63,8 +63,8 @@ function additional(acct_id, tlid) {
 				}).then(function(json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(json.title) + "<br>" +
-							escapeHTML(json.description) + "</span>");
+							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
+							json.description + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
 					}
@@ -148,8 +148,8 @@ function additionalIndv(tlid, acct_id, id) {
 				}).then(function(json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(json.title) + "<br>" +
-							escapeHTML(json.description) + "</span>");
+							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
+							json.description + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
 					}
--- a/app/js/tl/datails.js
+++ b/app/js/tl/datails.js
@@ -91,9 +91,6 @@ function details(id, acct_id, tlid, mode) {
 		}
 		beforeToot(id, acct_id, dom);
 		userToot(id, acct_id, uid);
-		afterToot(id, acct_id, dom);
-		afterUserToot(id, acct_id, uid);
-		afterFTLToot(id, acct_id, dom);
 		faved(id, acct_id);
 		rted(id, acct_id);
 		if($("#toot-this div").hasClass("cvo")){
@@ -102,7 +99,7 @@ function details(id, acct_id, tlid, mode) {
 			$("#toot-this").addClass("cvo");
 		}
 		if(!$("#activator").hasClass("active")){
-			$('#det-col').collapsible('open', 4);
+			$('#det-col').collapsible('open', 1);
 		}
 		
 	});
@@ -335,81 +332,6 @@ function userToot(id, acct_id, user) {
 	}
 	
 }
-//後のLTL
-function afterToot(id, acct_id, domain) {
-	//var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_"+ acct_id + "_at");
-		var start = "https://" + domain +
-		"/api/v1/timelines/public?local=true&min_id=" + id;
-		fetch(start, {
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json',
-			},
-		}).then(function(response) {
-			return response.json();
-		}).catch(function(error) {
-			todo(error);
-			console.error(error);
-		}).then(function(json) {
-			var templete = parse(json, 'noauth', acct_id);
-			if(templete!=""){
-				$("#ltl-after .no-data").hide();
-			}
-			$("#ltl-after").html(templete);
-			jQuery("time.timeago").timeago();
-		});
-}
-//後のUTL
-function afterUserToot(id, acct_id, user) {
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_"+ acct_id + "_at");
-		var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses?min_id=" + id;
-		fetch(start, {
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			},
-		}).then(function(response) {
-			return response.json();
-		}).catch(function(error) {
-			todo(error);
-			console.error(error);
-		}).then(function(json) {
-			var templete = parse(json, '', acct_id);
-			if(templete!=""){
-				$("#user-after .no-data").hide();
-			}
-			$("#user-after").html(templete);
-			jQuery("time.timeago").timeago();
-		});	
-}
-//後のFTL
-function afterFTLToot(id, acct_id, domain) {
-	//var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_"+ acct_id + "_at");
-		var start = "https://" + domain +
-		"/api/v1/timelines/public?min_id=" + id;
-		fetch(start, {
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json',
-			},
-		}).then(function(response) {
-			return response.json();
-		}).catch(function(error) {
-			todo(error);
-			console.error(error);
-		}).then(function(json) {
-			var templete = parse(json, 'noauth', acct_id);
-			if(templete!=""){
-				$("#ftl-after .no-data").hide();
-			}
-			$("#ftl-after").html(templete);
-			jQuery("time.timeago").timeago();
-		});
-}

 //ふぁぼ一覧
 function faved(id, acct_id) {
--- a/app/js/tl/dm.js
+++ b/app/js/tl/dm.js
@@ -251,7 +251,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var via = '';
 			viashow="hide";
 		} else {
-			var via = escapeHTML(toot.application.name);
+			var via = toot.application.name;
 			//強調チェック
 			Object.keys(emp).forEach(function(key6) {
 				var cli = emp[key6];
@@ -432,7 +432,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				if(word){
 					var word=word.tag;
 					var regExp = new RegExp( word, "g" ) ;
-					content=content.replace(regExp,'<span class="emp">'+escapeHTML(word)+"</span>");
+					content=content.replace(regExp,'<span class="emp">'+word+"</span>");
 				}
 			});
 		}
@@ -483,7 +483,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+escapeHTML(value.name)+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
 					break;
 				}
 		   }
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@@ -30,7 +30,7 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-					lists = lists + escapeHTML(list.title)+':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
+					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_show+'</a><br>';
 				});
 				$("#lists").html(lists);
@@ -57,7 +57,7 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-					lists = lists + escapeHTML(list.title)+':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
+					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_show+'</a>/<a onclick="listUser(\'' + list.id + '\',' + acct_id +
 						')" class="pointer">'+lang.lang_list_users+'</a><br>';
 				});
@@ -193,7 +193,7 @@ function hisList(user,acct_id){
 			Object.keys(json).forEach(function(key) {
                var list = json[key];
 				lists = lists + '<a onclick="listRemove(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
-					'\')" class="pointer">'+escapeHTML(list.title)+'</a><br> ';
+					'\')" class="pointer">'+list.title+'</a><br> ';
 			});
 			$("#his-lists-b").html(lists);
 		}else{
@@ -217,7 +217,7 @@ function hisList(user,acct_id){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
+					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_show+'</a>/<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_add+lang.lang_list_add_misskey+'</a><br>';
 				});
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -286,7 +286,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			}
 			var if_notf='data-notfIndv="'+acct_id+"_"+toot.id+'"';
 			var toot = toot.note;
-			var dis_name=escapeHTML(toot.user.name);
+			var dis_name=escapeHTMLtemp(toot.user.name);
 		}else{
 			var if_notf="";
 			if (toot.renote) {
@@ -299,7 +299,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				if(!toot.text){
 					var toot = toot.renote;
 				}
-				var dis_name=escapeHTML(toot.user.name);
+				var dis_name=escapeHTMLtemp(toot.user.name);
 			    var uniqueid=toot.id;
 				var actemojick=false
 			} else {
@@ -342,7 +342,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
            if(toot.viaMobile){
                var via = '<span style="font-style: italic;">Mobile</span>';
            }else{
-                var via = '';
+                var via = '<span style="font-style: italic;">Unknown</span>';
            }
 		} else {
 			var via = toot.app.name;
@@ -362,7 +362,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 		}
 		if ((toot.cw || toot.cw=="") && cw) {
-			var content = escapeHTML(toot.text);
+			var content = toot.text;
 			var spoil = escapeHTMLtemp(toot.cw);
 			var spoiler = "cw cw_hide_" + toot.id;
 			var api_spoil = "gray";
@@ -618,7 +618,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+escapeHTML(value.name)+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
 					break;
 				}
 		   }
@@ -634,7 +634,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}else{
 					var myvote="";
 				}
-				poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+toot.id+'\','+choice.id+')">'+escapeHTML(choice.text)+'('+choice.votes+''+myvote+')</div>';
+				poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+toot.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
 			});
 			poll='<div class="vote_'+toot.id+'">'+poll+'</div>';
 		}
@@ -841,7 +841,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
 			'<span class="cbadge viabadge waves-effect '+viashow+' '+mine_via+'" onclick="client(\''+$.strip_tagstemp(via)+'\')" title="via ' + $.strip_tagstemp(via) + '">via ' +
-			escapeHTML(via) +
+			via +
 			'</span>'+
 			'</div><div class="area-side '+mouseover+'"><div class="action ' + if_mine + ' '+noauth+'"><a onclick="toggleAction(\'' + toot.id + '\',\''+tlid+'\',\''+acct_id+'\')" class="waves-effect waves-dark btn-flat" style="padding:0"><i class="text-darken-3 material-icons act-icon">expand_more</i></a></div>' +
 			'<div class="action '+noauth+'"><a onclick="details(\'' + toot.id + '\',' + acct_id +
@@ -917,7 +917,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 				var dis_name=escapeHTMLtemp(toot.name);
 				dis_name=twemoji.parse(dis_name);
 			}else{
-				var dis_name=toot.username;
+				var dis_name=toot.name;
 			}
 		templete = templete +
 			'<div class="cvo" style="padding-top:5px;" user-id="' + toot.id + '"><div class="area-notice">' +
--- a/app/js/tl/mix.js
+++ b/app/js/tl/mix.js
@@ -94,14 +94,12 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 	websocketLocal[wslid] = new WebSocket(startLocal);
 	websocketHome[wshid].onopen = function(mess) {
 		localStorage.setItem("wssH_" + tlid, wshid);
-		console.log(tlid + ":Connect Streaming API(Integrated:Home)");
-		console.log(mess);
+		console.log("Connect Streaming API(Integrated:Home)");
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onopen = function(mess) {
 		localStorage.setItem("wssL_" + tlid, wslid);
-		console.log(tlid + ":Connect Streaming API(Integrated:Local)");
-		console.log(mess);
+		console.log("Connect Streaming API(Integrated:Local)");
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onmessage = function(mess) {
@@ -197,57 +195,39 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 		}
 	}
 	websocketLocal[wslid].onerror = function(error) {
-		console.error('WebSocketLocal Error')
-		console.error(error);
+		console.error('WebSocket Error ' + error);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Error ' + error);
 		}else{
-			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
-			localStorage.setItem("wserror_" + tlid,errorct);
-			if(errorct<3){
-				reconnector(tlid,TLtype,acct_id,"","error");
-			}
+			reconnector(tlid,TLtype,acct_id,"","error");
 		}
 	};
 	websocketLocal[wslid].onclose = function() {
-		console.log('WebSocketLocal Closing:' + tlid);
+		console.error('WebSocketLocal Closing by error:' + tlid);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
 		}else{
-			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
-			localStorage.setItem("wserror_" + tlid,errorct);
-			if(errorct<3){
-				reconnector(tlid,TLtype,acct_id,"","error");
-			}
+			reconnector(tlid,TLtype,acct_id,"","error");
 		}
 	};
 	websocketHome[wshid].onerror = function(error) {
-		console.error('WebSocketHome Error')
-		console.error(error);
+		console.error('WebSocket Error ' + error);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Error ' + error);
 		}else{
-			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
-			localStorage.setItem("wserror_" + tlid,errorct);
-			if(errorct<3){
-				reconnector(tlid,TLtype,acct_id,"","error");
-			}
+			reconnector(tlid,TLtype,acct_id,"","error");
 		}
 	};
 	websocketHome[wshid].onclose = function() {
-		console.log('WebSocketHome Closing:' + tlid);
+		console.error('WebSocketHome Closing by error:' + tlid);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
 		}else{
-			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
-			localStorage.setItem("wserror_" + tlid,errorct);
-			if(errorct<3){
-				reconnector(tlid,TLtype,acct_id,"","error");
-			}
+			reconnector(tlid,TLtype,acct_id,"","error");
 		}
 		
 	};
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -252,27 +252,18 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						localStorage.setItem("notf-reply_" + acct_id,replyct*1-(-1))
 						$(".notf-reply_" + acct_id).removeClass("hide")
 						var sound=localStorage.getItem("replySound");
-						if(sound=="default"){
-							var file="../../source/notif3.wav"
-						}
 					}else if (toot.type == "reblog") {
 						var btct=localStorage.getItem("notf-bt_" + acct_id)
 						$(".notf-bt_" + acct_id).text(btct*1-(-1));
 						localStorage.setItem("notf-bt_" + acct_id,btct*1-(-1))
 						$(".notf-bt_" + acct_id).removeClass("hide")
 						var sound=localStorage.getItem("btSound");
-						if(sound=="default"){
-							var file="../../source/notif2.wav"
-						}
 					}else if (toot.type == "favourite") {
 						var favct=localStorage.getItem("notf-fav_" + acct_id)
 						$(".notf-fav_" + acct_id).text(favct*1-(-1));
 						localStorage.setItem("notf-fav_" + acct_id,favct*1-(-1))
 						$(".notf-fav_" + acct_id).removeClass("hide")
 						var sound=localStorage.getItem("favSound");
-						if(sound=="default"){
-							var file="../../source/notif.wav"
-						}
 					}
 				}
 				
@@ -281,7 +272,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					Materialize.toast("["+domain+"]"+escapeHTML(toot.account.display_name)+what, popup * 1000);
 				}
 				//通知音
-				if(sound=="c1"){
+				if(sound=="default" || !sound){
+					var file="../../source/notif.wav"
+				}else if(sound=="c1"){
 					var file=localStorage.getItem("custom1");
 				}else if(sound=="c2"){
 					var file=localStorage.getItem("custom2");
@@ -489,7 +482,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var myvote=lang.lang_parse_voted;
 				var result_hide="";
 			}else{
-				var myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
+				myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
 				if(choices[0].votes_count===0 || choices[0].votes_count>0){
 					myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>";
 				}
@@ -580,25 +573,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var purl = media.preview_url;
 				media_ids=media_ids+media.id+",";
 				var url = media.url;
-				var nsfwmes=""
 				if (toot.sensitive && nsfw) {
 					var sense = "sensitive"
-					var blur=media.blurhash
-					if(blur){
-						nsfwmes='<span class="gray">NSFW media</span>'
-						purl=parseBlur(blur)
-						var sense=""
-					}
 				} else {
 					var sense = ""
-					var blur=null
 				}
-					viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
+				viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
 					acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
 					'" data-type="' + media.type + '" class="img-parsed"><img draggable="false" src="' +
 					purl + '" class="' + sense +
-					' toot-img pointer" style="width:calc(' + cwdt + '% - 1px); height:'+imh+';"></a>'+nsfwmes;
-				
+					' toot-img pointer" style="width:calc(' + cwdt + '% - 1px); height:'+imh+';"></a></span>';
 			});
 			media_ids = media_ids.slice(0, -1) ;
 		} else {
@@ -775,7 +759,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+escapeHTML(value.name)+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
 					break;
 				}
 		   }
@@ -807,8 +791,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="' +
 			api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
-			'</span><span class="toot ' + spoiler + '">' + content +
-			'</span>' + poll +
+			'</span><span class="toot ' + spoiler + '">' + content +poll+
+			'</span>' +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
 			'</span>' +
@@ -838,7 +822,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'</a></span></div>' +
 			'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fas fa-trash"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="far fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fas fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
@@ -1009,7 +993,7 @@ function client(name) {
 			if(!obj){
 				var obj=[];
 				obj.push(name);
-				Materialize.toast(escapeHTML(name)+lang.lang_status_emphas, 2000);
+				Materialize.toast(name+lang.lang_status_emphas, 2000);
 			}else{
 			var can;
 			Object.keys(obj).forEach(function(key) {
@@ -1019,12 +1003,12 @@ function client(name) {
 				}else{
 					can=true;
 					obj.splice(key, 1);
-					Materialize.toast(escapeHTML(name)+lang.lang_status_unemphas, 2000);
+					Materialize.toast(name+lang.lang_status_unemphas, 2000);
 				}
 			});
 			if(!can){
 				obj.push(name);
-				Materialize.toast(escapeHTML(name)+lang.lang_status_emphas, 2000);
+				Materialize.toast(name+lang.lang_status_emphas, 2000);
 			}else{
 				
 			}
@@ -1040,7 +1024,7 @@ function client(name) {
 			obj.push(name);
 			var json = JSON.stringify(obj);
 			localStorage.setItem("client_mute", json);
-			Materialize.toast(escapeHTML(name)+lang.lang_parse_mute, 2000);
+			Materialize.toast(name+lang.lang_parse_mute, 2000);
 		}else{
 			return;
 		}
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -52,7 +52,7 @@ function src(mode) {
 				var tag = json.hashtags[key4];
 				if(mode){
 					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
-					'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
+					'\',\'add\')" class="pointer">#' + tag + '</a><br> ';
 				}else{
 					tags=tags+graphDraw(tag);
 				}
@@ -186,13 +186,13 @@ function graphDraw(tag){
 		var zero=50-(his[0].uses/max*50);
 		if(max===0){
 			tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">'+
-	'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
-			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+	'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
+			'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
 		}else{
 			tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">'+
 			'<g><path d="M0,'+six+' L10,'+five+' 20,'+four+' 30,'+three+' 40,'+two+' 50,'+one+' 60,'+zero+'" style="stroke: #9e9e9e; stroke-width: 1;fill: none;"></path></g>'+
-		'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
-				'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+		'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
+				'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
 		}
 		
 	return tags;
--- a/app/js/tl/tag.js
+++ b/app/js/tl/tag.js
@@ -65,7 +65,6 @@ function favTag(){
            var ptt=lang.lang_tags_unrealtime;
            var nowon="("+lang.lang_tags_realtime+")";
        }
-        tag=escapeHTML(tag);
        tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a>'+nowon+'<span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
            '<a onclick="autoToot(\'' + tag + '\');" class="pointer" title="'+lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">'+ptt+'</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' +lang.lang_tags_tagunpin.replace("{{tag}}" ,'#'+tag)+ '">'+lang.lang_del+'</a></span> ';
    });
@@ -97,7 +96,6 @@ function trendTag(){
            var tags="";
            json=json.score;
            Object.keys(json).forEach(function(tag) {
-                tag=escapeHTML(tag);
                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span> ';
             });
             $("#taglist").append('<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags+'</div>');
@@ -117,7 +115,6 @@ function tagTL(a,b,c,d){
    tl(a,b,acct_id,d);
 }
 function autoToot(tag){
-    tag=escapeHTML(tag)
    var nowPT=localStorage.getItem("stable")
    if(nowPT==tag){
        localStorage.removeItem("stable");
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -337,8 +337,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		return false;
 	};
 	websocket[wsid].onclose = function() {
-		console.log("Closing");
-		console.log(tlid);
+		console.error("Closing");
+		console.error(tlid);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
@@ -660,7 +660,7 @@ function cap(type, data, acct_id) {
 			var response="Federated TL(Media)";
 		}
 	} else if (type == "tag") {
-		var response= "#" + escapeHTML(data)
+		var response= "#" + data
 	} else if (type == "list") {
 		var ltitle=localStorage.getItem("list_"+data+"_"+acct_id);
 		var response= "List(" + ltitle + ")"
@@ -685,7 +685,7 @@ function cap(type, data, acct_id) {
 	}else if (type == "webview") {
 		var response="Twitter"
 	}else if (type == "tootsearch") {
-		var response="tootsearch(" + escapeHTML(data) + ")";
+		var response="tootsearch(" + data + ")";
 	}
 	return response;
 }
@@ -788,7 +788,7 @@ function strAliveInt(){
 }
 function reconnector(tlid,type,acct_id,data,mode){
 	console.log("Reconnector:"+mode)
-	if(type=="mix" || type=="integrated" || type=="plus"){
+	if(type=="mix" || type=="plus"){
 		if(localStorage.getItem("voice_" + tlid)){
 			var voice=true;
 		}else{
@@ -801,11 +801,10 @@ function reconnector(tlid,type,acct_id,data,mode){
 		}
 		var wssh=localStorage.getItem("wssH_" + tlid);
 		websocketHome[wssh].close();
-		var wssl=localStorage.getItem("wssL_" + tlid);
+		var wssh=localStorage.getItem("wssL_" + tlid);
 		websocketLocal[wssl].close();
 		mixre(acct_id, tlid, type, mute,"",voice,mode);
 	}else if(type=="notf"){
-		notfColumn(acct_id, tlid, "")
 	}else{
 		var wss=localStorage.getItem("wss_" + tlid);
 		websocket[wss].close();
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -28,9 +28,6 @@ function parseColumn() {
 		$(".toot-reset").css("font-size", size + "px");
 		$(".cont-series").css("font-size", size + "px");
 	}
-	if(localStorage.getItem("menu-done")){
-		$("#fukidashi").addClass("hide")
-	}
 	tlCloser();
 	var multi = localStorage.getItem("multi");
 	if (multi) {
@@ -201,7 +198,7 @@ function parseColumn() {
 		  key + '">On</span></a>'+lang.lang_layout_linkana +'<br><a onclick="voiceToggle(' + key +
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_tts +'">hearing</i><span id="sta-voice-' +
 		  key + '">On</span></a>'+lang.lang_layout_tts +'TL<br><a onclick="reconnector(' + key +
-		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+escapeHTML(acct.data)+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
 			'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'" data-const="' + acct.type + '_'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
 			$('#timeline_box_' + basekey + '_parentBox').append(html);
 		localStorage.removeItem("pool_" + key);
--- a/app/js/ui/menu.js
+++ b/app/js/ui/menu.js
@@ -1,6 +1,4 @@
 function menu(){
-    localStorage.setItem("menu-done",true);
-    $("#fukidashi").addClass("hide")
    if(!$("#menu").hasClass("appear")){
        $("#menu").addClass("appear")
        var left=localStorage.getItem("menu-left");
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -668,4 +668,3 @@ oksload();
 npprovider();
 ctLoad()
  };
-
--- a/app/js/ui/sort.js
+++ b/app/js/ui/sort.js
@@ -32,7 +32,7 @@ function sortload(){
 				var acctdata=user+"@"+domain;
 			}
 			
-			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><div class="sorticon"><i class="material-icons">'+icon(acct.type)+'</i></div><div class="sorttitle">'+cap(acct.type, escapeHTML(acct.data),acct.domain)+'</div><div class="sortaction"><a onclick="goColumn(' + key +
+			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><div class="sorticon"><i class="material-icons">'+icon(acct.type)+'</i></div><div class="sorttitle">'+cap(acct.type, acct.data,acct.domain)+'</div><div class="sortaction"><a onclick="goColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_sort_gothis+'">forward</i></a> <a onclick="removeColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">'+acctdata+'</div></li>';
 			$("#sort").append(html);
@@ -103,7 +103,7 @@ function sort(){
 	var json = JSON.stringify(newobj);
 	localStorage.setItem("column", json);
 	$("#sort").html("");
-	Materialize.toast("Sorted", 3000);
+	Materialize.toast("並べ替え完了。", 3000);
 	sortload();
 	parseColumn();
 	sortMenu()
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -57,7 +57,7 @@ function startmem(){
 		var use=arg[0];
 		var cpu=arg[1];
 		var total=arg[2]
-		$("#tips-text").html(escapeHTML(cpu)+"<br>Memory:"+Math.floor(use/1024/1024/102.4)/10+"/"+Math.floor(total/1024/1024/102.4)/10+"GB("+Math.floor(use/total*100)+"%)")
+		$("#tips-text").html(cpu+"<br>Memory:"+Math.floor(use/1024/1024/102.4)/10+"/"+Math.floor(total/1024/1024/102.4)/10+"GB("+Math.floor(use/total*100)+"%)")
 	})
 }
 //トレンドタグ
@@ -83,7 +83,7 @@ function trendTagonTip(){
            var tags="";
            json=json.score;
            Object.keys(json).forEach(function(tag) {
-                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + escapeHTML(tag) + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
+                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
             });
             $("#tips-text").html('<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTagonTip()" style="font-size:12px">refresh</i>:<br>' + tags+'</div>');
             trendTagonTipInterval()
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -571,30 +571,15 @@ function udAdd(start) {
 		for(var i=0;i<fields.length;i++){
 			if(fields[i].type=="IdentityProof"){
 				if(fields[i].signatureAlgorithm=="keybase"){
-					var html='<a href="https://keybase.io/'+fields[i].name+'" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",escapeHTML(fields[i].signatureAlgorithm))+'"><i class="fas fa-key" aria-hidden="true"></i>'+escapeHTML(fields[i].signatureAlgorithm)+':'+escapeHTML(fields[i].name)+'</a>';
+					var html='<a href="https://keybase.io/'+fields[i].name+'" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",fields[i].signatureAlgorithm)+'"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</a>';
 				}else{
-					var html='<span class="cbadge teal" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",escapeHTML(fields[i].signatureAlgorithm))+'"><i class="fas fa-key" aria-hidden="true"></i>'+escapeHTML(fields[i].signatureAlgorithm)+':'+escapeHTML(fields[i].name)+'</span>';
+					var html='<span class="cbadge teal" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",fields[i].signatureAlgorithm)+'"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</span>';
 				}
 				$("#his-proof-prof").append(html)
 			}
 		}
 	});
-	fetch("https://notestock.osa-p.net/api/v1/isstock.json?id="+start.replace("@","users/"), {
-		method: 'GET',
-		headers: {
-			'Accept': 'application/json'
-		},
-	}).then(function(response) {
-		return response.json();
-	}).catch(function(error) {
-		todo(error);
-		console.error(error);
-	}).then(function(json) {
-		if(json.user.public_view){
-			var html='<a href="'+json.user.url+'" target="_blank" class="cbadge purple waves-effect" style="max-width:200px;" title="Notestock">Notestock</a>';
-			$("#his-proof-prof").append(html)
-		}
-	});
+

 }

--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -184,10 +184,10 @@ function udg(user, acct_id) {
 				showFrl('', acct_id);
 				$("#his-name-val").val(json.display_name);
 				if(json.fields.length>0){
-					if(json.fields[0]){$("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value));}
-					if(json.fields[1]){$("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value));}
-					if(json.fields[2]){$("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value));}
-					if(json.fields[3]){$("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value));}
+					$("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value));
+					$("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value));
+					$("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value));
+					$("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value));
 				}
 				var des = json.note;
 				des = des.replace(/<br \/>/g, "\n")
@@ -278,7 +278,7 @@ function misskeyUdg(user, acct_id) {
 			$("#his-follow").text(json.followingCount);
 			$("#his-follower").text(json.followersCount);
 			$("#his-since").text(crat(json.createdAt));
-			var note=escapeHTML(json.description);
+			var note=json.description;
 			$("#his-des").html(twemoji.parse(note));
 			if(json.isCat){
 				$("#his-bot").html("Cat"+twemoji.parse("😺"));
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "thedesk",
-  "version": "18.3.1",
+  "version": "18.2.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -18,7 +18,8 @@
    "abbrev": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "optional": true
    },
    "ajv": {
      "version": "6.10.0",
@@ -157,12 +158,14 @@
    "aproba": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "optional": true
    },
    "are-we-there-yet": {
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "optional": true,
      "requires": {
        "delegates": "^1.0.0",
        "readable-stream": "^2.0.6"
@@ -245,7 +248,7 @@
      "version": "0.0.9",
      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
+      "optional": true,
      "requires": {
        "inherits": "~2.0.0"
      }
@@ -472,12 +475,6 @@
        "supports-color": "^5.3.0"
      }
    },
-    "chownr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
-      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
-      "optional": true
-    },
    "chromium-pickle-js": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
@@ -496,21 +493,6 @@
      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
      "dev": true
    },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^2.0.0"
-      }
-    },
-    "cli-spinners": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.1.0.tgz",
-      "integrity": "sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA==",
-      "dev": true
-    },
    "cliui": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
@@ -555,12 +537,6 @@
        }
      }
    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true
-    },
    "code-point-at": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -581,12 +557,6 @@
      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
      "dev": true
    },
-    "colors": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-      "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-      "dev": true
-    },
    "combined-stream": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
@@ -635,7 +605,8 @@
    "console-control-strings": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "optional": true
    },
    "core-util-is": {
      "version": "1.0.2",
@@ -705,15 +676,6 @@
      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
      "dev": true
    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
    "delayed-stream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -722,13 +684,8 @@
    "delegates": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-    },
-    "detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-      "dev": true
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "optional": true
    },
    "dmg-builder": {
      "version": "6.6.0",
@@ -957,165 +914,6 @@
        }
      }
    },
-    "electron-rebuild": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.8.4.tgz",
-      "integrity": "sha512-QBUZg1due+R0bww5rNd4gEcsKczyhxyLrxSFZlKihwHRxaiHrGut532JAUe0fRz+VIU4WNSfNKyZ/ZwSGjaDhA==",
-      "dev": true,
-      "requires": {
-        "colors": "^1.3.3",
-        "debug": "^4.1.1",
-        "detect-libc": "^1.0.3",
-        "fs-extra": "^7.0.1",
-        "node-abi": "^2.7.0",
-        "node-gyp": "^3.8.0",
-        "ora": "^3.0.0",
-        "spawn-rx": "^3.0.0",
-        "yargs": "^12.0.5"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "node-gyp": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-          "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-          "dev": true,
-          "requires": {
-            "fstream": "^1.0.0",
-            "glob": "^7.0.3",
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "^0.5.0",
-            "nopt": "2 || 3",
-            "npmlog": "0 || 1 || 2 || 3 || 4",
-            "osenv": "0",
-            "request": "^2.87.0",
-            "rimraf": "2",
-            "semver": "~5.3.0",
-            "tar": "^2.0.0",
-            "which": "1"
-          }
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "tar": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-          "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-          "dev": true,
-          "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.2",
-            "inherits": "2"
-          }
-        },
-        "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
    "emoji-regex": {
      "version": "7.0.3",
      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
@@ -1320,25 +1118,17 @@
        "fs-extra": "^7.0.1"
      }
    },
-    "fs-minipass": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
-      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-      "optional": true,
-      "requires": {
-        "minipass": "^2.2.1"
-      }
-    },
    "fs.realpath": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "optional": true
    },
    "fstream": {
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "dev": true,
+      "optional": true,
      "requires": {
        "graceful-fs": "^4.1.2",
        "inherits": "~2.0.0",
@@ -1350,6 +1140,7 @@
      "version": "2.7.4",
      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "optional": true,
      "requires": {
        "aproba": "^1.0.3",
        "console-control-strings": "^1.0.0",
@@ -1391,6 +1182,7 @@
      "version": "7.1.3",
      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "optional": true,
      "requires": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@@ -1470,7 +1262,8 @@
    "has-unicode": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "optional": true
    },
    "hosted-git-info": {
      "version": "2.7.1",
@@ -1522,6 +1315,7 @@
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "optional": true,
      "requires": {
        "once": "^1.3.0",
        "wrappy": "1"
@@ -1826,21 +1620,6 @@
        "path-exists": "^3.0.0"
      }
    },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
-    },
-    "log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.1"
-      }
-    },
    "loud-rejection": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -1988,36 +1767,6 @@
      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
    },
-    "minipass": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-      "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-      "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-        }
-      }
-    },
-    "minizlib": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-      "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-      "optional": true,
-      "requires": {
-        "minipass": "^2.2.1"
-      }
-    },
    "mkdirp": {
      "version": "0.5.1",
      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -2048,27 +1797,19 @@
      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
      "dev": true
    },
-    "node-abi": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.8.0.tgz",
-      "integrity": "sha512-1/aa2clS0pue0HjckL62CsbhWWU35HARvBDXcJtYKbYR7LnIutmpxmXbuDMV9kEviD2lP/wACOgWmmwljghHyQ==",
-      "dev": true,
-      "requires": {
-        "semver": "^5.4.1"
-      }
-    },
    "node-addon-api": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.3.tgz",
-      "integrity": "sha512-FXWH6mqjWgU8ewuahp4spec8LkroFZK2NicOv6bNwZC3kcwZUI8LeZdG80UzTSLLhK4T7MsgNwlYDVRlDdfTDg==",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.2.tgz",
+      "integrity": "sha512-479Bjw9nTE5DdBSZZWprFryHGjUaQC31y1wHo19We/k0BZlrmhqQitWoUL0cD8+scljCbIUL+E58oRDEakdGGA==",
      "optional": true
    },
    "node-gyp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz",
-      "integrity": "sha512-2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
      "optional": true,
      "requires": {
+        "fstream": "^1.0.0",
        "glob": "^7.0.3",
        "graceful-fs": "^4.1.2",
        "mkdirp": "^0.5.0",
@@ -2078,15 +1819,138 @@
        "request": "^2.87.0",
        "rimraf": "2",
        "semver": "~5.3.0",
-        "tar": "^4.4.8",
+        "tar": "^2.0.0",
        "which": "1"
      },
      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "optional": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "aws4": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+          "optional": true
+        },
+        "extend": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+          "optional": true
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "optional": true
+        },
+        "har-validator": {
+          "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+          "optional": true,
+          "requires": {
+            "ajv": "^6.5.5",
+            "har-schema": "^2.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "optional": true
+        },
+        "mime-db": {
+          "version": "1.38.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
+          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+          "optional": true
+        },
+        "mime-types": {
+          "version": "2.1.22",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
+          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
+          "optional": true,
+          "requires": {
+            "mime-db": "~1.38.0"
+          }
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+          "optional": true
+        },
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+          "optional": true
+        },
+        "request": {
+          "version": "2.88.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+          "optional": true,
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.0",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.4.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "optional": true
+        },
        "semver": {
          "version": "5.3.0",
          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
          "optional": true
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "optional": true,
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+          "optional": true
        }
      }
    },
@@ -2105,6 +1969,7 @@
      "version": "3.0.6",
      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "optional": true,
      "requires": {
        "abbrev": "1"
      }
@@ -2123,12 +1988,13 @@
    },
    "nowplaying-node": {
      "version": "0.1.3",
-      "resolved": "git+https://github.com/cutls/nowplaying-node.git#1641fc3c7fad8cd1f10f15a2517ada67a8de802c",
+      "resolved": "https://registry.npmjs.org/nowplaying-node/-/nowplaying-node-0.1.3.tgz",
+      "integrity": "sha512-nEvuw93xmgZS7X1XqUaLJXhd4iB54xjTOnYuEEoPMBHHs3QWGECNKvnD0uDBCe269sUK8Z5InX5rPjzf3vRVrw==",
      "optional": true,
      "requires": {
        "@types/node": "^10.1.2",
        "node-addon-api": "^1.2.0",
-        "node-gyp": ">=4.0.0"
+        "node-gyp": "^3.6.2"
      }
    },
    "npm-run-path": {
@@ -2144,6 +2010,7 @@
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "optional": true,
      "requires": {
        "are-we-there-yet": "~1.1.2",
        "console-control-strings": "~1.1.0",
@@ -2203,58 +2070,11 @@
        "wrappy": "1"
      }
    },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-          "dev": true
-        }
-      }
-    },
-    "ora": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
-      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-spinners": "^2.0.0",
-        "log-symbols": "^2.2.0",
-        "strip-ansi": "^5.2.0",
-        "wcwidth": "^1.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
    "os-homedir": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "optional": true
    },
    "os-locale": {
      "version": "3.1.0",
@@ -2309,12 +2129,14 @@
    "os-tmpdir": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "optional": true
    },
    "osenv": {
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "optional": true,
      "requires": {
        "os-homedir": "^1.0.0",
        "os-tmpdir": "^1.0.0"
@@ -2436,7 +2258,8 @@
    "path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "optional": true
    },
    "path-is-inside": {
      "version": "1.0.2",
@@ -2778,31 +2601,13 @@
        "path-parse": "^1.0.6"
      }
    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dev": true,
-      "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "optional": true,
      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "rxjs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.1.tgz",
-      "integrity": "sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
+        "glob": "^7.0.5"
      }
    },
    "safe-buffer": {
@@ -2914,17 +2719,6 @@
        "source-map": "^0.6.0"
      }
    },
-    "spawn-rx": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-3.0.0.tgz",
-      "integrity": "sha512-dw4Ryg/KMNfkKa5ezAR5aZe9wNwPdKlnHEXtHOjVnyEDSPQyOpIPPRtcIiu7127SmtHhaCjw21yC43HliW0iIg==",
-      "dev": true,
-      "requires": {
-        "debug": "^2.5.1",
-        "lodash.assign": "^4.2.0",
-        "rxjs": "^6.3.1"
-      }
-    },
    "spdx-correct": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
@@ -3078,32 +2872,14 @@
      }
    },
    "tar": {
-      "version": "4.4.8",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-      "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
      "optional": true,
      "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.3.4",
-        "minizlib": "^1.1.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.2"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "optional": true
-        }
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
      }
    },
    "temp-file": {
@@ -3217,12 +2993,6 @@
        "utf8-byte-length": "^1.0.1"
      }
    },
-    "tslib": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
-      "dev": true
-    },
    "tunnel-agent": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -3380,15 +3150,6 @@
      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.9.tgz",
      "integrity": "sha512-t1+tvH8hybPM86oNne3ZozCD02zj/VoZIiojOBPJLjwBn7hxYU5e1gBObFpq8ts1NEn1VhPf/hVXBDAJ3X5ljg=="
    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
    "which": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -3407,6 +3168,7 @@
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "optional": true,
      "requires": {
        "string-width": "^1.0.2 || 2"
      }
@@ -3455,7 +3217,7 @@
    },
    "wrap-ansi": {
      "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
      "dev": true,
      "requires": {
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "thedesk",
-  "version": "18.3.3",
+  "version": "18.3.0",
  "description": "TheDesk is a Mastodon client for PC.",
  "repository": "https://github.com/cutls/TheDesk",
  "main": "main.js",
@@ -49,7 +49,7 @@
    "vue": "^2.6.9"
  },
  "optionalDependencies": {
-    "nowplaying-node": "git+https://github.com/cutls/nowplaying-node",
+    "nowplaying-node": "^0.1.3",
    "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/4/head",
    "font-manager": "^0.3.0"
  },
@@ -88,15 +88,13 @@
    "linux": {
      "icon": "build/icons",
      "target": [
-        "zip"
+        "zip",
+        "snap"
      ],
      "category": "Network"
    },
    "mac": {
-      "target": [
-        "dmg",
-        "zip"
-      ]
+      "target": ["dmg","zip"]
    },
    "electronDownload": {
      "version": "4.1.4"
--- a/app/source/notif2.wav
+++ b/app/source/notif2.wav
--- a/app/source/notif3.wav
+++ b/app/source/notif3.wav
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
--- a/app/view/en/oss.html
+++ b/app/view/en/oss.html
@@ -15,7 +15,7 @@
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
 <a href="setting.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>Back</a>
-LICENSE of TheDesk:<a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">TheDesk LICENSE (Latest Ver.)</a><br>
+LICENSE of TheDesk:<a href="https://github.com/cutls/TheDesk/blob/master/LICENSE.md">TheDesk LICENSE (Latest Ver.)</a><br>
 <article style="width:500px; max-width:100%; margin:15px; font-family:Arial,Helvetica">
 	<h5>TheDesk</h5>
 <i class="fa fa-github"></i><a href="https://github.com/cutls/TheDesk" target="_blank">cutls/TheDesk</a><br>
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -46,7 +46,7 @@
 			<div class="collapsible-body">
 				<h5>Languages</h5>
 				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
-				<a onclick="changelang('ja')" class="pointer" style="margin-right:5px;">日本語</a><a onclick="changelang('en')" class="pointer" style="margin-right:5px;">English</a><a onclick="changelang('ps')" class="pointer" style="margin-right:5px;">Crowdin translate system(beta)</a>
+				<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
 				<h5>Import and export of preferences</h5>
 				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
 					style="width:100%; max-width:200px;">Export</button>
@@ -407,15 +407,17 @@
 			class="material-icons left">info</i>About TheDesk</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>Website</a>
+	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
+			class="material-icons left">trending_up</i>Support(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>Help/Docs(Constructing)</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
 		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
-	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
+	<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
-			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
+			style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
 	<br>
 	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
@@ -427,7 +429,7 @@
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>
 		<br>Developer: Cutls P(
-		<a href="index.html?mode=user&code=Cutls@cutls.com">@Cutls@cutls.com</a>)
+		<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 		<br>
 	</span><br>
 	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
--- a/app/view/en/update.html
+++ b/app/view/en/update.html
@@ -197,24 +197,10 @@ function verck(){
        todo(error);
 		console.error(error);
    }).then(function(json) {
-            console.log(json);
-            if(platform=="win32"){
-                $("#ver").text(json.desk);
-                localStorage.setItem("next-ver",json.desk);
-	        }else if(platform=="linux"){
-                $("#ver").text(json.desk_linux);
-                localStorage.setItem("next-ver",json.desk_linux);
-	        }else if(platform=="darwin"){
-                $("#ver").text(json.desk_mac);
-                localStorage.setItem("next-ver",json.desk_mac);
-            }
-            var lang="en";
-            if(lang=="ja"){
-                $("#det").html(json.detail);
-            }else{
-                $("#det").html(json.detail_en);
-            }
-			 
+		    console.log(json);
+             $("#ver").text(json.desk);
+             localStorage.setItem("next-ver",json.desk);
+			 $("#det").html(json.detail);
             $("#now").text(localStorage.getItem("ver"));
             
    });
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -46,7 +46,7 @@
 			<div class="collapsible-body">
 				<h5>言語</h5>
 				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
-				<a onclick="changelang('ja')" class="pointer" style="margin-right:5px;">日本語</a><a onclick="changelang('en')" class="pointer" style="margin-right:5px;">English</a><a onclick="changelang('ps')" class="pointer" style="margin-right:5px;">Crowdin translate system(beta)</a>
+				<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
 				<h5>設定のインポートとエクスポート</h5>
 				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
 					style="width:100%; max-width:200px;">エクスポート</button>
@@ -407,15 +407,17 @@
 			class="material-icons left">info</i>このソフトについて</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>公式HP</a>
+	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
+			class="material-icons left">trending_up</i>支援(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>支援(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>ヘルプ/Docs(Constructing)</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
 		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
-	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
+	<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
-			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
+			style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
 	<br>
 	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
@@ -427,7 +429,7 @@
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>
 		<br>Developer: Cutls P(
-		<a href="index.html?mode=user&code=Cutls@cutls.com">@Cutls@cutls.com</a>)
+		<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 		<br>
 	</span><br>
 	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
--- a/app/view/ja/update.html
+++ b/app/view/ja/update.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="ja">
+<html lang="en">
 <head>
 <title>Update - TheDesk</title>
 <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
@@ -197,24 +197,10 @@ function verck(){
        todo(error);
 		console.error(error);
    }).then(function(json) {
-            console.log(json);
-            if(platform=="win32"){
-                $("#ver").text(json.desk);
-                localStorage.setItem("next-ver",json.desk);
-	        }else if(platform=="linux"){
-                $("#ver").text(json.desk_linux);
-                localStorage.setItem("next-ver",json.desk_linux);
-	        }else if(platform=="darwin"){
-                $("#ver").text(json.desk_mac);
-                localStorage.setItem("next-ver",json.desk_mac);
-            }
-            var lang="ja";
-            if(lang=="ja"){
-                $("#det").html(json.detail);
-            }else{
-                $("#det").html(json.detail_en);
-            }
-			 
+		    console.log(json);
+             $("#ver").text(json.desk);
+             localStorage.setItem("next-ver",json.desk);
+			 $("#det").html(json.detail);
             $("#now").text(localStorage.getItem("ver"));
             
    });
--- a/app/view/make/acct.sample.html
+++ b/app/view/make/acct.sample.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="@@lang@@">
+<html lang="{{lang}}">
 <head>
 <title>Account Manager - TheDesk</title>
 <meta content="width=device-width,initial-scale=1.0" name="viewport">
@@ -28,19 +28,19 @@ body,html{overflow-y: scroll;}
 }
 </style>
 <meta charset="utf-8">
-@@comment-start@@
+{{comment-start}}
 <script type="text/javascript">
 	var _jipt = [];
 	_jipt.push(['project', 'thedesk']);
 </script>
 <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-@@comment-end@@
+{{comment-end}}
 </head>
 <body id="mainView">
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.@@lang@@.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.{{lang}}.js"></script>
 <script>
      var misskeytoken=false;
 </script>
@@ -48,23 +48,23 @@ body,html{overflow-y: scroll;}
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <div class="hide-first">
-      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">@@back@@</a><br>
-      <h5>@@list@@</h5>
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">{{back}}</a><br>
+      <h5>{{list}}</h5>
      <div id="acct-list"></div>
      <div class="divider"></div>
 </div>
 <div>
-<h5>@@add@@</h5><br>
+<h5>{{add}}</h5><br>
 <div id="add">
 <div class="row">
      <div class="col s8">
            <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
            <div id="ins-suggest"></div>
-            @@codesetupwarn@@<br>
+            {{codesetupwarn}}<br>
            <input type="checkbox" class="filled-in" id="linux" />
-                  <label for="linux">@@codesetup@@</label><br>
+                  <label for="linux">{{codesetup}}</label><br>
            <input type="checkbox" class="filled-in" id="misskey" />
-                  <label for="misskey">@@thisismisskey@@</label><br>
+                  <label for="misskey">{{thisismisskey}}</label><br>
            <button class="btn waves-effect" onclick="instance()">Login</button><br>
      </div>
      <div class="col s4">
@@ -73,21 +73,21 @@ body,html{overflow-y: scroll;}
      </div>
 </div></div>
 <div id="auth" style="display:none">
-      @@codepastewarn@@<br>
-      <input type="text" id="code" placeholder="@@codepaste@@">
+      {{codepastewarn}}<br>
+      <input type="text" id="code" placeholder="{{codepaste}}">
      <button class="btn waves-effect" onclick="code()">Auth</button><br>
      </div>
      <div id="misskeylogin" style="display:none">
                  <h5>AppSecret</h5>
-                  @@misskeylogin@@<br>
+                  {{misskeylogin}}<br>
                  <input type="hidden" id="misskey-url">
-                  <input type="text" id="misskey-key" placeholder="@@codepaste@@">
+                  <input type="text" id="misskey-key" placeholder="{{codepaste}}">
                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
            </div>
      </div>
 <div class="hide-first">
-<h5>@@mainacct@@</h5>
-<div class="input-field" style="width:300px"><span data-trans="your_acct">@@selacct@@</span>
+<h5>{{mainacct}}</h5>
+<div class="input-field" style="width:300px"><span data-trans="your_acct">{{selacct}}</span>
      <br>
      <select id="main-acct-sel" class="acct-sel" style="color:black" onchange="mainacct()"></select>
      <label></label>
@@ -98,12 +98,12 @@ Administered by:<a id="ins-admin"></a><br>
 <span id="ins-desc"></span><br>
 <img src="../../img/loading.svg" id="ins-prof" width="200"><br>
 <br>
-@@domain@@:<span id="ins-name"></span><br>
-@@connect@@:<span id="ins-connect"></span>@@ko@@<br>
-@@toots@@:<span id="ins-toot"></span>@@ko@@<br>
-@@users@@:<span id="ins-user"></span>@@users@@<br>
-@@safety@@:<span id="ins-per"></span>%<br>
-@@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
+{{domain}}:<span id="ins-name"></span><br>
+{{connect}}:<span id="ins-connect"></span>{{ko}}<br>
+{{toots}}:<span id="ins-toot"></span>{{ko}}<br>
+{{users}}:<span id="ins-user"></span>{{users}}<br>
+{{safety}}:<span id="ins-per"></span>%<br>
+{{ver}}:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
 </div>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>
 <script type="text/javascript" src="../../js/platform/end.js"></script>
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
--- a/app/view/make/language/index.en.json
+++ b/app/view/make/language/index.en.json
@@ -56,9 +56,6 @@
    "contextAfter":"Context after this toot",
    "beforeLTL":"Local TL before this toot",
    "beforeUTL":"User TL before this toot",
-    "afterLTL":"Local TL after this toot)",
-    "afterUTL":"User TL before this toot",
-    "afterFTL":"Federated TL after this toot",
    "favedPeople":"People who favourited it",
    "btedPeople":"People who boosted it",
    "useOtherAcct1":"Use other account",
@@ -161,6 +158,5 @@
    "ramTips":"RAM status",
    "changeTips":"Change Tips",
    "help":"Help",
-    "about":"About TheDesk",
-    "hereAddColumns":"<- Add TL"
+    "about":"About TheDesk"
 }
--- a/app/view/make/language/index.ja.json
+++ b/app/view/make/language/index.ja.json
@@ -56,9 +56,6 @@
    "contextAfter":"これより後の会話",
    "beforeLTL":"これより前のLocal TL(エアリプソース確認)",
    "beforeUTL":"これより前のユーザーTL(BTソース確認)",
-    "afterLTL":"これより後のLocal TL(言及確認)",
-    "afterUTL":"これより後のユーザーTL(言及確認)",
-    "afterFTL":"これより後の連合TL(言及確認)",
    "favedPeople":"このトゥートをお気に入りに登録した人",
    "btedPeople":"このトゥートをブーストした人",
    "useOtherAcct1":"他のアカウントを使用",
@@ -161,6 +158,5 @@
    "ramTips":"システムメモリ容量",
    "changeTips":"Tips変更",
    "help":"ヘルプ",
-    "about":"このソフトについて",
-    "hereAddColumns":"←ここからTL追加"
+    "about":"このソフトについて"
 }
--- a/app/view/make/make.js
+++ b/app/view/make/make.js
@@ -1,37 +0,0 @@
-const fs = require("fs")
-const ver="Usamin (18.3.3)"
-const langs=["ja","en","ps"]
-const langsh=["日本語","English","Crowdin translate system(beta)"]
-const simples=["acct","index","setting","update","setting"]
-const samples=["acct.sample.html","index.sample.html","setting.sample.html","update.sample.html","setting.sample.js"]
-const pages=["acct.html","index.html","setting.html","update.html","setting.vue.js"]
-let langstr=""
-for(let n=0; n<langs.length; n++){
-    let lang=langs[n]
-    langstr=langstr+'<a onclick="changelang(\''+lang+'\')" class="pointer" style="margin-right:5px;">'+langsh[n]+'</a>'
-}
-for(let i=0; i<samples.length; i++){
-    let sample=samples[i]
-    let sourceParent = fs.readFileSync(sample, 'utf8')
-    for(let j=0; j<langs.length; j++){
-        let source=sourceParent
-        let lang=langs[j]
-        let target = JSON.parse(fs.readFileSync("language/"+simples[i]+"."+lang+".json", 'utf8'))
-        Object.keys(target).forEach(function(key) {
-            let str = target[key]
-            var regExp = new RegExp("@@" + key + "@@", "g")
-			source = source.replace(regExp, str)
-        })
-        if(lang=="ps"){
-            source = source.replace(/@@comment-start@@/g, "")
-            source = source.replace(/@@comment-end@@/g, "")
-        }else{
-            source = source.replace(/@@comment-start@@/g, "<!--")
-            source = source.replace(/@@comment-end@@/g, "-->")
-        }
-        source = source.replace(/@@versionLetter@@/g, ver)
-        source = source.replace(/@@lang@@/g, lang)
-        source = source.replace(/@@langlist@@/g, langstr)
-        fs.writeFileSync("../"+lang+"/"+pages[i], source)
-    }
-}
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -407,15 +407,17 @@
 			class="material-icons left">info</i>@@about@@</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>@@hp@@</a>
+	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
+			class="material-icons left">trending_up</i>@@support@@(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>@@support@@(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>@@help@@/Docs(Constructing)</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
 		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
-	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
+	<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
-			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
+			style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
 	<br>
 	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
@@ -427,7 +429,7 @@
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>
 		<br>Developer: Cutls P(
-		<a href="index.html?mode=user&code=Cutls@cutls.com">@Cutls@cutls.com</a>)
+		<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 		<br>
 	</span><br>
 	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
--- a/app/view/make/update.sample.html
+++ b/app/view/make/update.sample.html
@@ -1,18 +1,18 @@
 <!doctype html>
-<html lang="@@lang@@">
+<html lang="en">
 <head>
 <title>Update - TheDesk</title>
 <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
 <link href="../../css/master.css" type="text/css" rel="stylesheet">
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 <meta charset="utf-8">
-@@comment-start@@
+{{comment-start}}
 <script type="text/javascript">
 	var _jipt = [];
 	_jipt.push(['project', 'thedesk']);
 </script>
 <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-@@comment-end@@
+{{comment-end}}
 </head>
 <body>
 <style>
@@ -72,27 +72,27 @@ a,button,input,label,i{
 <div id="start">
    <div id="box" class="show">
        <h2>TheDesk</h2>
-        <p>@@updatehere@@</p>
+        <p>{{updatehere}}</p>
        <span id="now"></span>→<b id="ver"></b><br>
        <span id="det"></span><br>
-        <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">@@installer@@</button>
-        <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">@@portable@@</button>
-        <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">@@download@@</button>
-        <button class="waves-effect btn mac hide" onclick="update('mac')" style="margin-left:15px;">@@download@@</button>
+        <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
+        <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">{{portable}}</button>
+        <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">{{download}}</button>
+        <button class="waves-effect btn mac hide" onclick="update('mac')" style="margin-left:15px;">{{download}}</button>
        <br>
-        @@problem1@@<br>@@problem2@@
+        {{problem1}}<br>{{problem2}}
    </div>
    <div id="skipper" class="hide">
-        <h4>@@sureupd@@</h4>
-        @@skipupd@@<br>
+        <h4>{{sureupd}}</h4>
+        {{skipupd}}<br>
        <div id="updskip">
-                <a onclick="window.close();" class="pointer skipbtn waves-effect waves-light"><div>@@nexttl@@</div></a>
-                <a onclick="nextv();" class="pointer skipbtn waves-effect waves-light"><div>@@nextver@@</div></a>
+                <a onclick="window.close();" class="pointer skipbtn waves-effect waves-light"><div>{{nexttl}}</div></a>
+                <a onclick="nextv();" class="pointer skipbtn waves-effect waves-light"><div>{{nextver}}</div></a>
        </div>
-        <a class="pointer waves-effect" onclick="skipper();" style="margin-top:5px">@@continue@@</a>
+        <a class="pointer waves-effect" onclick="skipper();" style="margin-top:5px">{{continue}}</a>
    </div>
    <div id="dlnow" class="hide">
-        <h4>@@dlnow@@</h4>
+        <h4>{{dlnow}}</h4>
        <h4 id="prog"></h4>
    </div>
 </div>
@@ -197,24 +197,10 @@ function verck(){
        todo(error);
 		console.error(error);
    }).then(function(json) {
-            console.log(json);
-            if(platform=="win32"){
-                $("#ver").text(json.desk);
-                localStorage.setItem("next-ver",json.desk);
-	        }else if(platform=="linux"){
-                $("#ver").text(json.desk_linux);
-                localStorage.setItem("next-ver",json.desk_linux);
-	        }else if(platform=="darwin"){
-                $("#ver").text(json.desk_mac);
-                localStorage.setItem("next-ver",json.desk_mac);
-            }
-            var lang="@@lang@@";
-            if(lang=="ja"){
-                $("#det").html(json.detail);
-            }else{
-                $("#det").html(json.detail_en);
-            }
-			 
+		    console.log(json);
+             $("#ver").text(json.desk);
+             localStorage.setItem("next-ver",json.desk);
+			 $("#det").html(json.detail);
             $("#now").text(localStorage.getItem("ver"));
             
    });
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@@ -46,7 +46,7 @@
 			<div class="collapsible-body">
 				<h5>crwdns530:0crwdne530:0</h5>
 				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
-				<a onclick="changelang('ja')" class="pointer" style="margin-right:5px;">日本語</a><a onclick="changelang('en')" class="pointer" style="margin-right:5px;">English</a><a onclick="changelang('ps')" class="pointer" style="margin-right:5px;">Crowdin translate system(beta)</a>
+				<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
 				<h5>crwdns531:0crwdne531:0</h5>
 				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
 					style="width:100%; max-width:200px;">crwdns533:0crwdne533:0</button>
@@ -407,15 +407,17 @@
 			class="material-icons left">info</i>crwdns662:0crwdne662:0</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>crwdns663:0crwdne663:0</a>
+	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
+			class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>crwdns665:0crwdne665:0/Docs(Constructing)</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
 		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
-	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
+	<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
-			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
+			style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
 	<br>
 	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
@@ -427,7 +429,7 @@
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>
 		<br>Developer: Cutls P(
-		<a href="index.html?mode=user&code=Cutls@cutls.com">@Cutls@cutls.com</a>)
+		<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 		<br>
 	</span><br>
 	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
--- a/app/view/ps/update.html
+++ b/app/view/ps/update.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="ps">
+<html lang="en">
 <head>
 <title>Update - TheDesk</title>
 <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
@@ -197,24 +197,10 @@ function verck(){
        todo(error);
 		console.error(error);
    }).then(function(json) {
-            console.log(json);
-            if(platform=="win32"){
-                $("#ver").text(json.desk);
-                localStorage.setItem("next-ver",json.desk);
-	        }else if(platform=="linux"){
-                $("#ver").text(json.desk_linux);
-                localStorage.setItem("next-ver",json.desk_linux);
-	        }else if(platform=="darwin"){
-                $("#ver").text(json.desk_mac);
-                localStorage.setItem("next-ver",json.desk_mac);
-            }
-            var lang="ps";
-            if(lang=="ja"){
-                $("#det").html(json.detail);
-            }else{
-                $("#det").html(json.detail_en);
-            }
-			 
+		    console.log(json);
+             $("#ver").text(json.desk);
+             localStorage.setItem("next-ver",json.desk);
+			 $("#det").html(json.detail);
             $("#now").text(localStorage.getItem("ver"));
             
    });