WIP some ToDo

2019-04-11 01:52:01 +09:00 · 2019-04-11 01:52:01 +09:00 · 0ad7bf9036
commit 0ad7bf9036
parent 1670c0bc08
38 changed files with 396 additions and 202 deletions
--- a/app/css/master.css
+++ b/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 {
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@ -91,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;
+}
--- a/app/js/lang/lang.en.js
+++ b/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",
--- a/app/js/lang/lang.ja.js
+++ b/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":"件の新しい通知",
--- a/app/js/login/instance.js
+++ b/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_name":"Misskey",
+	"misskey.xyz":"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));
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@ -42,29 +42,24 @@ function ck() {
 		}
 	}
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
-		var obj = [];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
+	if(!multi || multi=="[]"){
+		location.href="acct.html?mode=first&code=true"
+	}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 {
-		$("#tl").show();
-		$("#post-box").hide();
+		verck(ver);
 	}
 }
+}
 ck();
 //ログインポップアップ
 function login(url) {
--- a/app/js/login/manager.js
+++ b/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");
@ -256,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);
 			}
 		});
 }
@ -264,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;
@ -452,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;
 			}
@ -540,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();
 	});
 }
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@ -4,7 +4,7 @@ $("#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){
@ -21,7 +21,7 @@ function emojiToggle() {
 				'<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,10 +34,11 @@ 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',
@ -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;
@ -100,11 +154,22 @@ function emojiList(target) {
 	}
 	$("#emoji-next").removeClass("disabled");
 	$("#emoji-count").text(ct);
+	if(localStorage.getItem("emoji-zero-width")){
+		var brank="";
+	}else{
+		var brank=" ";
+	}
 	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>';
+				':'+brank+'\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+			}
+			
 		}
 	}
 	$("#emoji-list").html(html);
--- a/app/js/post/misskeystatus.js
+++ b/app/js/post/misskeystatus.js
@ -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);
@ -126,23 +140,31 @@ function reactRefresh(acct_id,id){
 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++){
-            if(json.reactionCounts[reactions[i]]){
-                console.log(json.reactionCounts[reactions[i]])
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
-                $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+        var regExp = new RegExp( ":", "g" ) ;
+        Object.keys(json.reactionCounts).forEach(function(keye) {
+            keyeClass=keye.replace(regExp,'');
+            if(json.reactionCounts[keye]){
+                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-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
+                    $("#pub_" + id +" .re-"+keyeClass).addClass("hide")
                }
+                $("#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");
--- a/app/js/post/post.js
+++ b/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");
 }
--- a/app/js/post/suggest.js
+++ b/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")){
-				//セルフ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]) {
+			if (tag && tag[1]) {
 				var q = tag[1];
 			} else if (acct && acct[1]) {
 				var q = acct[1];
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@ -31,7 +31,7 @@ function list(){
 				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>';
+						'\')" class="pointer">'+lang.lang_list_show+'</a><br>';
 				});
 				$("#lists").html(lists);
 			}else{
@ -59,7 +59,7 @@ function list(){
 					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="listUser(\'' + list.id + '\',' + acct_id +
-						')" class="pointer">'+lang.lang_list_users+'</a';
+						')" class="pointer">'+lang.lang_list_users+'</a><br>';
 				});
 				$("#lists").html(lists);
 			}else{
@ -92,7 +92,7 @@ function makeNewList(){
 		}
 	}
 }else{
-	var start = "https://" + domain + "/users/lists/create"
+	var start = "https://" + domain + "/api/users/lists/create"
 	console.log(start)
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
@ -218,7 +218,8 @@ function hisList(user,acct_id){
 				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>';
+						'\')" 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{
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@ -606,8 +606,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 +715,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{
@ -730,7 +771,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>'+
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@ -482,23 +482,12 @@ function notfCanceler(acct){
 function allNotfRead(){
 	console.log(localStorage.getItem("notf-fav_2"));
 	var multi = localStorage.getItem("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 {
+	if (multi) {
 		var obj = JSON.parse(multi);
-	}
 	Object.keys(obj).forEach(function(key) {
 		console.log(key);
 		notfCanceler(key)
 	});
 }
+}
 allNotfRead()
--- a/app/js/tl/parse.js
+++ b/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{
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@ -189,7 +189,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			var start = "wss://" + acct_id +
 			"/local-timeline?i=" + at;
 		} else if (type=="list"){
-			Materialize.toast(lang.lang_misskeyparse_listnostr, 3000);
+			var start = "wss://" + domain +
+			"/user-list?i=" + at+"&listId="+data;
 		}
 	}else{
 		var misskey=false;
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@ -30,11 +30,7 @@ function parseColumn() {
 	}
 	tlCloser();
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
-		var obj = [];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
+	if (multi) {
 		var obj = JSON.parse(multi);

 		var templete;
--- a/app/js/ui/post-box.js
+++ b/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() {
--- a/app/js/ui/spotify.js
+++ b/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);
-				});
-}
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@ -399,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()
+		}

 	});
 }
@ -460,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");
--- a/app/main.js
+++ b/app/main.js
@ -50,19 +50,14 @@ try {

 	}; // デフォルトバリュー
 }
-try {
-	var lang = fs.readFileSync(lang_path, 'utf8');
-} catch (e) {
-	var langs=app.getLocale();
-	if(~langs.indexOf("ja")){
-		lang="ja";
-	}else{
-		lang="en";
+function isFile(file){
+	try {
+		fs.statSync(file);
+		return true
+	} catch (err) {
+		if (err.code === 'ENOENT') return false
 	}
-	fs.writeFileSync(lang_path,lang);
 }
-console.log(app.getLocale());
-console.log("launch:"+lang);
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function() {
 	if (process.platform != 'darwin') {
@ -78,6 +73,23 @@ app.on('activate', function() {
 });

 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;
--- a/app/package.json
+++ b/app/package.json
@ -1,6 +1,6 @@
 {
  "name": "thedesk",
-  "version": "18.1.2",
+  "version": "18.2.0",
  "description": "TheDesk is a Mastodon client for PC.",
  "main": "main.js",
  "scripts": {
--- a/app/view/en/acct.html
+++ b/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,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>
-<h5>List of accounts</h5>
-<div id="acct-list"></div>
-<div class="divider"></div>
+<div class="hide-first">
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">Back</a><br>
+      <h5>List of accounts</h5>
+      <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>
            Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)<br>
@ -56,7 +67,7 @@ body,html{overflow-y: scroll;}
                  <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>
--- a/app/view/en/index.html
+++ b/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="">
@ -520,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">
@ -771,7 +772,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>
@ -854,6 +857,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>
@ -867,7 +871,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>
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@ -280,11 +280,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" />
--- a/app/view/ja/acct.html
+++ b/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,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;">戻る</a><br>
-<h5>アカウント一覧</h5>
-<div id="acct-list"></div>
-<div class="divider"></div>
+<div class="hide-first">
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">戻る</a><br>
+      <h5>アカウント一覧</h5>
+      <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>
            チェックを外すとコード貼り付けをスキップできます。(<u>Mastodon</u>にWindowsやmacOSからログインする場合)失敗する場合はチェックを入れてください。<br>
@ -56,7 +67,7 @@ body,html{overflow-y: scroll;}
                  <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>
--- a/app/view/ja/index.html
+++ b/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="">
@ -520,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">
@ -771,7 +772,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>
@ -854,6 +857,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>
@ -867,7 +871,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>
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@ -280,11 +280,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" />
--- a/app/view/make/acct.sample.html
+++ b/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>
-<h5>{{list}}</h5>
-<div id="acct-list"></div>
-<div class="divider"></div>
+<div class="hide-first">
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">{{back}}</a><br>
+      <h5>{{list}}</h5>
+      <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>
--- a/app/view/make/index.sample.html
+++ b/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="">
@ -520,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">
@ -771,7 +772,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>
@ -854,6 +857,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>
@ -867,7 +871,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>
--- a/app/view/make/language/acct.en.json
+++ b/app/view/make/language/acct.en.json
@ -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"
 }
--- a/app/view/make/language/acct.ja.json
+++ b/app/view/make/language/acct.ja.json
@ -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":"アカウントがありません"
 }
--- a/app/view/make/language/index.en.json
+++ b/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",
@ -142,7 +143,7 @@
    "mins":"minutes",
    "secs":"seconds",
    "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",
--- a/app/view/make/language/index.ja.json
+++ b/app/view/make/language/index.ja.json
@ -98,6 +98,7 @@
    "note":"自己紹介",
    "editProfImg":"アバターを変更",
    "editHeader":"ヘッダーを変更",
+    "blocked":"ブロックされています。なぜでしょう？",
    "likeUserDes":"似ているユーザーを取得できます。",
    "get":"取得",
    "historyBack":"一つ前のユーザーデータ",
@ -142,7 +143,7 @@
    "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":"アカウントマネージャー",
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@ -280,11 +280,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" />
--- a/app/view/ps/acct.html
+++ b/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>
-<h5>crwdns365:0crwdne365:0</h5>
-<div id="acct-list"></div>
-<div class="divider"></div>
+<div class="hide-first">
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">crwdns366:0crwdne366:0</a><br>
+      <h5>crwdns365:0crwdne365:0</h5>
+      <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>
--- a/app/view/ps/index.html
+++ b/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="">
@ -520,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">
@ -771,7 +772,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>
@ -854,6 +857,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>
@ -867,7 +871,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>
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@ -280,11 +280,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" />