TheDesk Usamin (18.6.4)

Fix: streaming
TheDesk Usamin (18.6.3)
2019-06-23 18:38:22 +09:00 · 2019-06-23 18:24:55 +09:00 · 2019-06-23 10:57:56 +09:00 · 2019-06-23 01:20:17 +09:00 · 2019-06-23 01:06:07 +09:00 · 2019-06-23 00:51:21 +09:00
48 changed files with 574 additions and 26689 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ enq.md
 app/.tkn
 app/node_modules
 app/js/login/tkn.js
+app/package-lock.json
--- a/app/about.html
+++ b/app/about.html
@@ -4,7 +4,7 @@
 <head>
    <title>TheDesk</title>
    <meta content="width=device-width,initial-scale=1.0" name="viewport">
-    <link href="./css/materialize.css" type="text/css" rel="stylesheet">
+    <link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
    <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
    <link href="./css/themes.css" type="text/css" rel="stylesheet">
    <link href="./css/master.css" type="text/css" rel="stylesheet">
@@ -75,9 +75,9 @@
 </head>

 <body class="center " style="overflow:hidden">
-    <script type="text/javascript" src="./js/common/jquery.js"></script>
+    <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
    <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-    <script type="text/javascript" src="./js/common/materialize.js"></script>
+    <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
    <img src="./img/desk.png" style="max-width:62%;">
    <h5>TheDesk</h5>
    <div class="container">
--- a/app/css/materialize.css
+++ b/app/css/materialize.css
--- a/app/css/materialize.min.css
+++ b/app/css/materialize.min.css
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -594,6 +594,9 @@ p:not(:last-child) {
  width: 100%;
  height: 100%;
 }
+audio{
+  height: 2rem;
+}
@keyframes jump {
  0% {
    transform: translateY(0);
--- a/app/js/common/jquery.js
+++ b/app/js/common/jquery.js
--- a/app/js/common/materialize.js
+++ b/app/js/common/materialize.js
--- a/app/js/common/materialize.min.js
+++ b/app/js/common/materialize.min.js
--- a/app/js/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@@ -37,6 +37,7 @@ var lang = {
    "lang_manager_def": "Default",
    "lang_manager_none": "None",
    "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
+    "lang_manager_logout": "Logout",
    //post/bb-md.js
    "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
    //post/emoji.js
@@ -64,6 +65,7 @@ var lang = {
    "lang_status_unblock": "Unblock",
    "lang_status_mute": "Mute",
    "lang_status_unmute": "Unmute",
+    "lang_status_redraftTitle": "Delete & redraft",
    "lang_status_redraft": "Continue to delete & redraft? You lose statuses of this toot. This fanction may contain some bugs. Images of this toot will be deleted on older than Mastodon 2.4.1.",
    "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
    "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
--- a/app/js/lang/lang.ja.js
+++ b/app/js/lang/lang.ja.js
@@ -37,6 +37,7 @@ var lang = {
    "lang_manager_def": "既定",
    "lang_manager_none": "なし",
    "lang_manager_godev": "MisskeyのDevセンターに移動します。同時に開かれるドキュメントを参考にログインしてください。",
+    "lang_manager_logout": "ログアウト",
    //post/bb-md.js
    "lang_bbmd_misskey": "TheDeskにおけるMisskeyでは、@を返信として扱いますが、全ての@は消去され別パラメータに入力されます。また、「未収載」を「ホーム」として扱います。",
    //post/emoji.js
@@ -64,6 +65,7 @@ var lang = {
    "lang_status_unblock": "ブロック解除",
    "lang_status_mute": "ミュート",
    "lang_status_unmute": "ミュート解除",
+    "lang_status_redraftTitle": "削除して再編集",
    "lang_status_redraft": "削除して再編集しますか？そのトゥートの全てのデータがリセットされます。この機能はベータ版です。画像は~v2.4.1で破棄されます。",
    "lang_status_emphas": "を強調します。リロードしてください。",
    "lang_status_unemphas": "を強調解除します。リロードしてください。",
--- a/app/js/login/instance.js
+++ b/app/js/login/instance.js
@@ -90,16 +90,16 @@ var idata = {
 	"dtp-mstdn.jp_bbcode": "disabled",
 	"dtp-mstdn.jp_markdown": "disabled",
 	"dtp-mstdn.jp_glitch": "disabled",
-	"misskey.xyz": "misskey",
-	"misskey.xyz_name": "misskey.xyz",
-	"misskey.xyz_letters": "1000",
-	"misskey.xyz_bbcode": "disabled",
-	"misskey.xyz_markdown": "enabled",
-	"misskey.xyz_public": "Global",
-	"misskey.xyz_post": "Post",
-	"misskey.xyz_fav": " reacted your post.",
-	"misskey.xyz_bt": " reposted your post.",
-	"misskey.dev": "misskey",
+	"misskey.io": "misskey",
+	"misskey.io_name": "misskey.io",
+	"misskey.io_letters": "1000",
+	"misskey.io_bbcode": "disabled",
+	"misskey.io_markdown": "enabled",
+	"misskey.io_public": "Global",
+	"misskey.io_post": "Post",
+	"misskey.io_fav": " reacted your post.",
+	"misskey.io_bt": " reposted your post.",
+	"misskey.dev": "misskey.dev",
 	"misskey.dev_name": "misskey.dev",
 	"misskey.dev_letters": "1024",
 	"misskey.dev_bbcode": "disabled",
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -146,114 +146,136 @@ function multiDel(target) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
 	//削除確認ダイアログ
-	if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] + lang.lang_manager_confirm)) {
-		Object.keys(obj).forEach(function (key) {
-			var nk = key - 1;
-			//公開範囲(差分のみ)
-			if (key >= target) {
-				var oldvis = localStorage.getItem("vis-memory-" + key);
-				if (oldvis) {
-					localStorage.setItem("vis-memory-" + nk, oldvis);
+	Swal.fire({
+		title: lang.lang_manager_logout,
+		text: obj[target]["user"] + "@" + obj[target]["domain"] + lang.lang_manager_confirm,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			Object.keys(obj).forEach(function (key) {
+				var nk = key - 1;
+				//公開範囲(差分のみ)
+				if (key >= target) {
+					var oldvis = localStorage.getItem("vis-memory-" + key);
+					if (oldvis) {
+						localStorage.setItem("vis-memory-" + nk, oldvis);
+					}
+				}
+				//独自ロケール
+				localStorage.removeItem("home_" + key);
+				localStorage.removeItem("local_" + key);
+				localStorage.removeItem("public_" + key);
+				localStorage.removeItem("notification_" + key);
+				//アクセストークンとドメイン、プロフ(差分)
+				if (key > target) {
+					var olddom = localStorage.getItem("domain_" + key);
+					localStorage.setItem("domain_" + nk, olddom);
+					var oldat = localStorage.getItem("acct_" + key + "_at");
+					localStorage.setItem("acct_" + nk + "_at", oldat);
+					localStorage.setItem("name_" + nk, localStorage.getItem("name_" + key));
+					localStorage.setItem("user_" + target, localStorage.getItem("user_" + key));
+					localStorage.setItem("user-id_" + target, localStorage.getItem("user-id_" + key));
+					localStorage.setItem("prof_" + target, localStorage.getItem("prof_" + key));
 				}
-			}
-			//独自ロケール
-			localStorage.removeItem("home_" + key);
-			localStorage.removeItem("local_" + key);
-			localStorage.removeItem("public_" + key);
-			localStorage.removeItem("notification_" + key);
-			//アクセストークンとドメイン、プロフ(差分)
-			if (key > target) {
-				var olddom = localStorage.getItem("domain_" + key);
-				localStorage.setItem("domain_" + nk, olddom);
-				var oldat = localStorage.getItem("acct_" + key + "_at");
-				localStorage.setItem("acct_" + nk + "_at", oldat);
-				localStorage.setItem("name_" + nk, localStorage.getItem("name_" + key));
-				localStorage.setItem("user_" + target, localStorage.getItem("user_" + key));
-				localStorage.setItem("user-id_" + target, localStorage.getItem("user-id_" + key));
-				localStorage.setItem("prof_" + target, localStorage.getItem("prof_" + key));
-			}

-		});
-		//とりあえず消す
-		obj.splice(target, 1);
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-		load();
-		//カラムデータコンフリクト
-		var col = localStorage.getItem("column");
-		var oldcols = JSON.parse(col);
-		var newcols = [];
-		Object.keys(oldcols).forEach(function (key) {
-			var nk = key - 1;
-			var oldcol = oldcols[key];
-			if (target < oldcol.domain) {
-				var newdom = oldcol.domain - 1;
-			} else {
-				var newdom = oldcol.domain;
-			}
-			var type = oldcol.type;
-			//消した垢のコラムじゃないときコピー
-			if (target != oldcol.domain) {
-				var add = {
-					domain: newdom,
-					type: type
-				};
-				newcols.push(add);
-			}
-		});
-		var json = JSON.stringify(newcols);
-		localStorage.setItem("column", json);
+			});
+			//とりあえず消す
+			obj.splice(target, 1);
+			var json = JSON.stringify(obj);
+			localStorage.setItem("multi", json);
+			load();
+			//カラムデータコンフリクト
+			var col = localStorage.getItem("column");
+			var oldcols = JSON.parse(col);
+			var newcols = [];
+			Object.keys(oldcols).forEach(function (key) {
+				var nk = key - 1;
+				var oldcol = oldcols[key];
+				if (target < oldcol.domain) {
+					var newdom = oldcol.domain - 1;
+				} else {
+					var newdom = oldcol.domain;
+				}
+				var type = oldcol.type;
+				//消した垢のコラムじゃないときコピー
+				if (target != oldcol.domain) {
+					var add = {
+						domain: newdom,
+						type: type
+					};
+					newcols.push(add);
+				}
+			});
+			var json = JSON.stringify(newcols);
+			localStorage.setItem("column", json);

-	}
+		}
+	})
 }
 function multiDel2(target) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
-	if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] + lang.lang_manager_confirm)) {
-		obj.splice(target, 1);
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-		Object.keys(obj).forEach(function (key) {
-			if (key >= target) {
-				var oldvis = localStorage.getItem("vis-memory-" + key);
-				if (oldvis) {
-					var nk = key - 1;
-					localStorage.setItem("vis-memory-" + nk, oldvis);
-				}
-			}
-			localStorage.removeItem("home_" + key);
-			localStorage.removeItem("local_" + key);
-			localStorage.removeItem("public_" + key);
-			localStorage.removeItem("notification_" + key);
-			refresh(key);
-		});
-		var col = localStorage.getItem("column");
-		if (!col) {
-			var obj = [{
-				domain: 0,
-				type: 'local'
-			}];
-			localStorage.setItem("card_0", "true");
+	Swal.fire({
+		title: lang.lang_manager_logout,
+		text: obj[target]["user"] + "@" + obj[target]["domain"] + lang.lang_manager_confirm,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			obj.splice(target, 1);
 			var json = JSON.stringify(obj);
-			localStorage.setItem("column", json);
-		} else {
-			var cobj = JSON.parse(col);
-		}
-		Object.keys(cobj).forEach(function (key) {
-			var column = cobj[key];
-			if (column.domain > target) {
-				var nk = key - 1;
-				column.domain = nk;
-				cobj[key] = column;
-			} else if (column.domain == target) {
-				localStorage.removeItem("card_" + tlid);
-				cobj.splice(key, 1);
+			localStorage.setItem("multi", json);
+			Object.keys(obj).forEach(function (key) {
+				if (key >= target) {
+					var oldvis = localStorage.getItem("vis-memory-" + key);
+					if (oldvis) {
+						var nk = key - 1;
+						localStorage.setItem("vis-memory-" + nk, oldvis);
+					}
+				}
+				localStorage.removeItem("home_" + key);
+				localStorage.removeItem("local_" + key);
+				localStorage.removeItem("public_" + key);
+				localStorage.removeItem("notification_" + key);
+				refresh(key);
+			});
+			var col = localStorage.getItem("column");
+			if (!col) {
+				var obj = [{
+					domain: 0,
+					type: 'local'
+				}];
+				localStorage.setItem("card_0", "true");
+				var json = JSON.stringify(obj);
+				localStorage.setItem("column", json);
+			} else {
+				var cobj = JSON.parse(col);
 			}
-		});
-		var json = JSON.stringify(column);
-		localStorage.setItem("column", json);
-		load();
-	}
+			Object.keys(cobj).forEach(function (key) {
+				var column = cobj[key];
+				if (column.domain > target) {
+					var nk = key - 1;
+					column.domain = nk;
+					cobj[key] = column;
+				} else if (column.domain == target) {
+					localStorage.removeItem("card_" + tlid);
+					cobj.splice(key, 1);
+				}
+			});
+			var json = JSON.stringify(column);
+			localStorage.setItem("column", json);
+			load();
+		}
+	})
 }

 //サポートインスタンス
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -121,49 +121,54 @@ function playSound() {
 	source.start(0);
 }
 onmessage = function (e) {
-    if (e.data[0] == "details") {
-        details(e.data[1][0], e.data[1][1])
-    } else if (e.data[0] == "udg") {
-        udg(e.data[1][0], e.data[1][1])
-    } else if (e.data[0] == "media") {
-        media(e.data[1][0], e.data[1][1], e.data[1][2])
-    } else if (e.data[0] == "post") {
-        post("pass")
-    } else if (e.data[0] == "toastSaved") {
-		M.toast({ html:  lang.lang_img_DLDone + e.data[1][0] + '<button class="btn-flat toast-action" onclick="openFinder(\'' + e.data[1][1] + '\')">Show</button>', displayLength: 5000 })
-    } else if (e.data[0] == "toastMute") {
-		M.toast({ html:  escapeHTML(e.data[1]) + lang.lang_parse_mute, displayLength: 2000 })
-    } else if (e.data[0] == "toastEmp") {
-		M.toast({ html:  escapeHTML(e.data[1]) + lang.lang_status_emphas, displayLength: 2000 })
-    } else if (e.data[0] == "toastUnEmp") {
-		M.toast({ html:  escapeHTML(e.data[1]) + lang.lang_status_unemphas, displayLength: 2000 })
-    } else if (e.data[0] == "parseColumn") {
-       	parseColumn()
-    } else if (e.data[0] == "sortload") {
-        sortload()
-    } else if (e.data[0] == "exportSettingsCore") {
-        exportSettingsCore()
-    } else if (e.data[0] == "fontList") {
-        fontList(e.data[1])
-    } else if (e.data[0] == "customSoundSave") {
-        customSoundSave(e.data[1][0], e.data[1][1])
-    } else if (e.data[0] == "ctLoadCore") {
-        ctLoadCore(e.data[1])
-    } else if (e.data[0] == "ctLoad") {
-        ctLoad()
-    } else if (e.data[0] == "customConnect") {
-        customConnect(e.data[1])
-    } else if (e.data[0] == "clearCustomImport") {
-        clearCustomImport()
-    } else if (e.data[0] == "npCore") {
-        npCore(e.data[1]);
-    } else if (e.data[0] == "renderMem") {
-        renderMem(e.data[1][0], e.data[1][1], e.data[1][2])
-    } else if (e.data[0] == "updateProg") {
-        updateProg(e.data[1]);
-    } else if (e.data[0] == "updateMess") {
-        updateMess(e.data[1]);
-    } else if (e.data[0] == "renderAbout") {
+	if (e.data[0] == "details") {
+		details(e.data[1][0], e.data[1][1])
+	} else if (e.data[0] == "udg") {
+		udg(e.data[1][0], e.data[1][1])
+	} else if (e.data[0] == "media") {
+		media(e.data[1][0], e.data[1][1], e.data[1][2])
+	} else if (e.data[0] == "post") {
+		post("pass")
+	} else if (e.data[0] == "toastSaved") {
+		M.toast({ html: lang.lang_img_DLDone + e.data[1][0] + '<button class="btn-flat toast-action" onclick="openFinder(\'' + e.data[1][1] + '\')">Show</button>', displayLength: 5000 })
+	} else if (e.data[0] == "toastMute") {
+		M.toast({ html: escapeHTML(e.data[1]) + lang.lang_parse_mute, displayLength: 2000 })
+	} else if (e.data[0] == "toastEmp") {
+		M.toast({ html: escapeHTML(e.data[1]) + lang.lang_status_emphas, displayLength: 2000 })
+	} else if (e.data[0] == "toastUnEmp") {
+		M.toast({ html: escapeHTML(e.data[1]) + lang.lang_status_unemphas, displayLength: 2000 })
+	} else if (e.data[0] == "parseColumn") {
+		parseColumn()
+	} else if (e.data[0] == "sortload") {
+		sortload()
+	} else if (e.data[0] == "exportSettingsCore") {
+		exportSettingsCore()
+	} else if (e.data[0] == "fontList") {
+		fontList(e.data[1])
+	} else if (e.data[0] == "customSoundSave") {
+		customSoundSave(e.data[1][0], e.data[1][1])
+	} else if (e.data[0] == "ctLoadCore") {
+		ctLoadCore(e.data[1])
+	} else if (e.data[0] == "ctLoad") {
+		ctLoad()
+	} else if (e.data[0] == "customConnect") {
+		customConnect(e.data[1])
+	} else if (e.data[0] == "clearCustomImport") {
+		clearCustomImport()
+	} else if (e.data[0] == "npCore") {
+		npCore(e.data[1]);
+	} else if (e.data[0] == "renderMem") {
+		renderMem(e.data[1][0], e.data[1][1], e.data[1][2])
+	} else if (e.data[0] == "updateProg") {
+		updateProg(e.data[1]);
+	} else if (e.data[0] == "updateMess") {
+		updateMess(e.data[1]);
+	} else if (e.data[0] == "renderAbout") {
 		renderAbout(e.data[1]);
-    }
+	} else if (e.data[0] == "alert") {
+		Swal.fire({
+			type: 'info',
+			title: e.data[1]
+		})
+	}
 }
--- a/app/js/platform/preload.js
+++ b/app/js/platform/preload.js
@@ -195,7 +195,7 @@ ipc.on('langres', function (event, arg) {
 ipc.on('exportSettingsFile', function (event, savedFiles) {
    var exp = exportSettingsCore()
    ipc.send('export', [savedFiles, JSON.stringify(exp)]);
-    alert("Done.")
+    postMessage(["alert", "Done"], "*")
    //cards
    //lang
 });
@@ -237,6 +237,7 @@ ipc.on('memory', function (event, arg) {
 })
 //update.html
 ipc.on('prog', function (event, arg) {
+    console.log(arg)
    postMessage(["updateProg", arg], "*")
 })
 ipc.on('mess', function (event, arg) {
--- a/app/js/post/img.js
+++ b/app/js/post/img.js
@@ -205,17 +205,27 @@ element.addEventListener("paste", function (e) {
 	// 画像以外がペーストされたときのために、元に戻しておく
 });
 function deleteImage(key) {
-	if (!confirm(lang.lang_postimg_delete)) {
-		return false;
-	}
-	var media = $("#media").val();
-	var arr = media.split(",");
-	for (var i = 0; i < media.length; i++) {
-		if (arr[i] == key) {
-			arr.splice(i, 1);
-			break;
+	Swal.fire({
+		title: lang.lang_postimg_delete,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			var media = $("#media").val();
+			var arr = media.split(",");
+			for (var i = 0; i < media.length; i++) {
+				if (arr[i] == key) {
+					arr.splice(i, 1);
+					break;
+				}
+			}
+			$("#media").val(arr.join(","));
+			$('#preview [data-media=' + key + ']').remove();
 		}
-	}
-	$("#media").val(arr.join(","));
-	$('#preview [data-media=' + key + ']').remove();
+	})
+
 }
--- a/app/js/post/post.js
+++ b/app/js/post/post.js
@@ -17,24 +17,6 @@ function post(mode, postvis) {
 	var acct_id = $("#post-acct-sel").val();
 	localStorage.setItem("last-use", acct_id);
 	var domain = localStorage.getItem("domain_" + acct_id);
-	if (domain == "theboss.tech") {
-		if (~str.indexOf("#")) {
-			if (str.indexOf("#theboss_tech") == "-1") {
-				if (!confirm(lang.lang_post_tagTL)) {
-					return false;
-				}
-			}
-		}
-	}
-	if (domain == "dtp-mstdn.jp") {
-		if (~str.indexOf("#")) {
-			if (str.indexOf("#dtp") == "-1") {
-				if (!confirm(lang.lang_post_tagTL)) {
-					return false;
-				}
-			}
-		}
-	}
 	if (!localStorage.getItem("cw_sentence")) {
 		var cw_sent = 500;
 	} else {
@@ -91,22 +73,11 @@ function post(mode, postvis) {
 	} else {
 		var vis = $("#vis").text();
 	}
-
 	if (vis != "inherit" && vis != "local") {
 		toot.visibility = vis;
 	} else if (vis == "local") {
 		toot.status = str + "👁️";
 	}
-	//ここに非公開・未収載タグについてwarn
-	if (domain != "kirishima.cloud" && domain != "imastodon.net") {
-		if (~str.indexOf("#")) {
-			if (vis == "local" || vis == "unlisted" || vis == "direct" || vis == "private") {
-				if (!confirm(lang.lang_post_tagVis)) {
-					return false;
-				}
-			}
-		}
-	}
 	if ($("#cw").hasClass("cw-avail")) {
 		var spo = $("#cw-text").val();
 		cw();
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@@ -183,7 +183,7 @@ function block(acct_id) {
 }

 //ミュート
-function mute(acct_id) {
+function muteDo(acct_id) {
 	if (!acct_id) {
 		var acct_id = $('#his-data').attr("use-acct");
 	}
@@ -253,39 +253,50 @@ function del(id, acct_id) {
 }
 //redraft
 function redraft(id, acct_id) {
-	if (confirm(lang.lang_status_redraft)) {
-		show();
-		del(id, acct_id);
-		$("#post-acct-sel").prop("disabled", true);
-		var medias = $("[toot-id=" + id + "]").attr("data-medias");
-		var vismode = $("[toot-id=" + id + "] .vis-data").attr("data-vis");
-		vis(vismode);
-		$("#media").val(medias);
-		var ct = medias.split(",").length;
-		$("[toot-id=" + id + "] img.toot-img").each(function (i, elem) {
-			if (i < ct) {
-				var url = $(elem).attr("src");
-				console.log("Play back image data:" + url);
-				$('#preview').append('<img src="' + url + '" style="width:50px; max-height:100px;">');
+	Swal.fire({
+		title: lang.lang_status_redraftTitle,
+		text: lang.lang_status_redraft,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			show();
+			del(id, acct_id);
+			$("#post-acct-sel").prop("disabled", true);
+			var medias = $("[toot-id=" + id + "]").attr("data-medias");
+			var vismode = $("[toot-id=" + id + "] .vis-data").attr("data-vis");
+			vis(vismode);
+			$("#media").val(medias);
+			var ct = medias.split(",").length;
+			$("[toot-id=" + id + "] img.toot-img").each(function (i, elem) {
+				if (i < ct) {
+					var url = $(elem).attr("src");
+					console.log("Play back image data:" + url);
+					$('#preview').append('<img src="' + url + '" style="width:50px; max-height:100px;">');
+				}
+			});
+			var html = $("[toot-id=" + id + "] .toot").html();
+			html = html.replace(/^<p>(.+)<\/p>$/, "$1");
+			html = html.replace(/<br\s?\/?>/, "\n");
+			html = html.replace(/<p>/, "\n");
+			html = html.replace(/<\/p>/, "\n");
+			html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, "$1");
+			html = $.strip_tags(html);
+			localStorage.setItem("nohide", true);
+			show();
+			$("#textarea").val(html);
+			var cwtxt = $("[toot-id=" + id + "] .cw_text").html();
+			if (cwtxt != "") {
+				cwtxt = $.strip_tags(cwtxt);
+				cw();
+				$("#cw-text").val(cwtxt);
 			}
-		});
-		var html = $("[toot-id=" + id + "] .toot").html();
-		html = html.replace(/^<p>(.+)<\/p>$/, "$1");
-		html = html.replace(/<br\s?\/?>/, "\n");
-		html = html.replace(/<p>/, "\n");
-		html = html.replace(/<\/p>/, "\n");
-		html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, "$1");
-		html = $.strip_tags(html);
-		localStorage.setItem("nohide", true);
-		show();
-		$("#textarea").val(html);
-		var cwtxt = $("[toot-id=" + id + "] .cw_text").html();
-		if (cwtxt != "") {
-			cwtxt = $.strip_tags(cwtxt);
-			cw();
-			$("#cw-text").val(cwtxt);
 		}
-	}
+	})
 }
 //ピン留め
 function pin(id, acct_id) {
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -50,14 +50,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		native = "yes";
 	}
 	//クライアント強調
-	var emp = localStorage.getItem("client_emp");
-	if (emp) {
-		var emp = JSON.parse(emp);
+	var empCli = localStorage.getItem("client_emp");
+	if (empCli) {
+		var empCli = JSON.parse(empCli);
 	}
 	//クライアントミュート
-	var mute = localStorage.getItem("client_mute");
-	if (mute) {
-		var mute = JSON.parse(mute);
+	var muteCli = localStorage.getItem("client_mute");
+	if (muteCli) {
+		var muteCli = JSON.parse(muteCli);
 	}
 	//ユーザー強調
 	var useremp = localStorage.getItem("user_emp");
@@ -65,17 +65,19 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		var useremp = JSON.parse(useremp);
 	}
 	//ワード強調
-	var wordemp = localStorage.getItem("word_emp");
-	if (wordemp) {
-		var wordemp = JSON.parse(wordemp);
+	var wordempList = localStorage.getItem("word_emp");
+	if (wordempList) {
+		var wordempList = JSON.parse(wordempList);
 	}
 	//ワードミュート
-	var wordmute = localStorage.getItem("word_mute");
-	if (wordmute) {
-		var wordmute = JSON.parse(wordmute);
-		wordmute = wordmute.concat(mutefilter);
+	var wordmuteList = localStorage.getItem("word_mute");
+	if (wordmuteList) {
+		var wordmuteList = JSON.parse(wordmuteList);
+		if (wordmuteList) {
+			wordmuteList = wordmuteList.concat(mutefilter);
+		}
 	} else {
-		wordmute = mutefilter;
+		wordmuteList = mutefilter;
 	}
 	//Ticker
 	var tickerck = localStorage.getItem("ticker_ok");
@@ -349,16 +351,16 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				viashow = "via-hide";
 			}
 			//強調チェック
-			Object.keys(emp).forEach(function (key6) {
-				var cli = emp[key6];
-				if (cli == via) {
+			Object.keys(empCli).forEach(function (key6) {
+				var empCliList = empCli[key6];
+				if (empCliList == via) {
 					boostback = "emphasized";
 				}
 			});
 			//ミュートチェック
-			Object.keys(mute).forEach(function (key7) {
-				var cli = mute[key7];
-				if (cli == via) {
+			Object.keys(muteCli).forEach(function (key7) {
+				var muteCliList = muteCli[key7];
+				if (muteCliList == via) {
 					boostback = "hide";
 				}
 			});
@@ -495,6 +497,12 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						'" data-type="video" class="img-parsed"><video src="' +
 						purl + '" class="' + sense +
 						' toot-img pointer" style="max-width:100%;"></a></span>';
+				} else if (media.type.indexOf("audio") !== -1) {
+					viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',' +
+						acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
+						'" data-type="video" class="img-parsed"><audio src="' +
+						purl + '" class="' + sense +
+						' toot-img pointer" style="width:100%;" controls></a></span>';
 				} else {
 					viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',' +
 						acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
@@ -581,16 +589,16 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		//アバター
 		var avatar = toot.user.avatarUrl;
 		//ワードミュート
-		if (wordmute) {
-			Object.keys(wordmute).forEach(function (key8) {
-				var worde = wordmute[key8];
+		if (wordmuteList) {
+			Object.keys(wordmuteList).forEach(function (key8) {
+				var worde = wordmuteList[key8];
 				if (worde) {
 					if (worde.tag) {
-						var word = worde.tag;
+						var wordList = worde.tag;
 					} else {
-						var word = worde
+						var wordList = worde
 					}
-					var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
+					var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
 					if ($.strip_tagstemp(content).match(regExp)) {
 						boostback = "hide by_filter";
 					}
@@ -598,13 +606,13 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 		}
 		//ワード強調
-		if (wordemp) {
-			Object.keys(wordemp).forEach(function (key9) {
-				var word = wordemp[key9];
-				if (word) {
-					var word = word.tag;
-					var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
-					content = content.replace(regExp, '<span class="emp">' + word + "</span>");
+		if (wordempList) {
+			Object.keys(wordempList).forEach(function (key9) {
+				var wordList = wordempList[key9];
+				if (wordList) {
+					var wordList = wordList.tag;
+					var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
+					content = content.replace(regExp, '<span class="emp">' + wordList + "</span>");
 				}
 			});
 		}
--- a/app/js/tl/mix.js
+++ b/app/js/tl/mix.js
@@ -43,15 +43,15 @@ function mixtl(acct_id, tlid, type, delc, voice) {
 				timeline.splice(20);
 			}
 			var templete = "";
+			if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+				var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "mix");
+			} else {
+				var mute = [];
+			}
 			Object.keys(timeline).forEach(function (key) {
 				var pkey = key * 1 + 1;
 				if (pkey < timeline.length) {
 					if (date(timeline[key].created_at, "unix") != date(timeline[pkey].created_at, "unix")) {
-						if (localStorage.getItem("filter_" + acct_id) != "undefined") {
-							var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "mix");
-						} else {
-							var mute = [];
-						}
 						if (type == "integrated") {
 							templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
 						} else if (type == "plus") {
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -52,14 +52,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		native = "yes";
 	}
 	//クライアント強調
-	var emp = localStorage.getItem("client_emp");
-	if (emp) {
-		var emp = JSON.parse(emp);
+	var empCli = localStorage.getItem("client_emp");
+	if (empCli) {
+		var empCli = JSON.parse(empCli);
 	}
 	//クライアントミュート
-	var mute = localStorage.getItem("client_mute");
-	if (mute) {
-		var mute = JSON.parse(mute);
+	var muteCli = localStorage.getItem("client_mute");
+	if (muteCli) {
+		var muteCli = JSON.parse(muteCli);
 	}
 	//ユーザー強調
 	var useremp = localStorage.getItem("user_emp");
@@ -67,17 +67,19 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		var useremp = JSON.parse(useremp);
 	}
 	//ワード強調
-	var wordemp = localStorage.getItem("word_emp");
-	if (wordemp) {
-		var wordemp = JSON.parse(wordemp);
+	var wordempList = localStorage.getItem("word_emp");
+	if (wordempList) {
+		var wordempList = JSON.parse(wordempList);
 	}
 	//ワードミュート
-	var wordmute = localStorage.getItem("word_mute");
-	if (wordmute) {
-		var wordmute = JSON.parse(wordmute);
-		wordmute = wordmute.concat(mutefilter);
+	var wordmuteList = localStorage.getItem("word_mute");
+	if (wordmuteList) {
+		var wordmuteList = JSON.parse(wordmuteList);
+		if (wordmuteList) {
+			wordmuteList = wordmuteList.concat(mutefilter);
+		}
 	} else {
-		wordmute = mutefilter;
+		wordmuteList = mutefilter;
 	}
 	//Ticker
 	var tickerck = localStorage.getItem("ticker_ok");
@@ -430,20 +432,24 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			viashow = "hide";
 		} else {
 			var via = escapeHTML(toot.application.name);
-			//強調チェック
-			Object.keys(emp).forEach(function (key6) {
-				var cli = emp[key6];
-				if (cli == via) {
-					boostback = "emphasized";
-				}
-			});
-			//ミュートチェック
-			Object.keys(mute).forEach(function (key7) {
-				var cli = mute[key7];
-				if (cli == via) {
-					boostback = "hide";
-				}
-			});
+			if (empCli) {
+				//強調チェック
+				Object.keys(empCli).forEach(function (key6) {
+					var empCliList = empCli[key6];
+					if (empCliList == via) {
+						boostback = "emphasized";
+					}
+				});
+			}
+			if (muteCli) {
+				//ミュートチェック
+				Object.keys(muteCli).forEach(function (key7) {
+					var muteCliList = muteCli[key7];
+					if (muteCliList == via) {
+						boostback = "hide";
+					}
+				});
+			}
 		}
 		if (mix == "pinned") {
 			boostback = "emphasized";
@@ -606,6 +612,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				} else {
 					if (media.type == "unknown") {
 						viewer = viewer + '<a href="' + media.remote_url + '" title="' + media.remote_url + '">[' + lang.lang_parse_unknown + ']</a> '
+					} else if (media.type == "audio") {
+						viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',' +
+							acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
+							'" data-type="audio" class="img-parsed"><audio src="' +
+							url + '" class="pointer" style="width:100%;" controls></a></span>';
 					} else {
 						viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
 							acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
@@ -724,17 +735,17 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var avatar = toot.account.avatar_static;
 		}
 		//ワードミュート
-		if (wordmute) {
-			Object.keys(wordmute).forEach(function (key8) {
-				var worde = wordmute[key8];
+		if (wordmuteList) {
+			Object.keys(wordmuteList).forEach(function (key8) {
+				var worde = wordmuteList[key8];
+				console.log(worde)
 				if (worde) {
 					if (worde.tag) {
-						var word = worde.tag;
+						var wordList = worde.tag;
 					} else {
-						var word = worde
+						var wordList = worde
 					}
-					var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
-					console.log(regExp)
+					var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
 					if ($.strip_tags(content).match(regExp)) {
 						boostback = "hide by_filter";
 					}
@@ -742,13 +753,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			});
 		}
 		//ワード強調
-		if (wordemp) {
-			Object.keys(wordemp).forEach(function (key9) {
-				var word = wordemp[key9];
-				if (word) {
-					var word = word.tag;
-					var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
-					content = content.replace(regExp, '<span class="emp">' + word + "</span>");
+		if (wordempList) {
+			Object.keys(wordempList).forEach(function (key9) {
+				var wordList = wordempList[key9];
+				if (wordList) {
+					var wordList = wordList.tag;
+					var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
+					content = content.replace(regExp, '<span class="emp">' + wordList + "</span>");
 				}
 			});
 		}
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -54,7 +54,7 @@ function src(mode) {
 					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
 						'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
 				} else {
-					tags = tags + graphDraw(tag);
+					tags = tags + graphDraw(tag, acct_id);
 				}

 			});
@@ -63,12 +63,12 @@ function src(mode) {
 		//トゥート
 		if (json.statuses[0]) {
 			var templete = parse(json.statuses, '', acct_id);
-			$("#src-contents").append("Mentions<br>" + templete);
+			$("#src-contents").append("<br>Mentions<br>" + templete);
 		}
 		//アカウント
 		if (json.accounts[0]) {
 			var templete = userparse(json.accounts, '', acct_id);
-			$("#src-contents").append("Accounts<br>" + templete);
+			$("#src-contents").append("<br>Accounts<br>" + templete);
 		}
 		jQuery("time.timeago").timeago();
 	});
@@ -164,7 +164,7 @@ function moreTs(tlid, q) {
 		jQuery("time.timeago").timeago();
 	});
 }
-function graphDraw(tag) {
+function graphDraw(tag, acct_id) {
 	var tags = "";
 	var his = tag.history;
 	var max = Math.max.apply(null, [his[0].uses, his[1].uses, his[2].uses, his[3].uses, his[4].uses, his[5].uses, his[6].uses]);
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -425,6 +425,11 @@ function moreload(type, tlid) {
 			todo(error);
 			console.error(error);
 		}).then(function (json) {
+			if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+				var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+			} else {
+				var mute = [];
+			}
 			if (misskey) {
 				var templete = misskeyParse(json, '', acct_id, tlid, "", mute);
 			} else {
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -39,6 +39,7 @@ function show() {
 	$('#post-box').css("left", left + "px")
 	$('#post-box').css("top", top + "px")
 	$('#post-box').fadeIn();
+	$('#textarea').characterCounter();
 }

 $(function () {
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -217,10 +217,19 @@ function changelang(lang) {
 	postMessage(["lang", lang], "*")
 }
 function exportSettings() {
-	if (!confirm(lang.lang_setting_exportwarn)) {
-		return false;
-	}
-	postMessage(["exportSettings", ""], "*")
+	Swal.fire({
+		title: lang.lang_setting_exportwarn,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			postMessage(["exportSettings", ""], "*")
+		}
+	})
 }
 function exportSettingsCore() {
 	var exp = {};
@@ -283,10 +292,19 @@ function exportSettingsCore() {
 	return exp;
 }
 function importSettings() {
-	if (!confirm(lang.lang_setting_importwarn)) {
-		return false;
-	}
-	postMessage(["importSettings", ""], "*")
+	Swal.fire({
+		title: lang.lang_setting_importwarn,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			postMessage(["importSettings", ""], "*")
+		}
+	})	
 }
 function importSettingsCore(arg) {
 	var obj = JSON.parse(arg);
@@ -375,7 +393,10 @@ function importSettingsCore(arg) {
 		}
 		location.href = "index.html";
 	} else {
-		alert("Error.")
+		Swal.fire({
+			type: 'error',
+			title: 'Error'
+		})
 	}
 }
 function savefolder() {
@@ -576,7 +597,10 @@ function customImp() {
 	if (JSON5.parse(json)) {
 		postMessage(["themeJsonCreate", json], "*")
 	} else {
-		alert("Error")
+		Swal.fire({
+			type: 'error',
+			title: 'Error'
+		})
 	}
 }
 function clearCustomImport() {
--- a/app/js/ui/settings.old.js
+++ b/app/js/ui/settings.old.js
@@ -1,953 +0,0 @@
-//設定(setting.html)で読む
-var envView = new Vue({
-	el: '#env-view',
-	data: {config:envConstruction,value:envValue},
-	method: {
-		settings: function (index) {
-			return true
-		}
-	}
-});
-
-//設定ボタン押した。
-function settings() {
-	var dd = $("[name=time]:checked").val();
-	var dt = $("[for="+dd+"]").text();
-		if (dd != localStorage.getItem("datetype")) {
-		Materialize.toast(lang.lang_setting_time.replace("{{set}}" ,dt), 3000);
-	}
-	localStorage.setItem("datetype", dd);
-
-	var cd = $("[name=theme]:checked").val();
-	var ct = $("[for="+cd+"]").html();
-	if(cd=="custom" && !$("#custom-sel-sel").val()){
-		var theme = localStorage.getItem("theme");
-		if (!theme) {
-			var theme = "white";
-		}
-		$("#" + theme).prop("checked", true);
-	}else{
-		if (cd != localStorage.getItem("theme")) {
-			Materialize.toast(lang.lang_setting_theme.replace("{{set}}" ,ct), 3000);
-		}
-		//テーマはこの場で設定
-		themes(cd);
-		localStorage.setItem("theme", cd);
-	}
-
-	var nd = $("[name=nsfw]:checked").val();
-	var nt = $("[for=n_"+nd+"]").text();
-	if (nd != localStorage.getItem("nsfw")) {
-		Materialize.toast(lang.lang_setting_nsfw.replace("{{set}}" ,nt), 3000);
-	}
-	localStorage.setItem("nsfw", nd);
-
-	var cwd = $("[name=cw]:checked").val();
-	var cwt = $("[for=c_"+cwd+"]").text();
-	if (cwd != localStorage.getItem("cw")) {
-		Materialize.toast(lang.lang_setting_cw.replace("{{set}}" ,cwt), 3000);
-	}
-	localStorage.setItem("cw", cwd);
-
-	var cwtd = $("#cw-text").val();
-	if (cwtd != localStorage.getItem("cw-text")) {
-		Materialize.toast(lang.lang_setting_cwtext.replace("{{set}}" ,cwtd), 3000);
-	}
-	localStorage.setItem("cw-text", cwtd);
-
-	var cwsd = $("[name=cws]:checked").val();
-	var cwst = $("[for=cws_"+cwsd+"]").text();
-	if (cwsd != localStorage.getItem("always-cw")) {
-		Materialize.toast(lang.lang_setting_cws.replace("{{set}}" ,cwst), 3000);
-	}
-	localStorage.setItem("always-cw", cwsd);
-
-	var rpd = $("[name=rp]:checked").val();
-	var rpt = $("[for=c_"+cwd+"]").text();
-	if (rpd != localStorage.getItem("replyct")) {
-		Materialize.toast(lang.lang_setting_rp.replace("{{set}}" ,rpt), 3000);
-	}
-	localStorage.setItem("replyct", rpd);
-
-	var visd = $("[name=vis]:checked").val();
-	var vist = $("[for="+visd+"]").text();
-	if (visd != localStorage.getItem("vis")) {
-		Materialize.toast(lang.lang_setting_vis.replace("{{set}}" ,vist), 3000);
-	}
-	localStorage.setItem("vis", visd);
-
-	var popd = $("#popup").val();
-	if (popd > 0 && popd != localStorage.getItem("popup")) {
-		Materialize.toast(lang.lang_setting_popup.replace("{{set}}" ,popd+lang.lang_setting_s), 3000);
-	} else if (popd != localStorage.getItem("popup")) {
-		Materialize.toast(lang.lang_setting_popup.replace("{{set}}" ,lang.lang_setting_off), 3000);
-	}
-	localStorage.setItem("popup", popd);
-
-	var gifd = $("[name=gif]:checked").val();
-	var gift = $("[for=g_"+gifd+"]").text();
-	if (gifd != localStorage.getItem("gif")) {
-		Materialize.toast(lang.lang_setting_gif.replace("{{set}}" ,gift), 3000);
-	}
-	localStorage.setItem("gif", gifd);
-
-	var sentd = $("#sentence").val();
-	var ltrd = $("#letters").val();
-	if (sentd != localStorage.getItem("sentence") || ltrd != localStorage.getItem("letters")) {
-		Materialize.toast(lang.lang_setting_selt.replace("{{set1}}" ,sentd).replace("{{set2}}" ,ltrd), 3000);
-	}
-	localStorage.setItem("sentence", sentd);
-	localStorage.setItem("letters", ltrd);
-
-	var csentd = $("#cw_sentence").val();
-	var cltrd = $("#cw_letters").val();
-	if (csentd != localStorage.getItem("cw_sentence") || cltrd != localStorage.getItem("cw_letters")) {
-		Materialize.toast(lang.lang_setting_autocw.replace("{{set1}}" ,csentd).replace("{{set2}}" ,cltrd), 3000);
-	}
-	localStorage.setItem("cw_sentence", csentd);
-	localStorage.setItem("cw_letters", cltrd);
-
-	var widthd = $("#width").val();
-	if (widthd != localStorage.getItem("width")) {
-		Materialize.toast(lang.lang_setting_width.replace("{{set}}" ,widthd), 3000);
-	}
-	localStorage.setItem("width", widthd);
-
-	var fwidthd = $("#fixwidth").val();
-	if (fwidthd != localStorage.getItem("fixwidth")) {
-		Materialize.toast(lang.lang_setting_fixwidth.replace("{{set}}" ,fwidthd), 3000);
-	}
-	localStorage.setItem("fixwidth", fwidthd);
-
-	var imgd = $("[name=img]:checked").val();
-	var imgt = $("[for=i_"+imgd+"]").text();
-	if (imgd != localStorage.getItem("img")) {
-		Materialize.toast(lang.lang_setting_img.replace("{{set}}" ,imgt), 3000);
-	}
-	localStorage.setItem("img", imgd);
-
-	var fontd = $("#font").val();
-	if(fontd){
-		if (fontd != localStorage.getItem("font")) {
-			Materialize.toast(lang.lang_setting_font.replace("{{set}}" ,fontd), 3000);
-		}
-		localStorage.setItem("font", fontd);
-		themes();
-	}else{
-		if(localStorage.getItem("font")){
-			localStorage.removeItem("font");
-			Materialize.toast(lang.lang_setting_font.replace("{{set}}" ,lang.lang_setting_default), 3000);
-			themes();
-		}
-	}
-	
-
-	var sized = $("#size").val();
-	if (sized != localStorage.getItem("size")) {
-		Materialize.toast(lang.lang_setting_size.replace("{{set}}" ,sized), 3000);
-	}
-	localStorage.setItem("size", sized);
-
-	var heid = $("#img-height").val();
-	if (heid != localStorage.getItem("img-height")) {
-		Materialize.toast(lang.lang_setting_imgheight.replace("{{set}}" ,heid), 3000);
-	}
-	localStorage.setItem("img-height", heid);
-
-	var tckrd = $("[name=ticker]:checked").val();
-	var tckrt = $("[for=ticker_"+tckrd+"]").text();
-	if (tckrd != localStorage.getItem("ticker_ok")) {
-		Materialize.toast(lang.lang_setting_ticker.replace("{{set}}" ,tckrt), 3000);
-	}
-	localStorage.setItem("ticker_ok", tckrd);
-
-	var animed = $("[name=anime]:checked").val();
-	var animet = $("[for=anime_"+animed+"]").text();
-	if (animed != localStorage.getItem("animation")) {
-		Materialize.toast(lang.lang_setting_animation.replace("{{set}}" ,animet), 3000);
-	}
-	localStorage.setItem("animation", animed);
-
-	var boxd = $("[name=box]:checked").val();
-	var boxt = $("[for=bx_"+boxd+"]").text();
-	if (boxd != localStorage.getItem("box")) {
-		Materialize.toast(lang.lang_setting_boxConfirm.replace("{{set}}" ,boxt), 3000);
-	}
-	localStorage.setItem("box", boxd);
-
-	var tagd = $("[name=tag]:checked").val();
-	var tagt = $("[for=t_"+tagd+"]").text();
-	if (tagd != localStorage.getItem("tag-range")) {
-		Materialize.toast(lang.lang_setting_tag.replace("{{set}}" ,tagt), 3000);
-	}
-	localStorage.setItem("tag-range", tagd);
-
-	var uld = $("[name=ul]:checked").val();
-	var ult = $("[for=ul_"+uld+"]").text();
-	if (uld != localStorage.getItem("locale")) {
-		Materialize.toast(lang.lang_setting_ul.replace("{{set}}" ,ult), 3000);
-	}
-	localStorage.setItem("locale", uld);
-
-	var ntd = $("[name=notf]:checked").val();
-	var ntt = $("[for=ntf_"+ntd+"]").text();
-	if (ntd != localStorage.getItem("nativenotf")) {
-		Materialize.toast(lang.lang_setting_notf.replace("{{set}}" ,ntt), 3000);
-	}
-	localStorage.setItem("nativenotf", ntd);
-
-	var qtd = $("[name=quote]:checked").val();
-	var qtt = $("[for=q_"+qtd+"]").text();
-	if (qtd != localStorage.getItem("quote")) {
-		Materialize.toast(lang.lang_setting_quote.replace("{{set}}" ,qtt), 3000);
-	}
-	localStorage.setItem("quote", qtd);
-	
-	var viad = $("[name=via]:checked").val();
-	var viat = $("[for=via_"+viad+"]").text();
-	if (viad != localStorage.getItem("viashow")) {
-		Materialize.toast(lang.lang_setting_via.replace("{{set}}" ,viat), 3000);
-	}
-	localStorage.setItem("viashow", viad);
-
-	var notfmd = $("[name=notfm]:checked").val();
-	var notfmt = $("[for=notfm_"+notfmd+"]").text();
-	if (notfmd != localStorage.getItem("setasread")) {
-		Materialize.toast(lang.lang_setting_setasread.replace("{{set}}" ,notfmt), 3000);
-	}
-	localStorage.setItem("setasread", notfmd);
-
-	var movd = $("[name=mov]:checked").val();
-	var movt = $("[for=mov_"+movd+"]").text();
-	if (movd != localStorage.getItem("mouseover")) {
-		Materialize.toast(lang.lang_setting_mov.replace("{{set}}" ,movt), 3000);
-	}
-	localStorage.setItem("mouseover", movd);
-
-	var maind = $("[name=main]:checked").val();
-	var maint = $("[for=mn_"+maind+"]").text();
-	if (maind != localStorage.getItem("mainuse")) {
-		Materialize.toast(lang.lang_setting_main.replace("{{set}}" ,maint), 3000);
-	}
-	localStorage.setItem("mainuse", maind);
-
-	var secd = $("[name=sec]:checked").val();
-	var sect = $("[for=sec-"+secd+"]").text();
-	if (secd != localStorage.getItem("sec")) {
-		Materialize.toast(lang.lang_setting_sec.replace("{{set}}" ,sect), 3000);
-	}
-	localStorage.setItem("sec", secd);
-}
-
-//読み込み時の設定ロード
-function load() {
-	if(localStorage.getItem("imas")){
-		$(".imas").removeClass("hide");
-	}
-	if(localStorage.getItem("kirishima")){
-		$(".kirishima").removeClass("hide");
-	}
-	var prof = localStorage.getItem("prof");
-	$("#my-prof").attr("src", prof);
-	var datetype = localStorage.getItem("datetype");
-	if (!datetype) {
-		var datetype = "absolute";
-	}
-	$("#" + datetype).prop("checked", true);
-
-	var theme = localStorage.getItem("theme");
-	if (!theme) {
-		var theme = "white";
-	}
-	$("#" + theme).prop("checked", true);
-
-	var ha = localStorage.getItem("ha");
-	if (!ha) {
-		var ha = "false";
-	}
-	$("#ha_" + ha).prop("checked", true);
-
-	var nsfw = localStorage.getItem("nsfw");
-	if (!nsfw) {
-		var nsfw = "yes";
-	}
-	$("#n_" + nsfw).prop("checked", true);
-
-	var cw = localStorage.getItem("cw");
-	if (!cw) {
-		var cw = "yes";
-	}
-	$("#c_" + cw).prop("checked", true);
-
-	var cws = localStorage.getItem("always-cw");
-	if (!cws) {
-		var cws = "no";
-	}
-	$("#cws_" + cws).prop("checked", true);
-
-	var popup = localStorage.getItem("popup");
-	if (!popup) {
-		var popup = "0";
-	}
-	$("#popup").val(popup);
-
-	var box = localStorage.getItem("box");
-	if (!box) {
-		var box = "no";
-	}
-	if(box=="absolute"){
-		var box = "abs";
-	}
-	$("#bx_" + box).prop("checked", true);
-
-	var gif = localStorage.getItem("gif");
-	if (!gif) {
-		var gif = "yes";
-	}
-	$("#g_" + gif).prop("checked", true);
-
-	var sent = localStorage.getItem("sentence");
-	if (!sent) {
-		var sent = "500";
-	}
-	$("#sentence").val(sent);
-	var ltrs = localStorage.getItem("letters");
-	if (!ltrs) {
-		var ltrs = "500";
-	}
-	$("#letters").val(ltrs);
-
-	var csent = localStorage.getItem("cw_sentence");
-	if (!csent) {
-		var csent = "500";
-	}
-	$("#cw_sentence").val(csent);
-	var cltrs = localStorage.getItem("cw_letters");
-	if (!cltrs) {
-		var cltrs = "500";
-	}
-	$("#cw_letters").val(cltrs);
-
-	var width = localStorage.getItem("width");
-	if (!width) {
-		var width = "300";
-	}
-	$("#width").val(width);
-
-	var fwidth = localStorage.getItem("fixwidth");
-	if (!fwidth) {
-		var fwidth = "300";
-	}
-	$("#fixwidth").val(fwidth);
-
-	var cwt = localStorage.getItem("cw-text");
-	if (!cwt) {
-		var cwt = "";
-	}
-	$("#cw-text").val(cwt);
-
-	var cws = localStorage.getItem("always-cw");
-	if (!cws) {
-		var cws = "no";
-	}
-	$("#cws_" + cws).prop("checked", true);
-
-	var rps = localStorage.getItem("replyct");
-	if (!rps) {
-		var rps = "hidden";
-	}
-	$("#rp_" + rps).prop("checked", true);
-
-	var vis = localStorage.getItem("vis");
-	if (!vis) {
-		var vis = "public";
-	}
-	$("#" + vis).prop("checked", true);
-
-	var img = localStorage.getItem("img");
-	if (!img) {
-		var img = "no-act";
-	}
-	$("#i_" + img).prop("checked", true);
-	
-	var font = localStorage.getItem("font");
-	if (!font) {
-		var font = "";
-	}
-	$("#font").val(font);
-
-	var size = localStorage.getItem("size");
-	if (!size) {
-		var size = "13";
-	}
-	$("#size").val(size);
-
-	var imh = localStorage.getItem("img-height");
-	if (!imh) {
-		var imh = "200";
-	}
-	$("#img-height").val(imh);
-
-	var ticker = localStorage.getItem("ticker_ok");
-	if (!ticker) {
-		var ticker = "no";
-	}
-	$("#ticker_" + ticker).prop("checked", true);
-
-	var animation = localStorage.getItem("animation");
-	if (!animation) {
-		var animation = "yes";
-	}
-	$("#anime_" + animation).prop("checked", true);
-
-	var tag = localStorage.getItem("tag-range");
-	if (!tag) {
-		var tag = "all";
-	}
-	$("#t_" + tag).prop("checked", true);
-
-	var box = localStorage.getItem("box");
-	if (!box) {
-		var box = "yes";
-	}
-	$("#bx_" + box).prop("checked", true);
-
-	var uld = localStorage.getItem("locale");
-	if (!uld) {
-		var uld = "yes";
-	}
-	$("#ul_" + uld).prop("checked", true);
-
-	var nnd = localStorage.getItem("nativenotf");
-	if (!nnd) {
-		var nnd = "yes";
-	}
-	$("#ntf_" + nnd).prop("checked", true);
-
-	var qt = localStorage.getItem("quote");
-	if (!qt) {
-		var qt = "simple";
-	}
-	$("#q_" + qt).prop("checked", true);
-
-	var viat = localStorage.getItem("viashow");
-	if (!viat) {
-		var viat = "hide";
-	}
-	$("#via_" + viat).prop("checked", true);
-
-	var movt = localStorage.getItem("mouseover");
-	if (!movt) {
-		var movt = "no";
-	}
-	$("#mov_" + movt).prop("checked", true);
-
-	var notfmt = localStorage.getItem("setasread");
-	if (!notfmt) {
-		var notfmt = "yes";
-	}
-	$("#notfm_" + notfmt).prop("checked", true);
-
-	var maint = localStorage.getItem("mainuse");
-	if (!maint) {
-		var maint = "remain";
-	}
-	$("#mn_" + maint).prop("checked", true);
-
-	var sect = localStorage.getItem("sec");
-	if (!sect) {
-		var sect = "nothing";
-	}
-	$("#sec-" + sect).prop("checked", true);
-	
-}
-
-function climute(){
-	//クライアントミュート
-	var cli = localStorage.getItem("client_mute");
-	var obj = JSON.parse(cli);
-	if(!obj){
-		$("#mute-cli").html(lang.lang_setting_nomuting);
-	}else{
-		if(!obj[0]){
-			$("#mute-cli").html(lang.lang_setting_nomuting);
-			return;
-		}
-	var templete;
-	Object.keys(obj).forEach(function(key) {
-		var cli = obj[key];
-		var list = key * 1 + 1;
-		templete = '<div class="acct" id="acct_' + key + '">' + list +
-			'.' +
-			cli + '<button class="btn waves-effect red disTar" onclick="cliMuteDel(' +
-			key + ')">'+lang.lang_del+'</button><br></div>';
-		$("#mute-cli").append(templete);
-	});
-}
-}
-function cliMuteDel(key){
-	var cli = localStorage.getItem("client_mute");
-	var obj = JSON.parse(cli);
-	obj.splice(key, 1);
-	var json = JSON.stringify(obj);
-	localStorage.setItem("client_mute", json);
-	mute();
-}
-
-function wordmute(){
-	var word = localStorage.getItem("word_mute");
-	var obj = JSON.parse(word);
-	$('#wordmute').material_chip({
-		data: obj,
-	  });
-}
-function wordmuteSave(){
-	var word=$('#wordmute').material_chip('data');
-	var json = JSON.stringify(word);
-	localStorage.setItem("word_mute", json);
-}
-
-function wordemp(){
-	var word = localStorage.getItem("word_emp");
-	var obj = JSON.parse(word);
-	$('#wordemp').material_chip({
-		data: obj,
-	});
-}
-function wordempSave(){
-	var word=$('#wordemp').material_chip('data');
-	var json = JSON.stringify(word);
-	localStorage.setItem("word_emp", json);
-}
-function notftest(){
-		var electron = require("electron");
-		var ipc = electron.ipcRenderer;
-		var os = electron.remote.process.platform;
-		var options = {
-				body: lang.lang_setting_notftest+'('+lang.lang_setting_notftestprof+')',
-				icon: localStorage.getItem("prof_0")
-		  };
-		if(os=="darwin"){
-			var n = new Notification('TheDesk'+lang.lang_setting_notftest, options);
-		}else{
-			ipc.send('native-notf', ['TheDesk'+lang.lang_setting_notftest,lang.lang_setting_notftest+'('+lang.lang_setting_notftestprof+')',localStorage.getItem('prof_0'),"",""]);
-		}
-	
-}
-function oks(no){
-	var txt=$("#oks-"+no).val();
-	localStorage.setItem("oks-"+no, txt);
-	Materialize.toast(lang.lang_setting_ksref, 3000);
-}
-function oksload(){
-	if(localStorage.getItem("oks-1")){$("#oks-1").val(localStorage.getItem("oks-1"))}
-	if(localStorage.getItem("oks-2")){$("#oks-2").val(localStorage.getItem("oks-2"))}
-	if(localStorage.getItem("oks-3")){$("#oks-3").val(localStorage.getItem("oks-3"))}
-}
-function changelang(lang){
-	var electron = require("electron");
-	var ipc = electron.ipcRenderer;
-	ipc.send('lang',lang);
-	ipc.on('langres', function (event, arg) {
-		location.href="../"+lang+"/setting.html"
-	});
-}
-function exportSettings(){
-	if(!confirm(lang.lang_setting_exportwarn)){
-		return false;
-	}
-	var electron = require("electron");
-	var remote=electron.remote;
-	var dialog=remote.dialog;
-	var ipc = electron.ipcRenderer;
-	dialog.showSaveDialog(null, {
-		title: 'Export',
-		properties: ['openFile', 'createDirectory'],
-		defaultPath: "export.thedeskconfig"
-	}, (savedFiles) => {
-		console.log(savedFiles);
-		if(!savedFiles){
-			return false;
-		}
-		var exp={};
-		//Accounts
-		var multi = localStorage.getItem("multi");
-		var acct = JSON.parse(multi);
-		exp.accts=acct;
-		//Columns
-		var multi = localStorage.getItem("column");
-		var column = JSON.parse(multi);
-		exp.columns=column;
-		//Themes
-		exp.theme=localStorage.getItem("theme");
-		//Min width
-		exp.minwidth=localStorage.getItem("width");
-		//Font
-		exp.font=localStorage.getItem("font");
-		exp.size=localStorage.getItem("size");
-		//Img height
-		exp.imgheight=localStorage.getItem("img-height");
-		//Main
-		exp.mainuse=localStorage.getItem("mainuse");
-		//CW text
-		exp.cw=localStorage.getItem("cw-text");
-		//vis
-		exp.vis=localStorage.getItem("vis");
-		//keysc
-		exp.ksc=[
-			localStorage.getItem("oks-1"),
-			localStorage.getItem("oks-2"),
-			localStorage.getItem("oks-3")
-		];
-		//climu
-		var cli = localStorage.getItem("client_mute");
-		var climu = JSON.parse(cli);
-		exp.clientMute=climu;
-		//wordmu
-		var wdm = localStorage.getItem("word_mute");
-		var wordmu = JSON.parse(wdm);
-		exp.wordMute=wordmu;
-		//spotify
-		exp.spotifyArtwork=localStorage.getItem("artwork")
-		var content=localStorage.getItem("np-temp");
-		if(content || content=="" || content=="null"){
-			exp.spotifyTemplete=content;
-		}else{
-			exp.spotifyTemplete=null;
-		}
-		//tags
-		var tagarr = localStorage.getItem("tag");
-		var favtag = JSON.parse(tagarr);
-		exp.favoriteTags=favtag;
-		console.log(exp);
-		ipc.send('export', [savedFiles,JSON.stringify(exp)]);
-		alert("Done.")
-		//cards
-		//lang
-	});
-}
-function importSettings(){
-	if(!confirm(lang.lang_setting_importwarn)){
-		return false;
-	}
-	var electron = require("electron");
-	var remote=electron.remote;
-	var dialog=remote.dialog;
-	var ipc = electron.ipcRenderer;
-	dialog.showOpenDialog(null, {
-		title: 'Import',
-		properties: ['openFile'],
-		filters: [
-			{name: 'TheDesk Config', extensions: ['thedeskconfig']},
-		]
-	}, (fileNames) => {
-		console.log(fileNames);
-		if(!fileNames){
-			return false;
-		}
-		ipc.send('import', fileNames[0]);
-		ipc.on('config', function (event, arg) {
-			var obj = JSON.parse(arg);
-			if(obj){
-				localStorage.clear();
-				localStorage.setItem("multi",JSON.stringify(obj.accts));
-				for(var key=0;key<obj.accts.length;key++){
-					var acct=obj.accts[key];
-					localStorage.setItem("name_" + key, acct.name);
-					localStorage.setItem("user_" + key, acct.user);
-					localStorage.setItem("user-id_" + key, acct.id);
-					localStorage.setItem("prof_" + key, acct.prof);
-					localStorage.setItem("domain_" + key, acct.domain);
-					localStorage.setItem("acct_"+ key + "_at", acct.at);
-				}
-				localStorage.setItem("column",JSON.stringify(obj.columns));
-				localStorage.setItem("theme",obj.theme);
-				if(obj.width){
-					console.log(obj.width)
-					localStorage.setItem("width",obj.width);
-				}
-				if(obj.font){
-					localStorage.setItem("font",obj.font);
-				}
-				if(obj.size){
-					localStorage.setItem("size",obj.size);
-				}
-				themes(obj.theme);
-				if(obj.imgheight){
-					localStorage.setItem("img-height",obj.imgheight);
-				}
-				localStorage.setItem("mainuse",obj.mainuse);
-				if(obj.cw){
-					localStorage.setItem("cwtext",obj.cw);
-				}
-				localStorage.setItem("vis",obj.vis);
-				if(obj.ksc[0]){
-					localStorage.setItem("oks-1",obj.ksc[0]);
-				}
-				if(obj.ksc[1]){
-					localStorage.setItem("oks-2",obj.ksc[1]);
-				}
-				if(obj.ksc[2]){
-					localStorage.setItem("oks-3",obj.ksc[2]);
-				}
-				if(obj.clientMute){
-					localStorage.setItem("client_mute",JSON.stringify(obj.clientMute));
-				}
-				if(obj.wordMute){
-					localStorage.setItem("word_mute",JSON.stringify(obj.wordMute));
-				}
-				if(obj.favoriteTags){
-					localStorage.setItem("tag",JSON.stringify(obj.favoriteTags));
-				}
-				
-				localStorage.setItem("np-temp",obj.spotifyTemplete);
-				for(var i=0;i<obj.columns.length;i++){
-					localStorage.setItem("card_" + i,"true");
-					localStorage.removeItem("catch_" + i);
-				}
-				location.href="language.html";
-			}else{
-				alert("Error.")
-			}
-		})
-		//cards
-		//lang
-	});
-}
-function savefolder(){
-	var electron = require("electron");
-	var remote=electron.remote;
-	var dialog=remote.dialog;
-	dialog.showOpenDialog(null, {
-		title: 'Save folder',
-		properties: ['openDirectory'],
-	}, (fileNames) => {
-		localStorage.setItem("savefolder",fileNames[0]);
-	});
-}
-
-function font(){
-	var electron = require("electron");
-	var ipc = electron.ipcRenderer;
-	ipc.send('fonts', []);
-	ipc.on('font-list', function (event, arg) {
-		$("#fonts").removeClass("hide");
-		for( var i=0; i<arg.length; i++) {
-			var font=arg[i];
-			$("#fonts").append('<div class="font pointer" style="font-family:'+font.family+'" onclick="insertFont(\''+font.family+'\')">'+font.family+"</div>")
-		}
-	});
-}
-function insertFont(name){
-	$("#font").val(name);
-}
-$(".color-picker").each(function(i, elem) {
-	pickerDefine(i,"fff");
-});
-function pickerDefine(i,color){
-	var pickr = new Pickr({
-		el: '#color-picker'+i,
-		default: color,
-		showAlways: true,
-		appendToBody: true,
-		closeWithKey: 'Escape',
-		comparison: false,
-		components: {
-			preview: true, // Left side color comparison
-			opacity: false, // Opacity slider
-			hue: true,     // Hue slider
-			interaction: {
-				rgba: false, // rgba option (red green blue and alpha)
-				input: true, // input / output element
-			}
-		},
-		strings: {
-		   save: 'Save',  // Default for save button
-		   clear: 'Clear' // Default for clear button
-		}
-	   });
-		   pickr.on('change', (...args) => {
-			 	var rgb='rgb('+args[0].toRGBA()[0]+','+args[0].toRGBA()[1]+','+args[0].toRGBA()[2]+')';
-				$("#color-picker"+i+"_value").val(rgb)
-			});
-}
-function customComp(){
-	var nameC=$("#custom_name").val();
-	if(!nameC){return false;}
-	var descC=$("#custom_desc").val();
-	var primaryC=$("#color-picker0_value").val();
-	if(!primaryC){primaryC="rgb(255,255,255)"}
-	var secondaryC=$("#color-picker1_value").val();
-	if(!secondaryC){secondaryC="rgb(255,255,255)"}
-	var textC=$("#color-picker2_value").val();
-	if(!textC){textC="rgb(255,255,255)"}
-	var accentC=$("#color-picker3_value").val();
-	if(!accentC){accentC="rgb(255,255,255)"}
-	var multi = localStorage.getItem("multi");
-	var my=JSON.parse(multi)[0].name;
-	var id=$("#custom-edit-sel").val();
-	if(id=="add_new"){
-		id=makeCID();
-	}
-	var json={
-		"name": nameC,
-		"author": my,
-		"desc": descC,
-		"base": $("[name=direction]:checked").val(),
-		"vars": {
-		  "primary": primaryC,
-		  "secondary": secondaryC,
-		  "text": textC
-		},
-		"props": {
-			"TheDeskAccent": accentC
-		},
-		"id": id
-	  }
-	  $("#custom_json").val(JSON.stringify(json));
-	  themes();
-	  $("#custom_name").val("");
-	  $("#custom_desc").val("");
-	  $("#dark").prop("checked", true);
-	  $("#custom_json").val("");
-	  $("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-	  $("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-	  $("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-	  $("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-	  $("#color-picker0_value").val("");
-	  $("#color-picker1_value").val("");
-	  $("#color-picker2_value").val("");
-	  $("#color-picker3_value").val("");
-	  pickerDefine(0,"fff");
-	  pickerDefine(1,"fff");
-	  pickerDefine(2,"fff");
-	  pickerDefine(3,"fff");
-	  ipc.send('theme-json-create', JSON.stringify(json));
-}
-function deleteIt(){
-	var id=$("#custom-sel-sel").val();
-	$("#custom_name").val("");
-	$("#custom_desc").val("");
-	$("#dark").prop("checked", true);
-	$("#custom_json").val("");
-	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-	$("#color-picker0_value").val("");
-	$("#color-picker1_value").val("");
-	$("#color-picker2_value").val("");
-	$("#color-picker3_value").val("");
-	pickerDefine(0,"fff");
-	pickerDefine(1,"fff");
-	pickerDefine(2,"fff");
-	pickerDefine(3,"fff");
-	ipc.on('theme-json-delete-complete', function (event, args) {
-		ctLoad()
-	});
-	ipc.send('theme-json-delete', id);
-}
-function ctLoad(){
-	ipc.send('theme-json-list', "");
-	ipc.on('theme-json-list-response', function (event, args) {
-		console.log(args);
-		var templete="";
-		Object.keys(args).forEach(function(key) {
-			var theme = args[key];
-			var themeid=theme.id
-			templete = templete+'<option value="'+themeid+'">' + theme.name +'</option>';
-		});
-		if(args[0]){
-			localStorage.setItem("customtheme-id",args[0].id)
-		}
-		$("#custom-sel-sel").html(templete);
-		templete='<option value="add_new">'+$("#edit-selector").attr("data-add")+'</option>'+templete;
-		$("#custom-edit-sel").html(templete);
-		$('select').material_select('update');
-	});
-}
-function customSel(){
-	var id=$("#custom-sel-sel").val();
-	localStorage.setItem("customtheme-id",id)
-}
-function custom(){
-	var id=$("#custom-edit-sel").val();
-	if(id=="add_new"){
-		$("#custom_name").val("");
-		$("#custom_desc").val("");
-		$("#dark").prop("checked", true);
-		$("#custom_json").val("");
-		$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-		$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-		$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-		$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-		$("#color-picker0_value").val("");
-		$("#color-picker1_value").val("");
-		$("#color-picker2_value").val("");
-		$("#color-picker3_value").val("");
-		pickerDefine(0,"fff");
-		pickerDefine(1,"fff");
-		pickerDefine(2,"fff");
-		pickerDefine(3,"fff");
-		$("#delTheme").addClass("disabled")
-	}else{
-		$("#delTheme").removeClass("disabled")
-		ipc.send('theme-json-request', id);
-		ipc.on('theme-json-response', function (event, args) {
-			console.log(args);
-			$("#custom_name").val(args.name);
-			$("#custom_desc").val(args.desc);
-			$("#"+args.base).prop("checked", true);
-			$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-			pickerDefine(0,rgbToHex(args.vars.primary))
-			$("#color-picker0_value").val(args.vars.primary);
-			$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-			pickerDefine(1,rgbToHex(args.vars.secondary))
-			$("#color-picker1_value").val(args.vars.secondary);
-			$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-			$("#color-picker2_value").val(args.vars.text);
-			pickerDefine(2,rgbToHex(args.vars.text))
-			if(args.props){
-				if(args.props.TheDeskAccent){
-					var accent=args.props.TheDeskAccent;
-				}else{
-					var accent=args.vars.secondary;
-				}
-			}else{
-				var accent=args.vars.secondary;
-			}
-			$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-			pickerDefine(3,rgbToHex(accent))
-			$("#custom_json").val(JSON.stringify(args));
-		});
-	}
-}
-function customImp(){
-	var json=$("#custom_import").val();
-	if(JSON5.parse(json)){
-		ipc.send('theme-json-create', json);
-	}else{
-		alert("Error")
-	}
-}
-function hardwareAcceleration(){
-	var had = $("[name=ha]:checked").val();
-	localStorage.setItem("ha", had);
-	console.log("ha");
-	ipc.send('ha', had);
-}
-
-ipc.on('theme-json-create-complete', function (event, args) {
-	$("#custom_import").val("");
-	ctLoad()
-});
-//最初に読む
-load();
-climute();
-wordmute();
-wordemp();
-checkSpotify();
-voiceSettingLoad();
-oksload();
-npprovider();
-ctLoad()
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@@ -108,7 +108,10 @@ function nowplaying(mode) {
                $("#textarea").val(content);
            });
        } else {
-            alert(lang.lang_spotify_acct);
+            Swal.fire({
+                type: 'info',
+                title: lang.lang_spotify_acct
+            })
        }
    } else if (mode == "itunes") {
        postMessage(["itunes", ""], "*")
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -133,7 +133,10 @@ function spotifytips() {
 			spotint = setInterval(spotStart, 1000);
 		});
 	} else {
-		alert(lang.lang_spotify_acct);
+		Swal.fire({
+			type: 'info',
+			title: lang.lang_spotify_acct
+		})
 	}
 }
 function spotStart() {
--- a/app/main/dl.js
+++ b/app/main/dl.js
@@ -27,6 +27,7 @@ function dl(mainWindow, lang_path, base, dirname) {
 				"frame": false, // 枠の無いウィンドウ
 				"resizable": false
 			});
+			//updatewin.openDevTools()
 			var lang = fs.readFileSync(lang_path, 'utf8');
 			updatewin.loadURL(base + lang + '/update.html');

@@ -44,7 +45,7 @@ function dl(mainWindow, lang_path, base, dirname) {
 				directory: dir,
 				openFolderWhenDone: true,
 				onProgress: function (event) {
-					e.sender.webContents.send('prog', e);
+					e.sender.webContents.send('prog', event);
 				},
 				saveAs: false
 			};
@@ -53,7 +54,6 @@ function dl(mainWindow, lang_path, base, dirname) {
 				.then(dl => {
 					e.sender.webContents.send('mess', "ダウンロードが完了しました。");
 					app.quit();
-
 				})
 				.catch(console.error);
 		}
--- a/app/nano.html
+++ b/app/nano.html
@@ -99,10 +99,8 @@
 </head>

 <body>
+	<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
 	<script>
-		//jQuery読む
-		window.jQuery = window.$ = require('./js/common/jquery.js');
-		var Hammer = require('./js/common/hammer.min.js');
 		$.strip_tags = function (str, allowed) {
 			if (!str) {
 				return "";
--- a/app/package-lock.json
+++ b/app/package-lock.json
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "thedesk",
-  "version": "18.6.1",
+  "version": "18.6.4",
  "description": "TheDesk is a Mastodon client for PC.",
  "repository": "https://github.com/cutls/TheDesk",
  "main": "main.js",
@@ -51,9 +51,12 @@
  "dependencies": {
    "electron-dl": "^1.14.0",
    "jimp": "^0.6.4",
+    "jquery": "^3.4.1",
    "json5": "^2.1.0",
+    "materialize-css": "^1.0.0",
    "node-notifier": "^5.4.0",
    "sumchecker": "^3.0.0",
+    "sweetalert2": "^8.13.0",
    "vue": "^2.6.10"
  },
  "optionalDependencies": {
@@ -62,8 +65,8 @@
    "font-manager": "^0.3.0"
  },
  "devDependencies": {
-    "electron": "^5.0.1",
-    "electron-builder": "^20.43.0",
+    "electron": "^5.0.4",
+    "electron-builder": "^20.44.4",
    "readline-sync": "1.4.9"
  },
  "build": {
--- a/app/view/en/acct.html
+++ b/app/view/en/acct.html
@@ -4,7 +4,7 @@
 <head>
      <title>Account Manager - TheDesk</title>
      <meta content="width=device-width,initial-scale=1.0" name="viewport">
-      <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+      <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
      <link href="../../css/themes.css" type="text/css" rel="stylesheet">
      <link href="../../css/master.css" type="text/css" rel="stylesheet">
      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
@@ -74,10 +74,11 @@
 </head>

 <body id="mainView">
-      <script type="text/javascript" src="../../js/common/jquery.js"></script>
+      <script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
      <script type="text/javascript" src="../../js/lang/lang.en.js"></script>
+      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
      <script>
            var misskeytoken = false;
      </script>
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -4,7 +4,7 @@
 <head>
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css"
 		integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
@@ -25,9 +25,9 @@
 </head>

 <body>
-	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
 	<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
 	<script type="text/javascript" src="../../js/common/time.js"></script>
 	<script type="text/javascript" src="../../js/common/blurhash.js"></script>
@@ -35,8 +35,9 @@
 	<script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script>
-		var ver = "Usamin (18.6.1)";
+		var ver = "Usamin (18.6.4)";
 		//betaを入れるとバージョンチェックしない
 		//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 		//var ver="beta";
@@ -161,8 +162,8 @@
 					<div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 						<i class="waves-effect gray material-icons" id="nsfw" title="Mark media as sensitive"
 							onclick="nsfw()">visibility_off</i>
-						<i class="waves-effect gray material-icons purple-text dropdown-trigger"
-							data-target="dropdown1" id="vis-icon">public</i>
+						<i class="waves-effect gray material-icons purple-text dropdown-trigger" data-target="dropdown1"
+							id="vis-icon">public</i>
 						<a class="waves-effect gray" id="cw" onclick="cw()" title="Hide text behind warning">CW</a>
 						<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray"
 									onclick="fileselect()" title="Attach..">photo_library</i></span></span>
@@ -326,7 +327,7 @@
 	<!-- Modal Structure Tootdata-->
 	<div id="tootmodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
-			<ul class="collapsible"id="det-col">
+			<ul class="collapsible" id="det-col">
 				<li class="dm-hide">
 					<div class="collapsible-header">
 						<i class="material-icons">people_outline</i>Local TL after this toot)
@@ -622,7 +623,7 @@
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
 				onclick="follow()">Follow</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
-				onclick="mute()">Mute</a>
+				onclick="muteDo()">Mute</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
 				onclick="block()">Block</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">Close</a>
@@ -676,11 +677,21 @@
 			<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-6-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-6-4" 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>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
+				<h5>Release Note Usamin (18.6.4)</h5>
+				・Integrated TLの不具合修正<br>
+				・検索したときのタグ表示アカウントに関する不具合修正<br>
+				<h5>Release Note Usamin (18.6.3)</h5>
+				・タイムラインが表示できないバグを修正<br>
+				<h5>Release Note Usamin (18.6.2)</h5>
+				・Mastodon/Misskeyの音声ファイル添付に対応<br>
+				・TLを下に読めない不具合の修正<br>
+				・アップデータに関するバグの修正<br>
+				・削除して再投稿をするとき、文字入力ができなくなる不具合の修正<br>
 				<h5>Release Note Usamin (18.6.1)</h5>
 				・リプライができない不具合を修正<br>
 				・ワードフィルター/強調の適用がおかしい不具合<br>
@@ -689,7 +700,6 @@
 				・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
 				・投票済みのアンケートについて修正。<br>
 				・<b>セキュリティの大幅な強化。</b><br>
-				・ご注意<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">: TweetDeck統合は設定で有効にしないと使えなくなりました。<br>
 				・Adobeフォトエディタの廃止
 				<br>
 				<h5>ThinkingDeskラベル</h5>
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 	-->
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
@@ -30,13 +30,14 @@
 </head>

 <body id="mainView" style="overflow-y:scroll">
-	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/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>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>

 	<h4>Preferences</h4>
 	<ul class="collapsible" data-collapsible="accordion">
@@ -335,7 +336,8 @@
 					<span>AIMP</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
+						value="ITUNES" />
 					<span>iTunes</span>
 				</label>
 				<label>
@@ -344,7 +346,8 @@
 					<span>MediaMonkey</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
+						value="WINAMP" />
 					<span>Winamp</span>
 				</label>
 				<label>
@@ -381,11 +384,13 @@
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
 				<h5>Attach an Artwork of Spotify</h5>
 				<label>
-					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes"
+						value="yes" />
 					<span>Yes</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no"
+						value="no" />
 					<span>No</span>
 				</label>

--- a/app/view/en/update.html
+++ b/app/view/en/update.html
@@ -3,7 +3,7 @@

 <head>
    <title>Update - TheDesk</title>
-    <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+    <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
    <link href="../../css/master.css" type="text/css" rel="stylesheet">
    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
    <meta charset="utf-8">
@@ -76,9 +76,9 @@
            font-size: 200%;
        }
    </style>
-    <script type="text/javascript" src="../../js/common/jquery.js"></script>
+    <script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
    <i class="material-icons pointer waves-effect" onclick="about();">info</i>
    <i class="material-icons pointer waves-effect" onclick="skipper();">clear</i>
    <!--a href="update.html">Reload</a-->
--- a/app/view/ja/acct.html
+++ b/app/view/ja/acct.html
@@ -4,7 +4,7 @@
 <head>
      <title>Account Manager - TheDesk</title>
      <meta content="width=device-width,initial-scale=1.0" name="viewport">
-      <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+      <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
      <link href="../../css/themes.css" type="text/css" rel="stylesheet">
      <link href="../../css/master.css" type="text/css" rel="stylesheet">
      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
@@ -74,10 +74,11 @@
 </head>

 <body id="mainView">
-      <script type="text/javascript" src="../../js/common/jquery.js"></script>
+      <script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
      <script type="text/javascript" src="../../js/lang/lang.ja.js"></script>
+      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
      <script>
            var misskeytoken = false;
      </script>
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -4,7 +4,7 @@
 <head>
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css"
 		integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
@@ -25,9 +25,9 @@
 </head>

 <body>
-	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
 	<script type="text/javascript" src="../../js/lang/lang.ja.js"></script>
 	<script type="text/javascript" src="../../js/common/time.js"></script>
 	<script type="text/javascript" src="../../js/common/blurhash.js"></script>
@@ -35,8 +35,9 @@
 	<script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script>
-		var ver = "Usamin (18.6.1)";
+		var ver = "Usamin (18.6.4)";
 		//betaを入れるとバージョンチェックしない
 		//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 		//var ver="beta";
@@ -161,8 +162,8 @@
 					<div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 						<i class="waves-effect gray material-icons" id="nsfw" title="画像に制限を付与"
 							onclick="nsfw()">visibility_off</i>
-						<i class="waves-effect gray material-icons purple-text dropdown-trigger"
-							data-target="dropdown1" id="vis-icon">public</i>
+						<i class="waves-effect gray material-icons purple-text dropdown-trigger" data-target="dropdown1"
+							id="vis-icon">public</i>
 						<a class="waves-effect gray" id="cw" onclick="cw()" title="コンテンツワーニング(トゥートを表示する前にメッセージで隠す)">CW</a>
 						<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray"
 									onclick="fileselect()" title="ファイルを選択">photo_library</i></span></span>
@@ -326,7 +327,7 @@
 	<!-- Modal Structure Tootdata-->
 	<div id="tootmodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
-			<ul class="collapsible"id="det-col">
+			<ul class="collapsible" id="det-col">
 				<li class="dm-hide">
 					<div class="collapsible-header">
 						<i class="material-icons">people_outline</i>これより後のLocal TL(言及確認)
@@ -622,7 +623,7 @@
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
 				onclick="follow()">フォロー</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
-				onclick="mute()">ミュート</a>
+				onclick="muteDo()">ミュート</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
 				onclick="block()">ブロック</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">Close</a>
@@ -676,11 +677,21 @@
 			<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-6-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-6-4" 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>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
+				<h5>Release Note Usamin (18.6.4)</h5>
+				・Integrated TLの不具合修正<br>
+				・検索したときのタグ表示アカウントに関する不具合修正<br>
+				<h5>Release Note Usamin (18.6.3)</h5>
+				・タイムラインが表示できないバグを修正<br>
+				<h5>Release Note Usamin (18.6.2)</h5>
+				・Mastodon/Misskeyの音声ファイル添付に対応<br>
+				・TLを下に読めない不具合の修正<br>
+				・アップデータに関するバグの修正<br>
+				・削除して再投稿をするとき、文字入力ができなくなる不具合の修正<br>
 				<h5>Release Note Usamin (18.6.1)</h5>
 				・リプライができない不具合を修正<br>
 				・ワードフィルター/強調の適用がおかしい不具合<br>
@@ -689,7 +700,6 @@
 				・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
 				・投票済みのアンケートについて修正。<br>
 				・<b>セキュリティの大幅な強化。</b><br>
-				・ご注意<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">: TweetDeck統合は設定で有効にしないと使えなくなりました。<br>
 				・Adobeフォトエディタの廃止
 				<br>
 				<h5>ThinkingDeskラベル</h5>
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 	-->
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
@@ -30,13 +30,14 @@
 </head>

 <body id="mainView" style="overflow-y:scroll">
-	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/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>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>

 	<h4>設定</h4>
 	<ul class="collapsible" data-collapsible="accordion">
@@ -335,7 +336,8 @@
 					<span>AIMP</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
+						value="ITUNES" />
 					<span>iTunes</span>
 				</label>
 				<label>
@@ -344,7 +346,8 @@
 					<span>MediaMonkey</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
+						value="WINAMP" />
 					<span>Winamp</span>
 				</label>
 				<label>
@@ -381,11 +384,13 @@
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
 				<h5>アルバムアートワークを添付する(Spotify/Windows)</h5>
 				<label>
-					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes"
+						value="yes" />
 					<span>はい</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no"
+						value="no" />
 					<span>いいえ</span>
 				</label>

--- a/app/view/ja/update.html
+++ b/app/view/ja/update.html
@@ -3,7 +3,7 @@

 <head>
    <title>Update - TheDesk</title>
-    <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+    <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
    <link href="../../css/master.css" type="text/css" rel="stylesheet">
    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
    <meta charset="utf-8">
@@ -76,9 +76,9 @@
            font-size: 200%;
        }
    </style>
-    <script type="text/javascript" src="../../js/common/jquery.js"></script>
+    <script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
    <i class="material-icons pointer waves-effect" onclick="about();">info</i>
    <i class="material-icons pointer waves-effect" onclick="skipper();">clear</i>
    <!--a href="update.html">Reload</a-->
--- a/app/view/make/acct.sample.html
+++ b/app/view/make/acct.sample.html
@@ -4,7 +4,7 @@
 <head>
      <title>Account Manager - TheDesk</title>
      <meta content="width=device-width,initial-scale=1.0" name="viewport">
-      <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+      <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
      <link href="../../css/themes.css" type="text/css" rel="stylesheet">
      <link href="../../css/master.css" type="text/css" rel="stylesheet">
      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
@@ -74,10 +74,11 @@
 </head>

 <body id="mainView">
-      <script type="text/javascript" src="../../js/common/jquery.js"></script>
+      <script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
      <script type="text/javascript" src="../../js/lang/lang.@@lang@@.js"></script>
+      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
      <script>
            var misskeytoken = false;
      </script>
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -4,7 +4,7 @@
 <head>
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css"
 		integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
@@ -25,9 +25,9 @@
 </head>

 <body>
-	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
 	<script type="text/javascript" src="../../js/lang/lang.@@lang@@.js"></script>
 	<script type="text/javascript" src="../../js/common/time.js"></script>
 	<script type="text/javascript" src="../../js/common/blurhash.js"></script>
@@ -35,6 +35,7 @@
 	<script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script>
 		var ver = "@@versionLetter@@";
 		//betaを入れるとバージョンチェックしない
@@ -161,8 +162,8 @@
 					<div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 						<i class="waves-effect gray material-icons" id="nsfw" title="@@nsfwDes@@"
 							onclick="nsfw()">visibility_off</i>
-						<i class="waves-effect gray material-icons purple-text dropdown-trigger"
-							data-target="dropdown1" id="vis-icon">public</i>
+						<i class="waves-effect gray material-icons purple-text dropdown-trigger" data-target="dropdown1"
+							id="vis-icon">public</i>
 						<a class="waves-effect gray" id="cw" onclick="cw()" title="@@cwDes@@">CW</a>
 						<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray"
 									onclick="fileselect()" title="@@selfile@@">photo_library</i></span></span>
@@ -326,7 +327,7 @@
 	<!-- Modal Structure Tootdata-->
 	<div id="tootmodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
-			<ul class="collapsible"id="det-col">
+			<ul class="collapsible" id="det-col">
 				<li class="dm-hide">
 					<div class="collapsible-header">
 						<i class="material-icons">people_outline</i>@@afterLTL@@
@@ -622,7 +623,7 @@
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
 				onclick="follow()">@@follow@@</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
-				onclick="mute()">@@mute@@</a>
+				onclick="muteDo()">@@mute@@</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
 				onclick="block()">@@block@@</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">@@close@@</a>
@@ -676,11 +677,21 @@
 			<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-6-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-6-4" 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>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
+				<h5>Release Note Usamin (18.6.4)</h5>
+				・Integrated TLの不具合修正<br>
+				・検索したときのタグ表示アカウントに関する不具合修正<br>
+				<h5>Release Note Usamin (18.6.3)</h5>
+				・タイムラインが表示できないバグを修正<br>
+				<h5>Release Note Usamin (18.6.2)</h5>
+				・Mastodon/Misskeyの音声ファイル添付に対応<br>
+				・TLを下に読めない不具合の修正<br>
+				・アップデータに関するバグの修正<br>
+				・削除して再投稿をするとき、文字入力ができなくなる不具合の修正<br>
 				<h5>Release Note Usamin (18.6.1)</h5>
 				・リプライができない不具合を修正<br>
 				・ワードフィルター/強調の適用がおかしい不具合<br>
@@ -689,7 +700,6 @@
 				・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
 				・投票済みのアンケートについて修正。<br>
 				・<b>セキュリティの大幅な強化。</b><br>
-				・ご注意<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">: TweetDeck統合は設定で有効にしないと使えなくなりました。<br>
 				・Adobeフォトエディタの廃止
 				<br>
 				<h5>ThinkingDeskラベル</h5>
--- a/app/view/make/make.js
+++ b/app/view/make/make.js
@@ -2,7 +2,7 @@ const fs = require("fs")
 const readlineSync = require('readline-sync');
 let ver = readlineSync.question('version string (empty: default string)? ');
 if (!ver) {
-    ver = "Usamin (18.6.1)"
+    ver = "Usamin (18.6.4)"
 }
 console.log("Constructing view files " + ver + ": make sure to update package.json")
 const langs = ["ja", "en", "ps"]
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 	@@comment-end@@
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
@@ -30,13 +30,14 @@
 </head>

 <body id="mainView" style="overflow-y:scroll">
-	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/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>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>

 	<h4>@@setting@@</h4>
 	<ul class="collapsible" data-collapsible="accordion">
@@ -335,7 +336,8 @@
 					<span>AIMP</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
+						value="ITUNES" />
 					<span>iTunes</span>
 				</label>
 				<label>
@@ -344,7 +346,8 @@
 					<span>MediaMonkey</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
+						value="WINAMP" />
 					<span>Winamp</span>
 				</label>
 				<label>
@@ -381,11 +384,13 @@
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
 				<h5>@@postartwork@@</h5>
 				<label>
-					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes"
+						value="yes" />
 					<span>@@yes@@</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no"
+						value="no" />
 					<span>@@no@@</span>
 				</label>

--- a/app/view/make/update.sample.html
+++ b/app/view/make/update.sample.html
@@ -3,7 +3,7 @@

 <head>
    <title>Update - TheDesk</title>
-    <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+    <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
    <link href="../../css/master.css" type="text/css" rel="stylesheet">
    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
    <meta charset="utf-8">
@@ -76,9 +76,9 @@
            font-size: 200%;
        }
    </style>
-    <script type="text/javascript" src="../../js/common/jquery.js"></script>
+    <script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
    <i class="material-icons pointer waves-effect" onclick="about();">info</i>
    <i class="material-icons pointer waves-effect" onclick="skipper();">clear</i>
    <!--a href="update.html">Reload</a-->
--- a/app/view/ps/acct.html
+++ b/app/view/ps/acct.html
@@ -4,7 +4,7 @@
 <head>
      <title>Account Manager - TheDesk</title>
      <meta content="width=device-width,initial-scale=1.0" name="viewport">
-      <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+      <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
      <link href="../../css/themes.css" type="text/css" rel="stylesheet">
      <link href="../../css/master.css" type="text/css" rel="stylesheet">
      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
@@ -74,10 +74,11 @@
 </head>

 <body id="mainView">
-      <script type="text/javascript" src="../../js/common/jquery.js"></script>
+      <script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
      <script type="text/javascript" src="../../js/lang/lang.ps.js"></script>
+      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
      <script>
            var misskeytoken = false;
      </script>
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -4,7 +4,7 @@
 <head>
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css"
 		integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
@@ -25,9 +25,9 @@
 </head>

 <body>
-	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
 	<script type="text/javascript" src="../../js/lang/lang.ps.js"></script>
 	<script type="text/javascript" src="../../js/common/time.js"></script>
 	<script type="text/javascript" src="../../js/common/blurhash.js"></script>
@@ -35,8 +35,9 @@
 	<script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script>
-		var ver = "Usamin (18.6.1)";
+		var ver = "Usamin (18.6.4)";
 		//betaを入れるとバージョンチェックしない
 		//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 		//var ver="beta";
@@ -161,8 +162,8 @@
 					<div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 						<i class="waves-effect gray material-icons" id="nsfw" title="crwdns389:0crwdne389:0"
 							onclick="nsfw()">visibility_off</i>
-						<i class="waves-effect gray material-icons purple-text dropdown-trigger"
-							data-target="dropdown1" id="vis-icon">public</i>
+						<i class="waves-effect gray material-icons purple-text dropdown-trigger" data-target="dropdown1"
+							id="vis-icon">public</i>
 						<a class="waves-effect gray" id="cw" onclick="cw()" title="crwdns390:0crwdne390:0">CW</a>
 						<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray"
 									onclick="fileselect()" title="crwdns391:0crwdne391:0">photo_library</i></span></span>
@@ -326,7 +327,7 @@
 	<!-- Modal Structure Tootdata-->
 	<div id="tootmodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
-			<ul class="collapsible"id="det-col">
+			<ul class="collapsible" id="det-col">
 				<li class="dm-hide">
 					<div class="collapsible-header">
 						<i class="material-icons">people_outline</i>@@afterLTL@@
@@ -622,7 +623,7 @@
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
 				onclick="follow()">crwdns440:0crwdne440:0</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
-				onclick="mute()">crwdns449:0crwdne449:0</a>
+				onclick="muteDo()">crwdns449:0crwdne449:0</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
 				onclick="block()">crwdns448:0crwdne448:0</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">crwdns385:0crwdne385:0</a>
@@ -676,11 +677,21 @@
 			<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-6-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-6-4" 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>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
+				<h5>Release Note Usamin (18.6.4)</h5>
+				・Integrated TLの不具合修正<br>
+				・検索したときのタグ表示アカウントに関する不具合修正<br>
+				<h5>Release Note Usamin (18.6.3)</h5>
+				・タイムラインが表示できないバグを修正<br>
+				<h5>Release Note Usamin (18.6.2)</h5>
+				・Mastodon/Misskeyの音声ファイル添付に対応<br>
+				・TLを下に読めない不具合の修正<br>
+				・アップデータに関するバグの修正<br>
+				・削除して再投稿をするとき、文字入力ができなくなる不具合の修正<br>
 				<h5>Release Note Usamin (18.6.1)</h5>
 				・リプライができない不具合を修正<br>
 				・ワードフィルター/強調の適用がおかしい不具合<br>
@@ -689,7 +700,6 @@
 				・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
 				・投票済みのアンケートについて修正。<br>
 				・<b>セキュリティの大幅な強化。</b><br>
-				・ご注意<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">: TweetDeck統合は設定で有効にしないと使えなくなりました。<br>
 				・Adobeフォトエディタの廃止
 				<br>
 				<h5>ThinkingDeskラベル</h5>
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 	
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
@@ -30,13 +30,14 @@
 </head>

 <body id="mainView" style="overflow-y:scroll">
-	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/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>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>

 	<h4>crwdns524:0crwdne524:0</h4>
 	<ul class="collapsible" data-collapsible="accordion">
@@ -335,7 +336,8 @@
 					<span>AIMP</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
+						value="ITUNES" />
 					<span>iTunes</span>
 				</label>
 				<label>
@@ -344,7 +346,8 @@
 					<span>MediaMonkey</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
+						value="WINAMP" />
 					<span>Winamp</span>
 				</label>
 				<label>
@@ -381,11 +384,13 @@
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
 				<h5>crwdns635:0crwdne635:0</h5>
 				<label>
-					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes"
+						value="yes" />
 					<span>crwdns526:0crwdne526:0</span>
 				</label>
 				<label>
-					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no"
+						value="no" />
 					<span>crwdns527:0crwdne527:0</span>
 				</label>

--- a/app/view/ps/update.html
+++ b/app/view/ps/update.html
@@ -3,7 +3,7 @@

 <head>
    <title>Update - TheDesk</title>
-    <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+    <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
    <link href="../../css/master.css" type="text/css" rel="stylesheet">
    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
    <meta charset="utf-8">
@@ -76,9 +76,9 @@
            font-size: 200%;
        }
    </style>
-    <script type="text/javascript" src="../../js/common/jquery.js"></script>
+    <script type="text/javascript" src="../../node_modules/jquery/dist/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="../../node_modules/materialize-css/dist/js/materialize.js"></script>
    <i class="material-icons pointer waves-effect" onclick="about();">info</i>
    <i class="material-icons pointer waves-effect" onclick="skipper();">clear</i>
    <!--a href="update.html">Reload</a-->
Author	SHA1	Message	Date
Cutls	95460fabbb	TheDesk Usamin (18.6.4)	2019-06-23 18:38:22 +09:00
Cutls	0fb882b3ad	Fix: streaming	2019-06-23 18:24:55 +09:00
Cutls	3d0382d279	TheDesk Usamin (18.6.3)	2019-06-23 10:57:56 +09:00
Cutls	59d5aa4515	Add: audio player(chrome default)	2019-06-23 01:20:17 +09:00
Cutls	2dff9f9b17	TheDesk Usamin (18.6.2)	2019-06-23 01:06:07 +09:00
Cutls	03fded672e	Add gitignore	2019-06-23 00:51:21 +09:00
Cutls	a21c1f5329	Internal	2019-06-23 00:51:11 +09:00
Cutls	37815ced63	Merge pull request #91 from cutls/dependabot/npm_and_yarn/app/electron-builder-20.44.4 Bump electron-builder from 20.43.0 to 20.44.4 in /app	2019-06-22 10:08:07 +09:00
Cutls	b7f9b8d668	Merge pull request #92 from cutls/dependabot/npm_and_yarn/app/sweetalert2-8.13.0 Bump sweetalert2 from 8.12.2 to 8.13.0 in /app	2019-06-22 10:07:57 +09:00
Cutls	f68af78099	Merge pull request #93 from cutls/dependabot/npm_and_yarn/app/materialize-css-1.0.0 Bump materialize-css from 1.0.0-rc.2 to 1.0.0 in /app	2019-06-22 10:07:43 +09:00
dependabot-preview[bot]	027abffa01	Bump materialize-css from 1.0.0-rc.2 to 1.0.0 in /app Bumps [materialize-css](https://github.com/Dogfalo/materialize) from 1.0.0-rc.2 to 1.0.0. - [Release notes](https://github.com/Dogfalo/materialize/releases) - [Changelog](https://github.com/Dogfalo/materialize/blob/v1-dev/CHANGELOG.md) - [Commits](https://github.com/Dogfalo/materialize/compare/1.0.0-rc.2...1.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-21 20:18:44 +00:00
dependabot-preview[bot]	5dfba4dd5e	Bump sweetalert2 from 8.12.2 to 8.13.0 in /app Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.12.2 to 8.13.0. - [Release notes](https://github.com/sweetalert2/sweetalert2/releases) - [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md) - [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.12.2...v8.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-21 20:18:16 +00:00
dependabot-preview[bot]	d0ae7e9cf9	Bump electron-builder from 20.43.0 to 20.44.4 in /app Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 20.43.0 to 20.44.4. - [Release notes](https://github.com/electron-userland/electron-builder/releases) - [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-builder/compare/v20.43.0...v20.44.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-21 20:17:44 +00:00
Cutls	5a57e984de	Introduce: SweetAlert	2019-06-22 01:06:32 +09:00
Cutls	473f4d7c24	Move: jQuery and Materialize	2019-06-22 00:22:45 +09:00
Cutls	35bfea2dbd	Fix: update tool	2019-06-21 23:24:28 +09:00
Cutls	62cb30cb5b	Merge branch 'master' of https://github.com/cutls/TheDesk	2019-06-21 23:18:08 +09:00
Cutls	9d2eb6f18b	Fix: moreLoading	2019-06-21 23:17:56 +09:00
Cutls	d5cd57c26d	Merge pull request #88 from cutls/dependabot/npm_and_yarn/app/electron-5.0.4 Bump electron from 5.0.1 to 5.0.4 in /app	2019-06-17 00:34:27 +09:00
dependabot-preview[bot]	6cdd4cba9e	Bump electron from 5.0.1 to 5.0.4 in /app Bumps [electron](https://github.com/electron/electron) from 5.0.1 to 5.0.4. - [Release notes](https://github.com/electron/electron/releases) - [Commits](https://github.com/electron/electron/compare/v5.0.1...v5.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-15 16:10:18 +00:00