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

TheDesk Usamin (18.2.0)

app/about.html

@@ -76,7 +76,7 @@ a,button{
 <img src="./img/desk.png" style="max-width:70%;">
 <h5>TheDesk</h5>
 <div class='container'>
-    <div class='area-name1'>バージョン</div>
+    <div class='area-name1'>External version</div>
     <div class='area-data1' id="now"></div>
     <div class='area-name2'>Internal version</div>
     <div class='area-data2' id="ver"></div>

app/css/master.css

@@ -389,6 +389,9 @@ blockquote:before, .quote:before {
   font-size:16px;
   padding:4px;
 }
+#something-wrong{
+  width:100%; height:100%; position:absolute; display:flex; justify-content: center; align-items:center
+}
 
 /*スクロールバー*/
 ::-webkit-scrollbar {

app/css/tl.css

@@ -224,7 +224,10 @@ grid-area: toot;
   cursor:text;
   user-select: auto;
   grid-area: additional;
-  }
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 
 .area-actions {
   padding:0; 
@@ -334,6 +337,7 @@ p:not(:last-child){
 .notice-box {
   top: 0;
   background-color:var(--notfbox);
+  filter: brightness(110%);
   position: relative;
   margin-right: 10px;
   width:100%;
@@ -501,7 +505,26 @@ p:not(:last-child){
 .votebtn:hover{
   background-color:var(--color);
 }
-
+.jump{
+  display: inline-block; animation: jump 0.75s linear infinite;
+}
+@keyframes jump {
+  0% {
+    transform: translateY(0);
+}
+25% {
+  transform: translateY(-16px);
+}
+50% {
+  transform: translateY(0);
+}
+75% {
+  transform: translateY(-8px);
+}
+100% {
+  transform: translateY(0);
+}
+}
 @keyframes fadeInDown {
   from {
     opacity: 0;

app/css/userdata.css

@@ -45,6 +45,7 @@
   height:1.5rem; padding:0; background-color:#757575; text-align:center; 
   padding:5px;
   margin-bottom:1px;
+  width:30%;
 }
 .his-field-content{
   height:1.5rem; padding:0; padding-left:5px;
@@ -90,3 +91,10 @@
   color: #039be5;
   cursor: pointer;
 }
+#his-float-blocked{
+  display:flex; justify-content: center; align-items:center;
+  font-size:2rem;
+  width: 90%;
+  height: 100%;
+  position: absolute;
+}

app/js/lang/lang.en.js

@@ -91,6 +91,7 @@ var lang={
     "lang_list_users":"Users list",
     "lang_list_nouser":"No users in this list.",
     "lang_list_add":"Add to the list",
+    "lang_list_add_misskey":"(perhaps this user has been listed)",
     "lang_list_remove":"Remove from the list",
     //tl/notification.js
     "lang_notf_new":" new notifications",
@@ -148,6 +149,7 @@ var lang={
     "lang_showontl_notf":"Notification ",
     "lang_showontl_domain":"Domain ",
     "lang_showontl_listwarn":"Follow to add this user to lists.",
+    "lang_showontl_verified":"This website is verified by owner at ",
 //parse
     "lang_parse_mentioned":" replied to you",
     "lang_parse_faved":" favourited your toot",

app/js/lang/lang.ja.js

@@ -91,6 +91,7 @@ var lang={
     "lang_list_users":"ユーザー一覧",
     "lang_list_nouser":"ユーザーはいません",
     "lang_list_add":"リストに追加",
+    "lang_list_add_misskey":"(重複追加の可能性があります)",
     "lang_list_remove":"リストから削除",
 //tl/notification.js
     "lang_notf_new":"件の新しい通知",
@@ -150,6 +151,7 @@ var lang={
     "lang_showontl_notf":"通知",
     "lang_showontl_domain":"ドメイン",
     "lang_showontl_listwarn":"リストに追加するためにはフォローが必要です。",
+    "lang_showontl_verified":"このユーザーの所持するWebサイトであると証明されています。",
 //parse
    "lang_parse_mentioned":"が返信しました",
     "lang_parse_faved":"がお気に入り登録しました",

app/js/login/instance.js

@@ -8,17 +8,17 @@ var idata={
 	"kirishima.cloud_glitch":"enabled",
 	"kirishima.cloud_public":"パブリックタイムライン",
 	"minohdon.jp":"instance",
-	"minohdon.jp_name":"箕面丼",
+	"minohdon.jp_name":"箕面どん",
 	"minohdon.jp_letters":"500",
 	"minohdon.jp_bbcode":"disabled",
 	"minohdon.jp_markdown":"disabled",
 	"minohdon.jp_glitch":"disabled",
 	"knzk.me":"instance",
-	"knzk.me_name":"神崎丼",
+	"knzk.me_name":"Knzk",
 	"knzk.me_letters":"5000",
 	"knzk.me_bbcode":"disabled",
 	"knzk.me_markdown":"disabled",
-	"knzk.me_glitch":"enabled",
+	"knzk.me_glitch":"disabled",
 	"mastodos.com":"instance",
 	"mastodos.com_name":"マストどす",
 	"mastodos.com_letters":"500",
@@ -32,7 +32,7 @@ var idata={
 	"dev.kirishima.cloud_markdown":"enabled",
 	"dev.kirishima.cloud_glitch":"enabled",
 	"mstdn.y-zu.org":"instance",
-	"mstdn.y-zu.org_name":"Yづドン!(502 BadGateway)",
+	"mstdn.y-zu.org_name":"Yづドン(Y-zuDon)",
 	"mstdn.y-zu.org_letters":"500",
 	"mstdn.y-zu.org_bbcode":"disabled",
 	"mstdn.y-zu.org_markdown":"enabled",
@@ -84,20 +84,14 @@ var idata={
 	"itabashi.0j0.jp_bbcode":"disabled",
 	"itabashi.0j0.jp_markdown":"disabled",
 	"itabashi.0j0.jp_glitch":"disabled",
-	"theboss.tech":"instance",
-	"theboss.tech_name":"theboss.tech",
-	"theboss.tech_letters":"1000",
-	"theboss.tech_bbcode":"disabled",
-	"theboss.tech_markdown":"disabled",
-	"theboss.tech_glitch":"disabled",
 	"dtp-mstdn.jp":"instance",
 	"dtp-mstdn.jp_name":"DTP鯖",
 	"dtp-mstdn.jp_letters":"500",
 	"dtp-mstdn.jp_bbcode":"disabled",
 	"dtp-mstdn.jp_markdown":"disabled",
 	"dtp-mstdn.jp_glitch":"disabled",
-	"misskey.xyz":"instance",
+	"misskey.xyz":"misskey",
-	"misskey.xyz_name":"Misskey",
+	"misskey.xyz_name":"misskey.xyz",
 	"misskey.xyz_letters":"1000",
 	"misskey.xyz_bbcode":"disabled",
 	"misskey.xyz_markdown":"enabled",
@@ -105,6 +99,28 @@ var idata={
 	"misskey.xyz_post":"Post",
 	"misskey.xyz_fav":" reacted your post.",
 	"misskey.xyz_bt":" reposted your post.",
+	"misskey.dev":"misskey",
+	"misskey.dev_name":"misskey.dev",
+	"misskey.dev_letters":"1024",
+	"misskey.dev_bbcode":"disabled",
+	"misskey.dev_markdown":"enabled",
+	"misskey.dev_public":"Global",
+	"misskey.dev_post":"Post",
+	"misskey.dev_fav":" reacted your post.",
+	"misskey.dev_bt":" reposted your post.",
+	"precure.ml":"instance",
+	"precure.ml_name":"キュアスタ！",
+	"precure.ml_letters":"1024",
+	"precure.ml_bbcode":"disabled",
+	"precure.ml_markdown":"disabled",
+	"precure.ml_post":"キュア！",
+	"precure.ml_glitch":"disabled",
+	"best-friends.chat":"instance",
+	"best-friends.chat_name":"Best Friends",
+	"best-friends.chat_letters":"500",
+	"best-friends.chat_bbcode":"disabled",
+	"best-friends.chat_markdown":"disabled",
+	"best-friends.chat_glitch":"disabled",
 };
 
 localStorage.setItem("instance", JSON.stringify(idata));

app/js/login/login.js

@@ -42,29 +42,24 @@ function ck() {
 		}
 	}
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
+	if(!multi || multi=="[]"){
-		var obj = [];
+		location.href="acct.html?mode=first&code=true"
-		var json = JSON.stringify(obj);
+	}else{
-		localStorage.setItem("multi", json);
-	} else {
 		var obj = JSON.parse(multi);
-	}
 	Object.keys(obj).forEach(function(key) {
 		var acct=obj[key];
 		if(acct.domain){
 			refresh(key,true)
 		}
 	});
-	console.log(obj);
+if (obj[0].domain) {
-	if (obj[0].domain) {
 		$("#tl").show();
 		ticker();
 		multiSelector();
-	} else {
+		verck(ver);
-		$("#tl").show();
-		$("#post-box").hide();
 	}
 }
+}
 ck();
 //ログインポップアップ
 function login(url) {

app/js/login/manager.js

@@ -2,6 +2,15 @@
 //最初に読むやつ
 function load() {
 	$("#acct-list").html("");
+	if(location.search){
+		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+		var mode=m[1];
+		var codex=m[2];
+		if(mode=="first" && codex=="true"){
+			$("body").addClass("first")
+		}else{	
+		}
+	}
 	var prof = localStorage.getItem("prof");
 	$(".my-prof").attr("src", prof);
 	var name = localStorage.getItem("name");
@@ -57,14 +66,8 @@ function load() {
 		localStorage.setItem("acct", 0);
 		var acctN = 0;
 	}
-	var electron = require("electron");
+	//全部チェックアリでいいと思うの
-          var remote=electron.remote;
-          var platform=remote.process.platform;
-	    if(localStorage.getItem("winstore")!="localinstall"){
-			$("#linux").prop("checked", false);
-        }else{
 	$("#linux").prop("checked", true);
-		}
 
 }
 //最初に読む
@@ -262,6 +265,10 @@ function support() {
 				templete = '<a onclick="login(\'' + key +
 					'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
 				$("#support").append(templete);
+			}else if (instance == "misskey") {
+				templete = '<a onclick="misskeyLogin(\'' + key +
+					'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
+				$("#support").append(templete);
 			}
 		});
 }
@@ -270,7 +277,7 @@ function support() {
 function login(url) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
-	if($('#misskey:checked').val()=="on" || url=="misskey.xyz"){
+	if($('#misskey:checked').val()=="on"){
 		$("#misskey").prop("checked", true);
 		misskeyLogin(url);
 		return;
@@ -458,7 +465,9 @@ function code(code) {
 				console.log(obj);
 				var json = JSON.stringify(obj);
 				localStorage.setItem("multi", json);
-
+				if($("body").hasClass("first")){
+					location.href="index.html"
+				}
 				load();
 				return;
 			}
@@ -546,6 +555,9 @@ function getdata(domain, at) {
 		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
+		if($("body").hasClass("first")){
+			location.href="index.html"
+		}
 		load();
 	});
 }

app/js/platform/end.js

@@ -19,7 +19,7 @@
 		//メンションっぽかったら
 		var ats=[];
 			ats = url.match(
-				/https:\/\/([-a-zA-Z0-9@.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
+				/https:\/\/([-a-zA-Z0-9.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
 			);
 		console.log(toot);
 		if(toot){
@@ -41,7 +41,8 @@
 		}else if(ats){
 			console.log(ats);
 			if(ats[2]){
-				if(ats[1]!="quesdon.rinsuki.net"){
+				//Quesdon判定
+				if(!~ats[2].indexOf("@")){
 					udgEx(ats[2]+"@"+ats[1],"main");
 					return false
 				}else{

app/js/post/emoji.js

@@ -4,11 +4,11 @@ $("#emoji-before").addClass("disabled");
 $("#emoji-next").addClass("disabled");
 
 //絵文字ボタンのトグル
-function emojiToggle() {
+function emojiToggle(reaction) {
 	var acct_id = $("#post-acct-sel").val();
 	var selin = $("#textarea").prop('selectionStart');
-	if(!selin){
+	if (!selin) {
-		selin=0;
+		selin = 0;
 	}
 	localStorage.setItem("cursor", selin);
 
@@ -18,10 +18,10 @@ function emojiToggle() {
 		$("#suggest").html("");
 		if (!localStorage.getItem("emoji_" + acct_id)) {
 			var html =
-				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">'+lang.lang_emoji_get+'</button>';
+				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">' + lang.lang_emoji_get + '</button>';
 			$("#emoji-list").html(html);
 		} else {
-			emojiList('home');
+			emojiList('home', reaction);
 		}
 	} else {
 		$("#poll").addClass("hide")
@@ -34,26 +34,27 @@ function emojiToggle() {
 }
 
 //絵文字リスト挿入
-function emojiGet(parse) {
+function emojiGet(parse, started) {
 	$('#emoji-list').html('Loading...');
 	var acct_id = $("#post-acct-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
+	if (localStorage.getItem("mode_" + domain) != "misskey") {
 		var start = "https://" + domain + "/api/v1/custom_emojis";
 		fetch(start, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json'
 			},
-	}).then(function(response) {
+		}).then(function (response) {
 			return response.json();
-	}).catch(function(error) {
+		}).catch(function (error) {
 			todo(error);
 			console.error(error);
-	}).then(function(json) {
+		}).then(function (json) {
 			if (parse == "true") {
 				$('#emoji-list').html('Parsing...');
 				//絵文字をマストドン公式と同順にソート
-			json.sort(function(a, b) {
+				json.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
 					if (a.shortcode > b.shortcode) return 1;
 					return 0;
@@ -63,14 +64,67 @@ function emojiGet(parse) {
 				localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
 			}
 			localStorage.setItem("emojiseek", 0);
+			if (!started) {
 				emojiList('home')
+			}
 		});
+	} else {
+		var start = "https://" + domain + "/api/meta";
+		fetch(start, {
+			method: 'POST',
+			headers: {
+				'content-type': 'application/json'
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json.enableEmojiReaction) {
+				localStorage.setItem("emojiReaction_" + acct_id, "true");
+			} else {
+				localStorage.setItem("emojiReaction_" + acct_id, "disabled");
+			}
+			var emojis = json.emojis;
+			var md = [];
+			Object.keys(emojis).forEach(function (key) {
+				var emoji = emojis[key];
+				md.push({
+					"shortcode": emoji.name,
+					"url": emoji.url
+				})
+			});
+			if (parse == "true") {
+				$('#emoji-list').html('Parsing...');
+				//絵文字をマストドン公式と同順にソート
+				md.sort(function (a, b) {
+					if (a.shortcode < b.shortcode) return -1;
+					if (a.shortcode > b.shortcode) return 1;
+					return 0;
+				});
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+			} else {
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+			}
+			localStorage.setItem("emojiseek", 0);
+			if (!started) {
+				emojiList('home')
+			}
+		});
+	}
 }
 
 //リストの描画
-function emojiList(target) {
+function emojiList(target, reaction) {
 	$("#now-emoji").text(lang.lang_emoji_custom);
 	var acct_id = $("#post-acct-sel").val();
+	if (reaction && localStorage.getItem("emojiReaction_" + acct_id) != "true") {
+		console.error("Disabled")
+		clear()
+		hide();
+		return false;
+	}
 	var start = localStorage.getItem("emojiseek");
 	if (target == "next") {
 		var start = start * 1 + 127;
@@ -103,8 +157,14 @@ function emojiList(target) {
 	for (i = start; i < start + 126; i++) {
 		var emoji = obj[i];
 		if (emoji) {
+			if (reaction) {
+				html = html + '<a onclick="emojiReaction(\':' + emoji.shortcode +
+					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+			} else {
 				html = html + '<a onclick="emojiInsert(\':' + emoji.shortcode +
-				': \')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+			}
+
 		}
 	}
 	$("#emoji-list").html(html);
@@ -114,14 +174,19 @@ function emojiList(target) {
 function emojiInsert(code, del) {
 	var now = $("#textarea").val();
 	var selin = localStorage.getItem("cursor");
+	if (localStorage.getItem("emoji-zero-width") == "yes") {
+		var brank = "​";
+	} else {
+		var brank = " ";
+	}
 	console.log(selin);
 	var now = $("#textarea").val();
-	if(selin>0){
+	if (selin > 0) {
 		var before = now.substr(0, selin);
 		var after = now.substr(selin, now.length);
-		newt = before + " "+ code+" " + after;
+		newt = before + brank + code + brank + after;
-	}else{
+	} else {
-		newt = code+" ";
+		newt = code + brank;
 	}
 	if (!del) {
 		$("#textarea").val(newt);
@@ -129,20 +194,20 @@ function emojiInsert(code, del) {
 	} else {
 		var regExp = new RegExp(del, "g");
 		var now = now.replace(regExp, "");
-		$("#textarea").val(now + " " + code);
+		$("#textarea").val(now + brank + code);
 	}
 
 	$("#textarea").focus();
 	var selin = $("#textarea").prop('selectionStart');
-	if(!selin){
+	if (!selin) {
-		selin=0;
+		selin = 0;
 	}
 	localStorage.setItem("cursor", selin);
 }
 //改行挿入
 function brInsert(code) {
-	if(!$('#post-box').hasClass("appear")){
+	if (!$('#post-box').hasClass("appear")) {
-		localStorage.setItem("nohide",true);
+		localStorage.setItem("nohide", true);
 		show();
 	}
 	var now = $("#textarea").val();

app/js/post/misskeystatus.js

@@ -65,7 +65,7 @@ function reactiontoggle(id,acct_id,tlid){
             var json = httpreq.response;
             console.log(json);
             if(json.reactionCounts){
-                var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
+                var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding","star"];
                 for(var i=0;i<reactions.length;i++){
                     if(json.reactionCounts[reactions[i]]){
                         $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
@@ -94,6 +94,20 @@ function reactiontoggle(id,acct_id,tlid){
             }
 		}
     }
+    $("#pub_" + id +" .freeReact").toggleClass("hide");
+}
+//reactioncustom
+function reactioncustom(acct_id,id){
+    $("#reply").val(id);
+    $("#unreact").hide();
+    $("#addreact").removeClass("hide");
+	$("#post-acct-sel").val(acct_id);
+	$('select').material_select();
+    localStorage.setItem("nohide",true);
+    show()
+    emojiToggle(true)
+    $("#left-side").hide();
+    $("#default-emoji").hide();
 }
 function reactRefresh(acct_id,id){
     var domain = localStorage.getItem("domain_" + acct_id);
@@ -119,30 +133,42 @@ function reactRefresh(acct_id,id){
             return false;
         }
         var poll="";
-        console.log(json);
+        if(json.error){
+            $("[toot-id=" + id + "]").hide();
+			$("[toot-id=" + id + "]").remove();
+        }else{
             reactRefreshCore(json)
+        }
     });
 }
 function reactRefreshCore(json){
     var id=json.id;
     if(json.reactionCounts){
-        var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
         $("#pub_" + id +" .reactions").removeClass("hide")
-        for(var i=0;i<reactions.length;i++){
+        var regExp = new RegExp( ":", "g" ) ;
-            if(json.reactionCounts[reactions[i]]){
+        Object.keys(json.reactionCounts).forEach(function(keye) {
-                console.log(json.reactionCounts[reactions[i]])
+            keyeClass=keye.replace(regExp,'');
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
+            if(json.reactionCounts[keye]){
-                $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+                console.log(json.reactionCounts[keye])
+                $("#pub_" + id +" .re-"+keyeClass+"ct").text(json.reactionCounts[keye])
+                $("#pub_" + id +" .re-"+keyeClass).removeClass("hide")
             }else{
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(0)
+                $("#pub_" + id +" .re-"+keyeClass+"ct").text(0)
                 if($("#pub_" + id +" .reactions").hasClass("fullreact")){
-                    $("#pub_" + id +" .re-"+reactions[i]).addClass("hide")
+                    $("#pub_" + id +" .re-"+keyeClass).addClass("hide")
-                }
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
                 }
+                $("#pub_" + id +" .re-"+keyeClass+"ct").text(json.reactionCounts[keye])
             }
+        });
     }
 }
+function emojiReaction(emoji){
+    var acct_id = $("#post-acct-sel").val();
+    var id = $("#reply").val();
+    reaction(emoji,id,acct_id,null)
+    clear();
+    hide();
+}
 function reaction(mode,id,acct_id,tlid){
     var domain = localStorage.getItem("domain_" + acct_id);
     var at = localStorage.getItem("acct_"+ acct_id + "_at");

app/js/post/post.js

@@ -307,4 +307,8 @@ function clear() {
 		$("#post-acct-sel").val(localStorage.getItem("main"));
 	}
 	$('select').material_select();
+	$("#left-side").show();
+	$("#default-emoji").show();
+	$("#unreact").show();
+	$("#addreact").addClass("hide");
 }

app/js/post/status.js

@@ -236,6 +236,8 @@ function del(id, acct_id) {
 		httpreq.setRequestHeader('Content-Type', 'application/json');
 		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({i:at,noteId:id}));
+		$("[toot-id=" + id+ "]").hide();
+					$("[toot-id=" + id + "]").remove();
 	}else{
 		var start = "https://" + domain + "/api/v1/statuses/" + id;
 		var httpreq = new XMLHttpRequest();

app/js/post/suggest.js

@@ -53,16 +53,7 @@ input.addEventListener("focus", function() {
 			
 			var tag = new_val.match(/#(\S{3,})/);
 			var acct = new_val.match(/@(\S{3,})/);
-			if(localStorage.getItem("imas")){
+			if (tag && tag[1]) {
-				//セルフNP
-				var cpnp = new_val.match(/^(?!.*http)\/\/(\S{1,})/);
-			}else{
-				var cpnp=[];
-			}
-			if (cpnp && cpnp[1]) {
-				var q = cpnp[1];
-				cgNPs(q);
-			} else if (tag && tag[1]) {
 				var q = tag[1];
 			} else if (acct && acct[1]) {
 				var q = acct[1];

app/js/tl/filter.js

@@ -146,6 +146,11 @@ function filter(){
         }
 	});
 }
+function filterTime(day,hour,min){
+	$("#days_filter").val(day)
+	$("#hours_filter").val(hour)
+	$("#mins_filter").val(min)
+}
 function makeNewFilter(){
 	var acct_id = $("#filter-acct-sel").val();
 	var phr=$("#filter-add-word").val();

app/js/tl/list.js

@@ -13,6 +13,32 @@ function list(){
     var acct_id = $("#list-acct-sel").val();
     var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(localStorage.getItem("mode_" + domain)=="misskey"){
+		var start = "https://" + domain + "/api/users/lists/list"
+		fetch(start, {
+			method: 'POST',
+			body: JSON.stringify({
+				i:at
+			}),
+		}).then(function(response) {
+			return response.json();
+		}).catch(function(error) {
+			todo(error);
+			console.error(error);
+		}).then(function(json) {
+			if (json) {
+				var lists = "";
+				Object.keys(json).forEach(function(key) {
+					var list = json[key];
+					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+						'\')" class="pointer">'+lang.lang_list_show+'</a><br>';
+				});
+				$("#lists").html(lists);
+			}else{
+				$("#lists").html(lang.lang_list_nodata);
+			}
+		});
+    }else{
 		var start = "https://" + domain + "/api/v1/lists"
 		console.log(start)
 		fetch(start, {
@@ -31,21 +57,23 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-				lists = lists + list.title+':<a onclick="listShow(' + list.id + ',\'' + 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_show+'</a>/<a onclick="listUser(\'' + list.id + '\',' + acct_id +
-					')" class="pointer">'+lang.lang_list_users+'</a><br> ';
+						')" class="pointer">'+lang.lang_list_users+'</a><br>';
 				});
 				$("#lists").html(lists);
 			}else{
 				$("#lists").html(lang.lang_list_nodata);
 			}
 		});
+	}
 }
 function makeNewList(){
     var acct_id = $("#list-acct-sel").val();
     var text=$("#list-add").val();
     var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(localStorage.getItem("mode_" + domain)!="misskey"){
     var start = "https://" + domain + "/api/v1/lists"
 	console.log(start)
 	var httpreq = new XMLHttpRequest();
@@ -63,6 +91,25 @@ function makeNewList(){
 			$("#list-add").val("")
 		}
 	}
+}else{
+	var start = "https://" + domain + "/api/users/lists/create"
+	console.log(start)
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify({
+		i:at,
+		title: text
+	}));
+    httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response;
+			list();
+			$("#list-add").val("")
+		}
+	}
+}
 }
 function listShow(id,title,acct_id){
     localStorage.setItem("list_"+id+"_"+acct_id,title);
@@ -100,6 +147,7 @@ function listUser(id,acct_id){
 function hisList(user,acct_id){
     var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(localStorage.getItem("mode_" + domain)!="misskey"){
     var start = "https://" + domain + "/api/v1/lists"
 	console.log(start)
 	fetch(start, {
@@ -118,7 +166,7 @@ function hisList(user,acct_id){
 			var lists = lang.lang_list_add+"<br>";
 			Object.keys(json).forEach(function(key) {
                 var list = json[key];
-				lists = lists + '<a onclick="listAdd(' + list.id + ',\'' + user + '\',\'' + acct_id +
+				lists = lists + '<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
 					'\')" class="pointer">'+escapeHTML(list.title)+'</a><br> ';
 			});
 			$("#his-lists-a").html(lists);
@@ -144,7 +192,7 @@ function hisList(user,acct_id){
 			var lists = lang.lang_list_remove+"<br>";
 			Object.keys(json).forEach(function(key) {
                 var list = json[key];
-				lists = lists + '<a onclick="listRemove(' + list.id + ',\'' + user + '\',\'' + acct_id +
+				lists = lists + '<a onclick="listRemove(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
 					'\')" class="pointer">'+list.title+'</a><br> ';
 			});
 			$("#his-lists-b").html(lists);
@@ -152,20 +200,58 @@ function hisList(user,acct_id){
             $("#his-lists-b").html(lang.lang_list_nodata);
         }
 	});
+}else{
+	var start = "https://" + domain + "/api/users/lists/list"
+		fetch(start, {
+			method: 'POST',
+			body: JSON.stringify({
+				i:at
+			}),
+		}).then(function(response) {
+			return response.json();
+		}).catch(function(error) {
+			todo(error);
+			console.error(error);
+		}).then(function(json) {
+			if (json) {
+				var lists = "";
+				Object.keys(json).forEach(function(key) {
+					var list = json[key];
+					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>';
+				});
+				$("#his-lists-a").html(lists);
+			}else{
+				$("#his-lists-a").html(lang.lang_list_nodata);
+			}
+		});
+		$("#his-lists-b").html("");
+}
 }
 function listAdd(id,user,acct_id){
     var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(localStorage.getItem("mode_" + domain)=="misskey"){
+		var start = "https://" + domain + "/api/users/lists/push"
+		var i={
+			i:at,
+			listId:id,
+			userId:user
+		}
+	}else{
 		var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
+		var i={
+			account_ids: [user]
+		}
+	}
 	console.log(start)
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
 	httpreq.responseType = "json";
-	httpreq.send(JSON.stringify({
+	httpreq.send(JSON.stringify(i));
-		account_ids: [user]
-	}));
     httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
@@ -176,16 +262,28 @@ function listAdd(id,user,acct_id){
 function listRemove(id,user,acct_id){
     var domain = localStorage.getItem("domain_" + acct_id);
     var at = localStorage.getItem("acct_"+ acct_id + "_at");
+    if(localStorage.getItem("mode_" + domain)=="misskey"){
+		var start = "https://" + domain + "/api/users/lists/push"
+		var method='POST'
+		var i={
+			i:at,
+			listId:id,
+			userId:user
+		}
+	}else{
 		var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
+		var method='DELETE'
+		var i={
+			account_ids: [user]
+		}
+	}
 	console.log(start)
 	var httpreq = new XMLHttpRequest();
-	httpreq.open('DELETE', start, true);
+	httpreq.open(method, start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
 	httpreq.responseType = "json";
-	httpreq.send(JSON.stringify({
+	httpreq.send(JSON.stringify(i));
-		account_ids: [user]
-	}));
     httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;

app/js/tl/misskeyparse.js

@@ -160,6 +160,15 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         }else{
 			disname="";
 		}
+		//絵文字があれば
+		Object.keys(toot.user.emojis).forEach(function(key5) {
+			var emoji = toot.user.emojis[key5];
+			var shortcode = emoji.name;
+			var emoji_url = '<img draggable="false" src="' + emoji.url +
+				'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+			var regExp = new RegExp(":" + shortcode + ":", "g");
+			dis_name = dis_name.replace(regExp, emoji_url);
+		});
 		if (mix == "notf") {
 			if (gif == "yes") {
 				noticeavatar = toot.user.avatarUrl;
@@ -192,22 +201,23 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					"congrats":"🎉",
 					"amgry":"💢",
 					"confused":"😥",
-					"pudding":"🍮"
+					"pudding":"🍮",
+					"star":"⭐"
 				}
 				var icon=reactions[toot.reaction];
-				var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
+				var emojisData = JSON.parse(localStorage.getItem("emoji_" + acct_id));
-                for(var i=0;i<reactions.length;i++){
+				if(!icon){
-                    if(toot.note.reactionCounts[reactions[i]]){
+						if(emojisData){
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
+							var num = emojisData.length;
-                        $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+							var ehtml="";
-                    }else{
+							for (i = 0; i < num; i++) {
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(0)
+								var emoji = emojisData[i];
-                        if($("#pub_" + id +" .reactions").hasClass("fullreact")){
+								if (":"+emoji.shortcode+":"==toot.reaction) {
-                            $("#pub_" + id +" .re-"+reactions[i]).addClass("hide")
+									if (emoji) {
-                        }else{
+										icon='<img src="'+emoji.url+'" style="width:1rem">';
-                            $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+									}
+								}
 								}
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
 						}
 				}
 			}else{
@@ -250,19 +260,19 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					var ipc = electron.ipcRenderer;
 					var os = electron.remote.process.platform;
 					var options = {
-						body: toot.account.display_name+"(" + toot.account.acct +")"+what+"\n\n"+$.strip_tagstemp(toot.status.content),
+						body: toot.user.name+"(" + toot.user.username +")"+what+"\n\n"+$.strip_tagstemp(toot.note.text),
-						icon: toot.account.avatar
+						icon: toot.user.avatarUrl
 					  };
 					if(os=="darwin"){
 						var n = new Notification('TheDesk:'+domain, options);
 					}else{
 						ipc.send('native-notf', [
 							'TheDesk:'+domain,
-							toot.account.display_name+"(" + toot.account.acct +")"+what+"\n\n"+$.strip_tagstemp(toot.status.content),
+							toot.user.name+"(" + toot.user.username +")"+what+"\n\n"+$.strip_tagstemp(toot.note.text),
-							toot.account.avatar,
+							toot.user.avatarUrl,
 							"toot",
 							acct_id,
-							toot.status.id
+							toot.note.id
 						]);
 					}
 				}
@@ -403,17 +413,35 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			content=content.replace(/`(.+)`/gi, '<code>$1</code>')
 			content=content.replace(/(http(s)?:\/\/[\x21-\x7e]+)/gi, '<a href="$1" target="_blank">$1</a>')
 			content=content.replace(/\(\(\((.+)\)\)\)/gi, '<span class="shake">$1</span>')
-			content=content.replace(/<motion>(.+)<\/motion>/gi, '<span class="shake">$1</span>')
+			content=content.replace(/&lt;motion&gt;(.+)&lt;\/motion&gt;/gi, '<span class="shake">$1</span>')
 			content=content.replace(/\*\*\*([^*]+)\*\*\*/gi, '<span class="shake" style="font-size:200%">$1</span>')
 			content=content.replace(/\*\*([^*]+)\*\*/gi, '<b>$1</b>')
 			content=content.replace(/^(.+)\s(検索|search)$/gmi, '<div class="input-field"><i class="material-icons prefix">search</i><input type="text" style="width:calc( 60% - 80px);" name="q" value="$1" id="srcbox_'+toot.id+'"><label for="src" data-trans="src" class="">検索</label><button class="btn waves-effect indigo" style="width:40%;" data-trans-i="src" onclick="goGoogle(\''+toot.id+'\')">検索</button></div>')
 			content=content.replace(/\[(.+)\]\(<a href="(http(s)?:\/\/[\x21-\x7e]+)".+\)/gi,'<a href="$2" target="_blank">$1</a>');
-			
+			content=content.replace(/&lt;center&gt;/gi, '<div class="center">')
+			content=content.replace(/&lt;\/center&gt;/gi, '</div>')
+			content=content.replace(/&lt;flip&gt;(.+)&lt;\/flip&gt;/gi, '<span class="fa fa-flip-horizontal">$1</span>')
+			content=content.replace(/&lt;small&gt;(.+)&lt;\/small&gt;/gi, '<small>$1</small>')
+			content=content.replace(/&lt;i&gt;(.+)&lt;\/i&gt;/gi, '<i>$1</i>')
+			content=content.replace(/&lt;spin&gt;(.+)&lt;\/spin&gt;/gi, '<span class="fa fa-spin">$1</span>')
+			content=content.replace(/\*\*(.+)\*\*/gi, '<b>$1</b>')
+			content=content.replace(/&lt;jump&gt;(.+)&lt;\/jump&gt;/gi, '<span class="jump">$1</jump>')
             content=twemoji.parse(content);
         }else{
             content="";
         }
-		
+		//絵文字があれば
+		if (emojick) {
+			Object.keys(toot.emojis).forEach(function(key5) {
+				var emoji = toot.emojis[key5];
+				var shortcode = emoji.name;
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
+		}
 		if(dis_name){
 			dis_name=twemoji.parse(dis_name);
 		}else{
@@ -606,8 +634,46 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 			poll='<div class="vote_'+toot.id+'">'+poll+'</div>';
 		}
+		/*
+		
+			*/
+			if(localStorage.getItem("emojiReaction_" + acct_id)=="disabled"){
+				var freeReact="hide";
+			}else{
+				var freeReact="";
+			}
 		//Reactions
         if(toot.reactionCounts){
+			var addReact="";
+			Object.keys(toot.reactionCounts).forEach(function(keye) {
+				var thisReact=toot.reactionCounts[keye];
+					 if(keye=="like"){ var defaultEmoji=true;}
+				else if(keye=="love"){ var defaultEmoji=true; }
+				else if(keye=="laugh"){ var defaultEmoji=true; }
+				else if(keye=="hmm"){ var defaultEmoji=true; }
+				else if(keye=="surprise"){ var defaultEmoji=true; }
+				else if(keye=="congrats"){ var defaultEmoji=true; }
+				else if(keye=="angry"){ var defaultEmoji=true; }
+				else if(keye=="confused"){ var defaultEmoji=true; }
+				else if(keye=="pudding"){ var defaultEmoji=true; }
+				else{
+					var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
+				if(obj){
+					var num = obj.length;
+					var ehtml="";
+					for (i = 0; i < num; i++) {
+						var emoji = obj[i];
+						if (":"+emoji.shortcode+":"==keye) {
+							if (emoji) {
+								addReact=addReact+	'<span class="reaction "><a onclick="reaction(\''+keye+'\',\'' + toot.id + '\',' + acct_id +
+								',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;"><img src="'+emoji.url+'" style="width:13px;"></a><span class="re-'+emoji.shortcode+'ct">'+thisReact+
+								'</span></span>';
+							}
+						}
+						}
+				}
+				}
+			});
         if(toot.reactionCounts.like){
             var like=toot.reactionCounts.like;
             var likehide="";
@@ -677,6 +743,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
             var likehide="hide";var lovehide="hide";var laughhide="hide";var hmmhide="hide";var suphide="hide";var conghide="hide";var anghide="hide";var confhide="hide";var pudhide="hide";
             var fullhide="hide";
 		}
+		if(!addReact && likehide=="hide"&& lovehide=="hide"&& laughhide=="hide"&&  hmmhide=="hide"&&  suphide=="hide"&& conghide=="hide"&&  anghide=="hide"&&  confhide=="hide"&& pudhide=="hide"){
+			var fullhide="hide";
+		}
         if(toot.myReaction){
             var reacted=toot.myReaction;
         }else{
@@ -687,6 +756,11 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			content='<span class="gray">This post has no content. It may be media-only, private or deleted.</span>';
 		}
 		var trans="";
+		if(toot.user.emojis){
+			var actemojick = toot.user.emojis[0];
+		}else{
+			var actemojick=false;
+		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + '  ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
 				key].created_at, 'unix') + '" '+if_notf+' onmouseover="mov(\'' + toot.id + '\',\''+tlid+'\',\'mv\')" onclick="mov(\'' + toot.id + '\',\''+tlid+'\',\'cl\')" onmouseout="resetmv(\'mv\')" reacted="'+reacted+'">' +
@@ -730,7 +804,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
             ',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">'+twemoji.parse("😥")+'</a><span class="re-confusedct">'+confused+
             '</span></span><span class="'+pudhide+' reaction re-pudding"><a onclick="reaction(\'pudding\',\'' + toot.id + '\',' + acct_id +
             ',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">'+twemoji.parse("🍮")+'</a><span class="re-puddingct">'+pudding+
-			'</span></div>'+poll + mentions + tags + '</div>' +
+			'</span></span>'+addReact+
+			'<i class="material-icons pointer hide freeReact '+freeReact+'" style="font-size:1.0rem; padding-left:5px;position: relative;top: 3px;" onclick="reactioncustom(\''+acct_id+'\',\''+id+'\')">add_box</i></div>'
+			+poll + mentions + tags + '</div>' +
 			'<div class="area-vis"></div>'+
 			'<div class="area-actions '+mouseover+'">' +
 			'<div class="action">'+vis+'</div>'+

app/js/tl/notification.js

@@ -60,13 +60,13 @@ function notfColumn(acct_id, tlid, sys){
 						var ipc = electron.ipcRenderer;
 						var os = electron.remote.process.platform;
 							var options = {
-								body: ct+lang_notf_new[lang],
+								body: ct+lang.lang_notf_new,
 								icon: localStorage.getItem("prof_"+acct_id)
 							  };
 							if(os=="darwin"){
 								var n = new Notification('TheDesk:'+domain, options);
 							}else{
-								ipc.send('native-notf', ['TheDesk:'+domain,ct+lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
+								ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new,localStorage.getItem("prof_"+acct_id)]);
 							}
 						
 					}
@@ -233,13 +233,13 @@ function notfCommon(acct_id, tlid, sys) {
 				var ipc = electron.ipcRenderer;
 				var os = electron.remote.process.platform;
 					var options = {
-						body: ct+lang_notf_new[lang],
+						body: ct+lang.lang_notf_new[lang],
 						icon: localStorage.getItem("prof_"+acct_id)
 					  };
 					if(os=="darwin"){
 						var n = new Notification('TheDesk:'+domain, options);
 					}else{
-						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
+						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
 					}
 				
 			}
@@ -482,23 +482,12 @@ function notfCanceler(acct){
 function allNotfRead(){
 	console.log(localStorage.getItem("notf-fav_2"));
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
+	if (multi) {
-		var obj = [{
-			at: localStorage.getItem("acct_0_at"),
-			name: localStorage.getItem("name_0"),
-			domain: localStorage.getItem("domain_0"),
-			user: localStorage.getItem("user_0"),
-			prof: localStorage.getItem("prof_0"),
-			id: localStorage.getItem("user-id_0")
-		}];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
 		var obj = JSON.parse(multi);
-	}
 	Object.keys(obj).forEach(function(key) {
 		console.log(key);
 		notfCanceler(key)
 	});
 }
+}
 allNotfRead()

app/js/tl/parse.js

@@ -33,6 +33,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	var ltr = localStorage.getItem("letters");
 	var gif = localStorage.getItem("gif");
 	var imh = localStorage.getItem("img-height");
+	if(!imh){
+		imh=200;
+	}
 	if(imh=="full"){
 		imh="auto";
 	}else{
@@ -757,12 +760,12 @@ 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><span class="toot ' + spoiler + '">' + content +poll+
 			'</span>' +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
 			'</span>' +
-			'' +poll+ mentions + tags + '</div>' +
+			'' + mentions + tags + '</div>' +
 			'<div class="area-vis"></div>'+
 			'<div class="area-actions '+mouseover+'">' +
 			'<div class="action">'+vis+'</div>'+

app/js/tl/src.js

@@ -15,7 +15,7 @@ function src(mode) {
 	var q = $("#src").val();
 	var acct_id = $("#src-acct-sel").val();
 	if(acct_id=="tootsearch"){
-		tootsearch(q);
+		tsAdd(q)
 		return false;
 	}
 	localStorage.setItem("last-use", acct_id);
@@ -73,9 +73,26 @@ function src(mode) {
 		jQuery("time.timeago").timeago();
 	});
 }
-function tootsearch(q){
+function tsAdd(q){
+		var add = {
+			domain: acct_id,
+			type: "tootsearch",
+			data: q
+		};
+		var multi = localStorage.getItem("column");
+		var obj = JSON.parse(multi);
+		localStorage.setItem("card_" + obj.length,"true");
+		obj.push(add);
+		console.log(obj);
+		var json = JSON.stringify(obj);
+		localStorage.setItem("column", json);
+		parseColumn();
+}
+function tootsearch(tlid,q){
 	var start = "https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=" + q
 	console.log(start)
+	$("#notice_" + tlid).text("tootsearch("+q+")");
+	$("#notice_icon_" + tlid).text("search");
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -90,17 +107,68 @@ function tootsearch(q){
 			var templete="";
 			var json=raw.hits.hits;
 			console.log(json);
-			Object.keys(json).forEach(function(key5) {
+			var max_id = raw["hits"].length;
-				var toot = json[key5]["_source"];
+			for(var i=0;i<json.length;i++){
+				var toot = json[i]["_source"];
+				console.log(lastid)
+				if(lastid!=toot.uri){
 					console.log(toot);
 					if(toot && toot.account){
-					templete = templete+parse([toot],'noauth');
+						templete = templete+parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
+					}
+				}
+				var lastid=toot.uri;
 			}
-			});
 			if(!templete){
 				templete=lang.lang_details_nodata;
+			}else{
+				templete=templete+'<div class="hide ts-marker" data-maxid="'+max_id+'"></div>';
 			}
-			$("#src-contents").html("Tootsearch("+lang.lang_src_ts+")<br>" + templete);
+			$("#timeline_" + tlid).html(templete);
+
+		jQuery("time.timeago").timeago();
+	});
+}
+function moreTs(tlid,q){
+	var sid = $("#timeline_" + tlid + " .ts-marker").last().attr("data-maxid");
+	moreloading=true;
+	var start = "https://tootsearch.chotto.moe/api/v1/search?from="+sid+"&sort=created_at%3Adesc&q=" + q
+	console.log(start)
+	$("#notice_" + tlid).text("tootsearch("+q+")");
+	$("#notice_icon_" + tlid).text("search");
+	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(raw) {
+			var templete="";
+			var json=raw.hits.hits;
+			console.log(json);
+			var max_id = raw["hits"].length;
+			for(var i=0;i<json.length;i++){
+				var toot = json[i]["_source"];
+				console.log(lastid)
+				if(lastid!=toot.uri){
+					console.log(toot);
+					if(toot && toot.account){
+						templete = templete+parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
+					}
+				}
+				var lastid=toot.uri;
+			}
+			if(!templete){
+				templete=lang.lang_details_nodata;
+			}else{
+				templete=templete+'<div class="hide ts-marker" data-maxid="'+max_id+'"></div>';
+			}
+			$("#timeline_" + tlid).append(templete);
+
 		jQuery("time.timeago").timeago();
 	});
 }

app/js/tl/tl.js

@@ -164,6 +164,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 	localStorage.setItem("now", type);
 	if(localStorage.getItem("mode_" + domain)=="misskey"){
 		var misskey=true;
+		console.log(type);
 		if (type == "home") {
 			var start = "wss://" + domain +
 				"/?i=" + at;
@@ -183,12 +184,13 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			var start = "wss://" + domain +
 			"/hybrid-timeline?i=" + at;
 		} else if (type == "tag") {
-			Materialize.toast(lang_misskeyparse_tagnostr[lang], 1000);
+			Materialize.toast(lang.lang_misskeyparse_tagnostr, 3000);
 		} else if (type == "noauth") {
 			var start = "wss://" + acct_id +
 			"/local-timeline?i=" + at;
 		} else if (type=="list"){
-			Materialize.toast(lang_misskeyparse_listnostr[lang], 1000);
+			var start = "wss://" + domain +
+			"/user-list?i=" + at+"&listId="+data;
 		}
 	}else{
 		var misskey=false;
@@ -382,6 +384,10 @@ function moreload(type, tlid) {
 		}else if (type == "notf") {
 			notfmore(tlid);
 			return;
+		}else if (type == "tootsearch") {
+			var data=obj[tlid].data;
+			moreTs(tlid,data);
+			return;
 		}
 		moreloading=true;
 		localStorage.setItem("now", type);
@@ -441,8 +447,6 @@ function moreload(type, tlid) {
 				headers: hdr
 			};
 		}
-		
-		
 		fetch(start, i).then(function(response) {
 			return response.json();
 		}).catch(function(error) {
@@ -463,6 +467,119 @@ function moreload(type, tlid) {
 		});
 	}
 }
+//TL差分取得
+function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
+	console.log("sabun")
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	var acct_id = obj[tlid].domain;
+	if (!type) {
+		var type = obj[tlid].type;
+	}else{
+		var data;
+	}
+	if(type=="tag"){
+		var data=obj[tlid].data;
+		var tag = localStorage.getItem("tag-range");
+		if(tag=="local"){
+			data=data+"&local=true";
+		}
+	}else if(type=="list"){
+		var data=obj[tlid].data;
+	}
+	var sid = $("#timeline_" + tlid + " .cvo").first().attr("unique-id");
+	if (sid && !moreloading) {
+		if (type == "mix" && localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct_id))!="misskey") {
+			return;
+		}else if (type == "plus" && localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct_id))!="misskey") {
+			return;
+		}else if (type == "notf") {
+			return;
+		}
+		moreloading=true;
+		localStorage.setItem("now", type);
+		todo(cap(type) + " TL MoreLoading");
+		if(type!="noauth"){
+			var at = localStorage.getItem("acct_"+ acct_id + "_at");
+			var hdr={
+				'content-type': 'application/json',
+				'Authorization': 'Bearer ' + at
+			};
+				var domain = localStorage.getItem("domain_" + acct_id);
+		}else{
+			var hdr={
+				'content-type': 'application/json'
+			};
+			domain=acct_id;
+		}
+		if(localStorage.getItem("mode_" + domain)=="misskey"){
+			var misskey=true;
+			hdr={
+				'content-type': 'application/json'
+			};
+			var url=misskeycom(type, data);
+			var start = "https://" + domain + "/api/notes/"+url;
+			var method="POST";
+			var req={};
+			if(type!="noauth"){
+				req.i=at;
+			}
+			if(type=="local-media"||type=="pub-media"){
+				req.mediaOnly=true;
+			}
+			if(type=="tag"){
+				req.tag=data;
+			}
+			if(type=="list"){
+				req.listId=data;
+			}
+			req.sinceId=sid;
+			req.limit=20;
+			var i={
+				method: method,
+				headers: hdr,
+				body: JSON.stringify(req),
+			}
+		}else{
+			var misskey=false;
+			var start = "https://" + domain + "/api/v1/timelines/" + com(type,data) +
+			"since_id=" + sid;
+			if(type=="dm"){
+				var start = "https://" + domain + "/api/v1/conversations?" +
+					"since_id=" + sid;
+			}
+			var method="GET";
+			var i={
+				method: method,
+				headers: hdr
+			};
+		}
+		
+		
+		fetch(start, i).then(function(response) {
+			return response.json();
+		}).catch(function(error) {
+			todo(error);
+			console.error(error);
+		}).then(function(json) {
+			console.log(json);
+			if(misskey){
+				var templete = misskeyParse(json, '', acct_id, tlid,"",mute);
+			}else{
+				var templete = parse(json, '', acct_id, tlid,"",mute, type);
+			}
+			$("#timeline_" + tlid).prepend(templete);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			moreloading=false;
+			todc();
+		});
+	}
+}
+//TL再取得
+function reloadTL(type, data, acct_id, key, delc,voice){
+	tl(type, data, acct_id, key, delc,voice,"");
+}
 
 //WebSocket切断
 function tlCloser() {
@@ -567,6 +684,8 @@ function cap(type, data, acct_id) {
 		var response= "Local+"
 	}else if (type == "webview") {
 		var response="Twitter"
+	}else if (type == "tootsearch") {
+		var response="tootsearch(" + data + ")";
 	}
 	return response;
 }
@@ -624,7 +743,7 @@ function icon(type) {
 	} else if (type == "pub-media") {
 		var response="language";
 	} else if (type == "tag") {
-		var response="search";
+		var response="whatshot";
 	} else if (type == "list") {
 		var response="view_headline";
 	} else if (type == "notf") {
@@ -639,6 +758,8 @@ function icon(type) {
 		var response="merge_type";
 	}else if (type == "webview") {
 		var response="language";
+	}else if (type == "tootsearch") {
+		var response="search";
 	}
 	return response;
 }

app/js/ui/layout.js

@@ -30,11 +30,7 @@ function parseColumn() {
 	}
 	tlCloser();
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
+	if (multi) {
-		var obj = [];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
 		var obj = JSON.parse(multi);
 
 		var templete;
@@ -130,6 +126,21 @@ function parseColumn() {
 			}
 			var html =webviewParse("https://tweetdeck.twitter.com",key,insert,icnsert,css);
 			$("#timeline-container").append(html);
+		}else if(acct.type=="tootsearch"){
+			if(!acct.left_fold){
+				basekey=key;
+			}
+			var width = localStorage.getItem("width");
+			if (width) {
+				var css=" min-width:"+width+"px;"
+			}
+			var anime = localStorage.getItem("animation");
+			if (anime=="yes" || !anime) {
+				var animecss="box-anime";
+			}else{
+				var animecss="";
+			}
+			unstreamingTL(acct.type,key,basekey,insert,icnsert,acct.left_fold,css,animecss,acct.data);
 		}else{
 			var width = localStorage.getItem("width");
 		if (width) {
@@ -168,7 +179,7 @@ function parseColumn() {
 			}
 			var html='<div class="boxIn" id="timeline_box_' + key + '_box" tlid="' + key +
 			'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+' ">'+
-			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang.lang_layout_gotop +'"></i></div>'+
+			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="checkStr(\''+acct.type+'\', \''+data+'\', \''+acct.domain+'\', \''+key+'\', \''+delc+'\',\''+voice+'\',null)" title="'+lang.lang_layout_gotop +'"></i></div>'+
 			'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>'+
 			'<div class="area-a1"><a onclick="notfToggle(' + acct.domain + ',' + key +
 						  ')" class="setting nex '+if_notf+'" title="'+unique_notf+'"'+icnsert+'><i class="material-icons waves-effect nex notf-icon_' +
@@ -179,7 +190,7 @@ function parseColumn() {
 		  ')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
 		  '<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 		  '"><div id="notifications_' + key +
-		  '" data-notf="' + acct.domain + '" data-type="notf"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
+		  '" data-notf="' + acct.domain + '" data-type="notf" class="notf-timeline"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
 		  '" style="padding:5px;">'+exclude+left_hold+'<a onclick="mediaToggle(' + key +
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_mediafil +'">perm_media</i><span id="sta-media-' +
 		  key + '">On</span></a>'+lang.lang_layout_mediafil +'<br><a onclick="cardToggle(' + key +
@@ -240,6 +251,15 @@ function parseColumn() {
 		}
 	}
 }
+function checkStr(type, data, acct_id, key, delc,voice){
+	if($('#notice_icon_' + key).hasClass("red-text") && type!="notf" && type!="mix"){
+		console.log("sabun-get")
+		goTop(key);
+		tlDiff(type, data, acct_id, key, delc,voice,"");
+	}else{
+		goTop(key);
+	}
+}
 //セカンダリートゥートボタン
 function secvis(set){
 	if(set=="public"){
@@ -439,6 +459,37 @@ function webviewParse(url,key,insert,icnsert,css){
 	
 	return html;
 }
+function unstreamingTL(type,key,basekey,insert,icnsert,left_fold,css,animecss,q){
+	if(!left_fold){
+		var basehtml = '<div style="'+css+'" class="box '+animecss+'" id="timeline_box_' + basekey + '_parentBox"></div>';
+		$("#timeline-container").append(basehtml);
+		var left_hold='<a onclick="leftFoldSet(' + key +')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_leftFold+'">view_agenda</i></a>'+lang.lang_layout_leftFold+'</span><br>';
+	}else{
+		var left_hold='<a onclick="leftFoldRemove(' + key +')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_leftUnfold+'">view_column</i></a>'+lang.lang_layout_leftUnfold+'</span><br>';
+	}
+	var html='<div class="boxIn" id="timeline_box_' + key + '_box" tlid="' + key +
+	'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+' ">'+
+	'<div class="area-notice"><i class="material-icons waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;" onclick="tootsearch('+key+',\''+q+'\');" title="'+lang.lang_layout_gotop +'"></i></div>'+
+	'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>'+
+	'<div class="area-a1"></div><div class="area-sta"></div>'+
+	'<div class="area-a2"><a onclick="removeColumn(' + key +
+					')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_delthis +'"'+icnsert+'>cancel</i></a></div>'+
+	'<div class="area-a3"><a onclick="setToggle(' + key +
+	')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
+	'<div class="column-hide notf-indv-box" id="util-box_' + key +
+	'" style="padding:5px;">'+left_hold+'<a onclick="mediaToggle(' + key +
+	')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_mediafil +'">perm_media</i><span id="sta-media-' +
+	key + '">On</span></a>'+lang.lang_layout_mediafil +'<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 '+type+'-timeline " tlid="' + key + '" data-type="' + type + '" data-acct="nostr"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
+	$('#timeline_box_' + basekey + '_parentBox').append(html);
+	tootsearch(key,q);
+	cardCheck(key);
+	ebtCheck(key);
+	mediaCheck(key);
+	catchCheck(key);
+	voiceCheck(key);
+	return true;
+}
 function leftFoldSet(key){
 	var multi = localStorage.getItem("column");
 	var obj = JSON.parse(multi);

app/js/ui/menu.js

@@ -19,6 +19,8 @@ function menu(){
         $("#menu-bar").html("TheDesk "+localStorage.getItem("ver"));
         $(".menu-content").addClass("hide");
         $("#add-box").removeClass("hide");
+        $("#left-menu div").removeClass("active");
+	    $("#addColumnMenu").addClass("active");
     }else{
         $('#menu').fadeOut()
         $("#menu").removeClass("appear")

app/js/ui/post-box.js

@@ -5,6 +5,10 @@ function hide() {
 	$('#post-box').fadeOut()
 	$("#post-box").removeClass("appear")
 	$("#emoji").addClass("hide")
+	$("#left-side").show();
+	$("#default-emoji").show();
+	$("#unreact").show();
+	$("#addreact").addClass("hide");
 }
 //最小化
 function mini() {

app/js/ui/sort.js

@@ -58,6 +58,8 @@ function Scap(type, data) {
 		return "Integrated"
 	}else if (type == "webview") {
 		return "Twitter"
+	}else if (type == "tootsearch") {
+		return "tootsearch(" + data + ")"
 	}else{
 		console.log(type);
 	}

app/js/ui/spotify.js

@@ -215,49 +215,3 @@ $("#npbtn").bind('contextmenu', function() {
     nowplaying('itunes');
     return false;
 });
-/*cinderella NP*/
-function cgNP(q){
-    suggest = "https://cg.toot.app/api/v1/?song=" + q
-		console.log(suggest)
-		fetch(suggest, {
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json'
-			},
-		}).then(function(response) {
-			return response.json();
-		}).catch(function(error) {
-			todo(error);
-			console.error(error);
-		}).then(function(json) {
-			console.log(json);
-			var electron = require("electron");
-            var ipc = electron.ipcRenderer;
-            var flag=localStorage.getItem("artwork");
-            if(flag){
-                  var img=json.album.artwork;
-                ipc.send('bmp-image', [img,0]);
-             }
-            var content=localStorage.getItem("np-temp");
-             if(!content || content==""){
-                   var content="#NowPlaying {song} / {album} / {artist}\n{url}";
-             }
-            var regExp = new RegExp("{song}", "g");
-            content = content.replace(regExp, json.name);
-            var regExp = new RegExp("{album}", "g");
-            content = content.replace(regExp, json.album.name);
-            var regExp = new RegExp("{artist}", "g");
-            content = content.replace(regExp, json.artist.text);
-            var regExp = new RegExp("{composer}", "g");
-            content = content.replace(regExp, json.composer);
-            var regExp = new RegExp("{lyricist}", "g");
-            content = content.replace(regExp, json.lyricist);
-            var regExp = new RegExp("{bpm}", "g");
-            content = content.replace(regExp, json.bpm);
-            var regExp = new RegExp("{genre}", "g");
-            content = content.replace(regExp, "");
-            var regExp = new RegExp("{url}", "g");
-            content = content.replace(regExp, "");
-            $("#textarea").val(content);
-				});
-}

app/js/userdata/showOnTL.js

@@ -117,7 +117,7 @@ function udg(user, acct_id) {
 					var emoji = json.emojis[key5];
 					var shortcode = emoji.shortcode;
 					var emoji_url = '<img src="' + emoji.url +
-					'" class="emoji-img" data-emoji="'+shortcode+'">';
+					'" class="emoji-img" data-emoji="'+shortcode+'" draggable="false">';
 					var regExp = new RegExp(":" + shortcode + ":", "g");
 					dis_name = dis_name.replace(regExp, emoji_url);
 					note = note.replace(regExp, emoji_url);
@@ -143,8 +143,15 @@ function udg(user, acct_id) {
 					for(var i=0;i<json.fields.length;i++){
 						var fname=json.fields[i].name;
 						var fval=json.fields[i].value;
+						if(json.fields[i].verified_at){
+							var when=lang.lang_showontl_verified+":"+crat(json.fields[i].verified_at);
+							var color="rgba(121,189,154,.25);"
+						}else{
+							var when="";
+							var color="inherit"
+						}
 						fval=twemoji.parse(fval);
-						note=note+'<tr><td class="his-field-title">'+fname+'</td><td class="his-field-content">'+fval+'</td></tr>';
+						note=note+'<tr><td class="his-field-title">'+fname+'</td><td class="his-field-content" title="'+when+'" style="background-color:'+color+'">'+fval+'</td></tr>';
 					}
 					note=note+'</table>'
 					$("#his-des").html(twemoji.parse(note));
@@ -392,6 +399,12 @@ function relations(user, acct_id) {
 			$("#his-end-btn").removeClass("endorsed");
 			$("#his-end-btn").text(lang.lang_status_endorse)
 		}
+		//Blocked
+		if(json.blocked_by){
+			$("#his-float-timeline").hide();
+			$("#his-float-blocked").show();
+			$("#his-follow-btn").hide()
+		}
 
 	});
 }
@@ -453,6 +466,8 @@ function reset(){
 	$("#his-f4-name").val(""); $("#his-f4-val").val("");
 	$("#his-endorse").html("");
 	$("#his-openin").attr("data-href", "");
+	$("#his-float-timeline").show();
+	$("#his-float-blocked").hide();
 }
 $('#my-data-nav .custom-tab').on('click',function(){
 	var target=$(this).find("a").attr("go");

app/main.js

@@ -1,4 +1,4 @@
-'use strict';
+
 var dir='file://' + __dirname;
 var base=dir + '/view/';
 // Electronのモジュール
@@ -50,19 +50,14 @@ try {
 
 	}; // デフォルトバリュー
 }
-try {
+function isFile(file){
-	var lang = fs.readFileSync(lang_path, 'utf8');
+	try {
-} catch (e) {
+		fs.statSync(file);
-	var langs=app.getLocale();
+		return true
-	if(~langs.indexOf("ja")){
+	} catch (err) {
-		lang="ja";
+		if (err.code === 'ENOENT') return false
-	}else{
-		lang="en";
 	}
-	fs.writeFileSync(lang_path,lang);
 }
-console.log(app.getLocale());
-console.log("launch:"+lang);
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function() {
 	if (process.platform != 'darwin') {
@@ -70,8 +65,31 @@ app.on('window-all-closed', function() {
 		app.quit();
 	}
 });
+// macOSでウィンドウを閉じた後に再度開けるようにする
+app.on('activate', function() {
+	if (mainWindow == null) {
+		createWindow();
+	}
+});
 
 function createWindow() {
+	if(isFile(lang_path)) {
+		console.log("exist");
+		var lang = fs.readFileSync(lang_path, 'utf8');
+	} else {
+		var langs=app.getLocale();
+		console.log(langs);
+		if(~langs.indexOf("ja")){
+			lang="ja";
+		}else{
+			lang="en";
+		}
+		fs.mkdir(app.getPath("userData"), function (err) {
+			fs.writeFileSync(lang_path,lang);
+		});
+	}
+	console.log(app.getLocale());
+	console.log("launch:"+lang);
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
 	var platform=process.platform;
 	var bit=process.arch;
@@ -109,6 +127,7 @@ function createWindow() {
 	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function() {
+		electron.ipcMain.removeAllListeners();
 		mainWindow = null;
 	});
 	mainWindow.on('close', function() {
@@ -131,7 +150,7 @@ function createWindow() {
 	var platform=process.platform;
 	var bit=process.arch;
 	if(platform=="darwin"){
-		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang,mainWindow,false)));
+		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang,mainWindow,false,dir)));
 	}
 	//CSS
 	css.css(mainWindow);

app/main/language.js

@@ -1,5 +1,5 @@
 // Create the Application's main menu
-function templete(lang,mainWindow,packaged){
+function templete(lang,mainWindow,packaged,dir){
     const electron = require("electron");
     const app = electron.app;
     const BrowserWindow = electron.BrowserWindow;
@@ -74,7 +74,7 @@ function templete(lang,mainWindow,packaged){
 			        "transparent": false,    // ウィンドウの背景を透過
 			        "frame": false,     // 枠の無いウィンドウ
 			        "resizable": false });
-	             window.loadURL('file://' + __dirname + '/about.html?ver='+ver);
+	             window.loadURL(dir + '/about.html?ver='+ver);
              } },
             { type: "separator" },
             { label: dict.quit[lang], accelerator: "Command+Q", click: function() { app.quit(); }}

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.1.0",
+  "version": "18.2.0",
   "description": "TheDesk is a Mastodon client for PC.",
   "main": "main.js",
   "scripts": {

app/view/en/acct.html

@@ -18,6 +18,14 @@ body,html{overflow-y: scroll;}
 .colorsel{ display:flex; }
 .card .colorsel div:not(.exc){width:20px;height:20px;}
 .card .colorsel div.exc{width:40px;height:20px;}
+.first{
+      display:flex;
+      justify-content: center;
+      align-items:center
+}
+.first .hide-first{
+      display:none;
+}
 </style>
 <meta charset="utf-8">
 <!--
@@ -39,24 +47,27 @@ body,html{overflow-y: scroll;}
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">Back</a><br>
+<div class="hide-first">
-<h5>List of accounts</h5>
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">Back</a><br>
-<div id="acct-list"></div>
+      <h5>List of accounts</h5>
-<div class="divider"></div>
+      <div id="acct-list"></div>
+      <div class="divider"></div>
+</div>
+<div>
 <h5>Add an account</h5><br>
 <div id="add">
 <div class="row">
-      <div class="col s6">
+      <div class="col s8">
             <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
             <div id="ins-suggest"></div>
-            Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.<br>
+            Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)<br>
             <input type="checkbox" class="filled-in" id="linux" />
                   <label for="linux">Code setup</label><br>
             <input type="checkbox" class="filled-in" id="misskey" />
                   <label for="misskey">Login as Misskey</label><br>
             <button class="btn waves-effect" onclick="instance()">Login</button><br>
       </div>
-      <div class="col s6">
+      <div class="col s4">
             <span style="font-family:Open Sans;">Supports</span>
             <div id="support" class="collection transparent"></div>
       </div>
@@ -73,6 +84,8 @@ body,html{overflow-y: scroll;}
                   <input type="text" id="misskey-key" placeholder="Code">
                   <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
             </div>
+      </div>
+<div class="hide-first">
 <h5>Main an account</h5>
 <div class="input-field" style="width:300px"><span data-trans="your_acct">Select an account</span>
       <br>
@@ -91,6 +104,7 @@ Toots:<span id="ins-toot"></span><br>
 Users:<span id="ins-user"></span>Users<br>
 Connection:<span id="ins-per"></span>%<br>
 Mastodon version:<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>
 <script type="text/javascript" src="../../js/common/sha256.js"></script>

app/view/en/index.html

@@ -32,14 +32,13 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.1.2)";
+var ver="Usamin (18.2.0)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
 var acct_id=0;
 var tlid=0;
-  verck(ver);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
 <div id="tl">
@@ -53,7 +52,7 @@ var tlid=0;
 </div>
 </div>
 <div id="post-box" class="z-depth-5">
-<div id="post-bar" class="drag-bar">Post new</div>
+<div id="post-bar" class="drag-bar"><span id="unreact">Post new</span><span id="addreact" class="hide">Reaction</span></div>
 <!--トゥートボックス-->
 <div id="left-side">
 <div class="row" style="margin-bottom:0;">
@@ -205,7 +204,6 @@ var tlid=0;
 <div id="emoji" class="hide">
 		<span class="gray sml">
 			<a onclick="emojiGet('true')" class="pointer">Refresh emojis list</a>
-			<i class="material-icons waves-effect" onclick="emojiToggle()" title="Close this box" data-trans-title="post_box_close">cancel</i>
 		<br>
 		</span>
 		<div id="emoji-list" class="" style="">
@@ -259,12 +257,8 @@ var tlid=0;
 	<div id="poll" class="hide">
 		<select id="poll-sel"  onchange="pollProviderCk()">
 			<option value="nothing">Polls: Disabled</option>
-			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon" class="poll-provider hide">
-	WIP
-		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="Choice1">
 			<input type="text" class="mastodon-choice" placeholder="Choice2">
@@ -274,9 +268,9 @@ var tlid=0;
 			<label for="poll-multiple">Multiple select</label><br>
 			<input type="checkbox" class="filled-in" id="poll-until" value="1" />
 			<label for="poll-until">Hide 'votes' count until people vote it.</label><br>
-			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">days
+			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">day(s)
-			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hours
+			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hour(s)
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">minutes
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">minute(s)
 		</div>
 	</div>
 </div>
@@ -360,7 +354,6 @@ var tlid=0;
 </div>
 	<div class="modal-footer">
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">Open in browser</a>
-	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">Take a screenshot</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">Copy URL of this toot</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">Embed</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
@@ -372,7 +365,7 @@ var tlid=0;
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="../../img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof" draggable="false">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -525,6 +518,9 @@ var tlid=0;
 			</div>
 			</div>
 			</div>
+			<div class="his-float" id="his-float-blocked">
+				<div>You are blocked. Why?</div>
+			</div>
 			</div>
 			</div>
 			<div class="modal-footer">
@@ -583,20 +579,22 @@ var tlid=0;
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Usamin_18-1-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-2-0" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.1.1)</h5>
+					<h5>Release Note Usamin (18.2.0)</h5>
-・お知らせ機能改善<br>
+・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・イントロダクション(初回起動時)の挙動修正<br>
---以下18.1.0--<br>
+・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
+・(Misskey)MFM追加flipやjumpなど<br>
-・画像を個別に削除する(画像をクリックして)<br>
+・(Misskey)リストに対応<br>
-・何個もアルバムアートワークが投稿されるバグを修正<br>
+・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・Misskeyでログインしたまま何もできないバグを修正(権限回り)
+・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
+・一部機能の統廃合とバグの修正<br>
+・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -688,11 +686,10 @@ var tlid=0;
 			<div class="input-field">
 			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 	</div><div class="input-field">
-	<i class="material-icons prefix">search</i>
+	<input id="src" type="text" class="validate" style="width:60%">
-	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
 	<label for="src" data-trans="src">Search</label>
-	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
+	<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;" onclick="src()" data-trans-i="src">
-		<i class="material-icons left">search</i>Search
+		<i class="material-icons left" style="margin:0">search</i>Search
 	</button>
 	<br>
 	<br>
@@ -706,7 +703,7 @@ var tlid=0;
 	<div id="sort-box" class="hide menu-content">
 	<ul id="sort"></ul>
 	<div>
-	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+	<button onclick="sort()" class="btn waves-effect nex" style="width:97.5%;" data-trans-i="sort">
 		<i class="material-icons left">sort</i>Sort
 	</button>
 	</div>
@@ -759,9 +756,16 @@ var tlid=0;
 			<label for="except_filter">Drop instead of hide</label><br>
 		<span class="sml">Filtered toots will disappear irreversibly, even if filter is later removed</span><br>
 		Expire after<span class="sml">Unset or "0" means "Never"<b>This value may contain some error</b></span><br><br>
-		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">days
+		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">day(s)
-		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">hours
+		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">hour(s)
-		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">minutes
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">minute(s)<br>
+		Quick:<a onclick="filterTime(0,0,30)" class="pointer">30minute(s)</a>/
+		<a onclick="filterTime(0,1,0)" class="pointer">1hour(s)</a>/
+		<a onclick="filterTime(0,6,0)" class="pointer">6hour(s)</a>/
+		<a onclick="filterTime(0,12,0)" class="pointer">12hour(s)</a>/
+		<a onclick="filterTime(1,0,0)" class="pointer">1day(s)</a>/
+		<a onclick="filterTime(7,0,0)" class="pointer">7day(s)</a>/
+		<a onclick="filterTime(0,0,0)" class="pointer">Never</a><br>
 		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">Add</button><br>
 		<span class="sml">Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.</span>
 	</div>
@@ -777,7 +781,9 @@ var tlid=0;
 <div id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	<h3>Welcome to TheDesk</h3><br><a href="acct.html">Add an account</a> or click <i class="material-icons">apps</i> to add a column.
+	<div id="something-wrong">
+		<div>Internal error: please clear all data(at setting page) <b>All data will be deleted.</b></div>
+	</div>
 </div>
 </div>
 </div>
@@ -860,6 +866,7 @@ var tlid=0;
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
 <script type="text/javascript" src="../../js/ui/post-box.js"></script>
 <script type="text/javascript" src="../../js/ui/layout.js"></script>
+<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/login/instance.js"></script>
 <script type="text/javascript" src="../../js/login/login.js"></script>
 <script type="text/javascript" src="../../js/ui/img.js"></script>
@@ -873,7 +880,6 @@ var tlid=0;
 <script type="text/javascript" src="../../js/post/img.js"></script>
 <script type="text/javascript" src="../../js/post/status.js"></script>
 <script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
-<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/post/suggest.js"></script>
 <script type="text/javascript" src="../../js/post/bb-md.js"></script>
 <script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>

app/view/en/setting.html

@@ -1,5 +1,6 @@
 <!doctype html>
 <html lang="en">
+
 <head>
 	<title>Settings - TheDesk</title>
 	<!--
@@ -17,19 +18,28 @@
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
-	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
+	<style>
-</head>
+		input {
-<body id="mainView" style="overflow-y:scroll">
+			max-height: 50px !important
-<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.en.js"></script>
-<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
-<script src="../../node_modules/vue/dist/vue.min.js"></script>
-<script type="text/javascript" src="setting.vue.js"></script>
 
-<h4>Preferences</h4>
+		.pcr-result {
-<ul class="collapsible" data-collapsible="accordion">
+			height: 1rem !important;
+		}
+	</style>
+</head>
+
+<body id="mainView" style="overflow-y:scroll">
+	<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.en.js"></script>
+	<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+	<script src="../../node_modules/vue/dist/vue.min.js"></script>
+	<script type="text/javascript" src="setting.vue.js"></script>
+
+	<h4>Preferences</h4>
+	<ul class="collapsible" data-collapsible="accordion">
 		<li>
 			<div class="collapsible-header">
 				<i class="material-icons">desktop_windows</i>System Preferences
@@ -39,30 +49,39 @@
 				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
 				<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>
+				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
-		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">Import</button>
+					style="width:100%; max-width:200px;">Export</button>
+				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
+					style="width:100%; max-width:200px;">Import</button>
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
+						<template v-if=item.text.desc>
 							<templete v-html=item.text.desc></templete><br>
-				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">Notification test</a><br></template>
+						</template>
+						<template v-if="item.id=='notf'"><a onclick="notftest()"
+								class="pointer">Notification test</a><br></template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
 							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">Change</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">Change</button>
+						</template><br>
 					</template>
 				</div>
 				<h5>Font</h5>
@@ -109,7 +128,8 @@
 				<h5>Name</h5>
 				<input type="text" style="width:300px" id="custom_name" placeholder="Name...">
 				<h5>About this theme</h5>
-		<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea" placeholder="About this theme..."></textarea></div>
+				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
+						placeholder="About this theme..."></textarea></div>
 				<h5>Color scheme</h5>
 				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
@@ -118,31 +138,42 @@
 				<div id="pickers">
 					<div>
 						<h5>Primary</h5>Background of components
-			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
 						<input type="hidden" id="color-picker0_value">
 					</div>
 					<div>
 						<h5>Secondary</h5>Background color
-			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
 						<input type="hidden" id="color-picker1_value">
 					</div>
 					<div>
 						<h5>Texts</h5>Text color
-			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
 						<input type="hidden" id="color-picker2_value">
 					</div>
 					<div>
 						<h5>Accent</h5>Background of boosts
-			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
+						<div id="color-picker3-wrap">
+							<div class="color-picker" id="color-picker3"></div>
+						</div>
 						<input type="hidden" id="color-picker3_value">
 					</div>
 				</div>
-		<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">Delete</button><br><br>
+				<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button
-		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
+					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">Delete</button><br><br>
+				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+					placeholder="JSON style" readonly><br>
 				Share this code with other TheDesk. Do not share this code with MiAS.
 				<h4>Import of custom themes</h4>
 				Get more themes on <a href="https://assets.msky.cafe/" target="_blank">MiAS</a><br>
-		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
+				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+					placeholder="JSON/JSON5 style">
 				<button class="btn waves-effect" onclick="customImp()">Import</button><br>
 		</li>
 		<li>
@@ -153,24 +184,30 @@
 				<div id="tlView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+						<template v-if=item.text.desc>
+							<templete v-html=item.text.desc></templete><br>
+						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
 							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">Change</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">Change</button>
+						</template><br>
 					</template>
 				</div>
 			</div>
@@ -183,11 +220,14 @@
 				<div id="postView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+						<template v-if=item.text.desc>
+							<templete v-html=item.text.desc></templete><br>
+						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
 								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-                            	<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 									<label v-bind:for="item.id+check.value">{{check.text}}</label>
 									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
 								</template>
@@ -196,21 +236,24 @@
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">Change</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">Change</button>
+						</template><br>
 					</template>
 				</div>
 			</div>
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="material-icons">keyboard</i>Keyboard shortcut Preferences
+				<i class="material-icons">Fkeyboard</i>Keyboard shortcut Preferences
 			</div>
 			<div class="collapsible-body">
 				<h5>Easy inserter</h5>
@@ -270,9 +313,14 @@
 				Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
 				<h5>Account Connection</h5>
 				TheDesk save your data on thedesk.top server.<br>
-			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">Save</button></div>
+				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
-			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>Connect</a>
+						onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">Save</button></div>
-			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>Disconnect</a>
+				<a onclick="spotifyConnect()" class="btn waves-effect nex"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
+						class="fa fa-spotify left"></i>Connect</a>
+				<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
+						class="fa fa-spotify left"></i>Disconnect</a>
 				<h5>Edit a template</h5>
 				<br>
 				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
@@ -280,11 +328,8 @@
 				Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify<br>
 				macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}<br>
 				Windows:{song}:Song name/{album}:Album name/{artist}:Artist name<br>
-				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
-                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
 				<h5>Attach an Artwork of Spotify</h5>
-			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
 				<label for="awk_yes">Yes</label>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
@@ -299,80 +344,98 @@
 			<div class="collapsible-body">
 				<h5>Speed</h5>
 				1-100(default:10)<br>
-			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
+						style="width:500px; max-width:100%" /></p>
 				<h5>Pitch</h5>
 				0-100(default:50)<br>
-			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
+						style="width:500px; max-width:100%" /></p>
 				<h5>Volume</h5>
 				0-100(default:100)<br>
-			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
+						style="width:500px; max-width:100%" /></p>
 				<h5>Test</h5>
 				<input type="text" style="width:350px" id="voicetxt" value="TheDesk is an open-source Mastodon client for PC.">
-			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">Play/Stop</button><br>
+				<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
+					id="testplay">Play/Stop</button><br>
 				<br>
 				<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">Save</button>
 			</div>
 		</li>
-</ul>
+	</ul>
-<br>
+	<br>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>Back</a>
+	<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
-<br>
+			class="material-icons left">undo</i>Back</a>
-<br>Keyboard shortcuts
+	<br>
-<li>Ctrl+1-9:Jump to n(1-9)th column</li>
+	<br>Keyboard shortcuts
-<li>N:Open toot box</li>
+	<li>Ctrl+1-9:Jump to n(1-9)th column</li>
-<li>X:Toggle toot box</li>
+	<li>N:Open toot box</li>
-<li>Ctrl+Enter:Post</li>
+	<li>X:Toggle toot box</li>
-<li>Ctrl+Enter+Shift:Post(secondary toot)</li>
+	<li>Ctrl+Enter:Post</li>
-<li>Alt+Enter:Secondary Toot Button</li>
+	<li>Ctrl+Enter+Shift:Post(secondary toot)</li>
-<li>Ctrl+E:Make all notifications read</li>
+	<li>Alt+Enter:Secondary Toot Button</li>
-<li>Esc:Hide toot box</li>
+	<li>Ctrl+E:Make all notifications read</li>
-<li>F5:Super Reload</li>
+	<li>Esc:Hide toot box</li>
-<li>Ctrl+Shift+C:Clear toot box</li>
+	<li>F5:Super Reload</li>
-<li>Ctrl+Shift+S:Preferences</li>
+	<li>Ctrl+Shift+C:Clear toot box</li>
-<li>Ctrl+Shift+M:Account Manager</li>
+	<li>Ctrl+Shift+S:Preferences</li>
-<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
+	<li>Ctrl+Shift+M:Account Manager</li>
-<li>Ctrl+Shift+P:Show profile of selecting</li>
+	<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
-<li>←/→:Show next or previous image</li>
+	<li>Ctrl+Shift+P:Show profile of selecting</li>
-<li>Mousewheel:Zoom a image</li>
+	<li>←/→:Show next or previous image</li>
-<div class="hide kirishima">
+	<li>Mousewheel:Zoom a image</li>
-以下Markdownに対応したインスタンスのみ。
+	<div class="hide kirishima">
-<br>
+		以下Markdownに対応したインスタンスのみ。
-<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
+		<br>
-<li>Shift+Enter:全角スペースを入れて改行</li>
+		<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
-<li>Shift+Space:ゼロ幅スペース</li>
+		<li>Shift+Enter:全角スペースを入れて改行</li>
-以下アスタルテにログインしている場合のみ 
+		<li>Shift+Space:ゼロ幅スペース</li>
-<br>
+		以下アスタルテにログインしている場合のみ
-<li>Ctrl+R: 
+		<br>
-<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
+		<li>Ctrl+R:
-</li><br>
+			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
-</div>
+		</li><br>
-<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('Delete all data. You cannot undo. Continue?')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>Reset(Danger)</button><br><br>
+	</div>
-<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>About TheDesk</button>
+	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
-<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>
+		onclick="if(confirm('Delete all data. You cannot undo. Continue?')){ localStorage.clear(); location.href='index.html'; }"><i
-<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>
+			class="material-icons left">delete</i>Reset(Danger)</button><br><br>
-<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>
+	<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
-<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>
+			class="material-icons left">info</i>About TheDesk</button>
-<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="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
-<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@kirishima.cloud</a>
+			class="material-icons left">web</i>Website</a>
-<br>
+	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-Kyash<br>
+			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@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@kirishima.cloud</a>
+	<br>
+	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
-<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">Check update</a><br>
+	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
-<a href="oss.html">OSS License</a><br>
+		class="pointer">Check update</a><br>
-<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
+	<a href="oss.html">OSS License</a><br>
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
+	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
+			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@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 		<br>
-</span><br>
+	</span><br>
-TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
+	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
-タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+	タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
-<script type="text/javascript" src="../../js/common/about.js"></script>
+	<script type="text/javascript" src="../../js/common/about.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+	<script type="text/javascript" src="../../js/platform/end.js"></script>
-<script type="text/javascript" src="../../js/login/logout.js"></script>
+	<script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+	<script type="text/javascript" src="../../js/ui/spotify.js"></script>
-<script type="text/javascript" src="../../js/tl/speech.js"></script>
+	<script type="text/javascript" src="../../js/tl/speech.js"></script>
-<script type="text/javascript" src="../../js/platform/pickr.js"></script>
+	<script type="text/javascript" src="../../js/platform/pickr.js"></script>
-<script type="text/javascript" src="../../js/ui/settings.js"></script>
+	<script type="text/javascript" src="../../js/ui/settings.js"></script>
-<script type="text/javascript" src="../../js/ui/theme.js"></script>
+	<script type="text/javascript" src="../../js/ui/theme.js"></script>
-<script type="text/javascript" src="../../js/tl/date.js"></script>
+	<script type="text/javascript" src="../../js/tl/date.js"></script>

app/view/en/setting.vue.js

@@ -476,5 +476,16 @@ var postConstruction=[
                 }
             ]
         }
+    },{
+        id:"zero",
+        storage:"emoji-zero-width",
+        checkbox:true,
+        setValue:"normal",
+        setValue:"no",
+        text:{
+            head:"Zero-width space when inserting emojis",
+            desc:"",
+            checkbox:yesno
+        }
     }
 ]

app/view/ja/acct.html

@@ -18,6 +18,14 @@ body,html{overflow-y: scroll;}
 .colorsel{ display:flex; }
 .card .colorsel div:not(.exc){width:20px;height:20px;}
 .card .colorsel div.exc{width:40px;height:20px;}
+.first{
+      display:flex;
+      justify-content: center;
+      align-items:center
+}
+.first .hide-first{
+      display:none;
+}
 </style>
 <meta charset="utf-8">
 <!--
@@ -39,24 +47,27 @@ body,html{overflow-y: scroll;}
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">戻る</a><br>
+<div class="hide-first">
-<h5>アカウント一覧</h5>
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">戻る</a><br>
-<div id="acct-list"></div>
+      <h5>アカウント一覧</h5>
-<div class="divider"></div>
+      <div id="acct-list"></div>
+      <div class="divider"></div>
+</div>
+<div>
 <h5>アカウントを追加</h5><br>
 <div id="add">
 <div class="row">
-      <div class="col s6">
+      <div class="col s8">
             <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
             <div id="ins-suggest"></div>
-            Windows以外でご使用の方やPleromaにログインされる方はチェックを入れて下さい。ログインできない場合、チェックを外してください。<br>
+            チェックを外すとコード貼り付けをスキップできます。(<u>Mastodon</u>にWindowsやmacOSからログインする場合)失敗する場合はチェックを入れてください。<br>
             <input type="checkbox" class="filled-in" id="linux" />
                   <label for="linux">コードセットアップ</label><br>
             <input type="checkbox" class="filled-in" id="misskey" />
                   <label for="misskey">Misskeyとしてログイン</label><br>
             <button class="btn waves-effect" onclick="instance()">Login</button><br>
       </div>
-      <div class="col s6">
+      <div class="col s4">
             <span style="font-family:Open Sans;">Supports</span>
             <div id="support" class="collection transparent"></div>
       </div>
@@ -73,6 +84,8 @@ body,html{overflow-y: scroll;}
                   <input type="text" id="misskey-key" placeholder="コードを入力">
                   <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
             </div>
+      </div>
+<div class="hide-first">
 <h5>メインアカウント</h5>
 <div class="input-field" style="width:300px"><span data-trans="your_acct">アカウントを選択</span>
       <br>
@@ -91,6 +104,7 @@ Administered by:<a id="ins-admin"></a><br>
 ユーザー数:<span id="ins-user"></span>ユーザー数<br>
 コネクション:<span id="ins-per"></span>%<br>
 Mastodonバージョン:<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>
 <script type="text/javascript" src="../../js/common/sha256.js"></script>

app/view/ja/index.html

@@ -32,14 +32,13 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.1.2)";
+var ver="Usamin (18.2.0)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
 var acct_id=0;
 var tlid=0;
-  verck(ver);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
 <div id="tl">
@@ -53,7 +52,7 @@ var tlid=0;
 </div>
 </div>
 <div id="post-box" class="z-depth-5">
-<div id="post-bar" class="drag-bar">投稿</div>
+<div id="post-bar" class="drag-bar"><span id="unreact">投稿</span><span id="addreact" class="hide">Reaction</span></div>
 <!--トゥートボックス-->
 <div id="left-side">
 <div class="row" style="margin-bottom:0;">
@@ -205,7 +204,6 @@ var tlid=0;
 <div id="emoji" class="hide">
 		<span class="gray sml">サーバーによって実装が異なります。
 			<a onclick="emojiGet('true')" class="pointer">絵文字更新</a>
-			<i class="material-icons waves-effect" onclick="emojiToggle()" title="このボックスを閉じる" data-trans-title="post_box_close">cancel</i>
 		<br>
 		</span>
 		<div id="emoji-list" class="" style="">
@@ -259,12 +257,8 @@ var tlid=0;
 	<div id="poll" class="hide">
 		<select id="poll-sel"  onchange="pollProviderCk()">
 			<option value="nothing">アンケートを使用しない</option>
-			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon" class="poll-provider hide">
-	WIP
-		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="選択肢1">
 			<input type="text" class="mastodon-choice" placeholder="選択肢2">
@@ -360,7 +354,6 @@ var tlid=0;
 </div>
 	<div class="modal-footer">
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">ブラウザで開く</a>
-	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">スクリーンショット</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">URLをコピー</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">埋め込む</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
@@ -372,7 +365,7 @@ var tlid=0;
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="../../img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof" draggable="false">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -525,6 +518,9 @@ var tlid=0;
 			</div>
 			</div>
 			</div>
+			<div class="his-float" id="his-float-blocked">
+				<div>ブロックされています。なぜでしょう？</div>
+			</div>
 			</div>
 			</div>
 			<div class="modal-footer">
@@ -583,20 +579,22 @@ var tlid=0;
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Usamin_18-1-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-2-0" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.1.1)</h5>
+					<h5>Release Note Usamin (18.2.0)</h5>
-・お知らせ機能改善<br>
+・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・イントロダクション(初回起動時)の挙動修正<br>
---以下18.1.0--<br>
+・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
+・(Misskey)MFM追加flipやjumpなど<br>
-・画像を個別に削除する(画像をクリックして)<br>
+・(Misskey)リストに対応<br>
-・何個もアルバムアートワークが投稿されるバグを修正<br>
+・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・Misskeyでログインしたまま何もできないバグを修正(権限回り)
+・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
+・一部機能の統廃合とバグの修正<br>
+・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -688,11 +686,10 @@ var tlid=0;
 			<div class="input-field">
 			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 	</div><div class="input-field">
-	<i class="material-icons prefix">search</i>
+	<input id="src" type="text" class="validate" style="width:60%">
-	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
 	<label for="src" data-trans="src">検索</label>
-	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
+	<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;" onclick="src()" data-trans-i="src">
-		<i class="material-icons left">search</i>検索
+		<i class="material-icons left" style="margin:0">search</i>検索
 	</button>
 	<br>
 	<br>
@@ -706,7 +703,7 @@ var tlid=0;
 	<div id="sort-box" class="hide menu-content">
 	<ul id="sort"></ul>
 	<div>
-	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+	<button onclick="sort()" class="btn waves-effect nex" style="width:97.5%;" data-trans-i="sort">
 		<i class="material-icons left">sort</i>並べ替え設定
 	</button>
 	</div>
@@ -758,10 +755,17 @@ var tlid=0;
 		<input type="checkbox" class="filled-in" id="except_filter" value="1" />
 			<label for="except_filter">除外</label><br>
 		<span class="sml">「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。</span><br>
-		有効期限(あと)<span class="sml">未指定(または0分)で「無制限」になります。<b>仕様上数値の正確性を保証できません。</b></span><br><br>
+		有効期限(あと)<span class="sml">未指定(または0分)で「無期限」になります。<b>仕様上数値の正確性を保証できません。</b></span><br><br>
 		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">日
 		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">時間
-		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">分
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">分<br>
+		Quick:<a onclick="filterTime(0,0,30)" class="pointer">30分</a>/
+		<a onclick="filterTime(0,1,0)" class="pointer">1時間</a>/
+		<a onclick="filterTime(0,6,0)" class="pointer">6時間</a>/
+		<a onclick="filterTime(0,12,0)" class="pointer">12時間</a>/
+		<a onclick="filterTime(1,0,0)" class="pointer">1日</a>/
+		<a onclick="filterTime(7,0,0)" class="pointer">7日</a>/
+		<a onclick="filterTime(0,0,0)" class="pointer">無期限</a><br>
 		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">追加</button><br>
 		<span class="sml">Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。</span>
 	</div>
@@ -777,7 +781,9 @@ var tlid=0;
 <div id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	<h3>Welcome to TheDesk</h3><br><a href="acct.html">アカウントを追加</a>するか下の<i class="material-icons">apps</i>ボタンよりカラムを追加してください。
+	<div id="something-wrong">
+		<div>内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)</div>
+	</div>
 </div>
 </div>
 </div>
@@ -860,6 +866,7 @@ var tlid=0;
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
 <script type="text/javascript" src="../../js/ui/post-box.js"></script>
 <script type="text/javascript" src="../../js/ui/layout.js"></script>
+<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/login/instance.js"></script>
 <script type="text/javascript" src="../../js/login/login.js"></script>
 <script type="text/javascript" src="../../js/ui/img.js"></script>
@@ -873,7 +880,6 @@ var tlid=0;
 <script type="text/javascript" src="../../js/post/img.js"></script>
 <script type="text/javascript" src="../../js/post/status.js"></script>
 <script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
-<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/post/suggest.js"></script>
 <script type="text/javascript" src="../../js/post/bb-md.js"></script>
 <script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>

app/view/ja/setting.html

@@ -1,5 +1,6 @@
 <!doctype html>
 <html lang="ja">
+
 <head>
 	<title>Settings - TheDesk</title>
 	<!--
@@ -17,19 +18,28 @@
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
-	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
+	<style>
-</head>
+		input {
-<body id="mainView" style="overflow-y:scroll">
+			max-height: 50px !important
-<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.ja.js"></script>
-<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
-<script src="../../node_modules/vue/dist/vue.min.js"></script>
-<script type="text/javascript" src="setting.vue.js"></script>
 
-<h4>設定</h4>
+		.pcr-result {
-<ul class="collapsible" data-collapsible="accordion">
+			height: 1rem !important;
+		}
+	</style>
+</head>
+
+<body id="mainView" style="overflow-y:scroll">
+	<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.ja.js"></script>
+	<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+	<script src="../../node_modules/vue/dist/vue.min.js"></script>
+	<script type="text/javascript" src="setting.vue.js"></script>
+
+	<h4>設定</h4>
+	<ul class="collapsible" data-collapsible="accordion">
 		<li>
 			<div class="collapsible-header">
 				<i class="material-icons">desktop_windows</i>環境設定
@@ -39,30 +49,39 @@
 				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
 				<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>
+				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
-		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">インポート</button>
+					style="width:100%; max-width:200px;">エクスポート</button>
+				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
+					style="width:100%; max-width:200px;">インポート</button>
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
+						<template v-if=item.text.desc>
 							<templete v-html=item.text.desc></templete><br>
-				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">通知テスト</a><br></template>
+						</template>
+						<template v-if="item.id=='notf'"><a onclick="notftest()"
+								class="pointer">通知テスト</a><br></template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
 							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">変更</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">変更</button>
+						</template><br>
 					</template>
 				</div>
 				<h5>フォント</h5>
@@ -109,7 +128,8 @@
 				<h5>名前</h5>
 				<input type="text" style="width:300px" id="custom_name" placeholder="名前...">
 				<h5>説明</h5>
-		<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea" placeholder="説明..."></textarea></div>
+				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
+						placeholder="説明..."></textarea></div>
 				<h5>色の系統</h5>
 				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
@@ -118,31 +138,42 @@
 				<div id="pickers">
 					<div>
 						<h5>Primary</h5>補助要素に使われる背景色
-			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
 						<input type="hidden" id="color-picker0_value">
 					</div>
 					<div>
 						<h5>Secondary</h5>全体の背景色など
-			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
 						<input type="hidden" id="color-picker1_value">
 					</div>
 					<div>
 						<h5>Texts</h5>テキストの色
-			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
 						<input type="hidden" id="color-picker2_value">
 					</div>
 					<div>
 						<h5>Accent</h5>ブーストの背景色など
-			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
+						<div id="color-picker3-wrap">
+							<div class="color-picker" id="color-picker3"></div>
+						</div>
 						<input type="hidden" id="color-picker3_value">
 					</div>
 				</div>
-		<button class="btn-large waves-effect" onclick="customComp()">変更</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">削除</button><br><br>
+				<button class="btn-large waves-effect" onclick="customComp()">変更</button>&nbsp;<button
-		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
+					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">削除</button><br><br>
+				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+					placeholder="JSON style" readonly><br>
 				このコードは他のTheDeskなどとシェアできます。このコードをMiASに貼ることはご遠慮ください。詳細:<a href="https://thedesk.top/mias.html" target="_blank">テーマ互換性</a>
 				<h4>カスタムテーマのインポート</h4>
 				<a href="https://assets.msky.cafe/" target="_blank">MiAS</a>上の80を超えるテーマを張り付けることもできます。<br>
-		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
+				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+					placeholder="JSON/JSON5 style">
 				<button class="btn waves-effect" onclick="customImp()">インポート</button><br>
 		</li>
 		<li>
@@ -153,24 +184,30 @@
 				<div id="tlView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+						<template v-if=item.text.desc>
+							<templete v-html=item.text.desc></templete><br>
+						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
 							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">変更</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">変更</button>
+						</template><br>
 					</template>
 				</div>
 			</div>
@@ -183,11 +220,14 @@
 				<div id="postView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+						<template v-if=item.text.desc>
+							<templete v-html=item.text.desc></templete><br>
+						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
 								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-                            	<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 									<label v-bind:for="item.id+check.value">{{check.text}}</label>
 									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
 								</template>
@@ -196,21 +236,24 @@
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">変更</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">変更</button>
+						</template><br>
 					</template>
 				</div>
 			</div>
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="material-icons">keyboard</i>キーボードショートカットの設定
+				<i class="material-icons">Fkeyboard</i>キーボードショートカットの設定
 			</div>
 			<div class="collapsible-body">
 				<h5>簡単文字入力</h5>
@@ -270,9 +313,14 @@
 				<i class="material-icons" style="font-size:24px;">music_note</i>ボタンから簡単にNowPlayingができます。<br>
 				<h5>アカウントの連携</h5>
 				APIの性質上，thedesk.topへアクセスします。<br>
-			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">設定</button></div>
+				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
-			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>接続</a>
+						onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">設定</button></div>
-			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>切断</a>
+				<a onclick="spotifyConnect()" class="btn waves-effect nex"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
+						class="fa fa-spotify left"></i>接続</a>
+				<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
+						class="fa fa-spotify left"></i>切断</a>
 				<h5>テンプレートの編集</h5>
 				以下を編集してテンプレートを変更できます。<br>
 				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
@@ -280,11 +328,8 @@
 				Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br>
 				macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}<br>
 				Windows:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名<br>
-				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
-                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
 				<h5>アルバムアートワークを添付する(Spotify/Windows)</h5>
-			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
 				<label for="awk_yes">はい</label>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
@@ -299,80 +344,98 @@
 			<div class="collapsible-body">
 				<h5>読み上げの速さ</h5>
 				1-100まで、デフォルトは10。<br>
-			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
+						style="width:500px; max-width:100%" /></p>
 				<h5>読み上げの高さ</h5>
 				0-100まで、デフォルトは50。(大きくなるほど高い)<br>
-			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
+						style="width:500px; max-width:100%" /></p>
 				<h5>読み上げの音量</h5>
 				0-100まで、デフォルトは100。<br>
-			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
+						style="width:500px; max-width:100%" /></p>
 				<h5>テスト</h5>
 				<input type="text" style="width:350px" id="voicetxt" value="これはテスト音声です。TheDeskはオープンソースのPC向けマストドンクライアントです。マルチサーバーやマルチカラムに対応しています。">
-			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">再生/停止</button><br>
+				<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
+					id="testplay">再生/停止</button><br>
 				<br>
 				<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">設定</button>
 			</div>
 		</li>
-</ul>
+	</ul>
-<br>
+	<br>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>戻る</a>
+	<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
-<br>
+			class="material-icons left">undo</i>戻る</a>
-<br>キーボードショートカット一覧
+	<br>
-<li>Ctrl+1-9:1番目～9番目のTLにスクロール</li>
+	<br>キーボードショートカット一覧
-<li>N:投稿パネルを開く</li>
+	<li>Ctrl+1-9:1番目～9番目のTLにスクロール</li>
-<li>X:投稿パネルを開閉</li>
+	<li>N:投稿パネルを開く</li>
-<li>Ctrl+Enter:投稿</li>
+	<li>X:投稿パネルを開閉</li>
-<li>Ctrl+Enter+Shift:投稿(セカンダリートゥート)</li>
+	<li>Ctrl+Enter:投稿</li>
-<li>Alt+Enter:セカンダリートゥートボタン</li>
+	<li>Ctrl+Enter+Shift:投稿(セカンダリートゥート)</li>
-<li>Ctrl+E:全ての通知を既読にする</li>
+	<li>Alt+Enter:セカンダリートゥートボタン</li>
-<li>Esc:投稿パネルを消す</li>
+	<li>Ctrl+E:全ての通知を既読にする</li>
-<li>F5:スーパーリロード</li>
+	<li>Esc:投稿パネルを消す</li>
-<li>Ctrl+Shift+C:入力内容を消す</li>
+	<li>F5:スーパーリロード</li>
-<li>Ctrl+Shift+S:設定</li>
+	<li>Ctrl+Shift+C:入力内容を消す</li>
-<li>Ctrl+Shift+M:アカウントマネージャ</li>
+	<li>Ctrl+Shift+S:設定</li>
-<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
+	<li>Ctrl+Shift+M:アカウントマネージャ</li>
-<li>Ctrl+Shift+P:現在選択中のプロフィール</li>
+	<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
-<li>←/→:イメージビューワー起動時に画像切り替え</li>
+	<li>Ctrl+Shift+P:現在選択中のプロフィール</li>
-<li>マウスホイール:イメージビューワー時に拡大縮小</li>
+	<li>←/→:イメージビューワー起動時に画像切り替え</li>
-<div class="hide kirishima">
+	<li>マウスホイール:イメージビューワー時に拡大縮小</li>
-以下Markdownに対応したインスタンスのみ。
+	<div class="hide kirishima">
-<br>
+		以下Markdownに対応したインスタンスのみ。
-<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
+		<br>
-<li>Shift+Enter:全角スペースを入れて改行</li>
+		<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
-<li>Shift+Space:ゼロ幅スペース</li>
+		<li>Shift+Enter:全角スペースを入れて改行</li>
-以下アスタルテにログインしている場合のみ 
+		<li>Shift+Space:ゼロ幅スペース</li>
-<br>
+		以下アスタルテにログインしている場合のみ
-<li>Ctrl+R: 
+		<br>
-<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
+		<li>Ctrl+R:
-</li><br>
+			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
-</div>
+		</li><br>
-<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('全てのデータを削除します。この操作は取り消せません。')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>初期化</button><br><br>
+	</div>
-<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>このソフトについて</button>
+	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
-<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>
+		onclick="if(confirm('全てのデータを削除します。この操作は取り消せません。')){ localStorage.clear(); location.href='index.html'; }"><i
-<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>
+			class="material-icons left">delete</i>初期化</button><br><br>
-<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>
+	<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
-<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>
+			class="material-icons left">info</i>このソフトについて</button>
-<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="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
-<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@kirishima.cloud</a>
+			class="material-icons left">web</i>公式HP</a>
-<br>
+	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-Kyash<br>
+			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@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@kirishima.cloud</a>
+	<br>
+	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
-<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">アップデートを確認</a><br>
+	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
-<a href="oss.html">OSS License(オープンソースライセンス)</a><br>
+		class="pointer">アップデートを確認</a><br>
-<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
+	<a href="oss.html">OSS License(オープンソースライセンス)</a><br>
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
+	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
+			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@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 		<br>
-</span><br>
+	</span><br>
-TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
+	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
-タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+	タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
-<script type="text/javascript" src="../../js/common/about.js"></script>
+	<script type="text/javascript" src="../../js/common/about.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+	<script type="text/javascript" src="../../js/platform/end.js"></script>
-<script type="text/javascript" src="../../js/login/logout.js"></script>
+	<script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+	<script type="text/javascript" src="../../js/ui/spotify.js"></script>
-<script type="text/javascript" src="../../js/tl/speech.js"></script>
+	<script type="text/javascript" src="../../js/tl/speech.js"></script>
-<script type="text/javascript" src="../../js/platform/pickr.js"></script>
+	<script type="text/javascript" src="../../js/platform/pickr.js"></script>
-<script type="text/javascript" src="../../js/ui/settings.js"></script>
+	<script type="text/javascript" src="../../js/ui/settings.js"></script>
-<script type="text/javascript" src="../../js/ui/theme.js"></script>
+	<script type="text/javascript" src="../../js/ui/theme.js"></script>
-<script type="text/javascript" src="../../js/tl/date.js"></script>
+	<script type="text/javascript" src="../../js/tl/date.js"></script>

app/view/ja/setting.vue.js

@@ -476,5 +476,16 @@ var postConstruction=[
                 }
             ]
         }
+    },{
+        id:"zero",
+        storage:"emoji-zero-width",
+        checkbox:true,
+        setValue:"normal",
+        setValue:"no",
+        text:{
+            head:"絵文字にゼロ幅スペースを使う",
+            desc:"",
+            checkbox:yesno
+        }
     }
 ]

app/view/make/acct.sample.html

@@ -18,6 +18,14 @@ body,html{overflow-y: scroll;}
 .colorsel{ display:flex; }
 .card .colorsel div:not(.exc){width:20px;height:20px;}
 .card .colorsel div.exc{width:40px;height:20px;}
+.first{
+      display:flex;
+      justify-content: center;
+      align-items:center
+}
+.first .hide-first{
+      display:none;
+}
 </style>
 <meta charset="utf-8">
 {{comment-start}}
@@ -39,14 +47,17 @@ body,html{overflow-y: scroll;}
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">{{back}}</a><br>
+<div class="hide-first">
-<h5>{{list}}</h5>
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">{{back}}</a><br>
-<div id="acct-list"></div>
+      <h5>{{list}}</h5>
-<div class="divider"></div>
+      <div id="acct-list"></div>
+      <div class="divider"></div>
+</div>
+<div>
 <h5>{{add}}</h5><br>
 <div id="add">
 <div class="row">
-      <div class="col s6">
+      <div class="col s8">
             <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
             <div id="ins-suggest"></div>
             {{codesetupwarn}}<br>
@@ -56,7 +67,7 @@ body,html{overflow-y: scroll;}
                   <label for="misskey">{{thisismisskey}}</label><br>
             <button class="btn waves-effect" onclick="instance()">Login</button><br>
       </div>
-      <div class="col s6">
+      <div class="col s4">
             <span style="font-family:Open Sans;">Supports</span>
             <div id="support" class="collection transparent"></div>
       </div>
@@ -73,6 +84,8 @@ body,html{overflow-y: scroll;}
                   <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>
       <br>
@@ -91,6 +104,7 @@ Administered by:<a id="ins-admin"></a><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>
 <script type="text/javascript" src="../../js/common/sha256.js"></script>

app/view/make/index.sample.html

@@ -39,7 +39,6 @@ var ver="{{versionLetter}}";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
 var acct_id=0;
 var tlid=0;
-  verck(ver);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
 <div id="tl">
@@ -53,7 +52,7 @@ var tlid=0;
 </div>
 </div>
 <div id="post-box" class="z-depth-5">
-<div id="post-bar" class="drag-bar">{{post-new}}</div>
+<div id="post-bar" class="drag-bar"><span id="unreact">{{post-new}}</span><span id="addreact" class="hide">Reaction</span></div>
 <!--トゥートボックス-->
 <div id="left-side">
 <div class="row" style="margin-bottom:0;">
@@ -205,7 +204,6 @@ var tlid=0;
 <div id="emoji" class="hide">
 		<span class="gray sml">{{emojiWarn}}
 			<a onclick="emojiGet('true')" class="pointer">{{refreshEmoji}}</a>
-			<i class="material-icons waves-effect" onclick="emojiToggle()" title="{{closeThisBox}}" data-trans-title="post_box_close">cancel</i>
 		<br>
 		</span>
 		<div id="emoji-list" class="" style="">
@@ -259,12 +257,8 @@ var tlid=0;
 	<div id="poll" class="hide">
 		<select id="poll-sel"  onchange="pollProviderCk()">
 			<option value="nothing">{{pollDdisabled}}</option>
-			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon" class="poll-provider hide">
-	WIP
-		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="{{choice}}1">
 			<input type="text" class="mastodon-choice" placeholder="{{choice}}2">
@@ -371,7 +365,7 @@ var tlid=0;
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="../../img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof" draggable="false">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -524,6 +518,9 @@ var tlid=0;
 			</div>
 			</div>
 			</div>
+			<div class="his-float" id="his-float-blocked">
+				<div>{{blocked}}</div>
+			</div>
 			</div>
 			</div>
 			<div class="modal-footer">
@@ -582,20 +579,22 @@ var tlid=0;
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Usamin_18-1-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-2-0" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.1.1)</h5>
+					<h5>Release Note Usamin (18.2.0)</h5>
-・お知らせ機能改善<br>
+・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・イントロダクション(初回起動時)の挙動修正<br>
---以下18.1.0--<br>
+・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
+・(Misskey)MFM追加flipやjumpなど<br>
-・画像を個別に削除する(画像をクリックして)<br>
+・(Misskey)リストに対応<br>
-・何個もアルバムアートワークが投稿されるバグを修正<br>
+・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・Misskeyでログインしたまま何もできないバグを修正(権限回り)
+・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
+・一部機能の統廃合とバグの修正<br>
+・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -687,11 +686,10 @@ var tlid=0;
 			<div class="input-field">
 			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 	</div><div class="input-field">
-	<i class="material-icons prefix">search</i>
+	<input id="src" type="text" class="validate" style="width:60%">
-	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
 	<label for="src" data-trans="src">{{search}}</label>
-	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
+	<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;" onclick="src()" data-trans-i="src">
-		<i class="material-icons left">search</i>{{search}}
+		<i class="material-icons left" style="margin:0">search</i>{{search}}
 	</button>
 	<br>
 	<br>
@@ -705,7 +703,7 @@ var tlid=0;
 	<div id="sort-box" class="hide menu-content">
 	<ul id="sort"></ul>
 	<div>
-	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+	<button onclick="sort()" class="btn waves-effect nex" style="width:97.5%;" data-trans-i="sort">
 		<i class="material-icons left">sort</i>{{sortSet}}
 	</button>
 	</div>
@@ -760,7 +758,14 @@ var tlid=0;
 		{{avalableBefore}}<span class="sml">{{warnAvBefore}}<b>{{warnAvBefore2}}</b></span><br><br>
 		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">{{days}}
 		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">{{hours}}
-		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}<br>
+		Quick:<a onclick="filterTime(0,0,30)" class="pointer">30{{mins}}</a>/
+		<a onclick="filterTime(0,1,0)" class="pointer">1{{hours}}</a>/
+		<a onclick="filterTime(0,6,0)" class="pointer">6{{hours}}</a>/
+		<a onclick="filterTime(0,12,0)" class="pointer">12{{hours}}</a>/
+		<a onclick="filterTime(1,0,0)" class="pointer">1{{days}}</a>/
+		<a onclick="filterTime(7,0,0)" class="pointer">7{{days}}</a>/
+		<a onclick="filterTime(0,0,0)" class="pointer">{{unlimited}}</a><br>
 		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">{{add}}</button><br>
 		<span class="sml">{{warnOnIntegratedTL}}</span>
 	</div>
@@ -776,7 +781,9 @@ var tlid=0;
 <div id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	{{helloTheDesk}}
+	<div id="something-wrong">
+		<div>{{helloTheDesk}}</div>
+	</div>
 </div>
 </div>
 </div>
@@ -859,6 +866,7 @@ var tlid=0;
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
 <script type="text/javascript" src="../../js/ui/post-box.js"></script>
 <script type="text/javascript" src="../../js/ui/layout.js"></script>
+<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/login/instance.js"></script>
 <script type="text/javascript" src="../../js/login/login.js"></script>
 <script type="text/javascript" src="../../js/ui/img.js"></script>
@@ -872,7 +880,6 @@ var tlid=0;
 <script type="text/javascript" src="../../js/post/img.js"></script>
 <script type="text/javascript" src="../../js/post/status.js"></script>
 <script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
-<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/post/suggest.js"></script>
 <script type="text/javascript" src="../../js/post/bb-md.js"></script>
 <script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>

app/view/make/language/acct.en.json

@@ -2,7 +2,7 @@
     "list":"List of accounts",
     "back":"Back",
     "add":"Add an account",
-    "codesetupwarn":"Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.",
+    "codesetupwarn":"Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup":"Code setup",
     "mainacct":"Main an account",
     "selacct":"Select an account",
@@ -17,5 +17,6 @@
     "ver":"Mastodon version",
     "ko":"",
     "thisismisskey":"Login as Misskey",
-    "misskeylogin":"Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey."
+    "misskeylogin":"Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
+    "nodata":"No data"
 }

app/view/make/language/acct.ja.json

@@ -2,7 +2,7 @@
     "list":"アカウント一覧",
     "back":"戻る",
     "add":"アカウントを追加",
-    "codesetupwarn":"Windows以外でご使用の方やPleromaにログインされる方はチェックを入れて下さい。ログインできない場合、チェックを外してください。",
+    "codesetupwarn":"チェックを外すとコード貼り付けをスキップできます。(<u>Mastodon</u>にWindowsやmacOSからログインする場合)失敗する場合はチェックを入れてください。",
     "codesetup":"コードセットアップ",
     "mainacct":"メインアカウント",
     "selacct":"アカウントを選択",
@@ -17,5 +17,6 @@
     "ver":"Mastodonバージョン",
     "ko":"個",
     "thisismisskey":"Misskeyとしてログイン",
-    "misskeylogin":"<a href=\"https://thedesk.top/how-to-misskey-login.html\">ドキュメント</a>を参照して正しいコードを入れてください。"
+    "misskeylogin":"<a href=\"https://thedesk.top/how-to-misskey-login.html\">ドキュメント</a>を参照して正しいコードを入れてください。",
+    "nodata":"アカウントがありません"
 }

app/view/make/language/index.en.json

@@ -98,6 +98,7 @@
     "note":"Note",
     "editProfImg":"Change avataor",
     "editHeader":"Change header image",
+    "blocked":"You are blocked. Why?",
     "likeUserDes":"Get people resembling this user.",
     "get":"Get",
     "historyBack":"Back",
@@ -137,12 +138,13 @@
     "avalableBefore":"Expire after",
     "warnAvBefore":"Unset or \"0\" means \"Never\"",
     "warnAvBefore2":"This value may contain some error",
-    "days":"days",
+    "unlimited":"Never",
-    "hours":"hours",
+    "days":"day(s)",
-    "mins":"minutes",
+    "hours":"hour(s)",
-    "secs":"seconds",
+    "mins":"minute(s)",
+    "secs":"second(s)",
     "warnOnIntegratedTL":"Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
-    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">Add an account</a> or click <i class=\"material-icons\">apps</i> to add a column.",
+    "helloTheDesk":"Internal error: please clear all data(at setting page) <b>All data will be deleted.</b>",
     "addColumn":"Add a column",
     "sortColumns":"Sort",
     "acctMan":"Account Manager",

app/view/make/language/index.ja.json

@@ -98,6 +98,7 @@
     "note":"自己紹介",
     "editProfImg":"アバターを変更",
     "editHeader":"ヘッダーを変更",
+    "blocked":"ブロックされています。なぜでしょう？",
     "likeUserDes":"似ているユーザーを取得できます。",
     "get":"取得",
     "historyBack":"一つ前のユーザーデータ",
@@ -135,14 +136,15 @@
     "except":"除外",
     "exceptWorn":"「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。",
     "avalableBefore":"有効期限(あと)",
-    "warnAvBefore":"未指定(または0分)で「無制限」になります。",
+    "warnAvBefore":"未指定(または0分)で「無期限」になります。",
     "warnAvBefore2":"仕様上数値の正確性を保証できません。",
+    "unlimited":"無期限",
     "days":"日",
     "hours":"時間",
     "mins":"分",
     "secs":"秒",
     "warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。",
-    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">アカウントを追加</a>するか下の<i class=\"material-icons\">apps</i>ボタンよりカラムを追加してください。",
+    "helloTheDesk":"内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)",
     "addColumn":"カラム追加",
     "sortColumns":"カラム一覧/並べ替え",
     "acctMan":"アカウントマネージャー",

app/view/make/language/setting.en.json

@@ -114,6 +114,7 @@
     "secwarn":"Toot with other visibility setting",
     "nothing":"Hidden",
     "localonly":"Local Only",
+    "zeroWidthEmoji":"Zero-width space when inserting emojis",
     "keysc":"Keyboard shortcut Preferences",
     "iks":"Easy inserter",
     "okswarn":"You can insert any letters and emojis with only 3 keys",

app/view/make/language/setting.ja.json

@@ -114,6 +114,7 @@
     "secwarn":"公開範囲の変更とトゥートを一発でできます。",
     "nothing":"表示しない",
     "localonly":"ローカル限定",
+    "zeroWidthEmoji":"絵文字にゼロ幅スペースを使う",
     "keysc":"キーボードショートカットの設定",
     "iks":"簡単文字入力",
     "okswarn":"絵文字やタグ、>BTなどを登録しておくとすぐに入力できます。",

app/view/make/setting.sample.html

@@ -1,5 +1,6 @@
 <!doctype html>
 <html lang="@@lang@@">
+
 <head>
 	<title>Settings - TheDesk</title>
 	@@comment-start@@
@@ -17,19 +18,28 @@
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
-	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
+	<style>
-</head>
+		input {
-<body id="mainView" style="overflow-y:scroll">
+			max-height: 50px !important
-<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 src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
-<script src="../../node_modules/vue/dist/vue.min.js"></script>
-<script type="text/javascript" src="setting.vue.js"></script>
 
-<h4>@@setting@@</h4>
+		.pcr-result {
-<ul class="collapsible" data-collapsible="accordion">
+			height: 1rem !important;
+		}
+	</style>
+</head>
+
+<body id="mainView" style="overflow-y:scroll">
+	<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 src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+	<script src="../../node_modules/vue/dist/vue.min.js"></script>
+	<script type="text/javascript" src="setting.vue.js"></script>
+
+	<h4>@@setting@@</h4>
+	<ul class="collapsible" data-collapsible="accordion">
 		<li>
 			<div class="collapsible-header">
 				<i class="material-icons">desktop_windows</i>@@env@@
@@ -39,30 +49,39 @@
 				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
 				@@langlist@@
 				<h5>@@backup@@</h5>
-		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">@@export@@</button>
+				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
-		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">@@import@@</button>
+					style="width:100%; max-width:200px;">@@export@@</button>
+				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
+					style="width:100%; max-width:200px;">@@import@@</button>
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
+						<template v-if=item.text.desc>
 							<templete v-html=item.text.desc></templete><br>
-				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">@@nntest@@</a><br></template>
+						</template>
+						<template v-if="item.id=='notf'"><a onclick="notftest()"
+								class="pointer">@@nntest@@</a><br></template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
 							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">@@change@@</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">@@change@@</button>
+						</template><br>
 					</template>
 				</div>
 				<h5>@@font@@</h5>
@@ -109,7 +128,8 @@
 				<h5>@@name@@</h5>
 				<input type="text" style="width:300px" id="custom_name" placeholder="@@name@@...">
 				<h5>@@desc@@</h5>
-		<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea" placeholder="@@desc@@..."></textarea></div>
+				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
+						placeholder="@@desc@@..."></textarea></div>
 				<h5>@@customthemeDirection@@</h5>
 				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
@@ -118,31 +138,42 @@
 				<div id="pickers">
 					<div>
 						<h5>Primary</h5>@@secondarycolor@@
-			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
 						<input type="hidden" id="color-picker0_value">
 					</div>
 					<div>
 						<h5>Secondary</h5>@@primary@@
-			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
 						<input type="hidden" id="color-picker1_value">
 					</div>
 					<div>
 						<h5>Texts</h5>@@text@@
-			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
 						<input type="hidden" id="color-picker2_value">
 					</div>
 					<div>
 						<h5>Accent</h5>@@accent@@
-			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
+						<div id="color-picker3-wrap">
+							<div class="color-picker" id="color-picker3"></div>
+						</div>
 						<input type="hidden" id="color-picker3_value">
 					</div>
 				</div>
-		<button class="btn-large waves-effect" onclick="customComp()">@@change@@</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">@@delete@@</button><br><br>
+				<button class="btn-large waves-effect" onclick="customComp()">@@change@@</button>&nbsp;<button
-		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
+					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">@@delete@@</button><br><br>
+				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+					placeholder="JSON style" readonly><br>
 				@@customShare@@
 				<h4>@@customImport@@</h4>
 				@@cImpWarn@@<br>
-		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
+				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+					placeholder="JSON/JSON5 style">
 				<button class="btn waves-effect" onclick="customImp()">@@import@@</button><br>
 		</li>
 		<li>
@@ -153,24 +184,30 @@
 				<div id="tlView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+						<template v-if=item.text.desc>
+							<templete v-html=item.text.desc></templete><br>
+						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
 							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">@@change@@</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">@@change@@</button>
+						</template><br>
 					</template>
 				</div>
 			</div>
@@ -183,11 +220,14 @@
 				<div id="postView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+						<template v-if=item.text.desc>
+							<templete v-html=item.text.desc></templete><br>
+						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
 								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-                            	<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 									<label v-bind:for="item.id+check.value">{{check.text}}</label>
 									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
 								</template>
@@ -196,21 +236,24 @@
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">@@change@@</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">@@change@@</button>
+						</template><br>
 					</template>
 				</div>
 			</div>
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="material-icons">keyboard</i>@@keysc@@
+				<i class="material-icons">Fkeyboard</i>@@keysc@@
 			</div>
 			<div class="collapsible-body">
 				<h5>@@iks@@</h5>
@@ -270,9 +313,14 @@
 				@@spotifynote1@@<i class="material-icons" style="font-size:24px;">music_note</i>@@spotifynote2@@<br>
 				<h5>@@link@@</h5>
 				@@linkwarn@@<br>
-			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">@@set@@</button></div>
+				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
-			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>@@connect@@</a>
+						onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">@@set@@</button></div>
-			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>@@disconnect@@</a>
+				<a onclick="spotifyConnect()" class="btn waves-effect nex"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
+						class="fa fa-spotify left"></i>@@connect@@</a>
+				<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
+						class="fa fa-spotify left"></i>@@disconnect@@</a>
 				<h5>@@templeteedit@@</h5>
 				@@templeteeditwarn@@<br>
 				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
@@ -280,11 +328,8 @@
 				@@templete1@@<br>
 				@@templete2@@<br>
 				@@templete3@@<br>
-				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
-                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
 				<h5>@@postartwork@@</h5>
-			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
 				<label for="awk_yes">@@yes@@</label>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
@@ -299,80 +344,98 @@
 			<div class="collapsible-body">
 				<h5>@@speed@@</h5>
 				@@speedwarn@@<br>
-			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
+						style="width:500px; max-width:100%" /></p>
 				<h5>@@pitch@@</h5>
 				@@pitchwarn@@<br>
-			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
+						style="width:500px; max-width:100%" /></p>
 				<h5>@@vol@@</h5>
 				@@volwarn@@<br>
-			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
+						style="width:500px; max-width:100%" /></p>
 				<h5>@@test@@</h5>
 				<input type="text" style="width:350px" id="voicetxt" value="@@sample@@">
-			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">@@playstop@@</button><br>
+				<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
+					id="testplay">@@playstop@@</button><br>
 				<br>
 				<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">@@set@@</button>
 			</div>
 		</li>
-</ul>
+	</ul>
-<br>
+	<br>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>@@back@@</a>
+	<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
-<br>
+			class="material-icons left">undo</i>@@back@@</a>
-<br>@@keyscs@@
+	<br>
-<li>Ctrl+1-9:@@keyscr@@</li>
+	<br>@@keyscs@@
-<li>N:@@keynew@@</li>
+	<li>Ctrl+1-9:@@keyscr@@</li>
-<li>X:@@keytoggle@@</li>
+	<li>N:@@keynew@@</li>
-<li>Ctrl+Enter:@@keypost@@</li>
+	<li>X:@@keytoggle@@</li>
-<li>Ctrl+Enter+Shift:@@keysecpost@@</li>
+	<li>Ctrl+Enter:@@keypost@@</li>
-<li>Alt+Enter:@@secondary@@</li>
+	<li>Ctrl+Enter+Shift:@@keysecpost@@</li>
-<li>Ctrl+E:@@keyunread@@</li>
+	<li>Alt+Enter:@@secondary@@</li>
-<li>Esc:@@keyesc@@</li>
+	<li>Ctrl+E:@@keyunread@@</li>
-<li>F5:@@keyf5@@</li>
+	<li>Esc:@@keyesc@@</li>
-<li>Ctrl+Shift+C:@@keyclear@@</li>
+	<li>F5:@@keyf5@@</li>
-<li>Ctrl+Shift+S:@@setting@@</li>
+	<li>Ctrl+Shift+C:@@keyclear@@</li>
-<li>Ctrl+Shift+M:@@keyacctman@@</li>
+	<li>Ctrl+Shift+S:@@setting@@</li>
-<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
+	<li>Ctrl+Shift+M:@@keyacctman@@</li>
-<li>Ctrl+Shift+P:@@keyshowprof@@</li>
+	<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
-<li>←/→:@@keyrow@@</li>
+	<li>Ctrl+Shift+P:@@keyshowprof@@</li>
-<li>@@keyzoom@@</li>
+	<li>←/→:@@keyrow@@</li>
-<div class="hide kirishima">
+	<li>@@keyzoom@@</li>
-以下Markdownに対応したインスタンスのみ。
+	<div class="hide kirishima">
-<br>
+		以下Markdownに対応したインスタンスのみ。
-<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
+		<br>
-<li>Shift+Enter:全角スペースを入れて改行</li>
+		<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
-<li>Shift+Space:ゼロ幅スペース</li>
+		<li>Shift+Enter:全角スペースを入れて改行</li>
-以下アスタルテにログインしている場合のみ 
+		<li>Shift+Space:ゼロ幅スペース</li>
-<br>
+		以下アスタルテにログインしている場合のみ
-<li>Ctrl+R: 
+		<br>
-<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
+		<li>Ctrl+R:
-</li><br>
+			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
-</div>
+		</li><br>
-<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('@@resetconfirm@@')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>@@reset@@</button><br><br>
+	</div>
-<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>@@about@@</button>
+	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
-<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>
+		onclick="if(confirm('@@resetconfirm@@')){ localStorage.clear(); location.href='index.html'; }"><i
-<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>
+			class="material-icons left">delete</i>@@reset@@</button><br><br>
-<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>
+	<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
-<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>
+			class="material-icons left">info</i>@@about@@</button>
-<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="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
-<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@kirishima.cloud</a>
+			class="material-icons left">web</i>@@hp@@</a>
-<br>
+	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-Kyash<br>
+			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@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@kirishima.cloud</a>
+	<br>
+	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
-<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">@@checkup@@</a><br>
+	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
-<a href="oss.html">OSS License@@ossJP@@</a><br>
+		class="pointer">@@checkup@@</a><br>
-<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
+	<a href="oss.html">OSS License@@ossJP@@</a><br>
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
+	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
+			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@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 		<br>
-</span><br>
+	</span><br>
-TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
+	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
-タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+	タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
-<script type="text/javascript" src="../../js/common/about.js"></script>
+	<script type="text/javascript" src="../../js/common/about.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+	<script type="text/javascript" src="../../js/platform/end.js"></script>
-<script type="text/javascript" src="../../js/login/logout.js"></script>
+	<script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+	<script type="text/javascript" src="../../js/ui/spotify.js"></script>
-<script type="text/javascript" src="../../js/tl/speech.js"></script>
+	<script type="text/javascript" src="../../js/tl/speech.js"></script>
-<script type="text/javascript" src="../../js/platform/pickr.js"></script>
+	<script type="text/javascript" src="../../js/platform/pickr.js"></script>
-<script type="text/javascript" src="../../js/ui/settings.js"></script>
+	<script type="text/javascript" src="../../js/ui/settings.js"></script>
-<script type="text/javascript" src="../../js/ui/theme.js"></script>
+	<script type="text/javascript" src="../../js/ui/theme.js"></script>
-<script type="text/javascript" src="../../js/tl/date.js"></script>
+	<script type="text/javascript" src="../../js/tl/date.js"></script>

app/view/make/setting.sample.js

@@ -476,5 +476,16 @@ var postConstruction=[
                 }
             ]
         }
+    },{
+        id:"zero",
+        storage:"emoji-zero-width",
+        checkbox:true,
+        setValue:"normal",
+        setValue:"no",
+        text:{
+            head:"@@zeroWidthEmoji@@",
+            desc:"",
+            checkbox:yesno
+        }
     }
 ]

app/view/ps/acct.html

@@ -18,6 +18,14 @@ body,html{overflow-y: scroll;}
 .colorsel{ display:flex; }
 .card .colorsel div:not(.exc){width:20px;height:20px;}
 .card .colorsel div.exc{width:40px;height:20px;}
+.first{
+      display:flex;
+      justify-content: center;
+      align-items:center
+}
+.first .hide-first{
+      display:none;
+}
 </style>
 <meta charset="utf-8">
 
@@ -39,14 +47,17 @@ body,html{overflow-y: scroll;}
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">crwdns366:0crwdne366:0</a><br>
+<div class="hide-first">
-<h5>crwdns365:0crwdne365:0</h5>
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">crwdns366:0crwdne366:0</a><br>
-<div id="acct-list"></div>
+      <h5>crwdns365:0crwdne365:0</h5>
-<div class="divider"></div>
+      <div id="acct-list"></div>
+      <div class="divider"></div>
+</div>
+<div>
 <h5>crwdns367:0crwdne367:0</h5><br>
 <div id="add">
 <div class="row">
-      <div class="col s6">
+      <div class="col s8">
             <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
             <div id="ins-suggest"></div>
             crwdns368:0crwdne368:0<br>
@@ -56,7 +67,7 @@ body,html{overflow-y: scroll;}
                   <label for="misskey">crwdns382:0crwdne382:0</label><br>
             <button class="btn waves-effect" onclick="instance()">Login</button><br>
       </div>
-      <div class="col s6">
+      <div class="col s4">
             <span style="font-family:Open Sans;">Supports</span>
             <div id="support" class="collection transparent"></div>
       </div>
@@ -73,6 +84,8 @@ body,html{overflow-y: scroll;}
                   <input type="text" id="misskey-key" placeholder="crwdns373:0crwdne373:0">
                   <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
             </div>
+      </div>
+<div class="hide-first">
 <h5>crwdns370:0crwdne370:0</h5>
 <div class="input-field" style="width:300px"><span data-trans="your_acct">crwdns371:0crwdne371:0</span>
       <br>
@@ -91,6 +104,7 @@ crwdns376:0crwdne376:0:<span id="ins-toot"></span>crwdns381:0crwdne381:0<br>
 crwdns377:0crwdne377:0:<span id="ins-user"></span>crwdns377:0crwdne377:0<br>
 crwdns379:0crwdne379:0:<span id="ins-per"></span>%<br>
 crwdns380:0crwdne380:0:<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>
 <script type="text/javascript" src="../../js/common/sha256.js"></script>

app/view/ps/index.html

@@ -32,14 +32,13 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.1.2)";
+var ver="Usamin (18.2.0)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
 var acct_id=0;
 var tlid=0;
-  verck(ver);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
 <div id="tl">
@@ -53,7 +52,7 @@ var tlid=0;
 </div>
 </div>
 <div id="post-box" class="z-depth-5">
-<div id="post-bar" class="drag-bar">crwdns2402:0crwdne2402:0</div>
+<div id="post-bar" class="drag-bar"><span id="unreact">crwdns2402:0crwdne2402:0</span><span id="addreact" class="hide">Reaction</span></div>
 <!--トゥートボックス-->
 <div id="left-side">
 <div class="row" style="margin-bottom:0;">
@@ -205,7 +204,6 @@ var tlid=0;
 <div id="emoji" class="hide">
 		<span class="gray sml">crwdns409:0crwdne409:0
 			<a onclick="emojiGet('true')" class="pointer">crwdns411:0crwdne411:0</a>
-			<i class="material-icons waves-effect" onclick="emojiToggle()" title="crwdns412:0crwdne412:0" data-trans-title="post_box_close">cancel</i>
 		<br>
 		</span>
 		<div id="emoji-list" class="" style="">
@@ -259,12 +257,8 @@ var tlid=0;
 	<div id="poll" class="hide">
 		<select id="poll-sel"  onchange="pollProviderCk()">
 			<option value="nothing">crwdns2408:0crwdne2408:0</option>
-			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon" class="poll-provider hide">
-	WIP
-		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="crwdns2414:0crwdne2414:01">
 			<input type="text" class="mastodon-choice" placeholder="crwdns2414:0crwdne2414:02">
@@ -360,7 +354,6 @@ var tlid=0;
 </div>
 	<div class="modal-footer">
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">crwdns435:0crwdne435:0</a>
-	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">crwdns436:0crwdne436:0</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">crwdns437:0crwdne437:0</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">crwdns438:0crwdne438:0</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">crwdns385:0crwdne385:0</a>
@@ -372,7 +365,7 @@ var tlid=0;
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="../../img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof" draggable="false">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -525,6 +518,9 @@ var tlid=0;
 			</div>
 			</div>
 			</div>
+			<div class="his-float" id="his-float-blocked">
+				<div>{{blocked}}</div>
+			</div>
 			</div>
 			</div>
 			<div class="modal-footer">
@@ -583,20 +579,22 @@ var tlid=0;
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Usamin_18-1-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-2-0" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.1.1)</h5>
+					<h5>Release Note Usamin (18.2.0)</h5>
-・お知らせ機能改善<br>
+・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・イントロダクション(初回起動時)の挙動修正<br>
---以下18.1.0--<br>
+・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
+・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
+・(Misskey)MFM追加flipやjumpなど<br>
-・画像を個別に削除する(画像をクリックして)<br>
+・(Misskey)リストに対応<br>
-・何個もアルバムアートワークが投稿されるバグを修正<br>
+・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・Misskeyでログインしたまま何もできないバグを修正(権限回り)
+・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
+・一部機能の統廃合とバグの修正<br>
+・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -688,11 +686,10 @@ var tlid=0;
 			<div class="input-field">
 			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 	</div><div class="input-field">
-	<i class="material-icons prefix">search</i>
+	<input id="src" type="text" class="validate" style="width:60%">
-	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
 	<label for="src" data-trans="src">crwdns492:0crwdne492:0</label>
-	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
+	<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;" onclick="src()" data-trans-i="src">
-		<i class="material-icons left">search</i>crwdns492:0crwdne492:0
+		<i class="material-icons left" style="margin:0">search</i>crwdns492:0crwdne492:0
 	</button>
 	<br>
 	<br>
@@ -706,7 +703,7 @@ var tlid=0;
 	<div id="sort-box" class="hide menu-content">
 	<ul id="sort"></ul>
 	<div>
-	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+	<button onclick="sort()" class="btn waves-effect nex" style="width:97.5%;" data-trans-i="sort">
 		<i class="material-icons left">sort</i>crwdns493:0crwdne493:0
 	</button>
 	</div>
@@ -761,7 +758,14 @@ var tlid=0;
 		crwdns504:0crwdne504:0<span class="sml">crwdns505:0crwdne505:0<b>crwdns506:0crwdne506:0</b></span><br><br>
 		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">crwdns507:0crwdne507:0
 		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">crwdns508:0crwdne508:0
-		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">crwdns509:0crwdne509:0
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">crwdns509:0crwdne509:0<br>
+		Quick:<a onclick="filterTime(0,0,30)" class="pointer">30crwdns509:0crwdne509:0</a>/
+		<a onclick="filterTime(0,1,0)" class="pointer">1crwdns508:0crwdne508:0</a>/
+		<a onclick="filterTime(0,6,0)" class="pointer">6crwdns508:0crwdne508:0</a>/
+		<a onclick="filterTime(0,12,0)" class="pointer">12crwdns508:0crwdne508:0</a>/
+		<a onclick="filterTime(1,0,0)" class="pointer">1crwdns507:0crwdne507:0</a>/
+		<a onclick="filterTime(7,0,0)" class="pointer">7crwdns507:0crwdne507:0</a>/
+		<a onclick="filterTime(0,0,0)" class="pointer">{{unlimited}}</a><br>
 		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">crwdns491:0crwdne491:0</button><br>
 		<span class="sml">crwdns510:0crwdne510:0</span>
 	</div>
@@ -777,7 +781,9 @@ var tlid=0;
 <div id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	crwdns511:0crwdne511:0
+	<div id="something-wrong">
+		<div>crwdns511:0crwdne511:0</div>
+	</div>
 </div>
 </div>
 </div>
@@ -860,6 +866,7 @@ var tlid=0;
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
 <script type="text/javascript" src="../../js/ui/post-box.js"></script>
 <script type="text/javascript" src="../../js/ui/layout.js"></script>
+<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/login/instance.js"></script>
 <script type="text/javascript" src="../../js/login/login.js"></script>
 <script type="text/javascript" src="../../js/ui/img.js"></script>
@@ -873,7 +880,6 @@ var tlid=0;
 <script type="text/javascript" src="../../js/post/img.js"></script>
 <script type="text/javascript" src="../../js/post/status.js"></script>
 <script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
-<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/post/suggest.js"></script>
 <script type="text/javascript" src="../../js/post/bb-md.js"></script>
 <script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>

app/view/ps/setting.html

@@ -1,5 +1,6 @@
 <!doctype html>
 <html lang="ps">
+
 <head>
 	<title>Settings - TheDesk</title>
 	
@@ -17,19 +18,28 @@
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
-	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
+	<style>
-</head>
+		input {
-<body id="mainView" style="overflow-y:scroll">
+			max-height: 50px !important
-<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.ps.js"></script>
-<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
-<script src="../../node_modules/vue/dist/vue.min.js"></script>
-<script type="text/javascript" src="setting.vue.js"></script>
 
-<h4>crwdns524:0crwdne524:0</h4>
+		.pcr-result {
-<ul class="collapsible" data-collapsible="accordion">
+			height: 1rem !important;
+		}
+	</style>
+</head>
+
+<body id="mainView" style="overflow-y:scroll">
+	<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.ps.js"></script>
+	<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+	<script src="../../node_modules/vue/dist/vue.min.js"></script>
+	<script type="text/javascript" src="setting.vue.js"></script>
+
+	<h4>crwdns524:0crwdne524:0</h4>
+	<ul class="collapsible" data-collapsible="accordion">
 		<li>
 			<div class="collapsible-header">
 				<i class="material-icons">desktop_windows</i>crwdns529:0crwdne529:0
@@ -39,30 +49,39 @@
 				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
 				<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>
+				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
-		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">crwdns532:0crwdne532:0</button>
+					style="width:100%; max-width:200px;">crwdns533:0crwdne533:0</button>
+				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
+					style="width:100%; max-width:200px;">crwdns532:0crwdne532:0</button>
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
+						<template v-if=item.text.desc>
 							<templete v-html=item.text.desc></templete><br>
-				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">crwdns540:0crwdne540:0</a><br></template>
+						</template>
+						<template v-if="item.id=='notf'"><a onclick="notftest()"
+								class="pointer">crwdns540:0crwdne540:0</a><br></template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
 							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">crwdns528:0crwdne528:0</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">crwdns528:0crwdne528:0</button>
+						</template><br>
 					</template>
 				</div>
 				<h5>crwdns544:0crwdne544:0</h5>
@@ -109,7 +128,8 @@
 				<h5>crwdns2438:0crwdne2438:0</h5>
 				<input type="text" style="width:300px" id="custom_name" placeholder="crwdns2438:0crwdne2438:0...">
 				<h5>crwdns2440:0crwdne2440:0</h5>
-		<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea" placeholder="crwdns2440:0crwdne2440:0..."></textarea></div>
+				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
+						placeholder="crwdns2440:0crwdne2440:0..."></textarea></div>
 				<h5>crwdns2426:0crwdne2426:0</h5>
 				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
@@ -118,31 +138,42 @@
 				<div id="pickers">
 					<div>
 						<h5>Primary</h5>crwdns2430:0crwdne2430:0
-			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
 						<input type="hidden" id="color-picker0_value">
 					</div>
 					<div>
 						<h5>Secondary</h5>crwdns2428:0crwdne2428:0
-			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
 						<input type="hidden" id="color-picker1_value">
 					</div>
 					<div>
 						<h5>Texts</h5>crwdns2432:0crwdne2432:0
-			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
 						<input type="hidden" id="color-picker2_value">
 					</div>
 					<div>
 						<h5>Accent</h5>crwdns2434:0crwdne2434:0
-			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
+						<div id="color-picker3-wrap">
+							<div class="color-picker" id="color-picker3"></div>
+						</div>
 						<input type="hidden" id="color-picker3_value">
 					</div>
 				</div>
-		<button class="btn-large waves-effect" onclick="customComp()">crwdns528:0crwdne528:0</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">@@delete@@</button><br><br>
+				<button class="btn-large waves-effect" onclick="customComp()">crwdns528:0crwdne528:0</button>&nbsp;<button
-		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
+					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">@@delete@@</button><br><br>
+				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+					placeholder="JSON style" readonly><br>
 				crwdns2442:0crwdne2442:0
 				<h4>crwdns2444:0crwdne2444:0</h4>
 				@@cImpWarn@@<br>
-		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
+				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+					placeholder="JSON/JSON5 style">
 				<button class="btn waves-effect" onclick="customImp()">crwdns532:0crwdne532:0</button><br>
 		</li>
 		<li>
@@ -153,24 +184,30 @@
 				<div id="tlView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+						<template v-if=item.text.desc>
+							<templete v-html=item.text.desc></templete><br>
+						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
 							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">crwdns528:0crwdne528:0</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">crwdns528:0crwdne528:0</button>
+						</template><br>
 					</template>
 				</div>
 			</div>
@@ -183,11 +220,14 @@
 				<div id="postView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
+						<template v-if=item.text.desc>
+							<templete v-html=item.text.desc></templete><br>
+						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
 								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-                            	<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 									<label v-bind:for="item.id+check.value">{{check.text}}</label>
 									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
 								</template>
@@ -196,21 +236,24 @@
 						<template v-else>
 							<template v-if="item.doubleText">
 								<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
 								</template>
 							</template>
 							<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-					</template>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">crwdns528:0crwdne528:0</button> 
 							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">crwdns528:0crwdne528:0</button>
+						</template><br>
 					</template>
 				</div>
 			</div>
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="material-icons">keyboard</i>crwdns611:0crwdne611:0
+				<i class="material-icons">Fkeyboard</i>crwdns611:0crwdne611:0
 			</div>
 			<div class="collapsible-body">
 				<h5>crwdns612:0crwdne612:0</h5>
@@ -270,9 +313,14 @@
 				crwdns625:0crwdne625:0<i class="material-icons" style="font-size:24px;">music_note</i>crwdns626:0crwdne626:0<br>
 				<h5>crwdns627:0crwdne627:0</h5>
 				crwdns628:0crwdne628:0<br>
-			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button></div>
+				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
-			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>crwdns629:0crwdne629:0</a>
+						onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button></div>
-			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>crwdns630:0crwdne630:0</a>
+				<a onclick="spotifyConnect()" class="btn waves-effect nex"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
+						class="fa fa-spotify left"></i>crwdns629:0crwdne629:0</a>
+				<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
+						class="fa fa-spotify left"></i>crwdns630:0crwdne630:0</a>
 				<h5>crwdns631:0crwdne631:0</h5>
 				crwdns632:0crwdne632:0<br>
 				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
@@ -280,11 +328,8 @@
 				crwdns2358:0{song}crwdnd2358:0{album}crwdnd2358:0{artist}crwdnd2358:0{url}crwdne2358:0<br>
 				crwdns2360:0{song}crwdnd2360:0{album}crwdnd2360:0{artist}crwdnd2360:0{composer}crwdnd2360:0{hz}crwdnd2360:0{bitRate}crwdnd2360:0{genre}crwdne2360:0<br>
 				crwdns2362:0{song}crwdnd2362:0{album}crwdnd2362:0{artist}crwdne2362:0<br>
-				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
-                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
 				<h5>crwdns635:0crwdne635:0</h5>
-			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
 				<label for="awk_yes">crwdns526:0crwdne526:0</label>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
@@ -299,80 +344,98 @@
 			<div class="collapsible-body">
 				<h5>crwdns637:0crwdne637:0</h5>
 				crwdns638:0crwdne638:0<br>
-			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
+						style="width:500px; max-width:100%" /></p>
 				<h5>crwdns639:0crwdne639:0</h5>
 				crwdns640:0crwdne640:0<br>
-			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
+						style="width:500px; max-width:100%" /></p>
 				<h5>crwdns641:0crwdne641:0</h5>
 				crwdns642:0crwdne642:0<br>
-			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
+						style="width:500px; max-width:100%" /></p>
 				<h5>crwdns643:0crwdne643:0</h5>
 				<input type="text" style="width:350px" id="voicetxt" value="crwdns644:0crwdne644:0">
-			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">crwdns645:0crwdne645:0</button><br>
+				<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
+					id="testplay">crwdns645:0crwdne645:0</button><br>
 				<br>
 				<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">crwdns525:0crwdne525:0</button>
 			</div>
 		</li>
-</ul>
+	</ul>
-<br>
+	<br>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>crwdns646:0crwdne646:0</a>
+	<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
-<br>
+			class="material-icons left">undo</i>crwdns646:0crwdne646:0</a>
-<br>crwdns647:0crwdne647:0
+	<br>
-<li>Ctrl+1-9:crwdns648:0crwdne648:0</li>
+	<br>crwdns647:0crwdne647:0
-<li>N:crwdns649:0crwdne649:0</li>
+	<li>Ctrl+1-9:crwdns648:0crwdne648:0</li>
-<li>X:crwdns650:0crwdne650:0</li>
+	<li>N:crwdns649:0crwdne649:0</li>
-<li>Ctrl+Enter:crwdns651:0crwdne651:0</li>
+	<li>X:crwdns650:0crwdne650:0</li>
-<li>Ctrl+Enter+Shift:crwdns1924:0crwdne1924:0</li>
+	<li>Ctrl+Enter:crwdns651:0crwdne651:0</li>
-<li>Alt+Enter:crwdns1916:0crwdne1916:0</li>
+	<li>Ctrl+Enter+Shift:crwdns1924:0crwdne1924:0</li>
-<li>Ctrl+E:crwdns652:0crwdne652:0</li>
+	<li>Alt+Enter:crwdns1916:0crwdne1916:0</li>
-<li>Esc:crwdns653:0crwdne653:0</li>
+	<li>Ctrl+E:crwdns652:0crwdne652:0</li>
-<li>F5:crwdns654:0crwdne654:0</li>
+	<li>Esc:crwdns653:0crwdne653:0</li>
-<li>Ctrl+Shift+C:crwdns655:0crwdne655:0</li>
+	<li>F5:crwdns654:0crwdne654:0</li>
-<li>Ctrl+Shift+S:crwdns524:0crwdne524:0</li>
+	<li>Ctrl+Shift+C:crwdns655:0crwdne655:0</li>
-<li>Ctrl+Shift+M:crwdns656:0crwdne656:0</li>
+	<li>Ctrl+Shift+S:crwdns524:0crwdne524:0</li>
-<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
+	<li>Ctrl+Shift+M:crwdns656:0crwdne656:0</li>
-<li>Ctrl+Shift+P:crwdns657:0crwdne657:0</li>
+	<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
-<li>←/→:crwdns658:0crwdne658:0</li>
+	<li>Ctrl+Shift+P:crwdns657:0crwdne657:0</li>
-<li>crwdns659:0crwdne659:0</li>
+	<li>←/→:crwdns658:0crwdne658:0</li>
-<div class="hide kirishima">
+	<li>crwdns659:0crwdne659:0</li>
-以下Markdownに対応したインスタンスのみ。
+	<div class="hide kirishima">
-<br>
+		以下Markdownに対応したインスタンスのみ。
-<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
+		<br>
-<li>Shift+Enter:全角スペースを入れて改行</li>
+		<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
-<li>Shift+Space:ゼロ幅スペース</li>
+		<li>Shift+Enter:全角スペースを入れて改行</li>
-以下アスタルテにログインしている場合のみ 
+		<li>Shift+Space:ゼロ幅スペース</li>
-<br>
+		以下アスタルテにログインしている場合のみ
-<li>Ctrl+R: 
+		<br>
-<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
+		<li>Ctrl+R:
-</li><br>
+			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
-</div>
+		</li><br>
-<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('crwdns661:0crwdne661:0')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>crwdns660:0crwdne660:0</button><br><br>
+	</div>
-<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>crwdns662:0crwdne662:0</button>
+	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
-<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>
+		onclick="if(confirm('crwdns661:0crwdne661:0')){ localStorage.clear(); location.href='index.html'; }"><i
-<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>
+			class="material-icons left">delete</i>crwdns660:0crwdne660:0</button><br><br>
-<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>
+	<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
-<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>
+			class="material-icons left">info</i>crwdns662:0crwdne662:0</button>
-<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="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
-<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@kirishima.cloud</a>
+			class="material-icons left">web</i>crwdns663:0crwdne663:0</a>
-<br>
+	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-Kyash<br>
+			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@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@kirishima.cloud</a>
+	<br>
+	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
-<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">crwdns667:0crwdne667:0</a><br>
+	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
-<a href="oss.html">OSS Licensecrwdns668:0crwdne668:0</a><br>
+		class="pointer">crwdns667:0crwdne667:0</a><br>
-<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
+	<a href="oss.html">OSS Licensecrwdns668:0crwdne668:0</a><br>
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
+	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
+			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@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 		<br>
-</span><br>
+	</span><br>
-TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
+	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
-タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+	タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
-<script type="text/javascript" src="../../js/common/about.js"></script>
+	<script type="text/javascript" src="../../js/common/about.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+	<script type="text/javascript" src="../../js/platform/end.js"></script>
-<script type="text/javascript" src="../../js/login/logout.js"></script>
+	<script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+	<script type="text/javascript" src="../../js/ui/spotify.js"></script>
-<script type="text/javascript" src="../../js/tl/speech.js"></script>
+	<script type="text/javascript" src="../../js/tl/speech.js"></script>
-<script type="text/javascript" src="../../js/platform/pickr.js"></script>
+	<script type="text/javascript" src="../../js/platform/pickr.js"></script>
-<script type="text/javascript" src="../../js/ui/settings.js"></script>
+	<script type="text/javascript" src="../../js/ui/settings.js"></script>
-<script type="text/javascript" src="../../js/ui/theme.js"></script>
+	<script type="text/javascript" src="../../js/ui/theme.js"></script>
-<script type="text/javascript" src="../../js/tl/date.js"></script>
+	<script type="text/javascript" src="../../js/tl/date.js"></script>

app/view/ps/setting.vue.js

@@ -476,5 +476,16 @@ var postConstruction=[
                 }
             ]
         }
+    },{
+        id:"zero",
+        storage:"emoji-zero-width",
+        checkbox:true,
+        setValue:"normal",
+        setValue:"no",
+        text:{
+            head:"@@zeroWidthEmoji@@",
+            desc:"",
+            checkbox:yesno
+        }
     }
 ]