WIP: use-strict 'login'

WIP: use-strict
Merge branch 'master' into use-strict
2019-11-25 00:03:33 +09:00 · 2019-11-24 23:53:35 +09:00 · 2019-11-24 23:35:56 +09:00 · 2019-11-24 22:26:19 +09:00
245 changed files with 5145 additions and 8971 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,3 @@ app/view/es-AR
 app/git
 *.code-workspace
 releasenote.md
-app/yarn-error.log
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
 * [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
 * [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
 * [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
+* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)

 The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)

@@ -46,6 +47,19 @@ The default sounds of notifications is provided [Creative Commons BY](https://cr

 Crowdin project is available! Visit: https://translate.thedesk.top

+## Requirement and development
+
+* Electron 4.2 or above(install yourself)
+* electron-dl(in package.json)
+* Jimp(in package.json)
+* font-manager(in package.json)
+  * Python 2.x(install yourself)
+  * VisualC++(Windows)(install yourself)
+* itunes-nowplaying-mac(for macOS)(in package.json)
+* node-notifier(in package.json)
+* sumchecker(in package.json)
+* Ability to read unformated files!(install yourself)
+
 ### Run on developer mode

 `npm run dev` on `app` folder.
@@ -145,17 +159,6 @@ Linux
 macOS  
 `electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  

-### PWA support
-
-TheDesk is a wed-based app, so you can run it on a browser. Of course, the main stream is as Electron. Some features won't work as well as Electron.
-
-You can run `npm run build:pwa` to build as PWA, including `manifest.json` and the ServiceWorker.
-
-**You have to rename `node_modules` to `dependencies` to run as a web application. (restricted by Netlify)**
-
-Check the app on Chrome or Firefox: [Here](https://app.thedesk.top) (it follows the `master` branch, so not stable.)  
-[![Netlify Status](https://api.netlify.com/api/v1/badges/6916503b-2882-43f7-9681-ab814e6d28f9/deploy-status)](https://app.netlify.com/sites/thedesk/deploys)
-
 ## Pleroma support

 Did you find a bug with Pleroma accounts?  
--- a/README_ja.md
+++ b/README_ja.md
@@ -46,6 +46,19 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
  
 Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.top  

+## 環境
+
+* Electron 4.2以上(自分で入れて)
+* electron-dl(in package.json)
+* Jimp(in package.json)
+* font-manager(in package.json)
+  * Python 2.x(自分で入れて)
+  * VisualC++(Windows)(自分で入れて)
+* itunes-nowplaying-mac(macOS向け)(in package.json)
+* node-notifier(in package.json)
+* sumchecker(in package.json)
+* Ability to read unformated files!(自分で入れて)
+
 ### デベロッパーモード

 `npm run dev`を`app`フォルダ内で実行
@@ -145,17 +158,6 @@ Linux
 macOS  
 `electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  

-### PWAとして実行
-
-TheDeskはウェブ技術を使用して作られているので、ブラウザで動かすこともできます。もちろん、Electron向けに設計されているので一部機能は動きません。
-
-`npm run build:pwa`でビルドできます。PWAに必要な`manifest.json`やサービスワーカーなども要員されています。
-
-**`node_modules`を`dependencies`にリネームしないと動きません。(Netlifyの制限です)**
-
-ChromeまたはFirefoxでチェック: [こちら](https://app.thedesk.top) (`master`ブランチに追従しています。不安定です。)  
-[![Netlify Status](https://api.netlify.com/api/v1/badges/6916503b-2882-43f7-9681-ab814e6d28f9/deploy-status)](https://app.netlify.com/sites/thedesk/deploys)
-
 ## Pleromaのサポート

 Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  
--- a/app/about.html
+++ b/app/about.html
@@ -1,139 +1,135 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="ja">
-	<head>
-		<title>TheDesk</title>
-		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
-		<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" />
-		<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet" />
-		<meta charset="utf-8" />
-		<style>
-			body {
-				font-family: 'Open Sans';
-				-webkit-app-region: drag;
-				cursor: move;
-				padding: 5px;
-				padding-top: 15px;
-			}

-			a,
-			button {
-				-webkit-app-region: no-drag;
-			}
+<head>
+    <title>TheDesk</title>
+    <meta content="width=device-width,initial-scale=1.0" name="viewport">
+    <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">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
+    <meta charset="utf-8">
+    <style>
+        body {
+            font-family: 'Open Sans';
+            -webkit-app-region: drag;
+            cursor: move;
+            padding: 5px;
+            padding-top: 15px;
+        }

-			.container {
-				width: 100%;
-				display: grid;
-				grid-template-columns: 1fr 1fr;
-				grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-				grid-template-areas: 'name1 data1' 'name2 data2' 'name3 data3' 'name4 data4' 'name5 data5' 'name6 data6';
-				text-align: left;
-				margin: 5px;
-			}
+        a,
+        button {
+            -webkit-app-region: no-drag;
+        }

-			.area-name1 {
-				grid-area: name1;
-			}
+        .container {
+            width: 100%;
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
+            grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5''name6 data6';
+            text-align: left;
+            margin: 5px;
+        }

-			.area-data1 {
-				grid-area: data1;
-			}
+        .area-name1 {
+            grid-area: name1;
+        }

-			.area-name2 {
-				grid-area: name2;
-			}
+        .area-data1 {
+            grid-area: data1;
+        }

-			.area-data2 {
-				grid-area: data2;
-			}
+        .area-name2 {
+            grid-area: name2;
+        }

-			.area-name3 {
-				grid-area: name3;
-			}
+        .area-data2 {
+            grid-area: data2;
+        }

-			.area-data3 {
-				grid-area: data3;
-			}
+        .area-name3 {
+            grid-area: name3;
+        }

-			.area-name4 {
-				grid-area: name4;
-			}
+        .area-data3 {
+            grid-area: data3;
+        }

-			.area-data4 {
-				grid-area: data4;
-			}
+        .area-name4 {
+            grid-area: name4;
+        }

-			.area-name5 {
-				grid-area: name5;
-			}
+        .area-data4 {
+            grid-area: data4;
+        }

-			.area-data5 {
-				grid-area: data5;
-			}
+        .area-name5 {
+            grid-area: name5;
+        }

-			.area-name6 {
-				grid-area: name6;
-			}
+        .area-data5 {
+            grid-area: data5;
+        }

-			.area-data6 {
-				grid-area: data6;
-			}
-		</style>
-	</head>
+        .area-name6 {
+            grid-area: name6;
+        }

-	<body class="center" style="overflow: hidden;">
-		<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="./node_modules/materialize-css/dist/js/materialize.js"></script>
-		<img src="./img/desk.svg" style="max-width: 62%;" />
-		<h5>TheDesk</h5>
-		<div class="container">
-			<div class="area-name1">Display version</div>
-			<div class="area-data1" id="now"></div>
-			<div class="area-name2">Internal version</div>
-			<div class="area-data2" id="ver"></div>
-			<div class="area-name3">Commit(7chars)</div>
-			<div class="area-data3" id="hash"></div>
-			<div class="area-name4">Chromium</div>
-			<div class="area-data4" id="chrome"></div>
-			<div class="area-name5">Electron</div>
-			<div class="area-data5" id="electron"></div>
-			<div class="area-name6">Node.js</div>
-			<div class="area-data6" id="node"></div>
-		</div>
-		<div class="cp">
-			Copyright &copy; TheDesk 2018<br />
-			Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br />
-			Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a
-				href="https://pl.kpherox.dev/kPherox"
-				target="_blank"
-				>kPherox</a
-			>
-			and all users
-			<img draggable="false" style="width: 0.8rem; top: 1px; margin-left: 1px; position: relative;" alt="❤️" title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png" />
-			<br /><a href="https://thedesk.top" target="_blank">Web site</a>
-		</div>
-		<button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
-		<script type="text/javascript" src="./js/ui/theme.js"></script>
-		<script>
-			var about = JSON.parse(localStorage.getItem('about'))
-			$('#now').text(localStorage.getItem('ver'))
-			$('#node').text(about[0])
-			$('#chrome').text(about[1])
-			$('#electron').text(about[2])
-			if (location.search) {
-				var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/)
-				var ver = m[1]
-				$('#ver').text(ver)
-			}
-			$('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
-			$(document).on('click', 'a', (e) => {
-				var url = $(e.target).attr('href')
-				postMessage(['openUrl', url], '*')
-				return false
-			})
-		</script>
-	</body>
-</html>
+        .area-data6 {
+            grid-area: data6;
+        }
+    </style>
+</head>
+
+<body class="center " style="overflow:hidden">
+    <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="./node_modules/materialize-css/dist/js/materialize.js"></script>
+    <img src="./img/desk.svg" style="max-width:62%;">
+    <h5>TheDesk</h5>
+    <div class="container">
+        <div class="area-name1">Display version</div>
+        <div class="area-data1" id="now"></div>
+        <div class="area-name2">Internal version</div>
+        <div class="area-data2" id="ver"></div>
+        <div class="area-name3">Commit(7chars)</div>
+        <div class="area-data3" id="hash"></div>
+        <div class="area-name4">Chromium</div>
+        <div class="area-data4" id="chrome"></div>
+        <div class="area-name5">Electron</div>
+        <div class="area-data5" id="electron"></div>
+        <div class="area-name6">Node.js</div>
+        <div class="area-data6" id="node"></div>
+    </div>
+    <div class="cp">Copyright &copy; TheDesk 2018<br>
+        Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
+        Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a
+            href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pl.kpherox.dev/kPherox"
+            target="_blank">kPherox</a> and all users
+        <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️"
+            title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
+        <br><a href="https://thedesk.top" target="_blank">Web site</a></div>
+    <button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i
+            class="material-icons left">close</i>Close</button>
+    <script type="text/javascript" src="./js/ui/theme.js"></script>
+    <script>
+        var about = JSON.parse(localStorage.getItem("about"));
+        $("#now").text(localStorage.getItem("ver"));
+        $("#node").text(about[0]);
+        $("#chrome").text(about[1]);
+        $("#electron").text(about[2]);
+        if (location.search) {
+            var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/);
+            var ver = m[1];
+            $("#ver").text(ver);
+        }
+        $("#hash").html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>');
+        $(document).on('click', 'a', e => {
+            var url = $(e.target).attr('href');
+            postMessage(["openUrl", url], "*")
+            return false;
+        });
+    </script>
--- a/app/build/appx/Square150x150Logo.png
+++ b/app/build/appx/Square150x150Logo.png
--- a/app/build/appx/Square44x44Logo.png
+++ b/app/build/appx/Square44x44Logo.png
--- a/app/build/appx/StoreLogo.png
+++ b/app/build/appx/StoreLogo.png
--- a/app/build/thedesk.ico
+++ b/app/build/thedesk.ico
--- a/app/css/acct.css
+++ b/app/css/acct.css
@@ -1,76 +0,0 @@
-.acct {
-	display: flex;
-	justify-content: space-around;
-}
-
-.card {
-	width: 400px;
-	background-color: #494949;
-	margin: 10px;
-}
-
-body,
-html {
-	overflow-y: scroll;
-}
-
-#acct-list {
-	display: flex;
-	flex-wrap: wrap;
-	color: white;
-	align-items: flex-start;
-}
-
-.lts {
-	font-size: 150%;
-}
-
-.colorsel {
-	display: flex;
-}
-
-.card .colorsel div:not(.exc) {
-	width: 20px;
-	height: 20px;
-}
-
-.card .colorsel div.exc {
-	width: 40px;
-	height: 20px;
-}
-
-.first {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.first .hide-first {
-	display: none;
-}
-
-#compt {
-	margin-top: 20px;
-	margin-bottom: 50px;
-	border: 1px solid;
-	border: 1px solid;
-	padding: 5px;
-}
-
-#compt li {
-	list-style-type: disc;
-	margin-left: 20px;
-}
-
-#domain-list {
-    width: 500px;
-    max-width: 100%;
-}
-
-i.left {
-    margin-right: 5px;
-}
-
-#domain-list .title {
-   font-size: 1.3rem;
-}
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -1,602 +1,515 @@
 /*共通CSS*/
 html,
 body {
-	/*transform: translate3d(0,0,0);*/
-	overflow: hidden;
-	user-select: none;
-	cursor: default;
-	font-size: 13px;
-	height: 100vh;
-	color: var(--color);
-}
-.titlebar,
-.menubar-menu-container,
-.action-menu-item {
-	background-color: var(--notfbox) !important;
-	filter: brightness(110%) !important;
-	color: var(--color) !important;
-}
-.action-menu-item:hover {
-	filter: brightness(80%) !important;
+  /*transform: translate3d(0,0,0);*/
+  overflow: hidden;
+  user-select: none;
+  cursor: default;
+  font-size: 13px;
+  height: 100vh;
+  color: var(--color);
 }
 .btn {
-	margin: 5px;
-	text-transform: none;
+  margin: 5px;
+  text-transform: none;
 }
 .markdown {
-	display: none;
+  display: none;
 }
-.accessMark {
-	font-size: 12px;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	background-color: var(--emphasized);
-	padding-left: 5px;
-	padding-right: 5px;
-}
-.accessibility .scr {
-	display: none !important;
+help {
+  display: none;
 }
 .show-help {
-	display: inline;
+  display: inline;
 }
 option {
-	display: none;
+  display: none;
 }
 #mainView {
-	padding: 10px;
-	overflow: scroll;
-	height: auto;
+  padding: 10px;
+  overflow: scroll;
+  height: auto;
 }
 #message {
-	display: none;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	background-color: black;
-	color: white;
-	z-index: 9999;
+  display: none;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  background-color: black;
+  color: white;
+  z-index: 9999;
 }
 #imagemodal,
 #videomodal {
-	display: none;
-	max-width: 100vw;
-	max-height: 100vh;
-	position: fixed;
-	z-index: 9;
-	top: 0 !important;
+  display: none;
+  max-width: 100vw;
+  max-height: 100vh;
+  position: fixed;
+  z-index: 9;
+  top: 0 !important;
 }
 #videomodal,
 #tootmodal {
-	background-color: var(--modal);
+  background-color: var(--modal);
 }
 #imagemodal .modal-content {
-	overflow: hidden;
-	padding: 0;
+  overflow: hidden;
+  padding: 0;
 }
 #imagemodal .modal-footer {
-	overflow-x: hidden;
-	overflow-y: hidden;
+  overflow-x: scroll;
+  overflow-y: hidden;
 }

 #imagewrap {
-	width: 100%;
-	height: 100%;
+  width: 100%;
+  height: 100%;
 }
 .pointer {
-	cursor: pointer;
+  cursor: pointer;
 }
 .badge {
-	min-width: 0 !important;
-	margin-left: 5px !important;
+  min-width: 0 !important;
+  margin-left: 5px !important;
 }
 .unvisible {
-	opacity: 0;
+  opacity: 0;
 }
 .bbcode-pulse-loadings,
 .bbcode-pulse-loading,
 .fa-pulse {
-	display: inline-block;
-	animation-duration: 3s;
-	animation-fill-mode: both;
-	animation-iteration-count: infinite;
-	animation-name: pulse;
+  display: inline-block;
+  animation-duration: 3s;
+  animation-fill-mode: both;
+  animation-iteration-count: infinite;
+  animation-name: pulse;
 }
@keyframes pulse {
-	from,
-	50%,
-	to {
-		opacity: 1;
-	}
-	25%,
-	75% {
-		opacity: 0;
-	}
+  from,
+  50%,
+  to {
+    opacity: 1;
+  }
+  25%,
+  75% {
+    opacity: 0;
+  }
 }
@keyframes shake {
-	from,
-	to {
-		-webkit-transform: translate3d(0, 0, 0);
-		transform: translate3d(0, 0, 0);
-	}
+  from,
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }

-	10%,
-	30%,
-	50%,
-	70%,
-	90% {
-		-webkit-transform: translate3d(-10px, 0, 0);
-		transform: translate3d(-10px, 0, 0);
-	}
+  10%,
+  30%,
+  50%,
+  70%,
+  90% {
+    -webkit-transform: translate3d(-10px, 0, 0);
+    transform: translate3d(-10px, 0, 0);
+  }

-	20%,
-	40%,
-	60%,
-	80% {
-		-webkit-transform: translate3d(10px, 0, 0);
-		transform: translate3d(10px, 0, 0);
-	}
+  20%,
+  40%,
+  60%,
+  80% {
+    -webkit-transform: translate3d(10px, 0, 0);
+    transform: translate3d(10px, 0, 0);
+  }
 }

 .shake {
-	display: inline-block;
-	animation-duration: 1s;
-	animation-fill-mode: both;
-	animation-iteration-count: infinite;
-	animation-name: shake;
+  display: inline-block;
+  animation-duration: 1s;
+  animation-fill-mode: both;
+  animation-iteration-count: infinite;
+  animation-name: shake;
 }
 code:before,
 .pre:before {
-	content: 'Code';
-	font-size: 1.8rem;
-	line-height: 1em;
-	font-family: monospace, monospace;
-	color: #999;
-	position: absolute;
-	right: 0;
-	top: 0;
+  content: "Code";
+  font-size: 1.8rem;
+  line-height: 1em;
+  font-family: monospace, monospace;
+  color: #999;
+  position: absolute;
+  right: 0;
+  top: 0;
 }
 code,
 pre {
-	color: white;
-	display: block;
-	border-left: 5px solid;
-	border-color: #079903;
-	padding-left: 10px;
-	margin-top: 5px;
-	margin-bottom: 5px;
-	margin-left: 5px;
-	background-color: #000;
-	padding: 1em 1em 1em;
-	position: relative;
-	border-top-left-radius: 10px;
-	border-bottom-right-radius: 10px;
-	border-bottom-left-radius: 10px;
+  color: white;
+  display: block;
+  border-left: 5px solid;
+  border-color: #079903;
+  padding-left: 10px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 5px;
+  background-color: #000;
+  padding: 1em 1em 1em;
+  position: relative;
+  border-top-left-radius: 10px;
+  border-bottom-right-radius: 10px;
+  border-bottom-left-radius: 10px;
 }
 blockquote,
 .quote p {
-	margin: 0;
+  margin: 0;
 }
 blockquote,
 .quote {
-	color: black;
-	background-color: #ddd;
-	padding: 1em 1em 1em;
-	position: relative;
-	border-top-left-radius: 10px;
-	border-bottom-right-radius: 10px;
-	border-bottom-left-radius: 10px;
+  color: black;
+  background-color: #ddd;
+  padding: 1em 1em 1em;
+  position: relative;
+  border-top-left-radius: 10px;
+  border-bottom-right-radius: 10px;
+  border-bottom-left-radius: 10px;
 }
 blockquote:before,
 .quote:before {
-	content: 'Quote';
-	font-size: 1.8rem;
-	line-height: 1em;
-	font-family: Open Sans, cursive;
-	color: #999;
-	position: absolute;
-	right: 0;
-	top: 0;
+  content: "Quote";
+  font-size: 1.8rem;
+  line-height: 1em;
+  font-family: Open Sans, cursive;
+  color: #999;
+  position: absolute;
+  right: 0;
+  top: 0;
 }
 .pixiv-post {
-	color: black;
-	background-color: #fff;
-	padding: 1em 1em 1em;
-	position: relative;
-	border-top-left-radius: 10px;
-	border-bottom-right-radius: 10px;
-	border-bottom-left-radius: 10px;
-	border-left: 5px solid #0096fa;
+  color: black;
+  background-color: #fff;
+  padding: 1em 1em 1em;
+  position: relative;
+  border-top-left-radius: 10px;
+  border-bottom-right-radius: 10px;
+  border-bottom-left-radius: 10px;
+  border-left: 5px solid #0096fa;
 }
 .pixiv-post :before {
-	content: 'From Pixiv';
-	font-size: 1.8rem;
-	line-height: 1em;
-	font-family: Open Sans;
-	color: #999;
-	position: absolute;
-	right: 0;
-	top: 0;
+  content: "From Pixiv";
+  font-size: 1.8rem;
+  line-height: 1em;
+  font-family: Open Sans;
+  color: #999;
+  position: absolute;
+  right: 0;
+  top: 0;
 }
 #start {
-	display: none;
-	position: fixed;
-	width: 100vw;
-	height: calc(100vh - 40px);
-	background-color: var(--bg);
-	color: var(--color);
-	z-index: 99999;
-	justify-content: center;
-	align-items: center;
+  display: none;
+  position: fixed;
+  width: 100vw;
+  height: calc(100vh - 40px);
+  background-color: var(--bg);
+  color: var(--color);
+  z-index: 99999;
+  justify-content: center;
+  align-items: center;
 }
 #drag {
-	display: none;
-	position: fixed;
-	width: 100vw;
-	height: 100vh;
-	background-color: var(--bg);
-	color: var(--color);
-	z-index: 99999;
-	justify-content: center;
-	align-items: center;
+  display: none;
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  background-color: var(--bg);
+  color: var(--color);
+  z-index: 99999;
+  justify-content: center;
+  align-items: center;
 }
 #drag-content {
-	font-size: 2rem;
+  font-size: 2rem;
 }
 #pip {
-	z-index: 504;
-	width: 418px;
-	background-color: var(--subcolor);
-	position: absolute;
+  z-index: 504;
+  width: 418px;
+  background-color: var(--subcolor);
+  position: absolute;
 }
 .pip-bottom {
-	bottom: 10px;
+  bottom: 10px;
 }
 .pip-left {
-	left: 10px;
+  left: 10px;
 }
 .pip-top {
-	top: 10px;
+  top: 10px;
 }
 .pip-right {
-	right: 10px;
+  right: 10px;
 }
 #pip-content .material-icons {
-	display: none;
+  display: none;
 }
 .big-text {
-	font-size: 1.2rem;
+  font-size: 1.2rem;
 }
 #releasenote {
-	background-color: var(--modal);
+  background-color: var(--modal);
 }
 #releasenote li {
-	list-style-type: disc;
+  list-style-type: disc;
 }
@media only screen and (min-width: 993px) {
-	#toast-container {
-		top: auto;
-		right: auto;
-		bottom: 5%;
-		left: 4%;
-		max-width: 86%;
-	}
+  #toast-container {
+    top: auto;
+    right: auto;
+    bottom: 5%;
+    left: 4%;
+    max-width: 86%;
+  }
 }
 .show {
-	animation: show 0.2s linear 0s;
+  animation: show 0.2s linear 0s;
 }
@keyframes show {
-	from {
-		opacity: 0;
-	}
-	to {
-		opacity: 1;
-	}
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 .hide-anime {
-	animation: hide 0.2s linear 0s;
-	display: none;
+  animation: hide 0.2s linear 0s;
+  display: none;
 }
@keyframes hide {
-	from {
-		opacity: 1;
-	}
-	to {
-		opacity: 0;
-	}
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
 }
 .collapsible-header,
 .tabs {
-	background-color: var(--subcolor);
+  background-color: var(--subcolor);
 }
 .collapsible-header:focus {
-	background-color: var(--subcolor) !important;
+  background-color: var(--subcolor) !important;
 }
 .modal-footer {
-	background-color: var(--modalfooter) !important;
+  background-color: var(--modalfooter) !important;
 }
 .font {
-	font-size: 1.5rem;
-	margin-bottom: 5px;
+  font-size: 1.5rem;
+  margin-bottom: 5px;
 }
 .font:hover {
-	background-color: #999;
+  background-color: #999;
 }
 .release-do {
-	border: solid 2px;
-	border-color: var(--color);
-	padding: 5px;
+  border: solid 2px;
+  border-color: var(--color);
+  padding: 5px;
 }
 #pickers {
-	display: flex;
-	flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 #menu {
-	position: fixed;
-	z-index: 9999;
-	background-color: var(--postbox);
-	width: 540px;
-	top: calc(50% - 150px);
-	left: calc(50% - 250px);
-	padding: 5px;
-	border: thin solid gray;
-	border-radius: 5px;
-	overflow: hidden;
+  position: fixed;
+  z-index: 9999;
+  background-color: var(--postbox);
+  width: 540px;
+  top: calc(50% - 150px);
+  left: calc(50% - 250px);
+  padding: 5px;
+  border: thin solid gray;
+  border-radius: 5px;
+  overflow: hidden;
 }
 #menu-wrapper {
-	margin-left: -5px;
-	display: flex;
-	height: calc(100% - 3.5rem);
-	overflow: hidden;
+  margin-left: -5px;
+  display: flex;
+  height: calc(100% - 3.5rem);
+  overflow: hidden;
 }
 #left-menu {
-	width: 230px;
+  width: 230px;
 }
-#left-menu a {
-	padding-left: 5px;
-	width: 100%;
-	height: 50px;
-	display: flex;
-	align-items: center;
-	cursor: pointer;
-	color: var(--color);
+#left-menu div {
+  padding-left: 5px;
+  width: 100%;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
 }
-#left-menu a:hover {
-	background-color: var(--beforehover);
+#left-menu div:hover {
+  background-color: var(--beforehover);
 }
 #left-menu span {
-	margin-left: 5px;
+  margin-left: 5px;
 }
-#left-menu a.active {
-	background-color: var(--emphasized);
+#left-menu div.active {
+  background-color: var(--emphasized);
 }
 #right-menu {
-	width: 100%;
-	overflow-y: scroll;
-	overflow-x: hidden;
-	padding: 5px;
+  width: 100%;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  padding: 5px;
 }
 #tltype {
-	display: flex;
-	flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 #tltype .type {
-	display: flex;
-	flex-wrap: wrap;
-	align-items: center;
-	width: 170px;
-	height: 40px;
-	cursor: pointer;
-	color: var(--color);
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  width: 170px;
+  height: 40px;
+  cursor: pointer;
 }
 #tltype .type span {
-	width: calc(100% - 30px);
+  width: calc(100% - 30px);
 }
 #tltype .type:hover {
-	background-color: var(--beforehover);
+  background-color: var(--beforehover);
 }
 #tltype .active {
-	background-color: var(--emphasized);
+  background-color: var(--emphasized);
 }
 #tltype i {
-	font-size: 30px;
+  font-size: 30px;
 }
 #tltype i.sub-icon {
-	font-size: 20px;
-	position: absolute;
-	color: var(--beforehover);
-	left: 10px;
-	bottom: 5px;
-	background-color: #fff;
+  font-size: 20px;
+  position: absolute;
+  color: var(--beforehover);
+  left: 10px;
+  bottom: 5px;
+  background-color: #fff;
 }
 .drag-bar {
-	cursor: move;
-	text-align: center;
-	width: calc(100% + 10px);
-	border-radius: 5px;
-	background-color: var(--box);
-	filter: brightness(80%);
-	margin-left: -5px;
-	margin-right: -5px;
-	margin-top: -5px;
-	font-size: 16px;
-	padding: 4px;
+  cursor: move;
+  text-align: center;
+  width: calc(100% + 10px);
+  border-radius: 5px;
+  background-color: var(--box);
+  filter: brightness(80%);
+  margin-left: -5px;
+  margin-right: -5px;
+  margin-top: -5px;
+  font-size: 16px;
+  padding: 4px;
 }
 #something-wrong {
-	flex-direction: column;
-	width: 100%;
-	height: 100%;
-	position: absolute;
-	display: flex;
-	justify-content: center;
-	align-items: center;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 #support-btm {
-	position: fixed;
-	bottom: -300px;
-	width: 100vw;
-	background-color: var(--box);
-	z-index: 9999;
-	padding: 10px;
-	display: grid;
-	grid-template-columns: 3fr 1fr 1fr;
-	grid-template-rows: 1fr 36px;
-	grid-template-areas: 'note middle right' 'note close close';
+  position: fixed;
+  bottom: -300px;
+  width: 100vw;
+  background-color: var(--box);
+  z-index: 9999;
+  padding: 10px;
+  display: grid;
+  grid-template-columns: 3fr 1fr 1fr;
+  grid-template-rows: 1fr 36px;
+  grid-template-areas: "note middle right" "note close close";
 }
 #support-btm-en,
 #support-btm-ja {
-	grid-area: note;
+  grid-area: note;
 }
 #support-btm-middle {
-	grid-area: middle;
+  grid-area: middle;
 }
 #support-btm-right {
-	grid-area: right;
+  grid-area: right;
 }
 #support-btm-close {
-	grid-area: close;
+  grid-area: close;
 }
 .select-wrapper .dropdown-content {
-	width: 250px !important;
+  width: 250px !important;
 }
 input,
 textarea {
-	color: var(--color);
-	font-size: 1rem !important;
-	font-family: inherit;
+  color: var(--color);
+  font-size: 1rem !important;
+  font-family: inherit;
 }
 .swal2-popup {
-	background-color: var(--notfbox) !important;
+  background-color: var(--notfbox) !important;
 }
 .swal2-title,
 .swal2-content {
-	color: var(--color) !important;
+  color: var(--color) !important;
 }
 #src-contents svg {
-	margin-right: 5px;
+  margin-right: 5px;
 }
 .contributor {
-	cursor: pointer;
+  cursor: pointer;
 }
 .contributor img {
-	width: 1rem;
-}
-.tagComp {
-	display: grid;
-	grid-template-columns: 60px 80px 1fr;
-	grid-template-rows: 1fr 1fr;
-	grid-template-areas: 'svg toot user' 'svg toot tag' 'svg toots tag';
-	border-top: dotted 0.5px var(--gray);
-	padding: 5px;
-}
-.tagCompSvg {
-	grid-area: svg;
-}
-.tagCompToot {
-	grid-area: toot;
-	text-align: center;
-}
-.tagCompToots {
-	grid-area: toots;
-	text-align: center;
-}
-.tagCompUser {
-	grid-area: user;
-}
-.tagCompTag {
-	grid-area: tag;
-	padding-top: 10px;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	overflow: hidden;
-}
-#sabakanMark {
-	background-color: var(--emphasized);
-}
-#pageSrc {
-	position: absolute;
-	top: 0;
-	left: calc(50vw - 150px);
-	width: 300px;
-	max-width: 100%;
-	background-color: var(--box);
-	z-index: 501;
-	padding: 5px;
-}
-#pageSrcInput {
-	width: 160px;
-}
-.voice {
-	clip: rect(1px, 1px, 1px, 1px);
-	position: absolute !important;
-	height: 1px;
-	width: 1px;
-	overflow: hidden;
-}
-
-@media (max-width: 500px) {
-	#pageSrc {
-		left: 0;
-	}
+  width: 1rem;
 }

 /*スクロールバー*/
 ::-webkit-scrollbar {
-	width: 5px;
-	height: 10px;
-	background: rgba(0, 0, 0, 0.05);
+  width: 5px;
+  height: 10px;
+  background: rgba(0, 0, 0, 0.05);
 }
 ::-webkit-scrollbar-track {
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
 }
 /* Handle */
 ::-webkit-scrollbar-thumb {
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-	background: #607d8b;
-	-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  background: #607d8b;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
 }
 /* Web Fonts */
@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 300;
-	src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.ttf') format('truetype');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+  font-family: "Open Sans";
+  font-style: normal;
+  font-weight: 300;
+  src: local("Open Sans Light"), local("OpenSans-Light"),
+    url(https://fonts.gstatic.com/s/opensans/v17/mem5YaGs126MiZpBA-UN_r8OUuhp.woff2)
+      format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
+    U+FEFF, U+FFFD;
 }
@font-face {
-	font-family: 'Material Icons';
-	font-style: normal;
-	font-weight: 400;
-	src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
+  font-family: "Material Icons";
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2)
+    format("woff2");
 }
 .material-icons {
-	font-family: 'Material Icons';
-	font-weight: normal;
-	font-style: normal;
-	font-size: 24px;
-	line-height: 1;
-	letter-spacing: normal;
-	text-transform: none;
-	display: inline-block;
-	white-space: nowrap;
-	word-wrap: normal;
-	direction: ltr;
-	-webkit-font-feature-settings: 'liga';
-	-webkit-font-smoothing: antialiased;
-}
-.pwaView .pwa,
-.pwaView .mac,
-.pwaView .win {
-	display: none;
-}
-.win32 .mac,
-.linux .mac {
-	display: none;
-}
-.linux .win,
-.darwin .win {
-	display: none;
+  font-family: "Material Icons";
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: "liga";
+  -webkit-font-smoothing: antialiased;
 }
--- a/app/css/post.css
+++ b/app/css/post.css
@@ -124,7 +124,6 @@ textarea {
 }
 #posttgl,#toot-post-btn {
  background-color: var(--accentbtn);
-  color: var(--color);
 }
 /*mini*/
 .mini-post .mize {
--- a/app/css/themes.css
+++ b/app/css/themes.css
@@ -142,51 +142,3 @@
 .bluetheme #imagemodal {
  background: url("../img/pixel.white.svg");
 }
-.polartheme {
-  --bg: #2e3440;
-  --drag: rgba(0, 0, 0, 0.8);
-  --color: white;
-  --beforehover: #8d94a0;
-  --modal: #3b4252;
-  --subcolor: #434c5e;
-  --box: #4c566a;
-  --sidebar: #3b4252;
-  --shared: #2d3b58;
-  --notfbox: #2a3857;
-  --emphasized: #2f4b86;
-  --his-data: rgba(0, 0, 0, 0.8);
-  --active: #2a3857;
-  --postbox: #434c5e;
-  --modalfooter: #485166;
-  --accentbtn: #2f4b86;
-  --selected: #464f61;
-  --selectedWithShare: #3e527e;
-  --gray: #cccccc;
-}
-.polartheme #imagemodal {
-  background: url("../img/pixel.svg");
-}
-.snowtheme {
-  --bg: #eceff4;
-  --drag: rgba(255, 255, 255, 0.8);
-  --color: #36425a;
-  --beforehover: #344058;
-  --modal: #e5e9f0;
-  --subcolor: #d8dee9;
-  --box: #c0c8d6;
-  --sidebar: #eeeeee;
-  --shared: #c3d4e6;
-  --notfbox: #d8dee9;
-  --emphasized: #88c0d0;
-  --his-data: rgba(255, 255, 255, 0.9);
-  --active: #8fbcbb;
-  --postbox: #d8dee9;
-  --modalfooter: #b2bed4;
-  --accentbtn: #81a1c1;
-  --selected: #b4bdd0;
-  --selectedWithShare: #a3afbb;
-  --gray: #5c6c8c;
-}
-.snowtheme #imagemodal {
-  background: url("../img/pixel.white.svg");
-}
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -79,14 +79,6 @@
 	padding-right: 5px;
 	margin-right: 15px;
 	border-radius: 5px;
-	height: 35px;
-}
-.bgReport {
-	height: 34px;
-	padding-top: 0.45rem;
-	text-decoration: underline;
-	padding-left: 5px;
-	padding-right: 5px;
 }
 #spot-box {
 	display: grid;
@@ -224,10 +216,7 @@ iframe,
 	margin: -1px 0;
 }
 .bigemoji {
-	width: 100px !important;
-	height: auto !important;
-	position: relative;
-	z-index: 9999;
+	width: 60px !important;
 }
 .faicon_FTL {
 	display: none;
@@ -374,31 +363,6 @@ iframe,
 	grid-area: side;
 }

-.cusr {
-	user-select: text;
-	padding-left: 5px;
-	border-bottom: 0.5px solid;
-	padding-right: 2px;
-	word-break: break-word;
-	width: 100%;
-	display: grid;
-	grid-template-columns: 43px 2fr 1fr;
-	grid-template-rows: auto 1.6rem 2fr auto;
-	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions';
-}
-
-.area-status {
-	grid-area: status;
-	display: flex;
-	flex-wrap: wrap;
-	margin-bottom: 5px;
-}
-
-.cusr .cbadge {
-	margin-top: 6px;
-	margin-left: 6px;
-}
-
 .quote-inline {
 	display: none;
 }
@@ -559,7 +523,7 @@ p:not(:last-child) {
 	z-index: 500;
 	padding: 5px;
 	display: grid;
-	grid-template-columns: 40px 65px 1fr 24px;
+	grid-template-columns: 40px 1fr 1fr 24px;
 	grid-template-rows: 30px 30px;
 	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }
@@ -679,8 +643,6 @@ p:not(:last-child) {
 	margin-top: 3px;
 	padding: 1px;
 	border-radius: 3px;
-	overflow: hidden;
-	position: relative;
 }
 .fa-2x > .emoji-img {
 	width: 36px !important;
@@ -719,29 +681,6 @@ p:not(:last-child) {
 .votebtn:hover {
 	background-color: var(--color);
 }
-.leadPoll {
-	position: absolute;
-	background-color: var(--box);
-	height: 20px;
-	border-radius: 3px;
-}
-.lpAnime {
-	animation-duration: 1s;
-	animation-name: fadeInLeft;
-}
-.onPoll {
-	position: relative;
-}
-.maxVoter {
-	background-color: var(--emphasized);
-	filter: brightness(120%);
-}
-.ownMark img {
-	width: 1.2rem !important;
-	position: relative;
-	top: -1px;
-	margin-left: 5px !important;
-}
 .jump {
 	display: inline-block;
 	animation: jump 0.75s linear infinite;
@@ -785,7 +724,6 @@ audio {
 	padding-right: 3px;
 	border-radius: 3px;
 	border: 1px solid var(--color);
-	user-select: none;
 }
 .vis-data {
 	font-size: 1rem !important;
@@ -862,31 +800,3 @@ audio {
 .box .ui-resizable-se {
 	display: none !important;
 }
-.announcement {
-	padding: 5px;
-	border-bottom: 1px solid;
-}
-.announReaction {
-	width: 35px;
-	height: 1.7rem;
-	font-size: 1.1rem;
-	margin: 3px;
-	cursor: pointer;
-	border: solid 1px;
-	padding-left: 2px;
-	background-color: var(--notfbox);
-	border-radius: 2px;
-}
-.announReaction img {
-	position: relative;
-	top: 3px;
-}
-.announReaction.reactioned {
-	background-color: var(--emphasized);
-}
-.announReaction.add {
-	width: 19px;
-}
-.reactionsPack {
-	display: flex;
-}
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@@ -1,7 +1,7 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
 #his-data {
  background-repeat: no-repeat;
-  background-image: url("../img/loading.svg");
+  background-image: url("../../loading.svg");
  overflow-y: hidden;
 }
 #his-data .btn .material-icons{
--- a/app/fonts/OpenSans-Light.ttf
+++ b/app/fonts/OpenSans-Light.ttf
--- a/app/img/desk-animation.svg
+++ b/app/img/desk-animation.svg
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="TheDesk">
-        <g id="back">
-            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
-                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:rgba(255,255,255,0);">
-                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
-                </rect>
-            </g>
-            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:rgba(255,255,255,0);">
-                <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
-            </rect>
-            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
-                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:rgba(255,255,255,0);">
-                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
-                </rect>
-            </g>
-        </g>
-        <g transform="matrix(1,0,0,0.998821,0,4.65666)" id="gray">
-            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
-        </g>
-        <g transform="matrix(0.999978,-5.55112e-17,-2.20005e-08,0.996112,-1237.17,972.039)" id="orange">
-            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);" r="3117.62">
-                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,-583.55" to="-60,1915.71,-583.55" dur="0.5s" repeatCount="1" fill="freeze" />
-            </rect>
-        </g>
-        <g transform="matrix(0.999978,5.55112e-17,-5.55112e-17,0.999978,-1236.96,-1164.58)" id="blue">
-            <rect x="1915.5" y="1775.41" width="450" height="3105.58" style="fill:rgb(54,76,159);" r="3117.62">
-                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,4881" to="60,1915.71,4881" dur="0.5s" repeatCount="1" fill="freeze" />
-            </rect>
-        </g>
-        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgba(0,0,0,0);">
-            <animate attributeName="fill" begin="0.6s" dur="0.5s" fill="freeze" values="rgba(0,0,0,0);rgba(0,0,0,1)" repeatCount="1" />
-        </path>
-    </g>
-</svg>
--- a/app/img/desk.png
+++ b/app/img/desk.png
--- a/app/img/desk.svg
+++ b/app/img/desk.svg
@@ -1,26 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="TheDesk">
-        <g>
-            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
-                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:white;"/>
-            </g>
-            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:white;"/>
-            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
-                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:white;"/>
-            </g>
-        </g>
-        <g transform="matrix(1,0,0,0.998821,0,4.65666)">
-            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
-        </g>
-        <g transform="matrix(0.5,-0.866,0.862652,0.498067,224.046,2340.41)">
-            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);"/>
-        </g>
-        <g transform="matrix(0.5,0.866,-0.866,0.5,3757.17,-299.625)">
-            <rect x="1915.5" y="1555.41" width="450" height="3105.58" style="fill:rgb(54,76,159);"/>
-        </g>
-        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgb(4,0,0);"/>
-        <rect x="0" y="0" width="4096" height="4096" style="fill:none;"/>
-    </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
+	.st3{fill:#F0842E;}
+	.st4{fill:#364C9F;}
+	.st5{fill:#FFFFFF;stroke:#040000;stroke-miterlimit:10;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#040000;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
+</style>
+<g id="レイヤー_1" class="st0">
+</g>
+<g id="レイヤー_2">
+	<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+	<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
+	
+		<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
+	
+		<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
+	<path class="st5" d="M714.5,2953.5"/>
+	<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
+		c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
+		c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
+		c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
+		c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
+		c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
+		c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
+	<rect class="st7" width="4096" height="4096"/>
+	<path class="st1" d="M-58,1122"/>
+</g>
 </svg>
--- a/app/img/desk_full.svg
+++ b/app/img/desk_full.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!--
-	TheDesk icon, Cutls P.
-	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
 <style type="text/css">
--- a/app/img/icons/icon-128x128.png
+++ b/app/img/icons/icon-128x128.png
--- a/app/img/icons/icon-144x144.png
+++ b/app/img/icons/icon-144x144.png
--- a/app/img/icons/icon-152x152.png
+++ b/app/img/icons/icon-152x152.png
--- a/app/img/icons/icon-192x192.png
+++ b/app/img/icons/icon-192x192.png
--- a/app/img/icons/icon-384x384.png
+++ b/app/img/icons/icon-384x384.png
--- a/app/img/icons/icon-512x512.png
+++ b/app/img/icons/icon-512x512.png
--- a/app/img/icons/icon-72x72.png
+++ b/app/img/icons/icon-72x72.png
--- a/app/img/icons/icon-96x96.png
+++ b/app/img/icons/icon-96x96.png
--- a/app/img/picture.svg
+++ b/app/img/picture.svg
@@ -1,2 +0,0 @@
-
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
--- a/app/img/thinking.svg
+++ b/app/img/thinking.svg
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-	ThinkingDesk: Cutls P's icon, Cutls P.
-	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-->
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
--- a/app/index.html
+++ b/app/index.html
@@ -1,7 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <meta http-equiv=”refresh” content=”0;URL=’./view/ja'” />
-        <script>location.href = './view/ja';</script>
-    </head>
-</html>
--- a/app/js/common/about.js
+++ b/app/js/common/about.js
@@ -1,3 +1,4 @@
+'use strict'
 //このソフトについて
 function about() {
 	postMessage(["sendSinmpleIpc", "about"], "*")
--- a/app/js/common/blurhash.js
+++ b/app/js/common/blurhash.js
@@ -1,3 +1,4 @@
+'use strict'
 var digitCharacters = [
    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
    "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
--- a/app/js/common/hammer.min.js
+++ b/app/js/common/hammer.min.js
@@ -1,3 +1,4 @@
+'use strict'
 /*! Hammer.JS - v2.0.8 - 2016-04-23
 * http://hammerjs.github.io/
 *
--- a/app/js/common/keyshortcut.js
+++ b/app/js/common/keyshortcut.js
@@ -1,5 +1,6 @@
-selectedColumn = 0
-selectedToot = 0
+'use strict'
+var selectedColumn = 0
+var selectedToot = 0
 $(function($) {
 	//キーボードショートカット
 	$(window).keydown(function(e) {
@@ -84,12 +85,6 @@ $(function($) {
 					show()
 				}
 			}
-			//Ctrl+F:検索
-			if (event.metaKey || event.ctrlKey) {
-				if (e.keyCode === 70) {
-					srcBox()
-				}
-			}
 			//X:開閉
 			if (e.keyCode === 88) {
 				if (!$('#post-box').hasClass('appear')) {
@@ -115,13 +110,6 @@ $(function($) {
 					return false
 				}
 			}
-			//Ctrl+K:メニュー開閉
-			if (event.metaKey || event.ctrlKey) {
-				if (e.keyCode === 75) {
-					menu()
-					return false
-				}
-			}
 			//Ctrl+Space:読み込み
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 32) {
--- a/app/js/common/modal.js
+++ b/app/js/common/modal.js
@@ -1,3 +1,4 @@
+'use strict'
 //モーダル・ドロップダウンの各種設定
 $(document).ready(function () {
  // the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered
--- a/app/js/common/sha256.js
+++ b/app/js/common/sha256.js
@@ -1,3 +1,4 @@
+'use strict'
 var sha256 = function sha256(ascii) {
 	function rightRotate(value, amount) {
 		return (value >>> amount) | (value << (32 - amount));
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -1,9 +1,9 @@
+'use strict'
 //バージョンチェッカー
 function verck(ver, jp) {
-	console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
-	$('body').addClass(localStorage.getItem('platform'))
+	console.log('%c Welcome😊', 'color: red;font-size:200%;')
 	var date = new Date()
-	var showVer = false
+	var show = false
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
 		//ちょっと削除とリンク解析の都合上アレ(s)
 		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
@@ -16,13 +16,13 @@ function verck(ver, jp) {
 			}
 		}
 		//ちょっと削除とリンク解析の都合上アレ(e)
-		showVer = true
+		show = true
 		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 		$(document).ready(function() {
-			if (localStorage.getItem('winstore') && !pwa) {
+			if (localStorage.getItem('winstore')) {
 				$('#releasenote').modal('open')
 			}
-			verp = ver.replace('(', '')
+			var verp = ver.replace('(', '')
 			verp = verp.replace('.', '-')
 			verp = verp.replace('.', '-')
 			verp = verp.replace('[', '-')
@@ -38,18 +38,16 @@ function verck(ver, jp) {
 		})
 	}
 	localStorage.setItem('ver', ver)
-	if (!showVer) {
-		console.log(showVer)
+	if (!show) {
+		console.log(show)
 		if (
-			date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
+			date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
 			!localStorage.getItem('showSupportMe')
 		) {
 			if (date.getMonth() == 11) {
-				var yrs = date.getFullYear() + 1
-				var nextmonth = yrs * 100 + 1
+				var nextmonth = 1
 			} else {
-				var yrs = date.getFullYear() 
-				var nextmonth = yrs * 100 + date.getMonth() + 2
+				var nextmonth = date.getMonth() + 2
 			}
 			if (lang.language != 'ja') {
 				$('#support-btm-ja').addClass('hide')
@@ -69,7 +67,7 @@ function verck(ver, jp) {
 	}
 	var platform = localStorage.getItem('platform')
 	console.log('Your platform:' + platform)
-	if (!localStorage.getItem('winstore') && !pwa) {
+	if (!localStorage.getItem('winstore')) {
 		$('#start').css('display', 'flex')
 	}
 	if (
@@ -143,10 +141,9 @@ function verck(ver, jp) {
 	if (!localStorage.getItem('last-notice-id')) {
 		localStorage.setItem('last-notice-id', 0)
 	}
-	var start = 'https://thedesk.top/notice/index.php?since_id=' + localStorage.getItem('last-notice-id')
+	var start = 'https://thedesk.top/notice?since_id=' + localStorage.getItem('last-notice-id')
 	fetch(start, {
-		method: 'GET',
-		cors: true
+		method: 'GET'
 	})
 		.then(function(response) {
 			if (!response.ok) {
@@ -174,7 +171,7 @@ function verck(ver, jp) {
 					} else {
 						if (obj.type == 'textv2') {
 							if (~obj.languages.indexOf(lang.language)) {
-								var showVer = true
+								var show = true
 								if (obj.toot != '') {
 									var toot =
 										'<button class="btn-flat toast-action" onclick="detEx(\'' +
@@ -185,25 +182,25 @@ function verck(ver, jp) {
 								}
 								if (obj.ver != '') {
 									if (obj.ver == ver) {
-										showVer = true
+										show = true
 									} else {
-										showVer = false
+										show = false
 									}
 								}
 								if (obj.domain != '') {
 									var multi = localStorage.getItem('multi')
 									if (multi) {
-										showVer = false
+										show = false
 										var accts = JSON.parse(multi)
 										Object.keys(accts).forEach(function(key) {
 											var acct = accts[key]
 											if (acct.domain == obj.domain) {
-												showVer = true
+												show = true
 											}
 										})
 									}
 								}
-								if (showVer) {
+								if (show) {
 									M.toast({
 										html:
 											escapeHTML(obj.text) +
@@ -221,7 +218,7 @@ function verck(ver, jp) {
 }
 var infostreaming = false
 function infowebsocket() {
-	infows = new WebSocket('wss://thedesk.top/ws/')
+	var infows = new WebSocket('wss://thedesk.top/ws/')
 	infows.onopen = function(mess) {
 		console.log([tlid, ':Connect Streaming Info:', mess])
 		infostreaming = true
@@ -233,7 +230,7 @@ function infowebsocket() {
 			if (obj.type == 'textv2') {
 				if (~obj.languages.indexOf(lang.language)) {
 					localStorage.setItem('last-notice-id', obj.id)
-					var showVer = true
+					var show = true
 					if (obj.toot != '') {
 						var toot =
 							'<button class="btn-flat toast-action" onclick="detEx(\'' +
@@ -244,25 +241,25 @@ function infowebsocket() {
 					}
 					if (obj.ver != '') {
 						if (obj.ver == ver) {
-							showVer = true
+							show = true
 						} else {
-							showVer = false
+							show = false
 						}
 					}
 					if (obj.domain != '') {
 						var multi = localStorage.getItem('multi')
 						if (multi) {
-							showVer = false
+							show = false
 							var accts = JSON.parse(multi)
 							Object.keys(accts).forEach(function(key) {
 								var acct = accts[key]
 								if (acct.domain == obj.domain) {
-									showVer = true
+									show = true
 								}
 							})
 						}
 					}
-					if (showVer) {
+					if (show) {
 						console.log(obj.text)
 						console.log(escapeHTML(obj.text))
 						M.toast({
@@ -325,77 +322,48 @@ function closeSupport() {
 	)
 }
 function storeDialog(platform, ver) {
-	if($('body').hasClass('accessibility')) return false
 	if (platform == 'win32') {
 		var mes = lang.lang_version_platform
 	} else if (platform == 'linux') {
 		var mes = lang.lang_version_platform_linux
 	} else if (platform == 'darwin') {
 		var mes = lang.lang_version_platform_mac
-	} else {
-		var mes = false
 	}
-	if (mes) {
-		Swal.fire({
-			title: 'Select your platform',
-			text: mes,
-			type: 'info',
-			showCancelButton: true,
-			confirmButtonColor: '#3085d6',
-			cancelButtonColor: '#3085d6',
-			confirmButtonText: lang.lang_no,
-			cancelButtonText: lang.lang_yesno
-		}).then(result => {
-			//逆にしてる
-			if (!result.value) {
-				localStorage.setItem('winstore', 'winstore')
-			} else {
-				localStorage.setItem('winstore', 'localinstall')
-			}
-			localStorage.setItem('ver', ver)
-			showVer = true
-			if(pwa) return false
-			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-			$(document).ready(function() {
-				$('#releasenote').modal('open')
-				verp = ver.replace('(', '')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('[', '-')
-				verp = verp.replace(']', '')
-				verp = verp.replace(')', '')
-				verp = verp.replace(' ', '_')
-				console.log('%c ' + verp, 'color: red;font-size:200%;')
-				if (lang.language == 'ja') {
-					$('#release-' + verp).show()
-				} else {
-					$('#release-en').show()
-				}
-			})
-		})
-	} else {
+	Swal.fire({
+		title: 'Select your platform',
+		text: mes,
+		type: 'info',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#3085d6',
+		confirmButtonText: lang.lang_no,
+		cancelButtonText: lang.lang_yesno
+	}).then(result => {
+		//逆にしてる
+		if (!result.value) {
+			localStorage.setItem('winstore', 'winstore')
+		} else {
+			localStorage.setItem('winstore', 'localinstall')
+		}
 		localStorage.setItem('ver', ver)
-			showVer = true
-			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-			$(document).ready(function() {
-				if(pwa) return false
-				$('#releasenote').modal('open')
-				verp = ver.replace('(', '')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('[', '-')
-				verp = verp.replace(']', '')
-				verp = verp.replace(')', '')
-				verp = verp.replace(' ', '_')
-				console.log('%c ' + verp, 'color: red;font-size:200%;')
-				if (lang.language == 'ja') {
-					$('#release-' + verp).show()
-				} else {
-					$('#release-en').show()
-				}
-			})
-	}
-	
+		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
+		$(document).ready(function() {
+			$('#releasenote').modal('open')
+			var verp = ver.replace('(', '')
+			verp = verp.replace('.', '-')
+			verp = verp.replace('.', '-')
+			verp = verp.replace('[', '-')
+			verp = verp.replace(']', '')
+			verp = verp.replace(')', '')
+			verp = verp.replace(' ', '_')
+			console.log('%c ' + verp, 'color: red;font-size:200%;')
+			if (lang.language == 'ja') {
+				$('#release-' + verp).show()
+			} else {
+				$('#release-en').show()
+			}
+		})
+	})
 }
 function closeStart() {
 	$('#start').css('display', 'none')
--- a/app/js/emoji/default-emoji.js
+++ b/app/js/emoji/default-emoji.js
@@ -1,3 +1,4 @@
+'use strict'
 var defaultemojiList = ['activity', 'flag', 'food', 'nature', 'object', 'people', 'place', 'symbol']
 var defaultemoji = {
 	activity: activity,
@@ -34,26 +35,17 @@ if (lang == 'ja') {
 }

 function defaultEmoji(target) {
-    var announcement = false
-    if ($('#media').val() == 'announcement') {
-        announcement = true
-    }
 	var json = defaultemoji[target]
 	var emojis = ''
 	Object.keys(json).forEach(function(key) {
-        var emoji = json[key]
-        if (announcement) {
-            var def = `<a onclick="emojiReactionDef('${emoji['shortcode']}')" class="pointer">`
-        } else {
-            var def = `<a onclick="defEmoji('${emoji['shortcode']}')" class="pointer">`
-        }
+		var emoji = json[key]
 		emojis =
 			emojis +
-			`${def}
-            <span style="
-                width: 20px; height: 20px; display: inline-block; background-image: url('../../img/sheet.png'); background-size: 4900%;
-                 background-position:${emoji['css']};"></span>
-            </a>`
+			'<a onclick="defEmoji(\'' +
+			emoji['shortcode'] +
+			'\')" class="pointer"><span style="width: 20px; height: 20px; display: inline-block; background-image: url(\'../../img/sheet.png\'); background-size: 4900%; background-position: ' +
+			emoji['css'] +
+			';"></span></a>'
 	})
 	$('#emoji-list').html(emojis)
 	$('#now-emoji').text(lang.lang_defaultemojis_text.replace('{{cat}}', defaultemojiname[target]))
@@ -81,7 +73,7 @@ function defEmoji(target) {
 	var now = $('#textarea').val()
 	var before = now.substr(0, selin)
 	var after = now.substr(selin, now.length)
-	newt = before + emoji + after
+	var newt = before + emoji + after
 	$('#textarea').val(newt)
 	$('#textarea').focus()
 }
--- a/app/js/emoji/emojipack.js
+++ b/app/js/emoji/emojipack.js
@@ -1,3 +1,4 @@
+'use strict'
 var activity=[
    {shortcode:"soccer",css:"4.16667% 10.4167%"},
    {shortcode:"basketball",css:"16.6667% 56.25%"},
--- a/app/js/login/instance.js
+++ b/app/js/login/instance.js
@@ -1,3 +1,4 @@
+'use strict'
 //インスタンスリスト
 var idata = {
 	"kirishima.cloud": "instance",
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@@ -1,3 +1,4 @@
+'use strict'
 /*ログイン処理・認証までのJS*/
 //最初に読むやつ
 //アスタルテ判定初期化
@@ -47,9 +48,6 @@ function ck() {
 			multiSelector(false)
 			verck(ver, jp)
 			$('.stw').show()
-			if (localStorage.getItem('tips')) {
-				tips(localStorage.getItem('tips'))
-			}
 			$('#something-wrong img').attr('src', '../../img/thinking.svg')
 		}
 	}
@@ -382,9 +380,7 @@ function ckdb(acct_id) {
 		localStorage.setItem('imas', 'true')
 		$('.imasonly').show()
 	}
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	var bbcode = domain + '_bbcode'
-	var letters = domain + '_letters'
 	var quoteMarker = domain + '_quote'
 	if (localStorage.getItem('instance')) {
 		var json = JSON.parse(localStorage.getItem('instance'))
@@ -582,18 +578,17 @@ function multiSelector(parseC) {
 //バージョンエンコ
 function enc(ver) {
 	var ver = ver.replace(/\s/g, '')
-	var ver = ver.replace(/\(/g, '-')
-	var ver = ver.replace(/\)/g, '')
-	var ver = ver.replace(/\[/g, '_')
-	var ver = ver.replace(/\]/g, '')
+	ver = ver.replace(/\(/g, '-')
+	ver = ver.replace(/\)/g, '')
+	ver = ver.replace(/\[/g, '_')
+	ver = ver.replace(/\]/g, '')
 	return ver
 }
 //インスタンスティッカー
 function ticker() {
-	var start = 'https://toot.app/toot/index.php'
+	var start = 'https://toot.app/toot/'
 	fetch(start, {
 		method: 'GET',
-		cors: true,
 		headers: {
 			'content-type': 'application/json'
 		}
--- a/app/js/login/logout.js
+++ b/app/js/login/logout.js
@@ -1,3 +1,4 @@
+'use strict'
 //ログアウトします
 function logout() {
 	localStorage.removeItem("acct_" + acct_id + "_at");
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -1,3 +1,4 @@
+'use strict'
 //アカウントマネージャ
 //最初に読むやつ
 function load() {
@@ -33,9 +34,7 @@ function load() {
 	}

 	console.table(obj)
-	var domains = []
 	var templete
-	$('#acct-list').html('')
 	Object.keys(obj).forEach(function(key) {
 		var acct = obj[key]
 		var list = key * 1 + 1
@@ -49,7 +48,6 @@ function load() {
 		} else {
 			var name = acct.user
 		}
-		domains.push(acct.domain)
 		templete = `
 		<div id="acct_${key}" class="card" ${style}>
 			<div class="card-content ">
@@ -57,12 +55,15 @@ function load() {
 				<span class="card-title">${name}</span>${escapeHTML(acct.user)}@${acct.domain}
 			</div>
 			<div class="card-action">
-				<button class="btn-flat waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
-					<i class="material-icons left">refresh</i>${lang.lang_manager_refresh}
-				</button>
-				<button class="btn-flat waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
-					<i class="material-icons left">delete</i>${lang.lang_manager_delete}
-				</button><br />${lang.lang_manager_color}
+				<a class="waves-effect disTar pointer white-text" onclick="data('${acct.domain}')">
+					<i class="material-icons">info</i>${lang.lang_manager_info}
+				</a>
+				<a class="waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
+					<i class="material-icons">refresh</i>${lang.lang_manager_refresh}
+				</a>
+				<a class="waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
+					<i class="material-icons">delete</i>${lang.lang_manager_delete}
+				</a><br />${lang.lang_manager_color}
 				<div id="colorsel_${key}" class="colorsel"></div>
 			</div>
 		</div>
@@ -70,30 +71,6 @@ function load() {
 		$('#acct-list').append(templete)
 		colorpicker(key)
 	})
-	domains = _.uniq(domains)
-	$('#domain-list').html('')
-	Object.keys(domains).forEach(function(key2) {
-		var domain = domains[key2]
-		if (localStorage.getItem('letters_' + key2)) {
-			var maxChars = localStorage.getItem('letters_' + key2)
-		} else {
-			var maxChars = 500
-		}
-		var templete = `
-	<li class="collection-item transparent">
-		<div>
-			<p class="title">${domain}</p>
-			${lang.lang_manager_maxChars}　<input style="width: 100px" value="${maxChars}" id="maxChars${key2}">
-			<button class="btn-flat waves-effect" onclick="maxChars('${domain}', '${key2}')">
-				<i class="material-icons">send</i>
-			</button>
-			<button class="btn-flat waves-effect secondary-content" onclick="data('${domain}', '${key2}')">
-				<i class="material-icons left">info</i>${lang.lang_manager_info}
-			</button>
-		</div></li>
-		`
-		$('#domain-list').append(templete)
-	})
 	multisel()
 	var acctN = localStorage.getItem('acct')
 	if (!acctN) {
@@ -106,35 +83,9 @@ function load() {
 //最初に読む
 load()
 support()
-function maxChars(domain, uid) {
-	var value = $('#maxChars' + uid).val()
-	if(value*1 < 1 || !Number.isInteger(value*1)) {
-		Swal.fire({
-			type: 'error',
-			title: 'Error'
-		})
-		return false
-	}
-	var multi = localStorage.getItem('multi')
-	if (!multi) {
-		var obj = []
-	} else {
-		var obj = JSON.parse(multi)
-	}
-	if (obj[0]) {
-		if (!obj[0].at) {
-			obj = []
-			localStorage.removeItem('multi')
-		}
-	}
-	Object.keys(obj).forEach(function(key) {
-		if(obj[key].domain == domain) localStorage.setItem('letters_' + key, value)
-	})
-	console.log('#maxChars' + uid, value)
-	load()
-}
+
 //instances.social/instances API
-async function data(domain, acct_id) {
+function data(domain) {
 	$('#ins-upd').text('Loading...')
 	$('#ins-add').text('Loading...')
 	$('#ins-connect').text('Loading...')
@@ -146,7 +97,7 @@ async function data(domain, acct_id) {
 	$('#ins-name').text('Loading...')
 	$('#ins-prof').attr('src', '../../img/loading.svg')
 	var start = 'https://instances.social/api/1.0/instances/show?name=' + domain
-	let promise = await fetch(start, {
+	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
@@ -154,42 +105,74 @@ async function data(domain, acct_id) {
 				'Bearer tC8F6xWGWBUwGScyNevYlx62iO6fdQ4oIK0ad68Oo7ZKB8GQdGpjW9TKxBnIh8grAhvd5rw3iyP9JPamoDpeLQdz62EToPJUW99hDx8rfuJfGdjQuimZPTbIOx0woA5M'
 		}
 	})
-	var json = await promise.json()
-	$('#ins-name').text(json.name)
-	$('#ins-upd').text(date(json.checked_at, 'full'))
-	$('#ins-add').text(date(json.added_at, 'full'))
-	$('#ins-connect').text(json.connections)
-	$('#ins-toot').text(json.statuses)
-	$('#ins-sys').text(date(json.updated_at, 'full'))
-	$('#ins-per').text(json.uptime * 100)
-	$('#ins-user').text(json.users)
-	$('#ins-ver').text(json.version)
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			if (!json.error) {
+				$('#ins-name').text(json.name)
+				$('#ins-upd').text(date(json.checked_at, 'full'))
+				$('#ins-add').text(date(json.added_at, 'full'))
+				$('#ins-connect').text(json.connections)
+				$('#ins-toot').text(json.statuses)
+				$('#ins-sys').text(date(json.updated_at, 'full'))
+				$('#ins-per').text(json.uptime * 100)
+				$('#ins-user').text(json.users)
+				$('#ins-ver').text(json.version)
+			} else {
+				console.error(json.error)
+			}
+		})
 	var start = 'https://' + domain + '/api/v1/instance'
-	let promise2 = await fetch(start, {
+	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json'
 		}
 	})
-	var json = await promise2.json()
-	$('#ins-title').text(json.title)
-	$('#ins-desc').html(json.description)
-	$('#ins-email').text(json.email)
-	$('#ins-toot').text(json.stats.status_count)
-	$('#ins-user').text(json.stats.user_count)
-	$('#ins-ver').text(json.version)
-	$('#ins-prof').attr('src', json.thumbnail)
-	$('#ins-admin').text(
-		escapeHTML(json.contact_account.display_name) + '(' + json.contact_account.acct + ')'
-	)
-	$('#ins-admin').attr(
-		'href',
-		'index.html?mode=user&code=' + json.contact_account.username + '@' + domain
-	)
-	if (json['max_toot_chars']) {
-		localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
-		load()
-	}
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			if (!json.error) {
+				$('#ins-title').text(json.title)
+				$('#ins-desc').html(json.description)
+				$('#ins-email').text(json.email)
+				$('#ins-toot').text(json.stats.status_count)
+				$('#ins-user').text(json.stats.user_count)
+				$('#ins-ver').text(json.version)
+				$('#ins-prof').attr('src', json.thumbnail)
+				$('#ins-admin').text(
+					escapeHTML(json.contact_account.display_name) + '(' + json.contact_account.acct + ')'
+				)
+				$('#ins-admin').attr(
+					'href',
+					'index.html?mode=user&code=' + json.contact_account.username + '@' + domain
+				)
+			} else {
+				console.error(json.error)
+			}
+		})
 }

 //アカウントデータ　消す
@@ -334,14 +317,8 @@ function support() {
 	Object.keys(idata).forEach(function(key) {
 		var instance = idata[key]
 		if (instance == 'instance') {
-			templete =
-				'<a onclick="login(\'' +
-				key +
-				'\')" class="collection-item pointer transparent">' +
-				idata[key + '_name'] +
-				'(' +
-				key +
-				')</a>'
+			var templete =
+				`<a onclick="login('${key}')" class="collection-item pointer transparent">${idata[key + '_name']}(${key})</a>`
 			$('#support').append(templete)
 		}
 	})
@@ -349,8 +326,6 @@ function support() {

 //URL指定してポップアップ
 function login(url) {
-	var multi = localStorage.getItem('multi')
-	var obj = JSON.parse(multi)
 	if ($('#misskey:checked').val() == 'on') {
 		$('#misskey').prop('checked', true)
 		misskeyLogin(url)
@@ -506,7 +481,7 @@ function misskeyLogin(url) {
 	if (!url) {
 		var url = $('#misskey-url').val()
 	}
-	var start = 'https://' + url + '/api/app/create'
+	var start = 'http://' + url + '/api/app/create'
 	var httpreq = new XMLHttpRequest()
 	httpreq.open('POST', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')
@@ -956,7 +931,6 @@ function multisel() {
 	} else {
 		var obj = JSON.parse(multi)
 	}
-	var templete
 	var last = localStorage.getItem('main')
 	var sel
 	if (obj.length < 1) {
@@ -965,21 +939,18 @@ function multisel() {
 	} else {
 		Object.keys(obj).forEach(function(key) {
 			var acct = obj[key]
-			var list = key * 1 + 1
 			if (key == last) {
 				sel = 'selected'
-				mainb = '(' + lang.lang_manager_def + ')'
-				var domain = localStorage.getItem('domain_' + key)
+				var mainb = '(' + lang.lang_manager_def + ')'
 				var profimg = localStorage.getItem('prof_' + key)
-				var domain = localStorage.getItem('domain_' + key)
 				if (!profimg) {
 					profimg = '../../img/missing.svg'
 				}
 			} else {
 				sel = ''
-				mainb = ''
+				var mainb = ''
 			}
-			template = `
+			var template = `
 			<option value="${key}" data-icon="${acct.prof}" class="left circle" ${sel}>
 				${acct.user}@${acct.domain}${mainb}
 			</option>
@@ -995,7 +966,7 @@ function mainacct() {
 	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
 }
 function colorpicker(key) {
-	temp = `<div onclick="coloradd('${key}','def','def')" class="pointer exc">${lang.lang_manager_none}</div>
+	var temp = `<div onclick="coloradd('${key}','def','def')" class="pointer exc">${lang.lang_manager_none}</div>
 		<div onclick="coloradd('${key}','f44336','white')" class="red white-text pointer"></div>
 		<div onclick="coloradd('${key}','e91e63','white')" class="pink white-text pointer"></div>
 		<div onclick="coloradd('${key}','9c27b0','white')" class="purple white-text pointer"></div>
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -1,3 +1,4 @@
+'use strict'
 //プラットフォーム別　最後に読むやつ
 //リンクを外部で開くか内部で出すか
 $(document).on('click', 'a', e => {
@@ -10,7 +11,7 @@ $(document).on('click', 'a', e => {
 	if (url) {
 		urls = url.match(/https?:\/\/(.+)/)
 		//トゥートのURLぽかったら
-		toot = url.match(/https:\/\/([^+_]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
+		var toot = url.match(/https:\/\/([^+_]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
 		if (!toot) {
 			//Pleroma対策
 			toot = url.match(/https:\/\/([^+_]+)\/users\/([a-zA-Z0-9_]+)\/statuses\/([0-9]+)/)
@@ -46,17 +47,10 @@ $(document).on('click', 'a', e => {
 					udgEx(url, 'main')
 					return false
 				} else {
-					if(pwa) {
-						return true
-					} else {
-						postMessage(['openUrl', url], '*')
-					}
+					postMessage(['openUrl', url], '*')
 				}
 			}
 		} else {
-			if(pwa) {
-				return true
-			}
 			//hrefがhttp/httpsならブラウザで
 			if (urls) {
 				if (urls[0]) {
@@ -110,7 +104,7 @@ function playSound() {
 	if (soundFile) {
 		soundFile.stop()
 	}
-	context = new AudioContext()
+	var context = new AudioContext()
 	context.createBufferSource().start(0)
 	context.decodeAudioData(request.response, function(buf) {
 		//console.log("Playing:" , source)
@@ -130,30 +124,24 @@ function playSound() {
 	volumeControl.gain.value = vol
 	source.start(0)
 	soundFile = source
-
-	function newFunction() {
-		var source
-		return source
-	}
 }
 function nano() {
 	postMessage(['nano', null], '*')
 }
 onmessage = function(e) {
-	console.log(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], e.data[1][3])
+		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') {
-		var showTxt = `${lang.lang_img_DLDone}${
+		var show = `${lang.lang_img_DLDone}${
 			e.data[1][0]
-		}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
-		M.toast({ html: showTxt, displayLength: 5000 })
+		}<button class="btn-flat toast-action" onclick="openFinder(${e.data[1][1]}')">Show</button>`
+		M.toast({ html: show, displayLength: 5000 })
 	} else if (e.data[0] == 'parseColumn') {
 		parseColumn(e.data[1])
 	} else if (e.data[0] == 'exportSettingsCore') {
@@ -187,10 +175,6 @@ onmessage = function(e) {
 		asRead()
 	} else if (e.data[0] == 'asReadEnd') {
 		asReadEnd()
-	} else if (e.data[0] == 'accessibility') {
-		console.log('atrue')
-		$('body').addClass('accessibility')
-		$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
 	} else if (e.data[0] == 'logData') {
 		$('#logs').val(e.data[1])
 		var obj = document.getElementById('logs')
@@ -202,23 +186,3 @@ onmessage = function(e) {
 		})
 	}
 }
-/* PWA */
-if(pwa) {
-	function postMessage(e) {
-		if (e[0] == 'openUrl') {
-			urls = e[1].match(/https?:\/\/(.+)/)
-			if (urls) {
-				Swal.fire({
-					title: 'Open URL',
-					icon: 'info',
-					html:
-					  `If you are OK, click: <a href="${urls[0]}" target="_blank" class="btn waves-effect">Here</a>`,
-					showCloseButton: false,
-					showCancelButton: true,
-					focusConfirm: false,
-					confirmButtonText: 'Close'
-				  })
-			}
-		}
-	}
-}
--- a/app/js/platform/first-not-view.js
+++ b/app/js/platform/first-not-view.js
@@ -1 +1,2 @@
+'use strict'
 //jQuery読む
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -1,3 +1,5 @@
+'use strict'
+document.title = 'TheDesk'
 $.strip_tags = function(str, allowed) {
 	if (!str) {
 		return ''
@@ -160,8 +162,8 @@ $.mb_substr = function(str, begin, end) {
 	var splitter = new GraphemeSplitter()
 	var arr = splitter.splitGraphemes(str)
 	var newarr = []
-	for (var i = 0; i < arr.length; i++) {
-		if (i >= begin && i <= end) {
+	for(var i = 0; i < arr.length; i++){
+		if(i >= begin && i <= end){
 			newarr.push(arr[i])
 		}
 	}
@@ -204,81 +206,9 @@ function escapeCsv(str) {
 		return str
 	}
 	var result
-	result = str.toString().replace(/\"/g, '""')
+	result = str.replace(/\"/g, '""')
 	if (result.indexOf(',') >= 0) {
 		result = '"' + result + '"'
 	}
 	return result
 }
-function evalAttr(json, attr, lenCk) {
-	if (json[attr]) {
-		if (lenCk) {
-			if (json[attr][0]) {
-				return true
-			} else {
-				return false
-			}
-		} else {
-			return true
-		}
-	} else {
-		return false
-	}
-}
-function statusModel(now) {
-	if (!now) {
-		var now = new Date().toString()
-	}
-	return {
-		id: '',
-		created_at: now,
-		in_reply_to_id: null,
-		in_reply_to_account_id: null,
-		sensitive: false,
-		spoiler_text: '',
-		visibility: 'public',
-		language: 'en',
-		uri: '',
-		url: '',
-		replies_count: 0,
-		reblogs_count: 0,
-		favourites_count: 0,
-		favourited: false,
-		reblogged: false,
-		muted: false,
-		bookmarked: false,
-		pinned: false,
-		content: '<p><i>No status here</i></p>',
-		reblog: null,
-		application: {
-			name: null,
-			website: null
-		},
-		account: {
-			id: '',
-			username: '',
-			acct: '',
-			display_name: '',
-			locked: false,
-			bot: false,
-			created_at: now,
-			note: '',
-			url: '',
-			avatar: '',
-			avatar_static: '',
-			header: '',
-			header_static: '',
-			followers_count: 0,
-			following_count: 0,
-			statuses_count: 0,
-			last_status_at: now,
-			emojis: [],
-			fields: []
-		},
-		media_attachments: [],
-		mentions: [],
-		tags: [],
-		card: null,
-		poll: null
-	}
-}
--- a/app/js/platform/nano.js
+++ b/app/js/platform/nano.js
@@ -1,3 +1,4 @@
+'use strict'
 //TL取得
 var websocket
 function tl(data) {
--- a/app/js/platform/preload.js
+++ b/app/js/platform/preload.js
@@ -1,31 +1,10 @@
+'use strict'
 var electron = require('electron')
 const shell = electron.shell
 var ipc = electron.ipcRenderer
-//title bar
-const customTitlebar = require('custom-electron-titlebar')
-window.addEventListener('DOMContentLoaded', () => {
-	document.title = 'TheDesk'
-	ipc.send('acsCheck', '')
-	ipc.send('frameCheck', '')
-	ipc.on('frame', function(event, args) {
-		const file = location.href.substr(-10)
-		if (
-			file == 'index.html' ||
-			file == '/acct.html' ||
-			file == 'tting.html'
-		) {
-			new customTitlebar.Titlebar({
-				backgroundColor: customTitlebar.Color.fromHex('#000'),
-				titleHorizontalAlignment: 'right',
-				icon: '../../img/desk.png'
-			})
-		}
-		})
-})
-
 onmessage = function(e) {
 	if (e.data[0] == 'openUrl') {
-		urls = e.data[1].match(/https?:\/\/(.+)/)
+		var urls = e.data[1].match(/https?:\/\/(.+)/)
 		if (urls) {
 			shell.openExternal(e.data[1])
 		}
@@ -35,10 +14,6 @@ onmessage = function(e) {
 		ipc.send('dialogStore', e.data[1])
 	} else if (e.data[0] == 'bmpImage') {
 		ipc.send('bmp-image', e.data[1])
-	} else if (e.data[0] == 'resizeImage') {
-		ipc.send('resize-image', e.data[1])
-	} else if (e.data[0] == 'stampImage') {
-		ipc.send('stamp-image', e.data[1])
 	} else if (e.data[0] == 'dialogCW') {
 		ipc.send('dialogCW', e.data[1])
 	} else if (e.data[0] == 'nativeNotf') {
@@ -70,8 +45,6 @@ onmessage = function(e) {
 		ipc.send('theme-json-request', e.data[1])
 	} else if (e.data[0] == 'ha') {
 		ipc.send('ha', e.data[1])
-	} else if (e.data[0] == 'frameSet') {
-		ipc.send('frameSet', e.data[1])
 	} else if (e.data[0] == 'ua') {
 		ipc.send('ua', e.data[1])
 	} else if (e.data[0] == 'aboutData') {
@@ -140,31 +113,7 @@ ipc.on('theme-css-response', function(event, arg) {
 })
 //img.js
 ipc.on('bmp-img-comp', function(event, b64) {
-	if (b64[2]) {
-		var stamped = true
-	} else {
-		var stamped = false
-	}
-	postMessage(['media', [b64[0], 'image/png', b64[1], stamped]], '*')
-})
-ipc.on('resizeJudgement', function(event, b64) {
-	var resize = localStorage.getItem('uploadCrop') * 1
-	if (resize > 0) {
-		var element = new Image()
-		var width
-		element.onload = function() {
-			var width = element.naturalWidth
-			var height = element.naturalHeight
-			if (width > resize || height > resize) {
-				ipc.send('resize-image', [b64, resize])
-			} else {
-				postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
-			}
-		}
-		element.src = b64
-	} else {
-		postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
-	}
+	postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
 })
 //ui,img.js
 ipc.on('general-dl-prog', function(event, arg) {
@@ -232,16 +181,12 @@ ipc.on('prog', function(event, arg) {
 ipc.on('mess', function(event, arg) {
 	postMessage(['updateMess', arg], '*')
 })
-//misc
 ipc.on('asRead', function(event, arg) {
 	postMessage(['asRead', ''], '*')
 })
 ipc.on('asReadEnd', function(event, arg) {
 	postMessage(['asReadEnd', ''], '*')
 })
-ipc.on('accessibility', function(event, arg) {
-	postMessage(['accessibility', 'true'], '*')
-})
 var webviewDom = document.getElementById('webview')
 if (webviewDom) {
 	webviewDom.addEventListener('new-window', function(e) {
--- a/app/js/platform/punycode.js
+++ b/app/js/platform/punycode.js
@@ -1,3 +1,4 @@
+'use strict'
 /*! https://mths.be/punycode v1.4.1 by @mathias */
 ;(function(root) {
 	/** Detect free variables */
--- a/app/js/post/bb-md.js
+++ b/app/js/post/bb-md.js
@@ -1,3 +1,4 @@
+'use strict'
 //BBCodeとMarkdownの入力・パーサー
 //アカウント変えた時にBBとかMDとか
 function mdCheck() {
@@ -50,12 +51,7 @@ function mdCheck() {
 	if (idata[domain + '_letters']) {
 		$('#textarea').attr('data-length', idata[domain + '_letters'])
 	} else {
-		var maxletters = localStorage.getItem('letters_' + acct_id)
-		if (maxletters > 0) {
-			$('#textarea').attr('data-length', maxletters)
-		} else {
-			$('#textarea').attr('data-length', 500)
-		}
+		$('#textarea').attr('data-length', 500)
 	}
 	if (idata[domain + '_glitch'] === 'true') {
 		$('#local-button').removeClass('hide')
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@@ -1,3 +1,4 @@
+'use strict'
 //絵文字ピッカー
 //最初に読み込む
 $('#emoji-before').addClass('disabled')
@@ -193,15 +194,7 @@ function emojiGet(parse, started) {
 function emojiList(target, reaction) {
 	$('#now-emoji').text(lang.lang_emoji_custom)
 	var acct_id = $('#post-acct-sel').val()
-	if(reaction && $('#media').val() == 'misskey') {
-		var misskeyReact = true
-	} else {
-		var misskeyReact = false
-	}
-	if (
-		misskeyReact &&
-		localStorage.getItem('emojiReaction_' + acct_id) != 'true'
-	) {
+	if (reaction && localStorage.getItem('emojiReaction_' + acct_id) != 'true') {
 		console.error('Disabled')
 		clear()
 		hide()
@@ -271,20 +264,9 @@ function emojiList(target, reaction) {
 		var emoji = obj[i]
 		if (emoji) {
 			if (reaction) {
-				if (emoji.divider) {
-					html = html + '<p style="margin-bottom:0">' + emoji.cat + '</p>'
-				} else {
-					if (emoji.listed) {
-						if(misskeyReact) {
-							var shortcode = `:${emoji.shortcode}:`
-						} else {
-							var shortcode = emoji.shortcode
-						}
-						html =
-							html +
-							`<a onclick="emojiReaction('${shortcode}')" class="pointer"><img src="${emoji.url}" width="20" title="${emoji.shortcode}"></a>`
-					}
-				}
+				html =
+					html +
+					`<a onclick="emojiReaction(':${emoji.shortcode}:')" class="pointer"><img src="${emoji.url}" width="20" title="${emoji.shortcode}"></a>`
 			} else {
 				if (emoji.divider) {
 					html = html + '<p style="margin-bottom:0">' + emoji.cat + '</p>'
--- a/app/js/post/img.js
+++ b/app/js/post/img.js
@@ -1,3 +1,4 @@
+'use strict'
 //ドラッグ・アンド・ドロップからアップロードまで。uiのimg.jsとは異なります。
 var obj = $('body')
 var system
@@ -60,24 +61,6 @@ function handleFileUpload(files, obj, no) {
 	var fr = new FileReader()
 	fr.onload = function(evt) {
 		var b64 = evt.target.result
-		var resize = localStorage.getItem('uploadCrop') * 1
-		if (resize > 0) {
-			var element = new Image()
-			var width
-			element.onload = function() {
-				var width = element.naturalWidth
-				var height = element.naturalHeight
-				if (width > resize || height > resize) {
-					postMessage(['resizeImage', [b64, resize]], '*')
-					return false
-				} else {
-					$('#b64-box').val(b64)
-					var ret = media(b64, files['type'], no)
-				}
-			}
-			element.src = b64
-			return false
-		}
 		$('#b64-box').val(b64)
 		var ret = media(b64, files['type'], no)
 	}
@@ -86,14 +69,7 @@ function handleFileUpload(files, obj, no) {
 }

 //ファイルアップロード
-async function media(b64, type, no, stamped) {
-	var acct_id = $('#post-acct-sel').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var user = localStorage.getItem('user_' + acct_id)
-	if ($('#stamp').hasClass('stamp-avail') && !stamped) {
-		postMessage(['stampImage', [b64, user + '@' + domain]], '*')
-		return false
-	}
+function media(b64, type, no) {
 	var l = 4
 	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
 	var cl = c.length
@@ -113,6 +89,8 @@ async function media(b64, type, no, stamped) {
 	var media = toBlob(b64, type)
 	var fd = new FormData()
 	fd.append('file', media)
+	var acct_id = $('#post-acct-sel').val()
+	var domain = localStorage.getItem('domain_' + acct_id)
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	var httpreq = new XMLHttpRequest()
 	if (localStorage.getItem('mode_' + domain) == 'misskey') {
@@ -127,60 +105,22 @@ async function media(b64, type, no, stamped) {
 		}
 		var previewer = 'url'
 		fd.append('i', at)
+		//fd.append('isSensitive', nsfw);
 		httpreq.send(fd)
 	} else {
 		var previewer = 'preview_url'
-		//v2/media
-		try {
-			var id = await v2MediaUpload(domain, at, fd)
-			if(!id) {
-				var start = 'https://' + domain + '/api/v1/media'
-				httpreq.open('POST', start, true)
-				httpreq.upload.addEventListener('progress', progshow, false)
-				httpreq.responseType = 'json'
-				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-				httpreq.send(fd)
-			} else {
-				var mediav = $('#media').val()
-				var regExp = new RegExp('tmp_' + r, 'g')
-				mediav = mediav.replace(regExp, id)
-				$('#media').val(mediav)
-				var html = `<img src="../../img/picture.svg" class="preview-img pointer unknown" data-media="${id}" oncontextmenu="deleteImage('${id}')" onclick="altImage('${acct_id}','${id}')" title="${lang.lang_postimg_delete}">`
-				$('#preview').append(html)
-				todc()
-				if (localStorage.getItem('nsfw_' + acct_id)) {
-					$('#nsfw').addClass('yellow-text')
-					$('#nsfw').html('visibility')
-					$('#nsfw').addClass('nsfw-avail')
-				}
-				$('.toot-btn-group').prop('disabled', false)
-				$('select').formSelect()
-				$('#mec').text(lang.lang_there)
-				M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
-				$('#imgup').text('')
-				$('#imgsel').show()
-				localStorage.removeItem('image')
-			} 
-		} catch {
-			var start = 'https://' + domain + '/api/v1/media'
-			httpreq.open('POST', start, true)
-			httpreq.upload.addEventListener('progress', progshow, false)
-			httpreq.responseType = 'json'
-			httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-			httpreq.send(fd)
-		}
+		var start = 'https://' + domain + '/api/v1/media'
+		httpreq.open('POST', start, true)
+		httpreq.upload.addEventListener('progress', progshow, false)
+		httpreq.responseType = 'json'
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+		httpreq.send(fd)
 	}
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
 				setLog(start, this.status, json)
-				$('.toot-btn-group').prop('disabled', false)
-				$('select').formSelect()
-				$('#mec').text(lang.lang_there)
-				M.toast({ html: this.status + ':' +json, displayLength: 2000 })
-				$('#imgup').text('')
-				$('#imgsel').show()
 			}
 			if (!json.id) {
 				todc()
@@ -192,13 +132,13 @@ async function media(b64, type, no, stamped) {
 				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
 				return false
 			}
-			$('#imgup').text('')
-			$('.toot-btn-group').prop('disabled', false)
-			$('select').formSelect()
-			$('#imgsel').show()
 			var img = localStorage.getItem('img')
 			if (json.type.indexOf('image') != -1) {
-				var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${json['id']}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${json['id']}')" title="${lang.lang_postimg_delete}">`
+				var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${
+					json['id']
+				}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${
+					json['id']
+				}')" title="${lang.lang_postimg_delete}">`
 				$('#preview').append(html)
 			} else {
 				$('#preview').append(lang.lang_postimg_previewdis)
@@ -212,9 +152,22 @@ async function media(b64, type, no, stamped) {
 				mediav = mediav.replace(regExp, json['id'])
 				$('#media').val(mediav)
 			}
-			if (img == 'url' && json['text_url']) {
+			if (img == 'url') {
 				$('#textarea').val($('#textarea').val() + ' ' + json['text_url'])
 			}
+			todc()
+			if (localStorage.getItem('nsfw_' + acct_id)) {
+				$('#nsfw').addClass('yellow-text')
+				$('#nsfw').html('visibility')
+				$('#nsfw').addClass('nsfw-avail')
+			}
+			$('.toot-btn-group').prop('disabled', false)
+			$('select').formSelect()
+			$('#mec').text(lang.lang_there)
+			M.toast({ html: lang.lang_postimg_aftupload, displayLength: 1000 })
+			$('#imgup').text('')
+			$('#imgsel').show()
+			localStorage.removeItem('image')
 		}
 	}
 }
@@ -299,129 +252,52 @@ function altImage(acct_id, id) {
 	var domain = localStorage.getItem('domain_' + acct_id)
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	var start = 'https://' + domain + '/api/v1/media/' + id
-	if($('[data-media=' + id + ']').hasClass('unknown')) {
-		fetch(start, {
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
-			}
-		})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			console.log(json)
-			$('[data-media=' + id + ']').removeClass('unknown')
-			if(json.preview_url) {
-				$('[data-media=' + id + ']').attr('src', json.preview_url)
-			}
-		})
-	} else {
-		Swal.fire({
-			title: lang.lang_postimg_desc,
-			text: lang.lang_postimg_leadContext,
-			input: 'text',
-			inputAttributes: {
-				autocapitalize: 'off'
-			},
-			showCancelButton: true,
-			confirmButtonText: 'Post',
-			showLoaderOnConfirm: true,
-			preConfirm: data => {
-				return fetch(start, {
-					method: 'PUT',
-					headers: {
-						'content-type': 'application/json',
-						Authorization: 'Bearer ' + at
-					},
-					body: JSON.stringify({
-						description: data
-					})
-				})
-					.then(function(response) {
-						if (!response.ok) {
-							response.text().then(function(text) {
-								setLog(response.url, response.status, text)
-							})
-						}
-						return response.json()
-					})
-					.catch(function(error) {
-						todo(error)
-						setLog(start, 'JSON', error)
-						console.error(error)
-					})
-					.then(function(json) {
-						console.log(json)
-						$('[data-media=' + id + ']').attr('title', data)
-					})
-			},
-			allowOutsideClick: () => !Swal.isLoading()
-		}).then(result => {
-			if (result.value) {
-				Swal.fire({
-					title: 'Complete'
-				})
-			}
-		})
-	}
-	
-}
-function stamp() {
-	if ($('#stamp').hasClass('stamp-avail')) {
-		$('#stamp').html('Off')
-		$('#stamp').removeClass('stamp-avail')
-	} else {
-		$('#stamp').html('On')
-		$('#stamp').addClass('stamp-avail')
-	}
-}
-//v2/media対応
-async function v2MediaUpload(domain, at, fd) {
-	var start = 'https://' + domain + '/api/v2/media'
-	let promise = await fetch(start, {
-		method: 'POST',
-		headers: {
-			Authorization:
-				'Bearer ' + at
-		},
-		body: fd
-	})
-	var json = await promise.json()
-	if(json.id) {
-		return json.id
-	} else {
-		return false
-	}
-}
-function alertProcessUnfinished() {
+
 	Swal.fire({
-		title: lang.lang_post_unfinishedMedia,
-		type: 'error',
+		title: lang.lang_postimg_desc,
+		text: lang.lang_postimg_leadContext,
+		input: 'text',
+		inputAttributes: {
+			autocapitalize: 'off'
+		},
 		showCancelButton: true,
-		confirmButtonText: lang.lang_post_retry,
-		cancelButtonText: lang.lang_no
+		confirmButtonText: 'Post',
+		showLoaderOnConfirm: true,
+		preConfirm: data => {
+			return fetch(start, {
+				method: 'PUT',
+				headers: {
+					'content-type': 'application/json',
+					Authorization: 'Bearer ' + at
+				},
+				body: JSON.stringify({
+					description: data
+				})
+			})
+				.then(function(response) {
+					if (!response.ok) {
+						response.text().then(function(text) {
+							setLog(response.url, response.status, text)
+						})
+					}
+					return response.json()
+				})
+				.catch(function(error) {
+					todo(error)
+					setLog(start, 'JSON', error)
+					console.error(error)
+				})
+				.then(function(json) {
+					console.log(json)
+					$('[data-media=' + id + ']').attr('title', data)
+				})
+		},
+		allowOutsideClick: () => !Swal.isLoading()
 	}).then(result => {
 		if (result.value) {
-			post()
+			Swal.fire({
+				title: 'Complete'
+			})
 		}
 	})
 }
-function syncDetail() {
-	Swal.fire({
-		title: lang.lang_post_syncDetail,
-		text: lang.lang_post_syncDetailText,
-		type: 'info'
-	})
-}
--- a/app/js/post/misskeystatus.js
+++ b/app/js/post/misskeystatus.js
@@ -1,3 +1,4 @@
+'use strict'
 //Renpost
 function renote(id, acct_id, remote) {
 	if ($('#pub_' + id).hasClass('rted')) {
@@ -116,7 +117,6 @@ function reactiontoggle(id, acct_id, tlid) {
 //reactioncustom
 function reactioncustom(acct_id, id) {
 	$('#reply').val(id)
-	$('#media').val('misskey')
 	$('#unreact').hide()
 	$('#addreact').removeClass('hide')
 	$('#post-acct-sel').val(acct_id)
@@ -187,14 +187,9 @@ function reactRefreshCore(json) {
 	}
 }
 function emojiReaction(emoji) {
-	var media = $('#media').val()
 	var acct_id = $('#post-acct-sel').val()
 	var id = $('#reply').val()
-	if(media == 'announcement') {
-		announReaction(id, acct_id, 0, false, emoji)
-	} else {
-		reaction(emoji, id, acct_id, null)
-	}
+	reaction(emoji, id, acct_id, null)
 	clear()
 	hide()
 }
--- a/app/js/post/post.js
+++ b/app/js/post/post.js
@@ -1,3 +1,4 @@
+'use strict'
 /*投稿系*/
 //投稿
 function sec() {
@@ -17,13 +18,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 ($('#ideKey').val() != '') {
-		var ideKey = $('#ideKey').val()
-	} else {
-		var user = localStorage.getItem('user_' + acct_id)
-		var ideKey = Math.floor(Date.now() / 1000) + '/TheDesk/' + user + '@' + domain
-		$('#ideKey').val(ideKey)
-	}
 	if (!localStorage.getItem('cw_sentence')) {
 		var cw_sent = 500
 	} else {
@@ -159,39 +153,22 @@ function post(mode, postvis) {
 	httpreq.open('POST', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.setRequestHeader('Idempotency-Key', ideKey)
 	httpreq.responseType = 'json'
 	httpreq.send(JSON.stringify(toot))
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
-				if(media && this.status == 422) {
-					$('#ideKey').val('')
-					$('.toot-btn-group').prop('disabled', false)
-					alertProcessUnfinished()
-				} else {
-					setLog(start, this.status, json)
-					var box = localStorage.getItem('box')
-					if (box == 'yes' || !box) {
-						$('#textarea').blur()
-						hide()
-					}
-					$('.toot-btn-group').prop('disabled', false)
-					todc()
-					clear()
-				}
-			} else {
-				$('#ideKey').val('')
-				var box = localStorage.getItem('box')
-				if (box == 'yes' || !box) {
-					$('#textarea').blur()
-					hide()
-				}
-				$('.toot-btn-group').prop('disabled', false)
-				todc()
-				clear()
+				setLog(start, this.status, json)
 			}
+			var box = localStorage.getItem('box')
+			if (box == 'yes' || !box) {
+				$('#textarea').blur()
+				hide()
+			}
+			$('.toot-btn-group').prop('disabled', false)
+			todc()
+			clear()
 		}
 	}
 }
@@ -279,7 +256,6 @@ function misskeyPost() {
 //クリア(Shift+C)
 function clear() {
 	$('#textarea').val('')
-	$('#ideKey').val('')
 	if (localStorage.getItem('stable')) {
 		$('#textarea').val('#' + localStorage.getItem('stable') + ' ')
 	}
@@ -309,8 +285,6 @@ function clear() {
 	$('#nsfw').removeClass('yellow-text')
 	$('#nsfw').html('visibility_off')
 	$('#nsfw').removeClass('nsfw-avail')
-	$('#stamp').html('Off')
-	$('#stamp').removeClass('stamp-avail')
 	$('#nsc').text(lang.lang_nothing)
 	$('#drag').css('background-color', '#e0e0e0')
 	$('#preview').html('')
--- a/app/js/post/secure.js
+++ b/app/js/post/secure.js
@@ -1,3 +1,4 @@
+'use strict'
 /*保護系*/
 //画像保護
 function nsfw() {
@@ -96,9 +97,9 @@ function cw() {
 	}
 }
 //TLでコンテントワーニングを表示トグル
-function cw_show(e) {
-	$(e).parent().parent().find('.cw_hide').toggleClass('cw')
-	$(e).parent().find('.cw_long').toggleClass('hide')
+function cw_show(id) {
+	$('.cw_hide_' + id).toggleClass('cw')
+	$('.cw-long-' + id).toggleClass('hide')
 }
 $(function() {
 	$('#cw-text').on('change', function(event) {
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@@ -1,7 +1,8 @@
+'use strict'
 //お気に入り登録やブースト等、フォローやブロック等
 //お気に入り登録
 function fav(id, acct_id, remote) {
-	if ($(`.cvo[unique-id=${id}]`).hasClass('faved')) {
+	if ($('#pub_' + id).hasClass('faved')) {
 		var flag = 'unfavourite'
 	} else {
 		var flag = 'favourite'
@@ -57,7 +58,7 @@ function fav(id, acct_id, remote) {

 //ブースト
 function rt(id, acct_id, remote, vis) {
-	if ($(`.cvo[toot-id=${id}]`).hasClass('rted')) {
+	if ($('#pub_' + id).hasClass('rted')) {
 		var flag = 'unreblog'
 	} else {
 		var flag = 'reblog'
@@ -85,7 +86,7 @@ function rt(id, acct_id, remote, vis) {
 				json = json.reblog
 			}
 			console.log(['Success: boost', json])
-			$('[toot-id=' + id + '] .fav_ct').text(json.favourites_count)
+			$('[unique-id=' + id + '] .fav_ct').text(json.favourites_count)
 			if (!json.reblog) {
 				if (flag == 'unreblog') {
 					var rt = json.reblogs_count - 1
@@ -95,16 +96,16 @@ function rt(id, acct_id, remote, vis) {
 				} else {
 					var rt = json.reblogs_count
 				}
-				$('[toot-id=' + id + '] .rt_ct').text(rt)
+				$('[unique-id=' + id + '] .rt_ct').text(rt)
 			} else {
-				$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
+				$('[unique-id=' + id + '] .rt_ct').text(json.reblogs_count)
 			}

-			if ($('[toot-id=' + id + ']').hasClass('rted')) {
-				$('[toot-id=' + id + ']').removeClass('rted')
+			if ($('[unique-id=' + id + ']').hasClass('rted')) {
+				$('[unique-id=' + id + ']').removeClass('rted')
 				$('.rt_' + id).removeClass('light-blue-text')
 			} else {
-				$('[toot-id=' + id + ']').addClass('rted')
+				$('[unique-id=' + id + ']').addClass('rted')
 				$('.rt_' + id).addClass('light-blue-text')
 			}
 		}
@@ -117,7 +118,7 @@ function boostWith(vis) {
 }
 //ブックマーク
 function bkm(id, acct_id, tlid) {
-	if ($(`.cvo[unique-id=${id}]`).hasClass('bkmed')) {
+	if ($('#pub_' + id).hasClass('bkmed')) {
 		var flag = 'unbookmark'
 	} else {
 		var flag = 'bookmark'
@@ -141,19 +142,19 @@ function bkm(id, acct_id, tlid) {
 				json = json.reblog
 			}
 			var fav = json.favourites_count
-			$('[toot-id=' + id + '] .fav_ct').text(fav)
-			$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
-			if (flag == 'unbookmark') {
-				$('.bkmStr_' + id).text(lang.lang_parse_bookmark)
-				$('.bkm_' + id).removeClass('red-text')
-				$('[toot-id=' + id + ']').removeClass('bkmed')
-			} else {
-				$('.bkmStr_' + id).text(lang.lang_parse_unbookmark)
-				$('.bkm_' + id).addClass('red-text')
-				$('[toot-id=' + id + ']').addClass('bkmed')
-			}
-			var tlidTar = $(`.bookmark-timeline[data-acct=${acct_id}]`).attr('tlid')
-			columnReload(tlidTar, 'bookmark')
+				$('[toot-id=' + id + '] .fav_ct').text(fav)
+				$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
+				if (flag == 'unbookmark') {
+					$('.bkmStr_' + id).text(lang.lang_parse_bookmark)
+					$('.bkm_' + id).removeClass('red-text')
+					$('[toot-id=' + id + ']').removeClass('bkmed')
+				} else {
+					$('.bkmStr_' + id).text(lang.lang_parse_unbookmark)
+					$('.bkm_' + id).addClass('red-text')
+					$('[toot-id=' + id + ']').addClass('bkmed')
+				}
+				var tlidTar = $(`.bookmark-timeline[data-acct=${acct_id}]`).attr('tlid')
+				columnReload(tlidTar,'bookmark')
 		}
 	}
 }
@@ -389,92 +390,45 @@ function redraft(id, acct_id) {
 	}).then(result => {
 		if (result.value) {
 			show()
-			var domain = localStorage.getItem('domain_' + acct_id)
-			var at = localStorage.getItem('acct_' + acct_id + '_at')
-			if (localStorage.getItem('mode_' + domain) == 'misskey') {
-				var start = 'https://' + domain + '/api/notes/delete'
-				var httpreq = new XMLHttpRequest()
-				httpreq.open('POST', start, true)
-				httpreq.setRequestHeader('Content-Type', 'application/json')
-				httpreq.responseType = 'json'
-				httpreq.send(JSON.stringify({ i: at, noteId: id }))
-				$('[toot-id=' + id + ']').hide()
-				$('[toot-id=' + id + ']').remove()
-			} else {
-				var start = 'https://' + domain + '/api/v1/statuses/' + id
-				var httpreq = new XMLHttpRequest()
-				httpreq.open('DELETE', start, true)
-				httpreq.setRequestHeader('Content-Type', 'application/json')
-				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-				httpreq.responseType = 'json'
-				httpreq.send()
-			}
-			httpreq.onreadystatechange = function() {
-				if (httpreq.readyState === 4) {
-					if (this.status !== 200) {
-						setLog(start, this.status, this.response)
-					}
-					var json = httpreq.response
-					$('#post-acct-sel').prop('disabled', true)
-					$('#post-acct-sel').val(acct_id)
-					$('select').formSelect()
-					mdCheck()
-					var medias = $('[toot-id=' + id + ']').attr('data-medias')
-					var mediack = json.media_attachments[0]
-					//メディアがあれば
-					var media_ids = []
-					if (mediack) {
-						for (var i = 0; i <= 4; i++) {
-							if (json.media_attachments[i]) {
-								media_ids.push(json.media_attachments[i].id)
-								$('#preview').append(
-									'<img src="' +
-										json.media_attachments[i].preview_url +
-										'" style="width:50px; max-height:100px;">'
-								)
-							} else {
-								break
-							}
-						}
-					}
-					var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis')
-					vis(vismode)
-					var medias = media_ids.join(',');
-					$('#media').val(medias)
-					localStorage.setItem('nohide', true)
-					show()
-					if (json.text) {
-						var html = json.text
-					} else {
-						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)
-					}
-					$('#textarea').val(html)
-					if (json.spoiler_text) {
-						cw()
-						$('#cw-text').val(json.spoiler_text)
-					}
-					if (json.sensitive) {
-						$('#nsfw').addClass('yellow-text')
-						$('#nsfw').html('visibility')
-						$('#nsfw').addClass('nsfw-avail')
-					}
-					if (json.in_reply_to_id) {
-						$('#reply').val(json.in_reply_to_id)
-					}
+			del(id, acct_id)
+			$('#post-acct-sel').prop('disabled', true)
+			$('#post-acct-sel').val(acct_id)
+			$('select').formSelect()
+			mdCheck()
+			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)
 			}
 		}
 	})
 }
 //ピン留め
 function pin(id, acct_id) {
-	if ($(`.cvo[unique-id=${id}]`).hasClass('pined')) {
+	if ($('#pub_' + id).hasClass('pined')) {
 		var flag = 'unpin'
 	} else {
 		var flag = 'pin'
@@ -654,17 +608,13 @@ function staEx(mode) {
 			console.error(error)
 		})
 		.then(function(json) {
-			if (json.statuses) {
-				if (json.statuses[0]) {
-					var id = json.statuses[0].id
-					if (mode == 'rt') {
-						rt(id, acct_id, 'remote')
-					} else if (mode == 'fav') {
-						fav(id, acct_id, 'remote')
-					} else if (mode == 'reply') {
-						reEx(id)
-					}
-				}
+			var id = json.statuses[0].id
+			if (mode == 'rt') {
+				rt(id, acct_id, 'remote')
+			} else if (mode == 'fav') {
+				fav(id, acct_id, 'remote')
+			} else if (mode == 'reply') {
+				reEx(id)
 			}
 		})
 	return
@@ -683,10 +633,10 @@ function toggleAction(elem, height) {
 			cont.removeClass('top')
 			cont.addClass('bottom')
 		}
-		if (elem.parents('.cvo').attr('id') == 'toot-this') {
+		if(elem.parents('.cvo').attr('id') == 'toot-this'){
 			console.log($('#toot-this').offset().top, elem.offset().top)
 			left = $('#toot-this').offset().left + elem.offset().left + 10
-			top = $('#toot-this').offset().top - $('#toot-this').height() - height + 25
+			top = $('#toot-this').offset().top - $('#toot-this').height() -height + 25
 		}
 		cont.css('top', top + 'px')
 		cont.css('right', `calc(100vw - ${left}px)`)
--- a/app/js/post/suggest.js
+++ b/app/js/post/suggest.js
@@ -1,3 +1,4 @@
+'use strict'
 //入力時にハッシュタグと@をサジェスト
 var timer = null

--- a/app/js/post/use-txtbox.js
+++ b/app/js/post/use-txtbox.js
@@ -1,3 +1,4 @@
+'use strict'
 /*リプライ*/
 function re(id, ats_cm, acct_id, mode) {
 	clear()
--- a/app/js/tl/announParse.js
+++ b/app/js/tl/announParse.js
@@ -1,145 +0,0 @@
-function announParse(obj, acct_id, tlid) {
-	var template = ''
-	var datetype = localStorage.getItem('datetype')
-	var gif = localStorage.getItem('gif')
-	//Ticker
-	var tickerck = localStorage.getItem('ticker_ok')
-	if (tickerck == 'yes') {
-		var ticker = true
-	} else if (!ticker || ticker == 'no') {
-		var ticker = false
-	}
-	if (!datetype) {
-		datetype = 'absolute'
-	}
-	if (!gif) {
-		var gif = 'yes'
-	}
-	Object.keys(obj).forEach(function(key) {
-		var toot = obj[key]
-		var content = toot.content
-		if (toot.emojis) {
-			Object.keys(toot.emojis).forEach(function(key1) {
-				var emoji = toot.emojis[key1]
-				var shortcode = emoji.shortcode
-				if (gif == 'yes') {
-					var emoSource = emoji.url
-				} else {
-					var emoSource = emoji.static_url
-				}
-				var emoji_url = `
-					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-						alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
-				`
-				var regExp = new RegExp(':' + shortcode + ':', 'g')
-				content = content.replace(regExp, emoji_url)
-			})
-		}
-		content = twemoji.parse(content)
-		var reactions = ''
-		//既存のリアクション
-		if (toot.reactions) {
-			Object.keys(toot.reactions).forEach(function(key2) {
-				var reaction = toot.reactions[key2]
-				//普通の絵文字 or カスタム絵文字 は文字数判断。ただしスコットランド国旗みたいなやべぇやつに注意
-				var splitter = new GraphemeSplitter()
-				if (splitter.splitGraphemes(reaction.name).length > 1) {
-					//カスタム絵文字
-					var shortcode = reaction.shortcode
-					if (gif == 'yes') {
-						var emoSource = reaction.url
-					} else {
-						var emoSource = reaction.static_url
-					}
-					var emoji_url = `
-					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-                        alt=" :${shortcode}: " title="${shortcode}">`
-				} else {
-					emoji_url = twemoji.parse(reaction.name)
-				}
-				var addClass = ''
-				if (reaction.me) {
-					addClass = 'reactioned'
-				}
-				reactions =
-					reactions +
-                    `<div class="announReaction ${addClass}" onclick="announReaction('${toot.id}', '${acct_id}', '${tlid}', ${reaction.me},'${reaction.name}')">
-                        ${emoji_url} ${reaction.count}
-                    </div>`
-			})
-		}
-		if (toot.ends_at) {
-			var ended = `<div class="announReaction" title="${date(toot.ends_at, 'absolute')}" style="width: auto; cursor: default;">
-            <i class="fas fa-arrow-right"></i>
-            ${date(toot.ends_at, datetype)}
-        </div>`
-		} else {
-			var ended = ''
-		}
-
-		template =
-			template +
-			`<div class="announcement" data-id="${toot.id}">
-            ${content}
-            <div class="reactionsPack">
-                ${reactions}
-                <div class="announReaction add" onclick="announReactionNew('${toot.id}', '${acct_id}', '${tlid}')"><i class="fas fa-plus"></i></div>
-                ${ended}
-            </div>
-        </div>`
-	})
-	return template
-}
-function announReaction(id, acct_id, tlid, del, name) {
-    var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var start = 'https://' + domain + '/api/v1/announcements/' + id + '/reactions/' + encodeURIComponent(name)
-    var httpreq = new XMLHttpRequest()
-    if(del) {
-        var method = 'DELETE'
-    } else {
-        var method = 'PUT'
-    }
-	httpreq.open(method, start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = 'json'
-	httpreq.send()
-	httpreq.onreadystatechange = function() {
-		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
-			announ(acct_id, tlid)
-		}
-	}
-}
-function announReactionNew(id, acct_id, tlid) {
-    $('#reply').val(id)
-	$('#media').val('announcement')
-	$('#unreact').hide()
-	$('#addreact').removeClass('hide')
-	$('#post-acct-sel').val(acct_id)
-	$('select').formSelect()
-	localStorage.setItem('nohide', true)
-	show()
-	emojiToggle(true)
-	$('#left-side').hide()
-}
-function emojiReactionDef(target) {
-    var emojiraw = newpack.filter(function(item, index) {
-		if (item.short_name == target) return true
-	})
-	var hex = emojiraw[0].unified.split('-')
-	if (hex.length === 2) {
-		emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1])
-	} else {
-		emoji = twemoji.convert.fromCodePoint(hex[0])
-    }
-	var acct_id = $('#post-acct-sel').val()
-	var id = $('#reply').val()
-	announReaction(id, acct_id, 0, false, emoji)
-	clear()
-	hide()
-}
--- a/app/js/tl/card.js
+++ b/app/js/tl/card.js
@@ -1,3 +1,4 @@
+'use strict'
 //カード処理やメンション、ハッシュタグの別途表示
 //全てのTL処理で呼び出し
 function additional(acct_id, tlid) {
@@ -37,7 +38,7 @@ function additional(acct_id, tlid) {
 		}

 		//トゥートのURLぽかったら
-		toot = text.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
+		var toot = text.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
 		if (toot) {
 			if (toot[1]) {
 				$(this).attr('data-acct', acct_id)
@@ -172,7 +173,7 @@ function additionalIndv(tlid, acct_id, id) {
 					console.error(error)
 				})
 				.then(function(json) {
-					cards = json.card
+					var cards = json.card
 					var analyze = cardHtml(cards, acct_id, id)
 					$('[toot-id=' + id + '] .additional').html(analyze)
 					if (json.title) {
--- a/app/js/tl/datails.js
+++ b/app/js/tl/datails.js
@@ -1,3 +1,4 @@
+'use strict'
 //トゥートの詳細
 function details(id, acct_id, tlid, mode) {
 	if (mode == 'dm') {
--- a/app/js/tl/date.js
+++ b/app/js/tl/date.js
@@ -1,3 +1,4 @@
+'use strict'
 //日付パーサー
 function date(str, datetype) {
 	if (datetype == "relative") {
--- a/app/js/tl/directory.js
+++ b/app/js/tl/directory.js
@@ -1,9 +1,10 @@
+'use strict'
 //ディレクトリ
 //ディレクトリトグル
 function dirMenu() {
 	$("#dir-contents").html("");
 	directory();
-	$("#left-menu a").removeClass("active");
+	$("#left-menu div").removeClass("active");
 	$("#dirMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#dir-box").removeClass("hide");
--- a/app/js/tl/filter.js
+++ b/app/js/tl/filter.js
@@ -1,3 +1,4 @@
+'use strict'
 /*メディアフィルター機能*/
 //各TL上方のMedia[On/Off]
 function mediaToggle(tlid) {
@@ -14,46 +15,6 @@ function mediaToggle(tlid) {
 		$('#timeline_' + tlid).addClass('media-filter')
 	}
 }
-/* Remote only */
-function remoteOnly(tlid, type) {
-	var multi = localStorage.getItem('column')
-	var obj = JSON.parse(multi)
-	if (obj[tlid].data) {
-		if (obj[tlid].data.remote) {
-			obj[tlid].data.remote = false
-			var json = JSON.stringify(obj)
-			localStorage.setItem('column', json)
-			$('#sta-remote-' + tlid).text('Off')
-			$('#sta-remote-' + tlid).css('color', '#009688')
-		} else {
-			obj[tlid].data.remote = true
-			var json = JSON.stringify(obj)
-			localStorage.setItem('column', json)
-			$('#sta-remote-' + tlid).text('On')
-			$('#sta-remote-' + tlid).css('color', 'red')
-		}
-	} else {
-		obj[tlid].data = {}
-		obj[tlid].data.remote = true
-		var json = JSON.stringify(obj)
-		localStorage.setItem('column', json)
-		$('#sta-remote-' + tlid).text('On')
-		$('#sta-remote-' + tlid).css('color', 'red')
-	}
-	columnReload(tlid, type)
-}
-function remoteOnlyCk(tlid) {
-	var multi = localStorage.getItem('column')
-	var obj = JSON.parse(multi)
-	if (obj[tlid].data) {
-		if (obj[tlid].data.remote) {
-			$('#sta-remote-' + tlid).text('On')
-			$('#sta-remote-' + tlid).css('color', 'red')
-			return true
-		}
-	}
-	return false
-}
 //各TL上方のBT[BTOnly/BTExc/Off]
 function ebtToggle(tlid) {
 	var ebt = localStorage.getItem('ebt_' + tlid)
@@ -141,7 +102,7 @@ function delreset(tlid) {
 }
 /*ワードフィルター機能*/
 function filterMenu() {
-	$('#left-menu a').removeClass('active')
+	$('#left-menu div').removeClass('active')
 	$('#filterMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#filter-box').removeClass('hide')
@@ -157,26 +118,26 @@ function filter() {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at,
-		},
+			Authorization: 'Bearer ' + at
+		}
 	})
-		.then(function (response) {
+		.then(function(response) {
 			if (!response.ok) {
-				response.text().then(function (text) {
+				response.text().then(function(text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function (error) {
+		.catch(function(error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function (json) {
+		.then(function(json) {
 			if (json) {
 				var filters = ''
-				Object.keys(json).forEach(function (key) {
+				Object.keys(json).forEach(function(key) {
 					var filterword = json[key]
 					var context = filterword.context.join(',')
 					filters =
@@ -220,9 +181,6 @@ function makeNewFilter() {
 	if ($('#conv_filter:checked').val()) {
 		cont.push('thread')
 	}
-	if ($('#prof_filter:checked').val()) {
-		cont.push('profiles')
-	}
 	if (!cont.length) {
 		$('#filtered-words').html('Error:' + lang.lang_filter_errordegree)
 	}
@@ -231,7 +189,10 @@ function makeNewFilter() {
 	if (!who) {
 		who = false
 	}
-	var time = $('#days_filter').val() * 24 * 60 * 60 + $('#hours_filter').val() * 60 * 60 + $('#mins_filter').val() * 60
+	var time =
+		$('#days_filter').val() * 24 * 60 * 60 +
+		$('#hours_filter').val() * 60 * 60 +
+		$('#mins_filter').val() * 60
 	var domain = localStorage.getItem('domain_' + acct_id)
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	if ($('#filter-edit-id').val()) {
@@ -253,10 +214,10 @@ function makeNewFilter() {
 			context: cont,
 			irreversible: exc,
 			whole_word: who,
-			expires_in: time,
+			expires_in: time
 		})
 	)
-	httpreq.onreadystatechange = function () {
+	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -269,7 +230,6 @@ function makeNewFilter() {
 			$('#local_filter').prop('checked', false)
 			$('#notf_filter').prop('checked', false)
 			$('#conv_filter').prop('checked', false)
-			$('#prof_filter').prop('checked', false)
 			$('#except_filter').prop('checked', false)
 			$('#wholeword_filter').prop('checked', false)
 			$('#days_filter').val('0')
@@ -300,29 +260,29 @@ function filterEdit(id, acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at,
-		},
+			Authorization: 'Bearer ' + at
+		}
 	})
-		.then(function (response) {
+		.then(function(response) {
 			if (!response.ok) {
-				response.text().then(function (text) {
+				response.text().then(function(text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function (error) {
+		.catch(function(error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function (json) {
+		.then(function(json) {
 			if (json) {
 				var now = new Date()
 				now = now.getTime()
 				var now = Math.floor(now / 1000)
 				$('#filter-add-word').val(json.phrase)
-				Object.keys(json.context).forEach(function (key) {
+				Object.keys(json.context).forEach(function(key) {
 					var context = json.context[key]
 					$('[value=' + context + ']').prop('checked', true)
 				})
@@ -352,7 +312,7 @@ function filterDel(id, acct_id) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function () {
+	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -372,23 +332,23 @@ function getFilter(acct_id) {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at,
-			},
+				Authorization: 'Bearer ' + at
+			}
 		})
-			.then(function (response) {
+			.then(function(response) {
 				if (!response.ok) {
-					response.text().then(function (text) {
+					response.text().then(function(text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function (error) {
+			.catch(function(error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function (json) {
+			.then(function(json) {
 				localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
 			})
 	} else {
@@ -407,13 +367,13 @@ function getFilterType(json, type) {
 		type = 'notifi'
 	}
 	var mutedfilters = []
-	Object.keys(json).forEach(function (key) {
+	Object.keys(json).forEach(function(key) {
 		var filterword = json[key]
 		var phrases = filterword.phrase
 		var arr = filterword.context
 		if (arr.join(',').indexOf(type) !== -1) {
 			mutedfilters.push(phrases)
-		} else if (type == 'mix') {
+		} else if (type == 'mix'){
 			if (arr.indexOf('home') !== -1 || arr.indexOf('public') !== -1) {
 				mutedfilters.push(phrases)
 			}
@@ -437,23 +397,23 @@ function filterUpdate(acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at,
-		},
+			Authorization: 'Bearer ' + at
+		}
 	})
-		.then(function (response) {
+		.then(function(response) {
 			if (!response.ok) {
-				response.text().then(function (text) {
+				response.text().then(function(text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function (error) {
+		.catch(function(error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function (json) {
+		.then(function(json) {
 			localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
 			filterUpdateInternal(json, 'home')
 			filterUpdateInternal(json, 'local')
@@ -469,11 +429,13 @@ function filterUpdateInternal(json, type) {
 		home = home.concat(wordmute)
 	}
 	if (home) {
-		$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function (i, elem) {
+		$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function(i, elem) {
 			var id = $(elem).attr('toot-id')
 			$('[toot-id=' + id + ']').removeClass('hide')
-			var text = $(elem).find('.toot').html()
-			Object.keys(home).forEach(function (key8) {
+			var text = $(elem)
+				.find('.toot')
+				.html()
+			Object.keys(home).forEach(function(key8) {
 				var word = home[key8]
 				var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g')
 				if ($.strip_tags(text).match(regExp)) {
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@@ -1,5 +1,6 @@
+'use strict'
 function listMenu() {
-	$('#left-menu a').removeClass('active')
+	$('#left-menu div').removeClass('active')
 	$('#listMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#list-box').removeClass('hide')
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -1,3 +1,4 @@
+'use strict'
 function escapeHTMLtemp(str) {
 	if (!str) {
 		return "";
@@ -360,20 +361,22 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if ((toot.cw || toot.cw == "") && cw) {
 			var content = escapeHTML(toot.text);
 			var spoil = escapeHTMLtemp(toot.cw);
-			var spoiler = "cw cw_hide";
+			var spoiler = "cw cw_hide_" + toot.id;
 			var api_spoil = "gray";
-			var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
+			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+				'\')" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
 		} else {
 			var ct1 = nl2br(toot.text).split('<br />').length - 2;
 			var ct2 = nl2br(toot.text).split('<br>').length - 2;
 			if (ct1 > ct2) { var ct = ct1; } else { var ct = ct2; }
 			if ((sent < ct && $.mb_strlen($.strip_tagstemp(toot.text)) > 5) || ($.strip_tagstemp(toot.text).length > ltr && $.mb_strlen($.strip_tagstemp(toot.text)) > 5)) {
 				var content = '<span class="gray">' + lang.lang_parse_fulltext + '</span><br>' + escapeHTMLtemp(toot.text)
-				var spoil = '<span class="cw_long">' + $.mb_substr($.strip_tagstemp(
+				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tagstemp(
 					toot.text), 0, 100) +
 					'</span><span class="gray">' + lang.lang_parse_autofold + '</span>';
-				var spoiler = "cw cw_hide";
-				var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
+				var spoiler = "cw cw_hide_" + toot.id;
+				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+					'\')" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
 			} else {
 				var content = escapeHTMLtemp(toot.text);
 				if (toot.cw) {
@@ -878,7 +881,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		}
 		var ftxt = lang.lang_parse_followed;
 		if (popup > 0 || popup == -1) {
-			var notftext = '<span class="cbadge" title="' + date(toot.createdAt,
+			var notftext = '<span class="cbadge"title="' + date(toot.createdAt,
 				'absolute') + '(' + lang.lang_parse_notftime + ')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 					datetype) +
 				'</span>' + ftxt + '<br>';
--- a/app/js/tl/mix.js
+++ b/app/js/tl/mix.js
@@ -1,3 +1,4 @@
+'use strict'
 //Integrated TL
 async function mixtl(acct_id, tlid, type, delc, voice) {
 	localStorage.setItem('now', type)
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -1,3 +1,4 @@
+'use strict'
 //通知
 //取得+Streaming接続
 function notf(acct_id, tlid, sys) {
@@ -69,20 +70,17 @@ function notfColumn(acct_id, tlid, sys) {
 						var n = new Notification('TheDesk:' + domain, options)
 					}
 					var mute = getFilterTypeByAcct(acct_id, 'notif')
-					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
-					if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') {
+					if (obj.type != 'follow') {
 						if (misskey) {
 							templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
 						} else {
 							templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute)
 						}
-					} else if (obj.type == 'follow_request') {
-						templete = templete + userparse([obj.account], 'request', acct_id, tlid, -1)
 					} else {
 						if (misskey) {
 							templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
 						} else {
-							templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
+							templete = templete + userparse([obj.account], 'notf', acct_id, tlid, -1)
 						}
 					}
 				})
@@ -182,8 +180,7 @@ function notfCommon(acct_id, tlid, sys) {
 						var n = new Notification('TheDesk:' + domain, options)
 					}
 					var mute = getFilterTypeByAcct(acct_id, 'notif')
-					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
-					if (obj.type != 'follow' && obj.type != 'move') {
+					if (obj.type != 'follow') {
 						if (misskey) {
 							templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
 						} else {
@@ -193,7 +190,7 @@ function notfCommon(acct_id, tlid, sys) {
 						if (misskey) {
 							templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
 						} else {
-							templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
+							templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1)
 						}
 					}
 				})
@@ -239,12 +236,10 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 				localStorage.setItem('lastnotf_' + acct_id, obj.id)
 				if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
 					//markers show中はダメ
-					if (obj.type != 'follow' && obj.type != 'follow_request') {
+					if (obj.type != 'follow') {
 						templete = parse([obj], 'notf', acct_id, 'notf', popup)
-					} else if (obj.type == 'follow_request') {
-						templete = userparse([obj.account], 'request', acct_id, 'notf', -1)
 					} else {
-						templete = userparse([obj], obj.type, acct_id, 'notf', popup)
+						templete = userparse([obj], 'notf', acct_id, 'notf', popup)
 					}
 					if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
 						$('div[data-notf=' + acct_id + ']').prepend(templete)
@@ -344,7 +339,7 @@ function notfmore(tlid) {
 							if (misskey) {
 								templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
 							} else {
-								templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
+								templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1)
 							}
 						}
 					})
@@ -408,11 +403,6 @@ function notfCanceler(acct) {
 	localStorage.removeItem('notf-follow_' + acct)
 	$('.notf-follow_' + acct).addClass('hide')
 	$('.notf-icon_' + acct).removeClass('red-text')
-	var id = $('#announce_' + acct + ' .announcement').first().attr('data-id')
-	$('.notf-announ_' + acct + '_ct').text("")
-	if(id) {
-		localStorage.setItem('announ_' + acct, id)
-	}
 }
 function allNotfRead() {
 	var multi = localStorage.getItem('multi')
--- a/app/js/tl/old-mix.js
+++ b/app/js/tl/old-mix.js
@@ -1,3 +1,4 @@
+'use strict'
 //Integrated TL
 function mixtl(acct_id, tlid, type, delc, voice) {
 	localStorage.removeItem('morelock')
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -1,3 +1,4 @@
+'use strict'
 //オブジェクトパーサー(トゥート)
 function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	var splitter = new GraphemeSplitter()
@@ -217,13 +218,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			Object.keys(toot.account.emojis).forEach(function(key5) {
 				var emoji = toot.account.emojis[key5]
 				var shortcode = emoji.shortcode
-				if (gif == 'yes') {
-					var emoSource = emoji.url
-				} else {
-					var emoSource = emoji.static_url
-				}
 				var emoji_url = `
-					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+					<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
 						alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
 				`
 				var regExp = new RegExp(':' + shortcode + ':', 'g')
@@ -232,16 +228,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}
 		var noticeavatar = ''
 		if (mix == 'notf') {
-			if (!toot.status) {
-				toot.status = statusModel(toot.created_at)
-			}
 			if (gif == 'yes') {
 				noticeavatar = toot.account.avatar
 			} else {
 				noticeavatar = toot.account.avatar_static
 			}
 			noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
-					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}" alt="">
+					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}">
 				</a>`
 			if (toot.type == 'mention') {
 				var what = lang.lang_parse_mentioned
@@ -268,15 +261,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			} else {
 				var notfFilHide = ''
 			}
-			var noticetext = `<span onclick="notfFilter('${toot.account.id}','${tlid}');" class=" pointer big-text ${notfFilHide}"><i class="fas fa-filter" 
-					 title="${lang.lang_parse_notffilter}">
-				</i><span class="voice">${lang.lang_parse_notffilter}</span></span>
+			var noticetext = `<i class="fas fa-filter pointer big-text ${notfFilHide}" 
+					onclick="notfFilter('${toot.account.id}','${tlid}');" title="${lang.lang_parse_notffilter}">
+				</i>
 				<span class="cbadge cbadge-hover" title="${date(toot.created_at, 'absolute')}(${
 				lang.lang_parse_notftime
-			})" aria-hidden="true"><i class="far fa-clock"></i>
+			})">
+					<i class="far fa-clock"></i>
 					${date(toot.created_at, datetype)}
 				</span>
-				<span class="voice">${date(toot.created_at, 'absolute')}(${lang.lang_parse_notftime})</span>
 				<i class="big-text fas ${icon}"></i>
 				<a onclick="udg('${toot.account.id}','${acct_id}')" class="pointer grey-text">
 					${dis_name}(@${toot.account.acct})
@@ -372,15 +365,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				Object.keys(toot.account.emojis).forEach(function(key5) {
 					var emoji = toot.account.emojis[key5]
 					var shortcode = emoji.shortcode
-					if (gif == 'yes') {
-						var emoSource = emoji.url
-					} else {
-						var emoSource = emoji.static_url
-					}
 					var emoji_url = `
-						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
-					`
+						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					dis_name = dis_name.replace(regExp, emoji_url)
 				})
@@ -393,7 +380,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				} else {
 					noticeavatar = toot.account.avatar_static
 				}
-				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg" aria-hidden="true">
+				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg">
 						<img draggable="false" src="${noticeavatar}" width="20" class="prof-img" 
 							user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'">
 					</a>`
@@ -429,15 +416,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					Object.keys(toot.account.emojis).forEach(function(key5) {
 						var emoji = toot.account.emojis[key5]
 						var shortcode = emoji.shortcode
-						if (gif == 'yes') {
-							var emoSource = emoji.url
-						} else {
-							var emoSource = emoji.static_url
-						}
 						var emoji_url = `
-							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
-						`
+						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
 					})
@@ -516,9 +497,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			if (toot.spoiler_text && cw) {
 				var spoil = escapeHTML(toot.spoiler_text)
-				var spoiler = 'cw cw_hide'
+				var spoiler = 'cw cw_hide_' + toot.id
 				var api_spoil = 'gray'
-				var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}<span class="voice">${lang.lang_parse_cwshow_acc}</span></a><br>`
+				var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
 			} else {
 				if (content) {
 					var ct1 = content.split('</p>').length + content.split('<br />').length - 2
@@ -538,14 +519,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5)
 				) {
 					var content = `<span class="gray">${lang.lang_parse_fulltext}</span><br>` + content
-					var spoil = `<span class="cw_long">${$.mb_substr(
+					var spoil = `<span class="cw-long-${toot.id}">${$.mb_substr(
 						$.strip_tags(content),
 						0,
 						100
 					)}</span>
 						<span class="gray">${lang.lang_parse_autofold}</span>`
-					var spoiler = 'cw cw_hide'
-					var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">
+					var spoiler = 'cw cw_hide_' + toot.id
+					var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">
 							${lang.lang_parse_more}
 						</a><br>`
 				} else {
@@ -559,11 +540,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				.match(
 					/https?:\/\/([^+_]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/
 				)
-			urlsck = content.match(/(https?):\/\/([^<>]*?)\/([^"]*)/g)
+			var urlsck = content.match(/(https?):\/\/([^<>]*?)\/([^"]*)/g)
 			if (urlsck) {
 				for (var urlct = 0; urlct < urlsck.length; urlct++) {
 					var urlindv = urlsck[urlct]
-					urlCont = urlindv.match(/(https?):\/\/([^a-zA-Z0-9.-]*?)\.(.+?)\/([^"]*)/)
+					var urlCont = urlindv.match(/(https?):\/\/([^a-zA-Z0-9.-]*?)\.(.+?)\/([^"]*)/)
 					if (urlCont) {
 						urlindv = urlindv.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&')
 						var encoded = encodeURI(urlCont[4])
@@ -576,7 +557,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}

 			if (urls) {
-				var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer" aria-hidden="true">
+				var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer">
 						${lang.lang_parse_url}
 					</a><br>`
 			} else {
@@ -588,7 +569,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//Poll
 			var poll = ''
 			if (toot.poll) {
-				var poll = pollParse(toot.poll, acct_id, false)
+				var poll = pollParse(toot.poll, acct_id)
 			}

 			var mediack = toot.media_attachments[0]
@@ -621,7 +602,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							viewer +
 							`<a onclick="imgv('${id}','${key2}','${acct_id}')" id="${id}'-image-${key2}" 
 								data-url="${url}" data-type="video" class="img-parsed">
-									<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true" alt="attached media">
+									<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true">
 							</a></span>`
 					} else {
 						if (media.type == 'unknown') {
@@ -634,7 +615,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 								viewer +
 								'<audio src="' +
 								url +
-								'" class="pointer" style="width:100%;" controls alt="attached media"></span>'
+								'" class="pointer" style="width:100%;" controls></span>'
 						} else {
 							if (media.description) {
 								var desc = media.description
@@ -652,7 +633,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 										id="${id}-image-${key2}" data-url="${url}" data-original="${remote_url}" data-type="${media.type}" 
 										class="img-parsed img-link" style="width:calc(${cwdt}% - 1px); height:${imh};">
 									<img draggable="false" src="${purl}" class="${sense} toot-img pointer" 
-										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}" alt="${escapeHTML(desc)}">
+										onerror="this.src=\'../../img/loading.svg\'" title="${desc}">
 									${nsfwmes}
 								</a>`
 						}
@@ -683,7 +664,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						if (toot.account.acct != mention.acct) {
 							mentions =
 								mentions +
-								`<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer" aria-hidden="true">@${mention.acct}</a> `
+								`<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer">@${mention.acct}</a> `
 							to_mention.push(mention.acct)
 						}
 					}
@@ -709,9 +690,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					var featured = `　<a onclick="tagFeature('${tag.name}','${acct_id}')" class="pointer" title="add it to Featured tags">Feature</a>　`
 					tags =
 						tags +
-						`<span class="hide" data-tag="${tag.name}" data-regTag="${tag.name.toLowerCase()}">#${
-							tag.name
-						}:
+						`<span class="hide" data-tag="${tag.name}" data-regTag="${tag.name.toLowerCase()}">#${tag.name}:
 							<a onclick="tl('tag','${tag.name}','${acct_id}','add')" class="pointer"
 							 title="${lang.lang_parse_tagTL.replace(
 									'{{tag}}',
@@ -724,7 +703,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						)}
 						">Pin</a>${featured}</span> `
 				})
-				tags = '<div style="float:right" aria-hidden="true">' + tags + '</div>'
+				tags = '<div style="float:right">' + tags + '</div>'
 			}
 			//リプ数
 			if (toot.replies_count || toot.replies_count === 0) {
@@ -739,29 +718,29 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var vis = ''
 			var visen = toot.visibility
 			if (visen == 'public') {
-				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons gray sml vis-data pointer" 
-						title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
+				var vis = `<i class="text-darken-3 material-icons gray sml vis-data pointer" 
+						title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
 						public
-					</i><span class="voice">${lang.lang_parse_public} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
+					</i>`
 				var can_rt = ''
 			} else if (visen == 'unlisted') {
-				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons blue-text sml vis-data pointer" 
-						title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
+				var vis = `<i class="text-darken-3 material-icons blue-text sml vis-data pointer" 
+						title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
 						lock_open
-					</i><span class="voice">${lang.lang_parse_unlisted} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
+					</i>`
 				var can_rt = ''
 			} else if (visen == 'private') {
-				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons orange-text sml vis-data pointer" 
-						title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
+				var vis = `<i class="text-darken-3 material-icons orange-text sml vis-data pointer" 
+						title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
 						lock
-					</i><span class="voice">${lang.lang_parse_private} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
+					</i>`

 				var can_rt = 'unvisible'
 			} else if (visen == 'direct') {
-				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons red-text sml vis-data pointer" 
-						title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
+				var vis = `<i class="text-darken-3 material-icons red-text sml vis-data pointer" 
+						title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
 						mail
-					</i><span class="voice">${lang.lang_parse_direct} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
+					</i>`
 				var can_rt = 'unvisible'
 			}
 			if (toot.account.acct == localStorage.getItem('user_' + acct_id)) {
@@ -848,15 +827,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				Object.keys(toot.emojis).forEach(function(key5) {
 					var emoji = toot.emojis[key5]
 					var shortcode = emoji.shortcode
-					if (gif == 'yes') {
-						var emoSource = emoji.url
-					} else {
-						var emoSource = emoji.static_url
-					}
 					var emoji_url = `
-						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
-					`
+						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					content = content.replace(regExp, emoji_url)
 					spoil = spoil.replace(regExp, emoji_url)
@@ -904,7 +877,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var trans = `<div class="">
 						<a onclick="trans('${toot.language}','${lang.language}', $(this))" 
 							class="waves-effect waves-dark btn-flat actct" style="padding:0">
-								<i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
+								<i class="material-icons">g_translate</i>${lang.lang_parse_trans}
 						</a>
 					</div>`
 			} else {
@@ -929,7 +902,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					for (var i = 0; i < tickerdata.length; i++) {
 						var value = tickerdata[i]
 						if (value.domain == thisdomain) {
-							var tickerdom = `<div aria-hidden="true" style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
+							var tickerdom = `<div style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
 								value.bg
 							}, transparent 96%) !important; color:${
 								value.text
@@ -1007,7 +980,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				<div class="area-icon grid">
 					<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
 						<img draggable="false" src="${avatar}" width="40" class="prof-img"
-							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'" alt="" />
+							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'"/>
 					</a>
 					${noticeavatar}
 				</div>
@@ -1021,7 +994,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="flex-time">
 						<span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy('${toot.url}');"
 							title="${date(toot.created_at, 'absolute')}(${lang.lang_parse_clickcopyurl})">
-							<i class="far fa-clock"></i><span class="voice">posted at </span>${date(toot.created_at, datetype)}
+							<i class="far fa-clock"></i>${date(toot.created_at, datetype)}
 						</span>
 					</div>
 				</div>
@@ -1056,17 +1029,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							class="waves-effect waves-dark btn-flat actct rep-btn"
 							data-men="${to_mention}" data-visen="${visen}" style="padding:0" title="${lang.lang_parse_replyto}">
 								<i class="fas fa-share"></i>
-								<span class="voice">${lang.lang_parse_replyto} </span>
 								<span class="rep_ct">${replyct}</span>
 						</a>
 					</div>
 					<div class="action ${can_rt} ${disp['rt']} ${noauth}">
-						<a onclick="rt('${
-							toot.id
-						}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
+						<a onclick="rt('${uniqueid}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
 							style="padding:0" title="${lang.lang_parse_bt}">
-							<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
-							<span class="voice">${lang.lang_parse_bt} </span>
+							<i class="fas fa-retweet ${if_rt} rt_${uniqueid}"></i>
 							<span class="rt_ct">${toot.reblogs_count}</span>
 						</a>
 					</div>
@@ -1074,7 +1043,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<a onclick="qt('${toot.id}','${acct_id}','${toot.account.acct}','${toot.url}')" 
 							class="waves-effect waves-dark btn-flat actct" style="padding:0" title="${lang.lang_parse_quote}">
 							<i class="text-darken-3 fas fa-quote-right"></i>
-							<span class="voice">${lang.lang_parse_quote} </span>
 						</a>
 					</div>
 					<div class="action ${disp['bkm']} ${noauth} ${bkmClass}">
@@ -1082,7 +1050,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0"
 							title="${lang.lang_parse_bookmark}">
 							<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
-							<span class="voice">${lang.lang_parse_bookmark} </span>
 					</a>
 					</div>
 					<div class="action ${disp['fav']} ${noauth}">
@@ -1091,7 +1058,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							title="${lang.lang_parse_fav}">
 							<i class="fas text-darken-3 fa-star${if_fav} fav_${uniqueid}"></i>
 							<span class="fav_ct">${toot.favourites_count}</span>
-							<span class="voice">${lang.lang_parse_fav} </span>
 						</a>
 					</div>
 				</div>
@@ -1099,16 +1065,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="action ${noauth}">
 						<a onclick="toggleAction($(this), ${menuct * 39 + 6})" 
 							class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0">
-							<i class="text-darken-3 material-icons act-icon" aria-hidden="true">expand_more</i>
-							<span class="voice">Other actions</span>
+							<i class="text-darken-3 material-icons act-icon">expand_more</i>
 						</a>
 					</div>
 					<div class="action ${noauth}">
 						<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
 							class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0"
 							title="${lang.lang_parse_detail}">
-						<i class="text-darken-3 material-icons" aria-hidden="true">menu_open</i></a>
-						<span class="voice">${lang.lang_parse_detail}</span>
+						<i class="text-darken-3 material-icons">menu_open</i></a>
 					</div>
 				</div>
 				<div class="contextMenu hide z-depth-4">
@@ -1117,28 +1081,30 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<a onclick="client('${$.strip_tags(via)}')" class="pointer">${lang.lang_parse_clientop}</a>
 					</div>
 					<div>
-					<button onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
+					<button onclick="bkm('${toot.id}','${acct_id}','${tlid}')"
 						class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0">
 						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
-						<span class="bkmStr_${uniqueid}">${bkmStr}</span>
+						<span class="bkmStr_${toot.id}">${bkmStr}</span>
 					</button>
 					</div>
 					<div class="${if_mine}">
-						<button onclick="del('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+						<button onclick="del('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
 							<i class="fas fa-trash"></i>${lang.lang_parse_del}
 						</button>
 					</div>
 					<div class="${if_mine}">
-						<button onclick="pin('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
-							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>
-							<span class="pinStr_${uniqueid}">${pinStr}</span>
+						<button onclick="pin('${
+							toot.id
+						}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
+							<i class="fas fa-map-pin pin_${toot.id} ${if_pin}"></i>
+							<span class="pinStr_${toot.id}">${pinStr}</span>
 						</button>
 					</div>
 					<div class="${if_mine}">
-						<button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+						<button onclick="redraft('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
-							<i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
+							<i class="material-icons">redo</i>${lang.lang_parse_redraft}
 						</button>
 					</div>
 					${trans}
@@ -1168,10 +1134,6 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	if (locale == 'yes') {
 		var locale = false
 	}
-	var gif = localStorage.getItem('gif')
-	if (!gif) {
-		gif = 'yes'
-	}
 	var templete = ''
 	var datetype = localStorage.getItem('datetype')
 	Object.keys(obj).forEach(function(key) {
@@ -1192,26 +1154,19 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					var locked = ''
 				}
 				if (auth == 'request') {
-					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept" aria-hidden="true">
+					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept">
 							person_add
-						</i>
-						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject" aria-hidden="true">
+						</i>　
+						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject">
 							person_add_disabled
 						</i>`
 				} else {
 					var authhtml = ''
 				}
-				if (auth == 'follow') {
-					var ftxt = lang.lang_parse_followed
-					if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
-						ftxt = localStorage.getItem('followlocale_' + acct_id)
-					}
-				} else if (auth == 'moved') {
-					var ftxt = lang.lang_parse_moved
-				} else if (auth == 'request') {
-					var ftxt = lang.lang_parse_request
+				var ftxt = lang.lang_parse_followed
+				if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
+					ftxt = localStorage.getItem('followlocale_' + acct_id)
 				}
-				console.log(auth, ftxt)
 				if (popup > 0 || popup == -1 || notf) {
 					var notftext = ftxt + '<br>'
 				} else {
@@ -1254,15 +1209,9 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					Object.keys(toot.emojis).forEach(function(key5) {
 						var emoji = toot.emojis[key5]
 						var shortcode = emoji.shortcode
-						if (gif == 'yes') {
-							var emoSource = emoji.url
-						} else {
-							var emoSource = emoji.static_url
-						}
 						var emoji_url = `
-							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
-						`
+						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
 					})
@@ -1271,11 +1220,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					dis_name = twemoji.parse(dis_name)
 				}
 				if (toot.avatar) {
-					if (gif == 'yes') {
-						var avatar = toot.avatar
-					} else {
-						var avatar = toot.avatar_static
-					}
+					var avatar = toot.avatar
 				} else {
 					var avatar = '../../img/missing.svg'
 				}
@@ -1286,13 +1231,13 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				var latest = date(toot.last_status_at, 'relative')
 				if (toot.last_status_at) {
-					var latesthtml = `<div class="cbadge" style="width:100px;">Last <span class="voice">toot</span>: ${latest}</div>`
+					var latesthtml = `<div class="cbadge" style="width:100px;">Last:${latest}</div>`
 				} else {
 					var latesthtml = ''
 				}
 				templete =
 					templete +
-					`<div class="cusr" style="padding-top:5px;" user-id="${toot.id}">
+					`<div class="cvo" style="padding-top:5px;" user-id="${toot.id}">
 					<div class="area-notice">${notftext}</div>
 					<div class="area-icon">
 						${udg}
@@ -1303,7 +1248,6 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 							class="prof-img"
 							user="${toot.acct}"
 							onerror="this.src='../../img/loading.svg'"
-							alt=""
 						/>
 					</a></div>
 					<div class="area-display_name">
@@ -1313,20 +1257,21 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 								class="sml gray"
 								style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"
 							>
-								@ ${toot.acct}${locked}</span>
+								@ ${toot.acct}${locked}</span
+							>
 						</div>
 					</div>
-					<div class="area-status">
+					<div class="area-toot acct-note">
+						${toot.note.replace(/<br\s?\/?>.+/g, '<span class="gray">...</span>')}
+					</div>
+					<div style="justify-content:space-around;top:5px" class="area-actions">
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_follow}:${toot.following_count}
 						</div>
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_followers}:${toot.followers_count}
 						</div>
-						${latesthtml}
-					</div>
-					<div class="area-actions" style="justify-content: flex-end;">
-						${authhtml}
+						${latesthtml}${authhtml}
 					</div>
 				</div>
 				`
@@ -1398,130 +1343,71 @@ function client(name) {
 	}
 }
 //Poll Parser
-function pollParse(poll, acct_id, emojis) {
-	var rand = randomStr(8)
+function pollParse(poll, acct_id) {
 	var datetype = localStorage.getItem('datetype')
-	var anime = localStorage.getItem('animation')
-	if (anime == 'yes' || !anime) {
-		var lpAnime = 'lpAnime'
-	} else {
-		var lpAnime = ''
-	}
-	var gif = localStorage.getItem('gif')
-	if (!gif) {
-		gif = 'yes'
-	}
 	var choices = poll.options
 	if (poll.own_votes) {
 		var minechoice = poll.own_votes
 	} else {
 		var minechoice = []
 	}
-	var refresh = `<a onclick="voteMastodonrefresh('${acct_id}','${poll.id}','${rand}')" class="pointer">
-		${lang.lang_manager_refresh}
-	</a>`
-	if (poll.voted && minechoice.length) {
+
+	if (poll.voted) {
 		var myvote = lang.lang_parse_voted
-		if (poll.expired) myvote = myvote + '/' + lang.lang_parse_endedvote
-		var result_hide = ''
-	} else if (poll.voted && !minechoice.length) {
-		var myvote = lang.lang_parse_myvote
-		if (poll.expired) myvote = myvote + '/' + lang.lang_parse_endedvote
 		var result_hide = ''
 	} else if (poll.expired) {
 		var myvote = lang.lang_parse_endedvote
 		var result_hide = ''
 	} else {
-		var myvote = `<a onclick="voteMastodon('${acct_id}','${poll.id}','${rand}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
+		var myvote = `<a onclick="voteMastodon('${acct_id}','${poll.id}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
 		if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
 			myvote =
 				myvote +
-				`<a onclick="showResult('${acct_id}','${poll.id}','${rand}')" class="pointer">
+				`<a onclick="showResult('${acct_id}','${poll.id}')" class="pointer">
 				${lang.lang_parse_unvoted}
-				</a>　`
+				</a>`
 		}
 		var result_hide = 'hide'
 	}
 	var ended = date(poll.expires_at, datetype)
 	var pollHtml = ''
-	if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
-		var max = _.maxBy(choices, 'votes_count').votes_count
-	} else {
-		var max = 0
-	}
-
 	Object.keys(choices).forEach(function(keyc) {
 		var choice = choices[keyc]
 		var voteit = ''
 		for (var i = 0; i < minechoice.length; i++) {
 			var me = minechoice[i]
 			if (me == keyc) {
-				var voteit =
-					'<span class="ownMark"><img class="emoji" draggable="false" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/2705.png"></span>'
+				var voteit = '✅'
 				break
 			}
 		}
 		if (!poll.voted && !poll.expired) {
 			var votesel =
-				`voteSelMastodon('${acct_id}','${poll.id}',${keyc},${poll.multiple}, this)`
-			var voteclass = 'pointer'
+				"voteSelMastodon('" + acct_id + "','" + poll.id + "'," + keyc + ',' + poll.multiple + ')'
+			var voteclass = 'pointer waves-effect waves-light'
 		} else {
 			var votesel = ''
 			var voteclass = ''
 		}
-		var per = Math.ceil((choice.votes_count / poll.votes_count) * 100)
-		if (!per) per = 0
-		if (max == choice.votes_count) {
-			var addPoll = 'maxVoter'
-		} else {
-			var addPoll = ''
-		}
-		var openData = ''
-		if (choice.votes_count !== null) {
-			openData = `<span style="float: right">${voteit}${choice.votes_count}<span class="sml">(${per}%)</span></span>`
-		} else {
-			openData = `<span style="float: right">${voteit}?<span class="sml">(-%)</span></span>`
-		}
-		var choiceText = escapeHTML(choice.title)
-		if (emojis) {
-			//絵文字があれば
-			Object.keys(emojis).forEach(function(key5) {
-				var emoji = emojis[key5]
-				var shortcode = emoji.shortcode
-				if (gif == 'yes') {
-					var emoSource = emoji.url
-				} else {
-					var emoSource = emoji.static_url
-				}
-				var emoji_url = `
-			<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-				alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
-		`
-				var regExp = new RegExp(':' + shortcode + ':', 'g')
-				choiceText = choiceText.replace(regExp, emoji_url)
-			})
-			choiceText = twemoji.parse(choiceText)
-		}
 		pollHtml =
 			pollHtml +
 			`<div class="${voteclass} vote vote_${acct_id}_${poll.id}_${keyc}" onclick="${votesel}">
-				<span class="vote_${acct_id}_${poll.id}_result leadPoll ${result_hide} ${addPoll} ${lpAnime}" style="width: ${per}%"></span>
-				<span class="onPoll">${choiceText}</span>
-				<span class="vote_${acct_id}_${poll.id}_result ${result_hide} onPoll">
-					${openData}
+				${escapeHTML(choice.title)}
+				<span class="vote_${acct_id}_${poll.id}_result ${result_hide}">
+					(${choice.votes_count})
 				</span>
+				${voteit}
 			</div>`
 	})
-	if (poll.expired) {
-		refresh = ''
-	}
-	pollHtml = `<div class="vote_${acct_id}_${poll.id}" id="vote${rand}">
+	pollHtml = `<div class="vote_${acct_id}_${poll.id}">
 			${pollHtml}${myvote}
-			${refresh}
+			<a onclick="voteMastodonrefresh('${acct_id}','${poll.id}')" class="pointer">
+				${lang.lang_manager_refresh}
+			</a>
 			<span class="cbadge cbadge-hover" title="${date(poll.expires_at, 'absolute')}">
 				<i class="far fa-calendar-times"></i>
 				${ended}
-			</span>${poll.voters_count} ${lang.lang_parse_people}
+			</span>
 		</div>`
 	return pollHtml
 }
--- a/app/js/tl/poll.js
+++ b/app/js/tl/poll.js
@@ -1,3 +1,4 @@
+'use strict'
 //アンケートのトグル
 function pollToggle() {
 	if ($('#poll').hasClass('hide')) {
@@ -49,25 +50,30 @@ function pollCalc() {
 	return days * 86400 + hrs * 3600 + mins * 60
 }
 //Vote
-function voteSelMastodon(acct_id, id, to, mul, elem) {
-	if ($(elem).hasClass('sel')) {
-		$(elem).css('background-color', 'transparent')
-		$(elem).removeClass('sel')
+function voteSelMastodon(acct_id, id, to, mul) {
+	if ($('.vote_' + acct_id + '_' + id + '_' + to).hasClass('sel')) {
+		$('.vote_' + acct_id + '_' + id + '_' + to).css('background-color', 'transparent')
+		$('.vote_' + acct_id + '_' + id + '_' + to).removeClass('sel')
 	} else {
 		if (!mul) {
-			$('.vote_' + acct_id + '_' + id + ' div').css('background-color', 'transparent')
-			$('.vote_' + acct_id + '_' + id + ' div').removeClass('sel')
-			$(elem).css('background-color', 'var(--emphasized)')
-			$(elem).addClass('sel')
+			$('.vote_' + acct_id + '_' + id + ' div').each(function(i, elem) {
+				if (i == to) {
+					$(this).css('background-color', 'var(--emphasized)')
+					$(this).addClass('sel')
+				} else {
+					$(this).css('background-color', 'transparent')
+					$(this).removeClass('sel')
+				}
+			})
 		} else {
-			$(elem).css('background-color', 'var(--emphasized)')
-			$(elem).addClass('sel')
+			$('.vote_' + acct_id + '_' + id + '_' + to).css('background-color', 'var(--emphasized)')
+			$('.vote_' + acct_id + '_' + id + '_' + to).addClass('sel')
 		}
 	}
 }
-function voteMastodon(acct_id, id, target) {
+function voteMastodon(acct_id, id) {
 	var choice = []
-	$(`#vote${target} div`).each(function(i, elem) {
+	$('.vote_' + acct_id + '_' + id + ' div').each(function(i, elem) {
 		if ($(this).hasClass('sel')) {
 			choice.push(i + '')
 		}
@@ -85,13 +91,13 @@ function voteMastodon(acct_id, id, target) {
 	httpreq.responseType = 'json'
 	httpreq.send(JSON.stringify({ choices: choice }))
 	httpreq.onreadystatechange = function() {
-		voteMastodonrefresh(acct_id, id, target)
+		voteMastodonrefresh(acct_id, id)
 	}
 }
 function showResult(acct_id, id) {
 	$('.vote_' + acct_id + '_' + id + '_result').toggleClass('hide')
 }
-function voteMastodonrefresh(acct_id, id, target) {
+function voteMastodonrefresh(acct_id, id) {
 	var datetype = localStorage.getItem('datetype')
 	if (!datetype) {
 		datetype = 'absolute'
@@ -115,8 +121,8 @@ function voteMastodonrefresh(acct_id, id, target) {
 			if (!json) {
 				return false
 			}
-			var poll = pollParse(json, acct_id, json.emojis)
-			$(`#vote${target}`).html(poll)
+			var poll = pollParse(json, acct_id)
+			$('.vote_' + acct_id + '_' + json.id).html(poll)
 		}
 	}
 }
--- a/app/js/tl/speech.js
+++ b/app/js/tl/speech.js
@@ -1,8 +1,9 @@
-$voise = null
-isBouyomi = localStorage.getItem('voice_bouyomi')
-$voiseName = lang.lang_speech
-$voices = speechSynthesis.getVoices()
-$synthes = new SpeechSynthesisUtterance()
+'use strict'
+var $voise = null
+var isBouyomi = localStorage.getItem('voice_bouyomi')
+var $voiseName = lang.lang_speech
+var $voices = speechSynthesis.getVoices()
+var $synthes = new SpeechSynthesisUtterance()
 $voise = $.grep($voices, function(n, i) {
 	return n.name == $voiseName
 })[0]
@@ -12,14 +13,14 @@ speechSynthesis.cancel()
 if (!localStorage.getItem('voice_vol')) {
 	localStorage.setItem('voice_vol', 1)
 }
-voiceRate = localStorage.getItem('voice_speed')
+var voiceRate = localStorage.getItem('voice_speed')
 $synthes.rate = voiceRate
-voicePitch = localStorage.getItem('voice_pitch')
+var voicePitch = localStorage.getItem('voice_pitch')
 $synthes.pitch = voicePitch
-voiceVol = localStorage.getItem('voice_vol')
+var voiceVol = localStorage.getItem('voice_vol')
 $synthes.volume = voiceVol
 function say(msgr) {
-	msg = voiceParse(msgr)
+	var msg = voiceParse(msgr)
 	var voice = localStorage.getItem('voicebank')
 	var obj = JSON.parse(voice)
 	if (!obj) {
@@ -31,7 +32,7 @@ function say(msgr) {
 		localStorage.setItem('voicebank', json)
 	}
 }
-$repeat = setInterval(function() {
+var $repeat = setInterval(function() {
 	if (!speechSynthesis.speaking) {
 		var voice = localStorage.getItem('voicebank')
 		if (voice) {
@@ -72,7 +73,7 @@ $repeat = setInterval(function() {
 	}
 }, 300)
 function voiceParse(msg) {
-	msg = $.strip_tags(msg)
+	var msg = $.strip_tags(msg)
 	msg = msg.replace(/#/g, '')
 	msg = msg.replace(/'/g, '')
 	msg = msg.replace(/"/g, '')
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -1,9 +1,10 @@
+'use strict'
 //検索
 //検索ボックストグル
 function searchMenu() {
 	$('#src-contents').html('')
 	trend()
-	$('#left-menu a').removeClass('active')
+	$('#left-menu div').removeClass('active')
 	$('#searchMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#src-box').removeClass('hide')
@@ -36,7 +37,7 @@ function src(mode, offset) {
 		var user = $('#his-data').attr('user-id')
 	}
 	if (!mode) {
-		var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(q) + add
+		var start = 'https://' + domain + '/api/v2/search?q=' + q + add
 	} else {
 		var start = 'https://' + domain + '/api/v1/search?q=' + q
 	}
@@ -116,11 +117,8 @@ function tsAdd(q) {
 	parseColumn('add')
 }
 function tootsearch(tlid, q) {
-	if(!q || q=='undefined') {
-		return false
-	}
 	var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
-	console.log('Toot search at ' + start)
+	console.log('Toot srrach at ' + start)
 	$('#notice_' + tlid).text('tootsearch(' + q + ')')
 	$('#notice_icon_' + tlid).text('search')
 	fetch(start, {
@@ -219,9 +217,6 @@ function moreTs(tlid, q) {
 function graphDraw(tag, acct_id) {
 	var tags = ''
 	var his = tag.history
-	return graphDrawCore(his, tag)
-}
-function graphDrawCore(his, tag) {
 	var max = Math.max.apply(null, [
 		his[0].uses,
 		his[1].uses,
@@ -238,34 +233,36 @@ function graphDrawCore(his, tag) {
 	var two = 50 - (his[2].uses / max) * 50
 	var one = 50 - (his[1].uses / max) * 50
 	var zero = 50 - (his[0].uses / max) * 50
-	return `<div class="tagComp">
-				<div class="tagCompSvg">
-					<svg version="1.1" viewbox="0 0 60 50" width="60" height="50">
-						<g>
-							<path d="M0,${six} L10,${five} 20,${four} 30,${three} 40,${two} 50,${one} 60,${zero} 61,61 0,61" 
-							style="stroke: #0f8c0c;fill: rgba(13,113,19,.25); stroke-width: 1;">
-								</path>
-						</g>
-					</svg>
-				</div>
-				<div class="tagCompToot">
-					<span style="font-size:200%">${his[0].uses}</span>
-				</div>
-				<div class="tagCompToots">
-					toot
-				</div>
-				<div class="tagCompTag">
-					<a onclick="tl('tag','${escapeHTML(
-						tag.name
-					)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
-						#${escapeHTML(tag.name)}
-					</a>
-				</div>
-				<div class="tagCompUser">
-					${his[0].accounts}
-					${lang.lang_src_people}
-				</div>
-				</div>`
+	if (max === 0) {
+		tags =
+			`<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50"></svg>
+			<span style="font-size:200%">${his[0].uses}</span>
+			toot(s)&nbsp;
+			<a onclick=\"tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer">
+				#${escapeHTML(tag.name)}
+			</a>&nbsp;` +
+			his[0].accounts +
+			lang.lang_src_people
+	} else {
+		tags =
+			`<br><br>
+			<svg version="1.1" viewbox="0 0 60 50" width="60" height="50">
+				<g>
+					<path d="M0,${six} L10,${five} 20,${four} 30,${three} 40,${two} 50,${one} 60,${zero}" 
+						style="stroke: #0f8c0c;fill: rgba(13,113,19,.25); stroke-width: 1;">
+					</path>
+				</g>
+			</svg>
+			<span style="font-size:200%">${his[0].uses}</span>
+			toot&nbsp;
+			<a onclick="tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer">
+				#${escapeHTML(tag.name)}
+			</a>&nbsp;` +
+			his[0].accounts +
+			lang.lang_src_people
+	}
+
+	return tags
 }
 /*
 <svg version="1.1" viewbox="0 0 50 300" width="100%" height="50">
@@ -307,54 +304,40 @@ function trend() {
 			Object.keys(json).forEach(function(keye) {
 				var tag = json[keye]
 				var his = tag.history
-				tags = graphDrawCore(his, tag)
+				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
+				])
+				var six = 50 - (his[6].uses / max) * 50
+				var five = 50 - (his[5].uses / max) * 50
+				var four = 50 - (his[4].uses / max) * 50
+				var three = 50 - (his[3].uses / max) * 50
+				var two = 50 - (his[2].uses / max) * 50
+				var one = 50 - (his[1].uses / max) * 50
+				var zero = 50 - (his[0].uses / max) * 50
+				tags =
+				`<svg version="1.1" viewbox="0 0 60 50" width="60" height="50">
+					<g>
+						<path d="M0,${six} L10,${five} 20,${four} 30,${three} 40,${two} 50,${one} 60,${zero}" 
+							style="stroke: #0f8c0c;fill: rgba(13,113,19,.25); stroke-width: 1;">
+						</path>
+					</g>
+				</svg>
+				<span style="font-size:200%">${his[0].uses}</span>
+				toot&nbsp;
+				<a onclick="tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer">
+					#${escapeHTML(tag.name)}
+				</a>&nbsp;` +
+				his[0].accounts +
+				lang.lang_src_people +
+					'<br><br>'

 				$('#src-contents').append(tags)
 			})
 		})
 }
-function srcBox(mode) {
-	var selectedText = window.getSelection().toString()
-	if (mode == 'open') {
-		$('#pageSrc').removeClass('hide')
-	} else if (mode == 'close') {
-		if(!selectedText) {
-			$('#pageSrc').addClass('hide')
-			$('#pageSrc').removeClass('keep')
-		}
-	} else {
-		$('#pageSrc').toggleClass('hide')
-	}
-	if(!$('#pageSrc').hasClass('keep')) {
-		$('#pageSrcInput').val(selectedText)
-	}
-}
-$('#pageSrcInput').click(function() {
-	$('#pageSrc').addClass('keep')
-})
-$('#pageSrcInput').on('input', function(evt) {
-	if(!$('#pageSrcInput').val()) {
-		$('#pageSrc').removeClass('keep')
-	}
-})
-document.addEventListener('selectionchange', function() {
-	var selectedText = window.getSelection().toString()
-	if (selectedText && !$('input').is(':focus') && !$('textarea').is(':focus')) {
-		srcBox('open')
-	}
-})
-function doSrc(type) {
-	$('#pageSrc').addClass('hide')
-	$('#pageSrc').removeClass('keep')
-	var q = $('#pageSrcInput').val()
-	if(type == 'web') {
-		var start = localStorage.getItem('srcUrl')
-		if(!start) {
-			start = 'https://google.com/search?q={q}'
-		}
-		start = start.replace(/{q}/, q)
-		postMessage(["openUrl", start], "*")
-	} else if(type == 'ts') {
-		tsAdd(q)
-	}
-}
--- a/app/js/tl/tag.js
+++ b/app/js/tl/tag.js
@@ -1,3 +1,4 @@
+'use strict'
 //タグ表示
 if (location.search) {
 	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
@@ -198,28 +199,3 @@ function tagFeature(name, acct_id) {
 			M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
 		})
 }
-//タグのフィルタ
-function addTag(id) {
-	var columns = JSON.parse(localStorage.getItem('column'))
-	var column = columns[id]
-	if(!column.data.name) {
-		var name = column.data
-	} else {
-		var name = column.data.name
-	}
-	var col = localStorage.getItem('column')
-	var o = JSON.parse(col)
-	var obj = o[id]
-	obj.data = {
-		'name': name,
-		'all': $(`#all_tm-${id}`).val(),
-		'any': $(`#any_tm-${id}`).val(),
-		'none': $(`#none_tm-${id}`).val(),
-	}
-	o[id] = obj
-	var json = JSON.stringify(o)
-	console.log(json)
-	localStorage.setItem('column',json)
-	columnReload(id, 'tag')
-}
-
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -1,5 +1,6 @@
+'use strict'
 //TL取得
-moreloading = false
+var moreloading = false
 var errorct = 0
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	scrollevent()
@@ -10,18 +11,10 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (tlid == 'add') {
 		console.log('add new column')
 		var newtab = $('.box').length
-		if (type == 'tag') {
-			data = {
-				name: data,
-				any: [],
-				all: [],
-				none: [],
-			}
-		}
 		var add = {
 			domain: acct_id,
 			type: type,
-			data: data,
+			data: data
 		}
 		var multi = localStorage.getItem('column')
 		var obj = JSON.parse(multi)
@@ -43,11 +36,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (type == 'mix' && localStorage.getItem('mode_' + domain) != 'misskey') {
 		//Integratedなら飛ばす
 		$('#notice_' + tlid).text(
-			'Integrated TL(' +
-				localStorage.getItem('user_' + acct_id) +
-				'@' +
-				domain +
-				')'
+			'Integrated TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
 		)
 		$('#notice_icon_' + tlid).text('merge_type')
 		mixtl(acct_id, tlid, 'integrated', delc, voice)
@@ -55,11 +44,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	} else if (type == 'plus') {
 		//Local+なら飛ばす
 		$('#notice_' + tlid).text(
-			'Local+ TL(' +
-				localStorage.getItem('user_' + acct_id) +
-				'@' +
-				domain +
-				')'
+			'Local+ TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
 		)
 		$('#notice_icon_' + tlid).text('people_outline')
 		mixtl(acct_id, tlid, 'plus', delc, voice)
@@ -68,12 +53,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//通知なら飛ばす
 		notf(acct_id, tlid, 'direct')
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) +
-				'(' +
-				localStorage.getItem('user_' + acct_id) +
-				'@' +
-				domain +
-				')'
+			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
 		)
 		$('#notice_icon_' + tlid).text('notifications')
 		return
@@ -81,31 +61,10 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//ブックマークなら飛ばす
 		getBookmark(acct_id, tlid)
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) +
-				'(' +
-				localStorage.getItem('user_' + acct_id) +
-				'@' +
-				domain +
-				')'
+			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
 		)
 		$('#notice_icon_' + tlid).text('bookmark')
 		return
-	} else if (type == 'utl') {
-		//UTLなら飛ばす
-		getUtl(acct_id, tlid, data, false)
-		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) +
-				'(' +
-				localStorage.getItem('user_' + acct_id) +
-				'@' +
-				domain +
-				')'
-		)
-		$('#notice_icon_' + tlid).text('person')
-		return
-	} else if (type == 'home') {
-		//ホームならお知らせ「も」取りに行く
-		announ(acct_id, tlid)
 	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
@@ -113,19 +72,14 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (type != 'noauth') {
 		var hdr = {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at,
+			Authorization: 'Bearer ' + at
 		}
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) +
-				'(' +
-				localStorage.getItem('user_' + acct_id) +
-				'@' +
-				domain +
-				')'
+			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
 		)
 	} else {
 		var hdr = {
-			'content-type': 'application/json',
+			'content-type': 'application/json'
 		}
 		domain = acct_id
 		$('#notice_' + tlid).text('Glance TL(' + domain + ')')
@@ -154,11 +108,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var i = {
 			method: method,
 			headers: hdr,
-			body: JSON.stringify(req),
+			body: JSON.stringify(req)
 		}
 	} else {
 		var misskey = false
-		var url = com(type, data, tlid)
+		var url = com(type, data)
 		if (type == 'tag') {
 			var tag = localStorage.getItem('tag-range')
 			if (tag == 'local') {
@@ -173,26 +127,26 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var method = 'GET'
 		var i = {
 			method: method,
-			headers: hdr,
+			headers: hdr
 		}
 	}

 	console.log(['Try to get timeline of ' + tlid, start])
 	fetch(start, i)
-		.then(function (response) {
+		.then(function(response) {
 			if (!response.ok) {
-				response.text().then(function (text) {
+				response.text().then(function(text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function (error) {
+		.catch(function(error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function (json) {
+		.then(function(json) {
 			console.log(['Result of getting timeline of ' + tlid, json])
 			$('#landing_' + tlid).hide()
 			var mute = getFilterTypeByAcct(acct_id, type)
@@ -234,13 +188,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 	if (localStorage.getItem('mode_' + domain) == 'misskey') {
 		var misskey = true
 		var key = localStorage.getItem('misskey_wss_' + acct_id)
-		var send =
-			'{"type":"connect","body":{"channel":"' +
-			typePs(type) +
-			'","id":"' +
-			tlid +
-			'"}}'
-		var mskyset = setInterval(function () {
+		var send = '{"type":"connect","body":{"channel":"' + typePs(type) + '","id":"' + tlid + '"}}'
+		var mskyset = setInterval(function() {
 			if (misskeywsstate[key]) {
 				misskeyws[key].send(send)
 				clearInterval(mskyset)
@@ -256,25 +205,14 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		if (type == 'home') {
 			var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
 		} else if (type == 'pub') {
-			var add = ''
-			if(remoteOnlyCk(tlid)){
-				add = '&remote=true'
-			}
-			var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at + add
+			var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at
 		} else if (type == 'pub-media') {
-			var add = ''
-			if(remoteOnlyCk(tlid)){
-				add = '&remote=true'
-			}var start =
-				wss + '/api/v1/streaming/?stream=public:media&access_token=' + at + add
+			var start = wss + '/api/v1/streaming/?stream=public:media&access_token=' + at
 		} else if (type == 'local') {
-			var start =
-				wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
+			var start = wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
 		} else if (type == 'local-media') {
 			var start =
-				wss +
-				'/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' +
-				at
+				wss + '/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' + at
 		} else if (type == 'tag') {
 			if (type == 'tag') {
 				var tag = localStorage.getItem('tag-range')
@@ -282,38 +220,28 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					data = data + '&local=true'
 				}
 			}
-			var start =
-				wss +
-				'/api/v1/streaming/?stream=hashtag&tag=' +
-				data +
-				'&access_token=' +
-				at
+			var start = wss + '/api/v1/streaming/?stream=hashtag&tag=' + data + '&access_token=' + at
 		} else if (type == 'noauth') {
 			var start = 'wss://' + acct_id + '/api/v1/streaming/?stream=public:local'
 		} else if (type == 'list') {
-			var start =
-				wss +
-				'/api/v1/streaming/?stream=list&list=' +
-				data +
-				'&access_token=' +
-				at
+			var start = wss + '/api/v1/streaming/?stream=list&list=' + data + '&access_token=' + at
 		} else if (type == 'dm') {
 			var start = wss + '/api/v1/streaming/?stream=direct&access_token=' + at
 		}
 		var wsid = websocket.length
 		localStorage.setItem('wss_' + tlid, wsid)
 		websocket[wsid] = new WebSocket(start)
-		websocket[wsid].onopen = function (mess) {
+		websocket[wsid].onopen = function(mess) {
 			console.table({
 				tlid: tlid,
 				type: 'Connect Streaming API' + type,
 				domain: domain,
-				message: [mess],
+				message: [mess]
 			})
 			errorct = 0
 			$('#notice_icon_' + tlid).removeClass('red-text')
 		}
-		websocket[wsid].onmessage = function (mess) {
+		websocket[wsid].onmessage = function(mess) {
 			console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)])
 			if (misskey) {
 				if (JSON.parse(mess.data).type == 'note') {
@@ -324,7 +252,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					websocketNotf[acct_id].send(
 						JSON.stringify({
 							type: 'capture',
-							id: obj.id,
+							id: obj.id
 						})
 					)
 					var templete = misskeyParse([obj], type, acct_id, tlid, '', mute)
@@ -343,40 +271,26 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				if (typeA == 'delete') {
 					var obj = JSON.parse(mess.data).payload
 					if (delc == 'true') {
-						$(
-							'#timeline_' +
-								tlid +
-								' [unique-id=' +
-								JSON.parse(mess.data).payload +
-								']'
-						).addClass('emphasized')
-						$(
-							'#timeline_' +
-								tlid +
-								' [unique-id=' +
-								JSON.parse(mess.data).payload +
-								']'
-						).addClass('by_delcatch')
+						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+							'emphasized'
+						)
+						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+							'by_delcatch'
+						)
 					} else {
-						$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
-						$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
+						$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
+						$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
 					}
 				} else if (typeA == 'update' || typeA == 'conversation') {
-					if (
-						!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')
-					) {
+					if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
 						//markers show中はダメ
 						var obj = JSON.parse(JSON.parse(mess.data).payload)
-						if (
-							$('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1
-						) {
+						if ($('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1) {
 							if (voice) {
 								say(obj.content)
 							}
 							var templete = parse([obj], type, acct_id, tlid, '', mute, type)
-							if (
-								$('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0
-							) {
+							if ($('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0) {
 								$('#timeline_' + tlid).prepend(templete)
 							} else {
 								var pool = localStorage.getItem('pool_' + tlid)
@@ -398,12 +312,10 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					}
 				} else if (typeA == 'filters_changed') {
 					filterUpdate(acct_id)
-				} else if (~typeA.indexOf('announcement')) {
-					announ(acct_id, tlid)
 				}
 			}
 		}
-		websocket[wsid].onerror = function (error) {
+		websocket[wsid].onerror = function(error) {
 			console.error('Error closing')
 			console.error(error)
 			if (mode == 'error') {
@@ -418,7 +330,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			}
 			return false
 		}
-		websocket[wsid].onclose = function () {
+		websocket[wsid].onclose = function() {
 			console.warn('Closing ' + tlid)
 			if (mode == 'error') {
 				$('#notice_icon_' + tlid).addClass('red-text')
@@ -460,17 +372,13 @@ function moreload(type, tlid) {
 	if (sid && !moreloading) {
 		if (
 			type == 'mix' &&
-			localStorage.getItem(
-				'mode_' + localStorage.getItem('domain_' + acct_id)
-			) != 'misskey'
+			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
 		) {
 			mixmore(tlid, 'integrated')
 			return
 		} else if (
 			type == 'plus' &&
-			localStorage.getItem(
-				'mode_' + localStorage.getItem('domain_' + acct_id)
-			) != 'misskey'
+			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
 		) {
 			mixmore(tlid, 'plus')
 			return
@@ -484,10 +392,6 @@ function moreload(type, tlid) {
 		} else if (type == 'bookmark') {
 			getBookmark(acct_id, tlid, true)
 			return
-		} else if (type == 'utl') {
-			var data = obj[tlid].data
-			getUtl(acct_id, tlid, data, true)
-			return
 		}
 		moreloading = true
 		localStorage.setItem('now', type)
@@ -496,19 +400,19 @@ function moreload(type, tlid) {
 			var at = localStorage.getItem('acct_' + acct_id + '_at')
 			var hdr = {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at,
+				Authorization: 'Bearer ' + at
 			}
 			var domain = localStorage.getItem('domain_' + acct_id)
 		} else {
 			var hdr = {
-				'content-type': 'application/json',
+				'content-type': 'application/json'
 			}
 			domain = acct_id
 		}
 		if (localStorage.getItem('mode_' + domain) == 'misskey') {
 			var misskey = true
 			hdr = {
-				'content-type': 'application/json',
+				'content-type': 'application/json'
 			}
 			var url = misskeycom(type, data)
 			var start = 'https://' + domain + '/api/notes/' + url
@@ -531,42 +435,35 @@ function moreload(type, tlid) {
 			var i = {
 				method: method,
 				headers: hdr,
-				body: JSON.stringify(req),
+				body: JSON.stringify(req)
 			}
 		} else {
 			var misskey = false
-			var start =
-				'https://' +
-				domain +
-				'/api/v1/timelines/' +
-				com(type, data, tlid) +
-				'max_id=' +
-				sid
+			var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'max_id=' + sid
 			if (type == 'dm') {
-				var start =
-					'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid
+				var start = 'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid
 			}
 			var method = 'GET'
 			var i = {
 				method: method,
-				headers: hdr,
+				headers: hdr
 			}
 		}
 		fetch(start, i)
-			.then(function (response) {
+			.then(function(response) {
 				if (!response.ok) {
-					response.text().then(function (text) {
+					response.text().then(function(text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function (error) {
+			.catch(function(error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function (json) {
+			.then(function(json) {
 				var mute = getFilterTypeByAcct(acct_id, type)
 				if (misskey) {
 					var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -607,16 +504,12 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 	if (sid && !moreloading) {
 		if (
 			type == 'mix' &&
-			localStorage.getItem(
-				'mode_' + localStorage.getItem('domain_' + acct_id)
-			) != 'misskey'
+			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
 		) {
 			return
 		} else if (
 			type == 'plus' &&
-			localStorage.getItem(
-				'mode_' + localStorage.getItem('domain_' + acct_id)
-			) != 'misskey'
+			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
 		) {
 			return
 		} else if (type == 'notf') {
@@ -629,19 +522,19 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 			var at = localStorage.getItem('acct_' + acct_id + '_at')
 			var hdr = {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at,
+				Authorization: 'Bearer ' + at
 			}
 			var domain = localStorage.getItem('domain_' + acct_id)
 		} else {
 			var hdr = {
-				'content-type': 'application/json',
+				'content-type': 'application/json'
 			}
 			domain = acct_id
 		}
 		if (localStorage.getItem('mode_' + domain) == 'misskey') {
 			var misskey = true
 			hdr = {
-				'content-type': 'application/json',
+				'content-type': 'application/json'
 			}
 			var url = misskeycom(type, data)
 			var start = 'https://' + domain + '/api/notes/' + url
@@ -664,43 +557,36 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 			var i = {
 				method: method,
 				headers: hdr,
-				body: JSON.stringify(req),
+				body: JSON.stringify(req)
 			}
 		} else {
 			var misskey = false
-			var start =
-				'https://' +
-				domain +
-				'/api/v1/timelines/' +
-				com(type, data, tlid) +
-				'since_id=' +
-				sid
+			var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'since_id=' + sid
 			if (type == 'dm') {
-				var start =
-					'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid
+				var start = 'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid
 			}
 			var method = 'GET'
 			var i = {
 				method: method,
-				headers: hdr,
+				headers: hdr
 			}
 		}

 		fetch(start, i)
-			.then(function (response) {
+			.then(function(response) {
 				if (!response.ok) {
-					response.text().then(function (text) {
+					response.text().then(function(text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function (error) {
+			.catch(function(error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function (json) {
+			.then(function(json) {
 				console.log(['Result diff of TL' + tlid, json])
 				if (misskey) {
 					var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -722,7 +608,7 @@ function reloadTL(type, data, acct_id, key, delc, voice) {

 //WebSocket切断
 function tlCloser() {
-	Object.keys(websocket).forEach(function (tlid) {
+	Object.keys(websocket).forEach(function(tlid) {
 		if (websocketOld[tlid]) {
 			websocketOld[tlid].close()
 			console.log('%c Close Streaming API: Old' + tlid, 'color:blue')
@@ -734,30 +620,27 @@ function tlCloser() {
 		}
 	})
 	websocket = []
-	Object.keys(wsHome).forEach(function (tlid) {
+	Object.keys(wsHome).forEach(function(tlid) {
 		if (wsHome[tlid]) {
 			wsHome[tlid].close()
 			console.log('%c Close Streaming API:Integrated Home' + tlid, 'color:blue')
 		}
 	})
 	wsHome = []
-	Object.keys(wsLocal).forEach(function (tlid) {
+	Object.keys(wsLocal).forEach(function(tlid) {
 		if (wsLocal[tlid]) {
 			wsLocal[tlid].close()
-			console.log(
-				'%c Close Streaming API:Integrated Local' + tlid,
-				'color:blue'
-			)
+			console.log('%c Close Streaming API:Integrated Local' + tlid, 'color:blue')
 		}
 	})
 	wsLocal = []
-	Object.keys(websocketNotf).forEach(function (tlid) {
+	Object.keys(websocketNotf).forEach(function(tlid) {
 		if (websocketNotf[tlid]) {
 			websocketNotf[tlid].close()
 			console.log('%c Close Streaming API:Notf' + tlid, 'color:blue')
 		}
 	})
-	Object.keys(misskeyws).forEach(function (tlid) {
+	Object.keys(misskeyws).forEach(function(tlid) {
 		if (misskeyws[tlid]) {
 			misskeyws[tlid].close()
 			console.log('%c Close Streaming API:Misskey' + tlid, 'color:blue')
@@ -787,11 +670,7 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == 'local-media') {
 		if (localStorage.getItem('local_' + acct_id) && !locale) {
-			var response =
-				localStorage.getItem('local_' + acct_id) +
-				'(' +
-				lang.lang_tl_media +
-				')'
+			var response = localStorage.getItem('local_' + acct_id) + '(' + lang.lang_tl_media + ')'
 		} else {
 			var response = 'Local TL(Media)'
 		}
@@ -803,22 +682,12 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == 'pub-media') {
 		if (localStorage.getItem('public_' + acct_id) && !locale) {
-			var response =
-				localStorage.getItem('public_' + acct_id) +
-				'(' +
-				lang.lang_tl_media +
-				')'
+			var response = localStorage.getItem('public_' + acct_id) + '(' + lang.lang_tl_media + ')'
 		} else {
 			var response = 'Federated TL(Media)'
 		}
 	} else if (type == 'tag') {
-		if (data) {
-			if (data.name) {
-				var response = '#' + escapeHTML(data.name)
-			} else {
-				var response = '#' + escapeHTML(data)
-			}
-		}
+		var response = '#' + escapeHTML(data)
 	} else if (type == 'list') {
 		var ltitle = localStorage.getItem('list_' + data + '_' + acct_id)
 		var response = 'List(' + ltitle + ')'
@@ -833,11 +702,7 @@ function cap(type, data, acct_id) {
 	} else if (type == 'dm') {
 		var response = 'DM'
 	} else if (type == 'mix') {
-		if (
-			localStorage.getItem(
-				'mode_' + localStorage.getItem('domain_' + acct_id)
-			) == 'misskey'
-		) {
+		if (localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) == 'misskey') {
 			var response = 'Social TL'
 		} else {
 			var response = 'Integrated'
@@ -850,14 +715,12 @@ function cap(type, data, acct_id) {
 		var response = 'tootsearch(' + escapeHTML(data) + ')'
 	} else if (type == 'bookmark') {
 		var response = 'Bookmarks'
-	} else if (type == 'utl') {
-		var response = 'User TL(' + data.acct + ')'
 	}
 	return response
 }

 //TLのURL
-function com(type, data, tlid) {
+function com(type, data) {
 	if (type == 'home') {
 		return 'home?'
 	} else if (type == 'local' || type == 'noauth') {
@@ -865,33 +728,11 @@ function com(type, data, tlid) {
 	} else if (type == 'local-media') {
 		return 'public?local=true&only_media=true&'
 	} else if (type == 'pub') {
-		var add = ''
-		if(remoteOnlyCk(tlid)){
-			add = 'remote=true&'
-		}
-		return 'public?' + add
+		return 'public?'
 	} else if (type == 'pub-media') {
-		var add = ''
-		if(remoteOnlyCk(tlid)){
-			add = 'remote=true&'
-		}
-		return 'public?only_media=true&' + add
+		return 'public?only_media=true&'
 	} else if (type == 'tag') {
-		if (data.name) {
-			var name = data.name
-			var all = data.all
-			var any = data.any
-			var none = data.none
-		} else {
-			var name = data
-			var all = ''
-			var any = ''
-			var none = ''
-		}
-		return `tag/${name}?${buildQuery('all', all)}${buildQuery(
-			'any',
-			any
-		)}${buildQuery('none', none)}`.slice(0, -1)
+		return 'tag/' + data + '?'
 	} else if (type == 'list') {
 		return 'list/' + data + '?'
 	} else if (type == 'dm') {
@@ -1052,50 +893,37 @@ function getMarker(tlid, type, acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at,
-		},
+			Authorization: 'Bearer ' + at
+		}
 	})
-		.then(function (response) {
+		.then(function(response) {
 			if (!response.ok) {
-				response.text().then(function (text) {
+				response.text().then(function(text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function (error) {
-			$('#unread_' + tlid).attr(
-				'title',
-				lang.lang_layout_unread + ':' + lang.lang_nothing
-			)
+		.catch(function(error) {
+			$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
 			$('#unread_' + tlid).attr('data-id', '')
 			return false
 		})
-		.then(function (json) {
+		.then(function(json) {
 			if (json) {
 				if (json[add]) {
 					json = json[add]
 					$('#unread_' + tlid).attr(
 						'title',
-						lang.lang_layout_unread +
-							':' +
-							json.updated_at +
-							' v' +
-							json.version
+						lang.lang_layout_unread + ':' + json.updated_at + ' v' + json.version
 					)
 					$('#unread_' + tlid).attr('data-id', json.last_read_id)
 				} else {
-					$('#unread_' + tlid).attr(
-						'title',
-						lang.lang_layout_unread + ':' + lang.lang_nothing
-					)
+					$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
 					$('#unread_' + tlid).attr('data-id', '')
 				}
 			} else {
-				$('#unread_' + tlid).attr(
-					'title',
-					lang.lang_layout_unread + ':' + lang.lang_nothing
-				)
+				$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
 				$('#unread_' + tlid).attr('data-id', '')
 			}
 		})
@@ -1119,23 +947,23 @@ function showUnread(tlid, type, acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at,
-		},
+			Authorization: 'Bearer ' + at
+		}
 	})
-		.then(function (response) {
+		.then(function(response) {
 			if (!response.ok) {
-				response.text().then(function (text) {
+				response.text().then(function(text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function (error) {
+		.catch(function(error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function (json) {
+		.then(function(json) {
 			if (!json || !json.length) {
 				columnReload(tlid, type)
 			}
@@ -1175,23 +1003,23 @@ function ueload(tlid) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at,
-		},
+			Authorization: 'Bearer ' + at
+		}
 	})
-		.then(function (response) {
+		.then(function(response) {
 			if (!response.ok) {
-				response.text().then(function (text) {
+				response.text().then(function(text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function (error) {
+		.catch(function(error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function (json) {
+		.then(function(json) {
 			if (!json) {
 				columnReload(tlid, type)
 			}
@@ -1230,15 +1058,15 @@ function asRead(callback) {
 					var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('unique-id')
 					var poster = {
 						home: {
-							last_read_id: id,
-						},
+							last_read_id: id
+						}
 					}
 				} else {
 					var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('data-notf')
 					var poster = {
 						notifications: {
-							last_read_id: id,
-						},
+							last_read_id: id
+						}
 					}
 				}

@@ -1251,7 +1079,7 @@ function asRead(callback) {
 				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 				httpreq.responseType = 'json'
 				httpreq.send(JSON.stringify(poster))
-				httpreq.onreadystatechange = function () {
+				httpreq.onreadystatechange = function() {
 					if (httpreq.readyState === 4) {
 						var json = httpreq.response
 						if (this.status !== 200) {
@@ -1285,8 +1113,8 @@ function asReadEnd() {
 			onBeforeOpen: () => {
 				Swal.showLoading()
 			},
-			onClose: () => {},
-		}).then((result) => {})
+			onClose: () => {}
+		}).then(result => {})
 	} else {
 		postMessage(['asReadComp', ''], '*')
 	}
@@ -1312,7 +1140,7 @@ function getBookmark(acct_id, tlid, more) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function () {
+	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -1327,11 +1155,7 @@ function getBookmark(acct_id, tlid, more) {
 				}
 			}
 			var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
-			templete =
-				templete +
-				'<div class="hide notif-marker" data-maxid="' +
-				max_id +
-				'"></div>'
+			templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
 			if (more) {
 				$('#timeline_' + tlid).append(templete)
 			} else {
@@ -1344,93 +1168,3 @@ function getBookmark(acct_id, tlid, more) {
 		}
 	}
 }
-function getUtl(acct_id, tlid, data, more) {
-
-	moreloading = true
-	if (more) {
-		var sid = $('#timeline_' + tlid + ' .cvo')
-		.last()
-		.attr('unique-id')
-		var ad = '?max_id=' + sid
-	} else {
-		var ad = ''
-	}
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var start = "https://" + domain + "/api/v1/accounts/" + data.id + "/statuses" + ad
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('GET', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = 'json'
-	httpreq.send()
-	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
-			var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
-			templete =
-				templete
-			if (more) {
-				$('#timeline_' + tlid).append(templete)
-			} else {
-				$('#timeline_' + tlid).html(templete)
-			}
-			$('#landing_' + tlid).hide()
-			jQuery('time.timeago').timeago()
-			moreloading = false
-			todc()
-		}
-	}
-}
-//Announcement
-function announ(acct_id, tlid) {
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var start = 'https://' + domain + '/api/v1/announcements'
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('GET', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = 'json'
-	httpreq.send()
-	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
-			if (json.length > 0) {
-				$('.notf-announ_' + acct_id).removeClass('hide')
-				var ct = 0
-				for (var i = 0; i < json.length; i++) {
-					if (localStorage.getItem('announ_' + acct_id) == json[i].id) {
-						break
-					}
-					ct++
-				}
-				if (ct > 0) {
-					$('.notf-announ_' + acct_id + '_ct').text(ct)
-				}
-			} else {
-				$('.notf-announ_' + acct_id).addClass('hide')
-			}
-			var templete = announParse(json, acct_id, tlid)
-			$('#announce_' + tlid).html(templete)
-			jQuery('time.timeago').timeago()
-			todc()
-		}
-	}
-}
-//buildQuery
-function buildQuery(name, data) {
-	if(!data || data == '') return ''
-	var arr = data.split(',')
-	var str = ''
-	for (var i = 0; i < arr.length; i++) {
-		str = str + `${name}[]=${arr[i]}&`
-	}
-	return str
-}
--- a/app/js/ui/img.js
+++ b/app/js/ui/img.js
@@ -1,3 +1,4 @@
+'use strict'
 /*イメージビューワー*/
 //postのimg.jsとは異なります。
 function imgv(id, key, acct_id) {
@@ -53,7 +54,7 @@ function imgCont(type) {
 	$('#imagemodal').attr('data-image', murl)
 	//表示はリモートを使うか(どちらにしろコピーはオリジナル)
 	var remote_img = localStorage.getItem('remote_img')
-	if (remote_img == 'yes' && ourl != 'null') {
+	if (remote_img == 'yes') {
 		murl = ourl
 	}
 	if (murl) {
@@ -76,7 +77,7 @@ function imgCont(type) {
 }
 function imageXhr(id, key, murl) {
 	var startTime = new Date()
-	xhr = new XMLHttpRequest()
+	var xhr = new XMLHttpRequest()
 	xhr.open('GET', murl, true)
 	xhr.responseType = 'arraybuffer'
 	xhr.addEventListener(
@@ -95,23 +96,16 @@ function imageXhr(id, key, murl) {
 		'loadend',
 		function(event) {
 			var total = event.total
-			$('#imgbyte').text(Math.floor(total / 1024))
+			$('#imgbyte').text(Math.floor(total/1024))
 			var now = event.loaded
 			var per = (now / total) * 100
 			$('#imgprog').text(Math.floor(per))
 		},
 		false
 	)
-	xhr.addEventListener(
-		'error',
-		function(event) {
-			$('#imgmodal').attr('src', murl)
-		},
-		false
-	)
 	xhr.onreadystatechange = function() {
 		if (this.readyState == 4 && this.status == 200) {
-			r = new FileReader()
+			var r = new FileReader()
 			r.readAsDataURL(this.response)
 			r.onload = function() {
 				var b64 = r.result
@@ -119,22 +113,19 @@ function imageXhr(id, key, murl) {
 				var width
 				element.onload = function() {
 					var width = element.naturalWidth
-					if(width < 650) {
-						width = 650;
-					}
 					var height = element.naturalHeight
 					var windowH = $(window).height()
 					var windowW = $(window).width()
 					$('#imagemodal').css('bottom', '0')
 					$('#imagemodal img').css('width', 'auto')
 					if (height < windowH) {
-						$('#imagemodal').css('height', height + 100 + 'px')
-						$('#imagemodal img').css('height',  height + 'px')
+						$('#imagemodal').css('height', height + 60 + 'px')
+						$('#imagemodal img').css('height', '100%')
 						if (width > windowW * 0.8) {
 							$('#imagemodal').css('width', '80vw')
-							$('#imagemodal img').css('width', 'auto')
+							$('#imagemodal img').css('width', '100%')
 							var heightS = ((windowW * 0.8) / width) * height
-							$('#imagemodal').css('height', heightS + 100 + 'px')
+							$('#imagemodal').css('height', heightS + 60 + 'px')
 						} else {
 							$('#imagemodal').css('width', width + 'px')
 						}
@@ -276,8 +267,9 @@ function dlImg() {
 	if (remote_img == 'yes') {
 		murl = ourl
 	}
-	var save = localStorage.getItem('savefolder')
-	if (!save || save == 'null') {
+	if (localStorage.getItem('savefolder')) {
+		var save = localStorage.getItem('savefolder')
+	} else {
 		var save = ''
 	}
 	postMessage(['generalDL', [murl, save, false]], '*')
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -1,3 +1,4 @@
+'use strict'
 //レイアウトの設定

 var websocketOld = []
@@ -8,13 +9,13 @@ var websocketNotf = []

 //カラム追加ボックストグル
 function addColumnMenu() {
-	$('#left-menu a').removeClass('active')
+	$('#left-menu div').removeClass('active')
 	$('#addColumnMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#add-box').removeClass('hide')
 	addselCk()
 }
-$('.type').click(function () {
+$('.type').click(function() {
 	$('.type').removeClass('active')
 	$(this).addClass('active')
 	$('#type-sel').val($(this).attr('data-type'))
@@ -44,7 +45,7 @@ function parseColumn(target, dontclose) {
 		var obj = JSON.parse(multi)

 		var templete
-		Object.keys(obj).forEach(function (key) {
+		Object.keys(obj).forEach(function(key) {
 			var acct = obj[key]

 			localStorage.setItem('name_' + key, acct.name)
@@ -76,8 +77,8 @@ function parseColumn(target, dontclose) {
 		var obj = [
 			{
 				domain: 0,
-				type: 'local',
-			},
+				type: 'local'
+			}
 		]
 		var json = JSON.stringify(obj)
 		localStorage.setItem('column', json)
@@ -122,7 +123,10 @@ function parseColumn(target, dontclose) {
 			var if_notf = ''
 		}
 		if (localStorage.getItem('notification_' + acct.domain)) {
-			var unique_notf = lang.lang_layout_thisacct.replace('{{notf}}', localStorage.getItem('notification_' + acct.domain))
+			var unique_notf = lang.lang_layout_thisacct.replace(
+				'{{notf}}',
+				localStorage.getItem('notification_' + acct.domain)
+			)
 		} else {
 			if (lang.language == 'ja') {
 				var notflocale = '通知'
@@ -188,7 +192,17 @@ function parseColumn(target, dontclose) {
 			} else {
 				var animecss = ''
 			}
-			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.data)
+			unstreamingTL(
+				acct.type,
+				key,
+				basekey,
+				insert,
+				icnsert,
+				acct.left_fold,
+				css,
+				animecss,
+				acct.data
+			)
 		} else if (acct.type == 'bookmark') {
 			if (!acct.left_fold) {
 				basekey = key
@@ -200,19 +214,17 @@ function parseColumn(target, dontclose) {
 			} else {
 				var animecss = ''
 			}
-			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.domain)
-		} else if (acct.type == 'utl') {
-			if (!acct.left_fold) {
-				basekey = key
-			}
-
-			var anime = localStorage.getItem('animation')
-			if (anime == 'yes' || !anime) {
-				var animecss = 'box-anime'
-			} else {
-				var animecss = ''
-			}
-			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, { acct: acct.domain, data: acct.data })
+			unstreamingTL(
+				acct.type,
+				key,
+				basekey,
+				insert,
+				icnsert,
+				acct.left_fold,
+				css,
+				animecss,
+				acct.domain
+			)
 		} else {
 			var anime = localStorage.getItem('animation')
 			if (anime == 'yes' || !anime) {
@@ -223,7 +235,7 @@ function parseColumn(target, dontclose) {
 			var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
 					 class="setting nex" title="${lang.lang_layout_unread}">
 					<i class="material-icons waves-effect nex">more</i>
-				</a>${lang.lang_layout_unread}<br>`
+				</a>`
 			var notfDomain = acct.domain
 			var notfKey = key
 			var if_tag = ''
@@ -281,33 +293,16 @@ function parseColumn(target, dontclose) {
 					${lang.lang_layout_excludingbt}
 					<br>`
 			} else if (acct.type == 'tag') {
-				if (acct.data.name) {
-					var name = acct.data.name
-					var all = acct.data.all
-					var any = acct.data.any
-					var none = acct.data.none
-				} else {
-					var name = acct.data
-					var all = ''
-					var any = ''
-					var none = ''
-				}
 				if_tag = `<div class="column-hide notf-indv-box" id="tag-box_${key}" style="padding:5px;">
-					Base: ${name}<br>
-					<div id="tagManager-${key}">
-						all: <input type="text" id="all_tm-${key}"" value="${all}">
-						any: <input type="text" id="any_tm-${key}" value="${any}">
-						none: <input type="text" id="none_tm-${key}"" value="${none}">
-					</div>
-					<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Refresh</button>
+					Base: ${acct.data}<br>
+					<div id="tagManager-${key}"></div>
+					<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Add</button>
 				</div>`
 				if_tag_btn = `<a onclick="setToggleTag('${key}')" class="setting nex" 
 				title="${lang.lang_layout_tagManager}" style="width:30px">
 				<i class="material-icons waves-effect nex">note_add</i>
 				</a>`
 				unread = ''
-				var exclude = ''
-				var if_notf = 'hide'
 			} else {
 				var exclude = ''
 				unread = ''
@@ -341,7 +336,9 @@ function parseColumn(target, dontclose) {
 			if (key === 0) {
 				left_hold = ''
 			}
-			if (localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct.domain)) == 'misskey') {
+			if (
+				localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct.domain)) == 'misskey'
+			) {
 				var isMisRed = ''
 				exclude = ''
 				var if_misskey_hide = 'hide'
@@ -354,18 +351,6 @@ function parseColumn(target, dontclose) {
 			} else {
 				var addHeight = ''
 			}
-			if (acct.type != 'pub' && acct.type != 'pub-media') {
-				console.log(acct.type, key)
-				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex">
-					<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
-					<span id="sta-media-${key}">On</span>
-				</a>${lang.lang_layout_mediafil}`
-			} else {
-				var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex">
-					<i class="material-icons waves-effect nex" title="${lang.lang_layout_remoteOnly}">perm_media</i>
-					<span id="sta-remote-${key}">Off</span>
-				</a>${lang.lang_layout_remoteOnly}`
-			}
 			var html = `
 				<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}" data-acct="${acct.domain}" style="${addHeight}">
 					<div class="notice-box z-depth-2" id="menu_${key}" style="${insert}">
@@ -373,7 +358,7 @@ function parseColumn(target, dontclose) {
 							<i class="material-icons waves-effect ${isMisRed}" id="notice_icon_${key}" ${notf_attr}
 								 style="font-size:40px; padding-top:25%;" 
 								 onclick="checkStr('${acct.type}','${data}','${acct.domain}', '${key}', '${delc}','${voice}',null)"
-							 	 title="${lang.lang_layout_gotop}" aria-hidden="true">
+							 	 title="${lang.lang_layout_gotop}">
 							</i>
 						</div>
 					<div class="area-notice_name">
@@ -382,45 +367,39 @@ function parseColumn(target, dontclose) {
 					<div class="area-a1">
 						<a onclick="notfToggle('${acct.domain}','${key}')" class="setting nex ${if_notf}" 
 							title="${unique_notf}" ${icnsert}>
-							<i class="material-icons waves-effect nex notf-icon_${acct.domain}" aria-hidden="true">notifications</i>
-							<span class="voice">${unique_notf}</span>
+							<i class="material-icons waves-effect nex notf-icon_${acct.domain}">notifications</i>
 						</a>
-						<span class="cbadge hide notf-announ_${acct.domain}" style="margin-right:0" 
-							onclick="notfToggle('${acct.domain}','${key}')" title="${lang.lang_layout_announ}">
-							<i class="fas fa-bullhorn"></i>
-							<span class="notf-announ_${acct.domain}_ct"></span>
-							<span class="voice">${lang.lang_layout_announ}</span>
-						</span>
+						${unread}
 						${if_tag_btn}
 					</div>
 					<div class="area-sta">
-						<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply" aria-hidden="true">0</span>
-						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav" aria-hidden="true">0</span>
-						<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT" aria-hidden="true">0</span>
-						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow" aria-hidden="true">0</span>
+						<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply">0</span>
+						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav">0</span>
+						<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT">0</span>
+						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow">0</span>
 					</div>
 					<div class="area-a2">
 						<a onclick="removeColumn('${key}')" class="setting nex">
-							<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert} aria-hidden="true">cancel</i>
-							<span class="voice">${lang.lang_layout_delthis}</span>
+							<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert}>cancel</i>
 						</a>
 					</div>
 					<div class="area-a3">
 						<a onclick="setToggle('${key}')" class="setting nex" title="${lang.lang_layout_setthis}" ${icnsert}>
-							<i class="material-icons waves-effect nex" aria-hidden="true">settings</i>
-							<span class="voice">${lang.lang_layout_setthis}</span>
+							<i class="material-icons waves-effect nex">settings</i>
 						</a>
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box z-depth-4" id="notf-box_${notfKey}">
-					<div id="announce_${notfKey}" style="border: 1px solid"></div>
 					<div id="notifications_${notfKey}" data-notf="${notfDomain}" data-type="notf" class="notf-timeline">
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
-					${unread}
 					${exclude}${left_hold}
-					${mediaFil}<br>
+					<a onclick="mediaToggle('${key}')" class="setting nex">
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
+						<span id="sta-media-${key}">On</span>
+					</a>
+					${lang.lang_layout_mediafil}<br>
 					<a onclick="cardToggle('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_linkanades}">link</i>
 						<span id="sta-card-${key}">On</span>
@@ -512,13 +491,13 @@ function parseColumn(target, dontclose) {
 		minHeight: 50,
 		minWidth: 50,
 		grid: 50,
-		resize: function (event, ui) {
+		resize: function(event, ui) {
 			$(this).css('min-width', ui.size.width + 'px')
 			$(this).css('max-width', ui.size.width + 'px')
 			$(this).css('min-height', ui.size.height + 'px')
 			$(this).css('max-height', ui.size.height + 'px')
 		},
-		stop: function (event, ui) {
+		stop: function(event, ui) {
 			var col = localStorage.getItem('column')
 			var o = JSON.parse(col)
 			var width = ui.size.width
@@ -533,14 +512,16 @@ function parseColumn(target, dontclose) {
 			} else {
 				//横幅。その縦幅を持つカラムのidは
 				console.log('yoko')
-				var key = $(this).find('.boxIn').attr('tlid')
+				var key = $(this)
+					.find('.boxIn')
+					.attr('tlid')
 				var obj = o[key]
 				obj.width = width
 				o[key] = obj
 			}
 			var json = JSON.stringify(o)
 			localStorage.setItem('column', json)
-		},
+		}
 	})
 }
 function checkStr(type, data, acct_id, key, delc, voice) {
@@ -590,7 +571,7 @@ function addColumn() {
 	}
 	var add = {
 		domain: acct,
-		type: type,
+		type: type
 	}
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
@@ -624,7 +605,9 @@ function addselCk() {
 		$('#webview-add').addClass('hide')
 	}
 	if (domain == 'knzk.me' || domain == 'mstdn.y-zu.org') {
-		$('#type-sel').append('<option value="dm" data-trans="dm" id="direct-add">' + lang.layout_dm + '</option>')
+		$('#type-sel').append(
+			'<option value="dm" data-trans="dm" id="direct-add">' + lang.layout_dm + '</option>'
+		)
 	} else {
 		$('#direct-add').remove()
 	}
@@ -641,8 +624,8 @@ function removeColumn(tlid) {
 		confirmButtonColor: '#3085d6',
 		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no,
-	}).then((result) => {
+		cancelButtonText: lang.lang_no
+	}).then(result => {
 		if (result.value) {
 			var multi = localStorage.getItem('column')
 			var obj = JSON.parse(multi)
@@ -664,28 +647,28 @@ function setToggle(tlid) {
 		$('#util-box_' + tlid).css('display', 'block')
 		$('#util-box_' + tlid).animate(
 			{
-				height: '200px',
+				height: '200px'
 			},
 			{
 				duration: 300,
-				complete: function () {
+				complete: function() {
 					$('#util-box_' + tlid).css('overflow-y', 'scroll')
 					$('#util-box_' + tlid).removeClass('column-hide')
-				},
+				}
 			}
 		)
 	} else {
 		$('#util-box_' + tlid).css('overflow-y', 'hidden')
 		$('#util-box_' + tlid).animate(
 			{
-				height: '0',
+				height: '0'
 			},
 			{
 				duration: 300,
-				complete: function () {
+				complete: function() {
 					$('#util-box_' + tlid).addClass('column-hide')
 					$('#util-box_' + tlid).css('display', 'none')
-				},
+				}
 			}
 		)
 	}
@@ -697,34 +680,34 @@ function setToggleTag(tlid) {
 		$('#tag-box_' + tlid).css('display', 'block')
 		$('#tag-box_' + tlid).animate(
 			{
-				height: '200px',
+				height: '200px'
 			},
 			{
 				duration: 300,
-				complete: function () {
+				complete: function() {
 					$('#tag-box_' + tlid).css('overflow-y', 'scroll')
 					$('#tag-box_' + tlid).removeClass('column-hide')
-				},
+				}
 			}
 		)
 	} else {
 		$('#tag-box_' + tlid).css('overflow-y', 'hidden')
 		$('#tag-box_' + tlid).animate(
 			{
-				height: '0',
+				height: '0'
 			},
 			{
 				duration: 300,
-				complete: function () {
+				complete: function() {
 					$('#tag-box_' + tlid).addClass('column-hide')
 					$('#tag-box_' + tlid).css('display', 'none')
-				},
+				}
 			}
 		)
 	}
 }
 function colorpicker(key) {
-	temp = `<div onclick="coloradd('${key}','def','def')" class="pointer">Default</div>
+	var temp = `<div onclick="coloradd('${key}','def','def')" class="pointer">Default</div>
 		<div onclick="coloradd('${key}','f44336','white')" class="red white-text pointer">Red</div>
 		<div onclick="coloradd('${key}','e91e63','white')" class="pink white-text pointer">Pink</div>
 		<div onclick="coloradd('${key}','9c27b0','white')" class="purple white-text pointer">Purple</div>
@@ -825,16 +808,11 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 			${lang.lang_layout_leftUnfold}
 			</span><br>`
 	}
-	if(type == 'utl') {
-		var dataHtml = false
-	} else {
-		var dataHtml = data
-	}
 	var html = `<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}">
 			<div class="notice-box z-depth-2" id="menu_${key}" style="${insert} ">
 				<div class="area-notice">
 					<i class="material-icons waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;" 
-						onclick="${type}('${key}','${dataHtml}');" title="${lang.lang_layout_gotop}"></i>
+						onclick="${type}('${key}','${data}');" title="${lang.lang_layout_gotop}"></i>
 				</div>
 				<div class="area-notice_name">
 					<span id="notice_${key}" class="tl-title"></span>
@@ -875,8 +853,6 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 	} else if (type == 'bookmark') {
 		console.log(key, data)
 		bookmark(key, data)
-	} else if (type == 'utl') {
-		utl(key, data.acct, data.data)
 	}
 	cardCheck(key)
 	ebtCheck(key)
@@ -894,22 +870,6 @@ function bookmark(key, data) {
 	}
 	tl('bookmark', '', data, key, 'false', voice, '')
 }
-function utl(key, acct_id, data) {
-	if(!data) {
-		var multi = localStorage.getItem('column')
-		var obj = JSON.parse(multi)
-		data = obj[key].data
-		acct_id = obj[key].domain
-	}
-	
-	console.log(key, data)
-	if (localStorage.getItem('voice_' + key)) {
-		var voice = true
-	} else {
-		var voice = false
-	}
-	tl('utl', data, acct_id, key, 'false', voice, '')
-}
 function leftFoldSet(key) {
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
--- a/app/js/ui/menu.js
+++ b/app/js/ui/menu.js
@@ -1,3 +1,4 @@
+'use strict'
 function menu() {
  localStorage.setItem("menu-done", true);
  $("#fukidashi").addClass("hide")
@@ -33,7 +34,6 @@ function menu() {
    $("#add-box").removeClass("hide");
    $("#left-menu div").removeClass("active");
    $("#addColumnMenu").addClass("active");
-    $("#addColumnMenu").click();
  } else {
    $('#menu').fadeOut()
    $("#menu").removeClass("appear")
@@ -70,7 +70,7 @@ $(function () {
  });
 });
 function help() {
-  $("#left-menu a").removeClass("active");
+  $("#left-menu div").removeClass("active");
 	$("#helpMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#help-box").removeClass("hide");
--- a/app/js/ui/pip.js
+++ b/app/js/ui/pip.js
@@ -1,3 +1,4 @@
+'use strict'
 function pip(id) {
    $("#pip-content").html($("[toot-id=" + id + "] .additional").html());
    $("#pip").removeClass("hide");
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -1,3 +1,4 @@
+'use strict'
 /*ささやきボックス(Cr民並感)*/
 //✕隠す
 function hide() {
@@ -58,10 +59,10 @@ function show() {
 	mdCheck()
 }

-$(function () {
+$(function() {
 	$('#post-box').draggable({
 		handle: '#post-bar',
-		stop: function () {
+		stop: function() {
 			var left = $('#post-box').offset().left
 			if (left > $('body').width() - $('#post-box').width()) {
 				left = $('body').width() - $('#post-box').width()
@@ -76,15 +77,15 @@ $(function () {
 			}
 			localStorage.setItem('postbox-left', left)
 			localStorage.setItem('postbox-top', top)
-		},
+		}
 	})
 	$('#post-box').resizable({
 		minHeight: 150,
 		minWidth: 100,
-		stop: function (event, ui) {
+		stop: function(event, ui) {
 			$('#textarea').blur()
 			localStorage.setItem('postbox-width', ui.size.width)
-		},
+		}
 	})
 })

@@ -101,44 +102,40 @@ if (location.search) {
 		$('.mini-btn').text('expand_less')
 	}
 }
-window.onload = initPostbox
-function initPostbox() {
-	$('#posttgl').click(function (e) {
-		if (!$('#post-box').hasClass('appear')) {
-			show()
-		} else {
+$('#posttgl').click(function(e) {
+	if (!$('#post-box').hasClass('appear')) {
+		show()
+	} else {
+		hide()
+	}
+	$('.cvo').removeClass('selectedToot')
+	selectedColumn = 0
+	selectedToot = 0
+})
+
+$('#timeline-container,#group').click(function(e) {
+	if (localStorage.getItem('box') != 'absolute') {
+		if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
 			hide()
 		}
-		$('.cvo').removeClass('selectedToot')
-		selectedColumn = 0
-		selectedToot = 0
-	})
-
-	$('#timeline-container,#group').click(function (e) {
-		if (localStorage.getItem('box') != 'absolute') {
-			if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
-				hide()
-			}
-		}
-		$('.cvo').removeClass('selectedToot')
-		selectedColumn = 0
-		selectedToot = 0
+	}
+	$('.cvo').removeClass('selectedToot')
+	selectedColumn = 0
+	selectedToot = 0
+	localStorage.removeItem('nohide')
+})
+$('#contextWrap').click(function(e) {
+	$('#contextWrap').addClass('hide')
+	$('.contextMenu').addClass('hide')
+	$('.act-icon').text('expand_more')
+})
+$('#textarea,#cw-text').focusout(function(e) {
+	localStorage.setItem('nohide', true)
+	var countup = function() {
 		localStorage.removeItem('nohide')
-		srcBox('close')
-	})
-	$('#contextWrap').click(function (e) {
-		$('#contextWrap').addClass('hide')
-		$('.contextMenu').addClass('hide')
-		$('.act-icon').text('expand_more')
-	})
-	$('#textarea,#cw-text').focusout(function (e) {
-		localStorage.setItem('nohide', true)
-		var countup = function () {
-			localStorage.removeItem('nohide')
-		}
-		//setTimeout(remove, 100);
-		$('.cvo').removeClass('selectedToot')
-		selectedColumn = 0
-		selectedToot = 0
-	})
-}
+	}
+	//setTimeout(remove, 100);
+	$('.cvo').removeClass('selectedToot')
+	selectedColumn = 0
+	selectedToot = 0
+})
--- a/app/js/ui/radio.js
+++ b/app/js/ui/radio.js
@@ -1,3 +1,4 @@
+'use strict'
 var r = document.getElementById("radio");
 function Rtoggle() {
    if ($("#radio").hasClass("play")) {
--- a/app/js/ui/scroll.js
+++ b/app/js/ui/scroll.js
@@ -1,3 +1,4 @@
+'use strict'
 //スクロールで続きを読む
 function scrollevent() {
 	$('.tl-box').scroll(function() {
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
--- a/app/js/ui/sort.js
+++ b/app/js/ui/sort.js
@@ -1,3 +1,4 @@
+'use strict'
 //ソートデータ読み込み
 function sortLoad () {
 	$("#sort").html("");
@@ -111,7 +112,7 @@ function sort() {
 }
 //ソートボタントグル
 function sortMenu() {
-	$("#left-menu a").removeClass("active");
+	$("#left-menu div").removeClass("active");
 	$("#sortMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#sort-box").removeClass("hide");
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@@ -1,294 +1,190 @@
+'use strict'
 function spotifyConnect() {
-	var auth = 'https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing'
-	var platform = localStorage.getItem('platform')
-	if (platform == 'win32') {
-		postMessage(['openUrl', auth], '*')
-		postMessage(['sendSinmpleIpc', 'quit'], '*')
+	var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing";
+	var platform = localStorage.getItem("platform");
+	if (platform == "win32") {
+		postMessage(["openUrl", auth], "*");
+		postMessage(["sendSinmpleIpc", "quit"], "*");
 	} else {
-		auth = auth + '&state=code'
-		$('#spotify-code-show').removeClass('hide')
-		postMessage(['openUrl', auth], '*')
+		auth = auth + "&state=code";
+		$("#spotify-code-show").removeClass("hide");
+		postMessage(["openUrl", auth], "*");
 	}
 }
 function spotifyAuth() {
-	var code = $('#spotify-code').val()
-	localStorage.setItem('spotify', 'code')
-	localStorage.setItem('spotify-refresh', code)
-	$('#spotify-code-show').addClass('hide')
-	$('#spotify-enable').addClass('disabled')
-	$('#spotify-disable').removeClass('disabled')
+	var code = $("#spotify-code").val();
+	localStorage.setItem("spotify", "code");
+	localStorage.setItem("spotify-refresh", code);
+	$("#spotify-code-show").addClass("hide");
+	$("#spotify-enable").addClass("disabled");
+	$("#spotify-disable").removeClass("disabled");
 }
 function spotifyDisconnect() {
-	localStorage.removeItem('spotify')
-	localStorage.removeItem('spotify-refresh')
-	checkSpotify()
+	localStorage.removeItem("spotify");
+	localStorage.removeItem("spotify-refresh");
+	checkSpotify();
 }
 function checkSpotify() {
-	if (localStorage.getItem('spotify')) {
-		$('#spotify-enable').addClass('disabled')
-		$('#spotify-disable').removeClass('disabled')
+	if (localStorage.getItem("spotify")) {
+		$("#spotify-enable").addClass("disabled");
+		$("#spotify-disable").removeClass("disabled");
 	} else {
-		$('#spotify-enable').removeClass('disabled')
-		$('#spotify-disable').addClass('disabled')
+		$("#spotify-enable").removeClass("disabled");
+		$("#spotify-disable").addClass("disabled");
 	}
-	var content = localStorage.getItem('np-temp')
-	if (!content || content == '' || content == 'null') {
-		var content = '#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk'
+	var content = localStorage.getItem("np-temp");
+	if (!content || content == "" || content == "null") {
+		var content = "#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
 	}
-	$('#np-temp').val(content)
-	var flag = localStorage.getItem('artwork')
+	$("#np-temp").val(content);
+	var flag = localStorage.getItem("artwork");
 	if (flag) {
-		$('#awk_yes').prop('checked', true)
+		$("#awk_yes").prop("checked", true);
 	} else {
-		$('#awk_no').prop('checked', true)
-	}
-	var flag2 = localStorage.getItem('complete-artwork')
-	if (flag2) {
-		$('#amw_yes').prop('checked', true)
-	} else {
-		$('#amw_no').prop('checked', true)
+		$("#awk_no").prop("checked", true);
 	}
 }
 function spotifyFlagSave() {
-	var awk = $('[name=awk]:checked').val()
-	if (awk == 'yes') {
-		localStorage.setItem('artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
+	var awk = $("[name=awk]:checked").val();
+	if (awk == "yes") {
+		localStorage.setItem("artwork", "yes");
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
 	} else {
-		localStorage.removeItem('artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
-	}
-}
-function aMusicFlagSave() {
-	var awk = $('[name=amw]:checked').val()
-	if (awk == 'yes') {
-		localStorage.setItem('complete-artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
-	} else {
-		localStorage.removeItem('complete-artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
+		localStorage.removeItem("artwork");
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
 	}
 }
 function nowplaying(mode) {
-	if (mode == 'spotify') {
-		var start = 'https://thedesk.top/now-playing?at=' + localStorage.getItem('spotify') + '&rt=' + localStorage.getItem('spotify-refresh')
-		var at = localStorage.getItem('spotify')
+	if (mode == "spotify") {
+		var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
+		var at = localStorage.getItem("spotify");
 		if (at) {
 			fetch(start, {
-				method: 'GET',
+				method: "GET",
 				headers: {
-					'content-type': 'application/json',
-				},
+					"content-type": "application/json"
+				}
 			})
-				.then(function (response) {
+				.then(function(response) {
 					if (!response.ok) {
-						response.text().then(function (text) {
-							setLog(response.url, response.status, text)
-						})
+						response.text().then(function(text) {
+							setLog(response.url, response.status, text);
+						});
 					}
-					return response.json()
+					return response.json();
 				})
-				.catch(function (error) {
-					todo(error)
-					setLog(start, 'JSON', error)
-					console.error(error)
+				.catch(function(error) {
+					todo(error);
+					setLog(start, "JSON", error);
+					console.error(error);
 				})
-				.then(function (json) {
-					console.table(json)
+				.then(function(json) {
+					console.table(json);
 					if (json.length < 1) {
-						return false
+						return false;
 					}
-					var item = json.item
-					var img = item.album.images[0].url
-					var flag = localStorage.getItem('artwork')
+					var item = json.item;
+					var img = item.album.images[0].url;
+					var flag = localStorage.getItem("artwork");
 					if (flag) {
-						postMessage(['bmpImage', [img, 0]], '*')
+						postMessage(["bmpImage", [img, 0]], "*");
 					}
-					var content = localStorage.getItem('np-temp')
-					if (!content || content == '' || content == 'null') {
-						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
+					var content = localStorage.getItem("np-temp");
+					if (!content || content == "" || content == "null") {
+						var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
 					}
-					var regExp = new RegExp('{song}', 'g')
-					content = content.replace(regExp, item.name)
-					var regExp = new RegExp('{album}', 'g')
-					content = content.replace(regExp, item.album.name)
-					var regExp = new RegExp('{artist}', 'g')
-					content = content.replace(regExp, item.artists[0].name)
-					var regExp = new RegExp('{url}', 'g')
-					content = content.replace(regExp, item.external_urls.spotify)
-					var regExp = new RegExp('{composer}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{hz}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{bitRate}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{lyricist}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{bpm}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{genre}', 'g')
-					content = content.replace(regExp, '')
-					$('#textarea').val(content)
-				})
+					var regExp = new RegExp("{song}", "g");
+					content = content.replace(regExp, item.name);
+					var regExp = new RegExp("{album}", "g");
+					content = content.replace(regExp, item.album.name);
+					var regExp = new RegExp("{artist}", "g");
+					content = content.replace(regExp, item.artists[0].name);
+					var regExp = new RegExp("{url}", "g");
+					content = content.replace(regExp, item.external_urls.spotify);
+					var regExp = new RegExp("{composer}", "g");
+					content = content.replace(regExp, "");
+					var regExp = new RegExp("{hz}", "g");
+					content = content.replace(regExp, "");
+					var regExp = new RegExp("{bitRate}", "g");
+					content = content.replace(regExp, "");
+					var regExp = new RegExp("{lyricist}", "g");
+					content = content.replace(regExp, "");
+					var regExp = new RegExp("{bpm}", "g");
+					content = content.replace(regExp, "");
+					var regExp = new RegExp("{genre}", "g");
+					content = content.replace(regExp, "");
+					$("#textarea").val(content);
+				});
 		} else {
 			Swal.fire({
-				type: 'info',
-				title: lang.lang_spotify_acct,
-			})
-		}
-	} else if (mode == 'itunes') {
-		postMessage(['itunes', ''], '*')
-	} else if (mode == 'lastFm') {
-		var user = localStorage.getItem('lastFmUser')
-		var start = 'https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=' + user + '&limit=1&api_key=8f113803bfea951b6dde9e56d32458b2&format=json'
-
-		if (user) {
-			fetch(start, {
-				method: 'GET',
-				headers: {
-					'content-type': 'application/json',
-				},
-			})
-				.then(function (response) {
-					if (!response.ok) {
-						response.text().then(function (text) {
-							setLog(response.url, response.status, text)
-						})
-					}
-					return response.json()
-				})
-				.catch(function (error) {
-					todo(error)
-					setLog(start, 'JSON', error)
-					console.error(error)
-				})
-				.then(function (json) {
-					console.table(json)
-					if (!json || !json.recenttracks) {
-						console.error('no data')
-						return false
-					}
-					var item = json.recenttracks.track[0]
-					if(!item['@attr']) return false
-					var img = item.image[3]['#text']
-					var isImg = item.streamable*1
-					var flag = localStorage.getItem('artwork')
-					if (flag && isImg && img) {
-						postMessage(['bmpImage', [img, 0]], '*')
-					}
-					var content = localStorage.getItem('np-temp')
-					if (!content || content == '' || content == 'null') {
-						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
-					}
-					var regExp = new RegExp('{song}', 'g')
-					content = content.replace(regExp, item.name)
-					var regExp = new RegExp('{album}', 'g')
-					content = content.replace(regExp, item.album['#text'])
-					var regExp = new RegExp('{artist}', 'g')
-					content = content.replace(regExp, item.artist['#text'])
-					var regExp = new RegExp('{url}', 'g')
-					content = content.replace(regExp,'')
-					var regExp = new RegExp('{composer}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{hz}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{bitRate}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{lyricist}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{bpm}', 'g')
-					content = content.replace(regExp, '')
-					var regExp = new RegExp('{genre}', 'g')
-					content = content.replace(regExp, '')
-					$('#textarea').val(content)
-				})
-		} else {
-			Swal.fire({
-				type: 'info',
-				title: lang.lang_spotify_acct,
-			})
+				type: "info",
+				title: lang.lang_spotify_acct
+			});
 		}
+	} else if (mode == "itunes") {
+		postMessage(["itunes", ""], "*");
 	}
 }
-async function npCore(arg) {
-	console.table(arg)
-	var content = localStorage.getItem('np-temp')
-	if (!content || content == '' || content == 'null') {
-		var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
+function npCore(arg) {
+	if (arg.cmd) {
+		console.error(arg);
+		return;
 	}
-	var flag = localStorage.getItem('artwork')
-	var platform = localStorage.getItem('platform')
-	var aaw = { aaw: '', album: '' }
-	if (platform == 'win32') {
+	console.table(arg);
+	var content = localStorage.getItem("np-temp");
+	if (!content || content == "" || content == "null") {
+		var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
+	}
+	var flag = localStorage.getItem("artwork");
+	var platform = localStorage.getItem("platform");
+	if (platform == "win32") {
 		if (flag && arg.path) {
-			media(arg.path, 'image/png', 'new')
+			media(arg.path, "image/png", "new");
 		}
-	} else if (platform == 'darwin') {
+	} else if (platform == "darwin") {
 		if (flag && arg.artwork) {
-			media(arg.artwork, 'image/png', 'new')
-		} else if (flag && localStorage.getItem('complete-artwork')) {
-			var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name
-			aaw = await getUnknownAA(q)
-			postMessage(['bmpImage', [aaw.aaw, 0]], '*')
+			media(arg.artwork, "image/png", "new");
 		}
 	}
-	var regExp = new RegExp('{song}', 'g')
-	content = content.replace(regExp, arg.name)
-	var regExp = new RegExp('{album}', 'g')
+	var regExp = new RegExp("{song}", "g");
+	content = content.replace(regExp, arg.name);
+	var regExp = new RegExp("{album}", "g");
 	if (arg.album) {
 		if (arg.album.name) {
-			content = content.replace(regExp, arg.album.name)
-		} else {
-			if (aaw.album) content = content.replace(regExp, aaw.album)
-			content = content.replace(regExp, '-')
+			content = content.replace(regExp, arg.album.name);
 		}
-	} else {
-		if (aaw.album) content = content.replace(regExp, aaw.album)
-		content = content.replace(regExp, '-')
 	}
-	var regExp = new RegExp('{artist}', 'g')
-	content = content.replace(regExp, arg.artist)
-	var regExp = new RegExp('{url}', 'g')
-	content = content.replace(regExp, '')
-	var regExp = new RegExp('{composer}', 'g')
-	content = content.replace(regExp, arg.composer)
-	var regExp = new RegExp('{hz}', 'g')
-	content = content.replace(regExp, arg.sampleRate / 1000 + 'kHz')
-	var regExp = new RegExp('{lyricist}', 'g')
-	content = content.replace(regExp, '')
-	var regExp = new RegExp('{bpm}', 'g')
-	content = content.replace(regExp, '')
-	var regExp = new RegExp('{bitRate}', 'g')
-	content = content.replace(regExp, arg.bitRate + 'kbps')
-	var regExp = new RegExp('{genre}', 'g')
-	content = content.replace(regExp, arg.genre)
-	$('#textarea').val(content)
+	var regExp = new RegExp("{artist}", "g");
+	content = content.replace(regExp, arg.artist);
+	var regExp = new RegExp("{url}", "g");
+	content = content.replace(regExp, "");
+	var regExp = new RegExp("{composer}", "g");
+	content = content.replace(regExp, arg.composer);
+	var regExp = new RegExp("{hz}", "g");
+	content = content.replace(regExp, arg.sampleRate / 1000 + "kHz");
+	var regExp = new RegExp("{lyricist}", "g");
+	content = content.replace(regExp, "");
+	var regExp = new RegExp("{bpm}", "g");
+	content = content.replace(regExp, "");
+	var regExp = new RegExp("{bitRate}", "g");
+	content = content.replace(regExp, arg.bitRate + "kbps");
+	var regExp = new RegExp("{genre}", "g");
+	content = content.replace(regExp, arg.genre);
+	$("#textarea").val(content);
 }
 function spotifySave() {
-	var temp = $('#np-temp').val()
-	localStorage.setItem('np-temp', temp)
-	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
+	var temp = $("#np-temp").val();
+	localStorage.setItem("np-temp", temp);
+	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 });
 }
 if (location.search) {
-	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
-	var mode = m[1]
-	var codex = m[2]
-	if (mode == 'spotify') {
-		var coder = codex.split(':')
-		localStorage.setItem('spotify', coder[0])
-		localStorage.setItem('spotify-refresh', coder[1])
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+	var mode = m[1];
+	var codex = m[2];
+	if (mode == "spotify") {
+		var coder = codex.split(":");
+		localStorage.setItem("spotify", coder[0]);
+		localStorage.setItem("spotify-refresh", coder[1]);
 	} else {
 	}
 }
-async function getUnknownAA(q) {
-	const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song'
-	let promise = await fetch(start, {
-		method: 'GET',
-	})
-	const json = await promise.json()
-	if (!json.resultCount) {
-		return []
-	}
-	const data = json.results[0].artworkUrl100
-	return { aaw: data.replace(/100x100/, '512x512'), album: json.results[0].collectionName }
-}
--- a/app/js/ui/theme.js
+++ b/app/js/ui/theme.js
@@ -1,35 +1,33 @@
+'use strict'
 //テーマ適用
 function themes(theme) {
 	if (!theme) {
-		var theme = localStorage.getItem('theme')
+		var theme = localStorage.getItem("theme");
 		if (!theme) {
-			var theme = 'black'
-			localStorage.setItem('theme', 'black')
+			var theme = "black";
+			localStorage.setItem("theme", "black");
 		}
 	}
-	var el = document.getElementsByTagName('html')[0]
+	var el = document.getElementsByTagName("html")[0]

-	el.classList.remove('indigotheme')
-	el.classList.remove('greentheme')
-	el.classList.remove('browntheme')
-	el.classList.remove('blacktheme')
-	el.classList.remove('bluetheme')
-	el.classList.remove('polartheme')
-	el.classList.remove('snowtheme')
-	el.classList.remove('customtheme')
-	el.classList.add(theme + 'theme')
-	var font = localStorage.getItem('font')
+	el.classList.remove('indigotheme');
+	el.classList.remove('greentheme');
+	el.classList.remove('browntheme');
+	el.classList.remove('blacktheme');
+	el.classList.remove('bluetheme');
+	el.classList.remove('customtheme');
+	el.classList.add(theme + "theme");
+	var font = localStorage.getItem("font");
 	if (font) {
-		font = font.replace(/"(.+)"/, '$1')
-		el.style.fontFamily = '"' + font + '"'
+		el.style.fontFamily = font;
 	} else {
-		el.style.fontFamily = ''
+		el.style.fontFamily = "";
 	}
-	if (theme == 'custom') {
-		if (localStorage.getItem('customtheme-id')) {
-			postMessage(['themeCSSRequest', localStorage.getItem('customtheme-id')], '*')
+	if (theme == "custom") {
+		if (localStorage.getItem("customtheme-id")) {
+			postMessage(["themeCSSRequest", localStorage.getItem("customtheme-id")], "*")
 		}
 	}
-	el.style.backgroundColor = 'var(--bg)'
+	el.style.backgroundColor = "var(--bg)";
 }
-themes()
+themes();
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -1,3 +1,4 @@
+'use strict'
 //左下のメッセージ
 var todcTrigger = null
 function todo(mes) {
@@ -30,7 +31,7 @@ function tips(mode) {
 				localStorage.getItem('ver') +
 				' git: ' +
 				gitHash +
-				'\')"> ' +
+				'\')">TheDesk ' +
 				localStorage.getItem('ver') +
 				' {' +
 				gitHash.slice(0, 7) +
@@ -128,7 +129,7 @@ function trendTagonTip() {
 		})
 }
 //Spotify
-spotint = null
+var spotint = null
 function spotifytips() {
 	if (spotint) clearInterval(spotint)
 	var start =
@@ -159,10 +160,6 @@ function spotifytips() {
 			})
 			.then(function(json) {
 				var ms = json.progress_ms
-				if(!ms) {
-					tips('ver')
-					return false
-				}
 				var last = 1000 - (ms % 1000)
 				var item = json.item
 				var img = item.album.images[0].url
@@ -222,8 +219,6 @@ function spotifytips() {
 			type: 'info',
 			title: lang.lang_spotify_acct
 		})
-		tips('ver')
-		return false
 	}
 }
 function spotStart() {
@@ -294,4 +289,6 @@ function tipsToggle() {
 	$('#tips').toggleClass('hide')
 	$('#tips-menu').toggleClass('hide')
 }
-
+if (localStorage.getItem('tips')) {
+	tips(localStorage.getItem('tips'))
+}
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -1,6 +1,7 @@
+'use strict'
 //ユーザーデータ表示
 //タイムライン
-function utlShow(user, more, acct_id) {
+function utl(user, more, acct_id) {
 	if (!acct_id) {
 		var acct_id = $("#his-data").attr("use-acct");
 	}
@@ -79,26 +80,6 @@ function utlShow(user, more, acct_id) {
 			jQuery("time.timeago").timeago();
 		});
 }
-function utlAdd() {
-	var acct_id = $("#his-data").attr("use-acct");
-	var user = $("#his-data").attr("user-id");
-	var add = {
-		domain: acct_id,
-		type: 'utl',
-		data: {
-			id: user,
-			acct: $("#his-acct").attr('fullname')
-		}
-	}
-	var multi = localStorage.getItem('column')
-	var obj = JSON.parse(multi)
-	localStorage.setItem('card_' + obj.length, 'true')
-	obj.push(add)
-	var json = JSON.stringify(obj)
-	localStorage.setItem('column', json)
-	parseColumn('add')
-	hisclose()
-}
 //ピン留めTL
 function pinutl(before, user, acct_id) {
 	if (!acct_id) {
--- a/app/js/userdata/prof-edit.js
+++ b/app/js/userdata/prof-edit.js
@@ -1,3 +1,4 @@
+'use strict'
 //プロフ編集
 //文字系
 function profedit() {
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -1,3 +1,4 @@
+'use strict'
 //ユーザーデータ表示
 localStorage.removeItem("history");
 //コード受信
@@ -115,7 +116,7 @@ function udg(user, acct_id) {
 				$("#his-data").attr("remote", "false");
 				var fullname = json.acct + "@" + domain;
 			}
-			utlShow(json.id, "", acct_id);
+			utl(json.id, "", acct_id);
 			flw(json.id, "", acct_id);
 			fer(json.id, "", acct_id);
 			var dis_name = escapeHTML(json.display_name);
@@ -298,7 +299,7 @@ function misskeyUdg(user, acct_id) {
 				$("#his-data").attr("remote", "false");
 				var fullname = json.acct + "@" + domain;
 			}
-			utlShow(json.id, "", acct_id);
+			utl(json.id, "", acct_id);
 			flw(json.id, "", acct_id);
 			fer(json.id, "", acct_id);
 			if (json.name) {
--- a/app/main.js
+++ b/app/main.js
@@ -3,10 +3,6 @@ var dir = 'file://' + __dirname
 var base = dir + '/view/'
 // Electronのモジュール
 const electron = require('electron')
-// アプリケーションをコントロールするモジュール
-const app = electron.app
-// Electronの初期化完了後に実行
-app.on('ready', createWindow)
 const fs = require('fs')
 const language = require('./main/language.js')
 const css = require('./main/css.js')
@@ -16,6 +12,9 @@ const np = require('./main/np.js')
 const systemFunc = require('./main/system.js')
 const Menu = electron.Menu
 const join = require('path').join
+
+// アプリケーションをコントロールするモジュール
+const app = electron.app
 // ウィンドウを作成するモジュール
 const BrowserWindow = electron.BrowserWindow
 // メインウィンドウはGCされないようにグローバル宣言
@@ -37,11 +36,59 @@ if (!gotTheLock) {
 	})
 }

-// 全てのウィンドウが閉じたら終了
-app.on('window-all-closed', function () {
-	electron.session.defaultSession.clearCache(() => {})
-	app.quit()
-})
+if (process.argv.indexOf('--dev') === -1) {
+	var packaged = true
+} else {
+	var packaged = false
+	console.log(
+		'||\\\\\\ \n' +
+			'||||  \\\\\\\\ \n' +
+			'||||     \\\\\\\\ \n' +
+			'|||| Am I a \\\\\\\\ \n' +
+			'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
+			'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
+			"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
+			'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
+			'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
+			'||||          /////         \n' +
+			'||||       /////\n' +
+			'||||     /////\n' +
+			'||||//////'
+	)
+	console.log('Welcome!')
+}
+var info_path = join(app.getPath('userData'), 'window-size.json')
+var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
+var lang_path = join(app.getPath('userData'), 'language')
+var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
+var ua_path = join(app.getPath('userData'), 'useragent')
+try {
+	fs.readFileSync(ha_path, 'utf8')
+	app.disableHardwareAcceleration()
+	if (!packaged) console.log('disabled: Hardware Acceleration')
+} catch {
+	if (!packaged) console.log('enabled: Hardware Acceleration')
+}
+var window_size
+try {
+	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
+} catch (e) {
+	window_size = {
+		width: 1000,
+		height: 750
+	} // デフォルトバリュー
+}
+var max_window_size
+try {
+	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
+} catch (e) {
+	max_window_size = {
+		width: 'string',
+		height: 'string',
+		x: 'string',
+		y: 'string'
+	} // デフォルトバリュー
+}
 function isFile(file) {
 	try {
 		fs.statSync(file)
@@ -50,8 +97,12 @@ function isFile(file) {
 		if (err.code === 'ENOENT') return false
 	}
 }
+// 全てのウィンドウが閉じたら終了
+app.on('window-all-closed', function() {
+	electron.session.defaultSession.clearCache(() => {})
+	app.quit()
+})
 function createWindow() {
-	var lang_path = join(app.getPath('userData'), 'language')
 	if (isFile(lang_path)) {
 		var lang = fs.readFileSync(lang_path, 'utf8')
 	} else {
@@ -68,130 +119,64 @@ function createWindow() {
 		} else {
 			lang = 'en'
 		}
-		fs.mkdir(app.getPath('userData'), function (err) {
+		fs.mkdir(app.getPath('userData'), function(err) {
 			fs.writeFileSync(lang_path, lang)
 		})
 	}
 	if (!packaged) console.log('your lang:' + app.getLocale())
 	if (!packaged) console.log('launch:' + lang)
-	//Opening
-	const package = fs.readFileSync(__dirname + '/package.json')
-	if(lang == 'ja') {
-		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
-		var show = maxims[Math.floor(Math.random() * maxims.length)]
-	} else {
-		var show = 'TheDesk 2018'
-	}
-	const data = JSON.parse(package)
-	const version = data.version
-	const codename = data.codename
-	var openingWindow = new BrowserWindow({
-		width: 300,
-		height: 400,
-		transparent: false,
-		frame: false,
-		resizable: false,
-	})
-	openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`)
-
-	if (process.argv.indexOf('--dev') === -1) {
-		var packaged = true
-	} else {
-		var packaged = false
-		console.log(
-			'||\\\\\\ \n' +
-				'||||  \\\\\\\\ \n' +
-				'||||     \\\\\\\\ \n' +
-				'|||| Am I a \\\\\\\\ \n' +
-				'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
-				'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
-				"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
-				'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
-				'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
-				'||||          /////         \n' +
-				'||||       /////\n' +
-				'||||     /////\n' +
-				'||||//////'
-		)
-		console.log('If it does not show the window, you might forget `npm run construct`.')
-	}
-
-	var info_path = join(app.getPath('userData'), 'window-size.json')
-	var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
-	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
-	var ua_path = join(app.getPath('userData'), 'useragent')
-	var frame_path = join(app.getPath('userData'), 'frame')
-	try {
-		fs.readFileSync(ha_path, 'utf8')
-		app.disableHardwareAcceleration()
-		if (!packaged) console.log('disabled: Hardware Acceleration')
-	} catch {
-		if (!packaged) console.log('enabled: Hardware Acceleration')
-	}
-	var window_size
-	try {
-		window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
-	} catch (e) {
-		window_size = {
-			width: 1000,
-			height: 750,
-		} // デフォルトバリュー
-	}
-	var max_window_size
-	try {
-		max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
-	} catch (e) {
-		max_window_size = {
-			width: 'string',
-			height: 'string',
-			x: 'string',
-			y: 'string',
-		} // デフォルトバリュー
-	}
-
-	try {
-		var frameRaw = fs.readFileSync(frame_path, 'utf8')
-		if (frameRaw == 'false') {
-			var frame = false
-			var frameTitle = 'hidden'
-		} else {
-			var frame = true
-			var frameTitle = 'default'
-		}
-	} catch {
-		var frame = true
-	}
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
 	var platform = process.platform
 	var bit = process.arch
-	var arg = {
-		webPreferences: {
-			webviewTag: true,
-			nodeIntegration: false,
-			contextIsolation: true,
-			preload: join(__dirname, 'js', 'platform', 'preload.js'),
-		},
-		width: window_size.width,
-		height: window_size.height,
-		x: window_size.x,
-		y: window_size.y,
-		show: false,
-		frame: frame,
-	}
 	if (platform == 'linux') {
-		arg.resizable = true
-		arg.icon = __dirname + '/desk.png'
+		var arg = {
+			webPreferences: {
+				webviewTag: true,
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(__dirname, 'js', 'platform', 'preload.js')
+			},
+			width: window_size.width,
+			height: window_size.height,
+			x: window_size.x,
+			y: window_size.y,
+			icon: __dirname + '/desk.png',
+			show: false
+		}
 	} else if (platform == 'win32') {
-		arg.simpleFullscreen = true
+		var arg = {
+			webPreferences: {
+				webviewTag: true,
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(__dirname, 'js', 'platform', 'preload.js')
+			},
+			width: window_size.width,
+			height: window_size.height,
+			x: window_size.x,
+			y: window_size.y,
+			simpleFullscreen: true,
+			show: false
+		}
 	} else if (platform == 'darwin') {
-		arg.simpleFullscreen = true
-		arg.titleBarStyle = frameTitle
+		var arg = {
+			webPreferences: {
+				webviewTag: true,
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(__dirname, 'js', 'platform', 'preload.js')
+			},
+			width: window_size.width,
+			height: window_size.height,
+			x: window_size.x,
+			y: window_size.y,
+			simpleFullscreen: true,
+			show: false
+		}
 	}
 	mainWindow = new BrowserWindow(arg)
 	mainWindow.once('page-title-updated', () => {
-		openingWindow.close()
 		mainWindow.show()
-		console.log('Accessibility: ' + app.accessibilitySupportEnabled)
 		if (window_size.max) {
 			mainWindow.maximize()
 		}
@@ -222,35 +207,40 @@ function createWindow() {
 		// Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36
 		const crypto = require('crypto')
 		const N = 100
-		var ua = 'Mastodon client: ' + crypto.randomBytes(N).toString('base64').substring(0, N)
+		var ua =
+			'Mastodon client: ' +
+			crypto
+				.randomBytes(N)
+				.toString('base64')
+				.substring(0, N)
 	}
 	mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua })
 	if (!window_size.x && !window_size.y) {
 		mainWindow.center()
 	}
 	// ウィンドウが閉じられたらアプリも終了
-	mainWindow.on('closed', function () {
+	mainWindow.on('closed', function() {
 		electron.ipcMain.removeAllListeners()
 		mainWindow = null
 	})
 	closeArg = false
-	mainWindow.on('close', function (e, arg) {
+	mainWindow.on('close', function(e, arg) {
 		writePos(mainWindow)
 		if (!closeArg) {
 			e.preventDefault()
 		}
-		const promise = new Promise(function (resolve) {
+		const promise = new Promise(function(resolve) {
 			mainWindow.webContents.send('asReadEnd', '')
-			setTimeout(function () {
+			setTimeout(function() {
 				resolve()
 			}, 3000)
 		})
-		promise.then(function (response) {
+		promise.then(function(response) {
 			closeArg = true
 			mainWindow.close()
 		})
 	})
-	electron.ipcMain.on('sendMarkersComplete', function (e, arg) {
+	electron.ipcMain.on('sendMarkersComplete', function(e, arg) {
 		closeArg = true
 		mainWindow.close()
 	})
@@ -266,33 +256,32 @@ function createWindow() {
 				height: mainWindow.getBounds().height,
 				x: mainWindow.getBounds().x,
 				y: mainWindow.getBounds().y,
-				max: true,
+				max: true
 			}
 		} else {
 			var size = {
 				width: mainWindow.getBounds().width,
 				height: mainWindow.getBounds().height,
 				x: mainWindow.getBounds().x,
-				y: mainWindow.getBounds().y,
+				y: mainWindow.getBounds().y
 			}
 		}
 		fs.writeFileSync(info_path, JSON.stringify(size))
 	}
-	mainWindow.on('maximize', function () {
+	mainWindow.on('maximize', function() {
 		writePos(mainWindow)
 		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()))
 	})
-	mainWindow.on('minimize', function () {
+	mainWindow.on('minimize', function() {
 		writePos(mainWindow)
 		mainWindow.webContents.send('asRead', '')
 	})

 	var platform = process.platform
 	var bit = process.arch
-	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame)))
-	if (!frame) {
-		mainWindow.setMenu(null)
-	}
+	Menu.setApplicationMenu(
+		Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname))
+	)
 	//CSS
 	css.css(mainWindow)
 	//アップデータとダウンロード
@@ -303,7 +292,7 @@ function createWindow() {
 	np.TheDeskNowPlaying(mainWindow)
 	//その他system
 	systemFunc.system(mainWindow, dir, lang, dirname)
-	setInterval(function () {
+	setInterval(function() {
 		mouseTrack(mainWindow)
 	}, 1000)
 }
@@ -329,5 +318,10 @@ function mouseTrack(mainWindow) {
 	x = xNow
 	y = yNow
 }
+// Electronの初期化完了後に実行
+app.on('ready', createWindow)
+var onError = function(err, response) {
+	console.error(err, response)
+}

 app.setAsDefaultProtocolClient('thedesk')
--- a/app/main/dl.js
+++ b/app/main/dl.js
@@ -1,126 +1,126 @@
 function dl(mainWindow, lang_path, base, dirname) {
-	const electron = require('electron')
-	const shell = electron.shell
-	const fs = require('fs')
-	const { download } = require('electron-dl')
-	const BrowserWindow = electron.BrowserWindow
-	const dialog = electron.dialog
-	var updatewin = null
-	var ipc = electron.ipcMain
-	const app = electron.app
-	const join = require('path').join
-	ipc.on('update', function(e, x, y) {
-		var platform = process.platform
-		var bit = process.arch
-		if (platform != 'others') {
+	const electron = require("electron");
+	const shell = electron.shell;
+	const fs = require("fs");
+	const { download } = require('electron-dl');
+	const BrowserWindow = electron.BrowserWindow;
+	const dialog = electron.dialog;
+	var updatewin = null;
+	var ipc = electron.ipcMain;
+	const app = electron.app;
+	const join = require('path').join;
+	ipc.on('update', function (e, x, y) {
+
+		var platform = process.platform;
+		var bit = process.arch;
+		if (platform != "others") {
 			updatewin = new BrowserWindow({
 				webPreferences: {
 					webviewTag: false,
 					nodeIntegration: false,
 					contextIsolation: true,
-					preload: join(dirname, 'js', 'platform', 'preload.js')
+					preload: join(dirname,"js", "platform", "preload.js")
 				},
 				width: 600,
 				height: 400,
-				transparent: false, // ウィンドウの背景を透過
-				frame: false, // 枠の無いウィンドウ
-				resizable: false,
-				show: false
+				"transparent": false, // ウィンドウの背景を透過
+				"frame": false, // 枠の無いウィンドウ
+				"resizable": false
 			})
-			var lang = fs.readFileSync(lang_path, 'utf8')
-			updatewin.loadURL(base + lang + '/update.html')
-			updatewin.webContents.once('dom-ready', () => {
-				updatewin.show()
-			 })
-			return 'true'
+			var lang = fs.readFileSync(lang_path, 'utf8');
+			updatewin.loadURL(base + lang + '/update.html');
+			return "true"
 		} else {
-			return false
+			return false;
 		}
 	})
 	//アプデDL
-	ipc.on('download-btn', async (e, args) => {
+	ipc.on('download-btn', (e, args) => {
 		function dl(url, file, dir, e) {
-			e.sender.webContents.send('mess', 'Start...')
+
+			e.sender.webContents.send('mess', "ダウンロードを開始します。");
 			const opts = {
 				directory: dir,
-				filename: file,
 				openFolderWhenDone: true,
-				onProgress: function(event) {
-					e.sender.webContents.send('prog', [event, args[2]])
+				onProgress: function (event) {
+					e.sender.webContents.send('prog', event);
 				},
 				saveAs: false
-			}
-			download(updatewin, url, opts)
+			};
+			download(updatewin,
+				url, opts)
 				.then(dl => {
-					e.sender.webContents.send('mess', 'ダウンロードが完了しました。')
-					app.quit()
+					e.sender.webContents.send('mess', "ダウンロードが完了しました。");
+					app.quit();
 				})
-				.catch(console.error)
+				.catch(console.error);
 		}
-		var platform = process.platform
-		var bit = process.arch
-		var options = {
+		var platform = process.platform;
+		var bit = process.arch;
+		dialog.showSaveDialog(null, {
 			title: 'Save',
-			defaultPath: app.getPath('home') + '/' + args[1]
-		}
-		const file = await dialog.showSaveDialog(null, options)
-		const savedFiles = file.filePath
-		console.log(savedFiles)
-		if (!savedFiles) {
-			return false
-		}
-		if (platform == 'win32') {
-			var m = savedFiles.match(/(.+)\\(.+)$/)
-		} else {
-			var m = savedFiles.match(/(.+)\/(.+)$/)
-		}
-		//console.log(m);
-		if (isExistFile(savedFiles)) {
-			fs.unlinkSync(savedFiles)
-		}
-		console.log(m)
-		dl(args[0], m[2], m[1], e)
-	})
+			defaultPath: app.getPath('home') + "/" + args[1]
+		}, (savedFiles) => {
+			console.log(savedFiles);
+			if (!savedFiles) {
+				return false;
+			}
+			if (platform == "win32") {
+				var m = savedFiles.match(/(.+)\\(.+)$/);
+			} else {
+				var m = savedFiles.match(/(.+)\/(.+)$/);
+			}
+			//console.log(m);
+			if (isExistFile(savedFiles)) {
+				fs.unlinkSync(savedFiles);
+			}
+			dl(args[0], args[1], m[1], e);
+		});
+	});

 	function isExistFile(file) {
 		try {
-			fs.statSync(file)
+			fs.statSync(file);
 			return true
 		} catch (err) {
 			if (err.code === 'ENOENT') return false
 		}
 	}

+
 	ipc.on('general-dl', (event, args) => {
-		var name = ''
-		var platform = process.platform
-		var bit = process.arch
-		if (args[1] == '') {
-			if (platform == 'win32') {
-				var dir = app.getPath('home') + '\\Pictures\\TheDesk'
-			} else if (platform == 'linux' || platform == 'darwin') {
-				var dir = app.getPath('home') + '/Pictures/TheDesk'
+
+		var name = "";
+		var platform = process.platform;
+		var bit = process.arch;
+		if (args[1] == "") {
+			if (platform == "win32") {
+				var dir = app.getPath('home') + "\\Pictures\\TheDesk";
+			} else if (platform == "linux" || platform == "darwin") {
+				var dir = app.getPath('home') + "/Pictures/TheDesk";
 			}
 		} else {
-			var dir = args[1]
+			var dir = args[1];
 		}
 		const opts = {
 			directory: dir,
 			filename: name,
 			openFolderWhenDone: false,
-			onProgress: function(e) {
-				event.sender.webContents.send('general-dl-prog', e)
+			onProgress: function (e) {
+				event.sender.webContents.send('general-dl-prog', e);
 			},
 			saveAs: false
-		}
-		download(BrowserWindow.getFocusedWindow(), args[0], opts)
+		};
+		download(BrowserWindow.getFocusedWindow(),
+			args[0], opts)
 			.then(dl => {
-				event.sender.webContents.send('general-dl-message', dir)
+				event.sender.webContents.send('general-dl-message', dir);
 			})
-			.catch(console.error)
-	})
+			.catch(console.error);
+	});
 	ipc.on('open-finder', (e, folder) => {
+
 		shell.showItemInFolder(folder)
-	})
+	});
 }
-exports.dl = dl
+exports.dl = dl;
--- a/app/main/img.js
+++ b/app/main/img.js
@@ -1,92 +1,43 @@
 function img(mainWindow, dir) {
-	const electron = require('electron')
-	const dialog = electron.dialog
-	const fs = require('fs')
-	var Jimp = require('jimp')
-	var ipc = electron.ipcMain
-	const BrowserWindow = electron.BrowserWindow
-	ipc.on('file-select', (e, args) => {
-		dialog.showOpenDialog(
-			null,
-			{
-				properties: ['openFile', 'multiSelections'],
-				title: '添付ファイルを選択',
-				defaultPath: '.',
-				filters: [
-					{
-						name: 'メディアファイル',
-						extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm']
-					},
-					{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
-					{ name: '動画', extensions: ['mp4', 'webm'] },
-					{ name: '全てのファイル', extensions: ['*'] }
-				]
-			},
-			fileNames => {
-				if (!fileNames) {
-					return false
-				}
-				for (var i = 0; i < fileNames.length; i++) {
-					var path = fileNames[i]
-					var bin = fs.readFileSync(path, 'base64')
-					e.sender.webContents.send('resizeJudgement', [bin, 'new'])
-				}
-			}
-		)
-	})
-	ipc.on('bmp-image', (e, args) => {
-		Jimp.read(args[0], function(err, lenna) {
-			if (err) throw err
-			lenna.getBase64(Jimp.MIME_PNG, function(err, src) {
-				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
-			})
-		})
-	})
-	ipc.on('resize-image', (e, args) => {
-		var ext = args[0].toString().slice(args[0].indexOf('/') + 1, args[0].indexOf(';'))
-		if (ext == 'jpeg') {
-			var use = 'MIME_JPEG'
-		} else {
-			var use = 'MIME_PNG'
-		}
-		var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
-		var decodedFile = new Buffer(b64, 'base64')
-		Jimp.read(decodedFile, function(err, lenna) {
-			if (err) throw err
-			lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function(err, src) {
-				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
-			})
-		})
-	})
-	ipc.on('stamp-image', (e, args) => {
-		var text = args[1]
-		var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
-		var decodedFile = new Buffer(b64, 'base64')
-		console.log(text)
-		Jimp.read(decodedFile, function(err, image) {
-			if (err) throw err
-			Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then(font => {
-				var evWidth = Jimp.measureText(font, text)
-				var width = image.bitmap.width
-				var height = image.bitmap.height
-				var left = width - evWidth - 10
-				var top = height - 30
-                var color = Jimp.intToRGBA(image.getPixelColor(left, top))
-                console.log(left, top, color)
-				var ave = (color.r + color.g + color.b) / 3
-				if (ave > 128) {
-					image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
-						e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
-					})
-				} else {
-					Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then(font => {
-						image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
-							e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
-						})
-					})
-				}
-			})
-		})
-	})
+    const electron = require("electron");
+    const dialog = electron.dialog;
+    const fs = require("fs");
+    var Jimp = require("jimp");
+    var ipc = electron.ipcMain;
+    const BrowserWindow = electron.BrowserWindow;
+    ipc.on('file-select', (e, args) => {
+
+        dialog.showOpenDialog(null, {
+            properties: ['openFile', 'multiSelections'],
+            title: '添付ファイルを選択',
+            defaultPath: '.',
+            filters: [
+                { name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] },
+                { name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
+                { name: '動画', extensions: ['mp4', 'webm'] },
+                { name: '全てのファイル', extensions: ['*'] }
+            ]
+        }, (fileNames) => {
+            if (!fileNames) {
+                return false;
+            }
+            for (var i = 0; i < fileNames.length; i++) {
+                var path = fileNames[i];
+                var bin = fs.readFileSync(path, 'base64');
+                e.sender.webContents.send('bmp-img-comp', [bin, 'new']);
+            }
+        });
+    });
+    ipc.on('bmp-image', (e, args) => {
+
+        var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
+        Jimp.read(args[0], function (err, lenna) {
+            if (err) throw err;
+            lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
+                e.sender.webContents.send('bmp-img-comp', [src, args[1]]);
+            });
+        });
+
+    });
 }
-exports.img = img
+exports.img = img;
--- a/app/main/language.js
+++ b/app/main/language.js
@@ -1,19 +1,12 @@
 // Create the Application's main menu
-function templete(lang, mainWindow, packaged, dir, dirname, frame) {
-    //フレーム
+function templete(lang, mainWindow, packaged, dir, dirname) {
    if(lang !="ja" && lang != "en"){
        lang = "en"
    }
    const electron = require("electron");
-    const ipc = electron.ipcMain;
    const app = electron.app;
    const BrowserWindow = electron.BrowserWindow;
    const join = require('path').join;
-    ipc.on("frameCheck", function(e, arg) {
-		if(!frame) {
-            e.sender.webContents.send("frame", "");
-        }
-	});
    const dict = {
        "application": {
            "ja": "アプリケーション",
--- a/app/main/np.js
+++ b/app/main/np.js
@@ -1,36 +1,36 @@
 function np(mainWindow) {
-	const electron = require('electron')
-	const ipc = electron.ipcMain
-	ipc.on('itunes', async (e, args) => {
-		console.log('Access')
-		if (args[0] == 'set') {
-		} else {
-			var platform = process.platform
-			var bit = process.arch
-			if (platform == 'darwin') {
-				try {
-					const nowplaying = require('itunes-nowplaying-mac')
-					let value = await nowplaying()
-					try {
-						const artwork = await nowplaying.getThumbnailBuffer(value.databaseID)
-						if(artwork) {
-							const base64 = artwork.toString('base64')
-							value.artwork = base64
-							e.sender.webContents.send('itunes-np', value)
-						}
-					} catch (error) {
-						console.error(error)
-						e.sender.webContents.send('itunes-np', value)
-					}
-					
-				} catch (error) {
-					console.error(error)
-					e.sender.webContents.send('itunes-np', error)
-				}
-			} else {
-			}
-		}
-    })
-    
+    const electron = require("electron");
+    const join = require('path').join;
+    const app = electron.app;
+    const fs = require("fs");
+    var ipc = electron.ipcMain;
+    ipc.on('itunes', async (e, args) => {
+        //Verified on Windows
+        console.log("Access");
+        if (args[0] == "set") {
+            
+        } else {
+            var platform = process.platform;
+            var bit = process.arch;
+            if (platform == "darwin") {
+                try {
+                    const nowplaying = require("itunes-nowplaying-mac");
+                    let value = await nowplaying();
+
+                    const artwork = await nowplaying.getThumbnailBuffer(value.databaseID);
+                    const base64 = artwork.toString('base64');
+                    value.artwork = base64
+                    e.sender.webContents.send('itunes-np', value);
+                } catch (error) {
+                    // エラーを返す
+                    console.error(error);
+                    e.sender.webContents.send('itunes-np', error);
+                }
+            } else {
+                
+            }
+        }
+
+    });
 }
-exports.TheDeskNowPlaying = np
+exports.TheDeskNowPlaying = np;
--- a/app/main/system.js
+++ b/app/main/system.js
@@ -12,7 +12,6 @@ function system(mainWindow, dir, lang, dirname) {
 	var ua_path = join(app.getPath("userData"), "useragent");
 	var lang_path = join(app.getPath("userData"), "language");
 	var log_dir_path = join(app.getPath("userData"), "logs");
-	var frame_path = join(app.getPath("userData"), "frame");
 	//ログ
 	var today = new Date();
 	//今日のやつ
@@ -46,7 +45,7 @@ function system(mainWindow, dir, lang, dirname) {
 	//エクスポートのダイアログ
 	ipc.on("exportSettings", function(e, args) {
 		dialog.showSaveDialog(
-			mainWindow,
+			null,
 			{
 				title: "Export",
 				properties: ["openFile", "createDirectory"],
@@ -63,14 +62,13 @@ function system(mainWindow, dir, lang, dirname) {
 	//インポートのダイアログ
 	ipc.on("importSettings", function(e, args) {
 		dialog.showOpenDialog(
-			mainWindow,
+			null,
 			{
 				title: "Import",
 				properties: ["openFile"],
 				filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
 			},
 			fileNames => {
-				console.log("imported from: ", fileNames)
 				if (!fileNames) {
 					return false;
 				}
@@ -81,7 +79,7 @@ function system(mainWindow, dir, lang, dirname) {
 	//保存フォルダのダイアログ
 	ipc.on("savefolder", function(e, args) {
 		dialog.showOpenDialog(
-			mainWindow,
+			null,
 			{
 				title: "Save folder",
 				properties: ["openDirectory"]
@@ -94,7 +92,7 @@ function system(mainWindow, dir, lang, dirname) {
 	//カスタムサウンドのダイアログ
 	ipc.on("customSound", function(e, arg) {
 		dialog.showOpenDialog(
-			mainWindow,
+			null,
 			{
 				title: "Custom sound",
 				properties: ["openFile"],
@@ -116,7 +114,6 @@ function system(mainWindow, dir, lang, dirname) {
 		app.relaunch();
 		app.exit();
 	});
-	//ユーザーエージェント
 	ipc.on("ua", function(e, arg) {
 		if (arg == "") {
 			fs.unlink(ua_path, function(err) {});
@@ -126,18 +123,7 @@ function system(mainWindow, dir, lang, dirname) {
 		app.relaunch();
 		app.exit();
 	});
-	//フレームのありなし
-	ipc.on("frameSet", function(e, arg) {
-		fs.writeFileSync(frame_path, arg);
-		app.relaunch();
-		app.exit();
-	});
-	//スクリーンリーダー
-	ipc.on("acsCheck", function(e, arg) {
-		if(app.accessibilitySupportEnabled) {
-			mainWindow.webContents.send('accessibility', 'true')
-		}
-	});
+
 	ipc.on("quit", (e, args) => {
 		app.quit();
 	});
@@ -247,10 +233,11 @@ function system(mainWindow, dir, lang, dirname) {
 		fn(data); // ソート後の配列を返す
 	}
 	ipc.on("fonts", (e, arg) => {
-		var SystemFonts = require('system-font-families').default;
-		var fm = new SystemFonts();
-		const fontList = fm.getFontsSync();
-		e.sender.webContents.send("font-list", fontList);
+		const fm = require("font-manager");
+		var fonts = fm.getAvailableFontsSync();
+		object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
+			e.sender.webContents.send("font-list", fonts_sorted);
+		});
 	});
 	//コピー
 	ipc.on("copy", (e, arg) => {
@@ -290,7 +277,6 @@ function system(mainWindow, dir, lang, dirname) {
 			e.sender.webContents.send("logData", logs);
 		});
 	});
-	
 	//起動時ログディレクトリ存在確認と作成、古ログ削除
 	fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, error => {
 		if (error) {
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,52 +0,0 @@
-{
-  "name": "TheDesk",
-  "short_name": "TheDesk",
-  "theme_color": "#212121",
-  "background_color": "#212121",
-  "display": "standalone",
-  "Scope": "/",
-  "start_url": "/",
-  "icons": [
-    {
-      "src": "img/icons/icon-72x72.png",
-      "sizes": "72x72",
-      "type": "image/png"
-    },
-    {
-      "src": "img/icons/icon-96x96.png",
-      "sizes": "96x96",
-      "type": "image/png"
-    },
-    {
-      "src": "img/icons/icon-128x128.png",
-      "sizes": "128x128",
-      "type": "image/png"
-    },
-    {
-      "src": "img/icons/icon-144x144.png",
-      "sizes": "144x144",
-      "type": "image/png"
-    },
-    {
-      "src": "img/icons/icon-152x152.png",
-      "sizes": "152x152",
-      "type": "image/png"
-    },
-    {
-      "src": "img/icons/icon-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "img/icons/icon-384x384.png",
-      "sizes": "384x384",
-      "type": "image/png"
-    },
-    {
-      "src": "img/icons/icon-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ],
-  "splash_pages": null
-}
--- a/app/maxim.ja.json
+++ b/app/maxim.ja.json
@@ -1,41 +0,0 @@
-[
-    "TheDeskは自称ステイホームの必須アイテム",
-    "あと数秒でPCのファンが全力で回り始める",
-    "カラムの数だけ夢があるがネットワークは逼迫する",
-    "朝起きたらストリーミングが止まっていた…",
-    "誰も使ってない機能1: 未読管理",
-    "誰も使ってない機能2: スタンプ機能",
-    "TheDeskは重い(ダブルミーニング)",
-    "今日も生茶が美味しい(4ケース96本の在庫)",
-    "jQueryは死すべき(流れ弾)",
-    "なんでTheDeskのバージョン19は無いの？",
-    "デレマス要素なくない？",
-    "今日も「TheDesk」でエゴサが捗る",
-    "開発者はTheDeskのヘビーユーザではない",
-    "アイコンは猫だが開発者は犬派",
-    "#TheDeskのアイコンは猫虐待",
-    "上のアニメーションからしてこの猫は完全に仮想化されている",
-    "TheDeskの歴史は2016年まで遡ることができる",
-    "WIP: Croudia, ネコ型SNS",
-    "リリース間隔は平均1桁日(昔1日に6回アプデを提供したせい)",
-    "node_modulesをignoreせずに上げてしまったせいでCode Frequencyが破壊された",
-    "TheDesk XSS Hunt をしなければならない()",
-    "毎月出る支援お願いしますダイアログで月初めを知る人 #いろいろな人",
-    "Integrated TLは目玉機能なので消せないが消せるものなら消したいくらい内部構造がヤバい",
-    "「アンケート」か「投票」か。「時間指定投稿」か「予約投稿」か",
-    "実装当初は言語を「関西弁」にするとお問い合わせフォームまで関西弁だった",
-    "Ctrl+Kでメニューが出ます",
-    "検索ボックスは入力後Enterで確定できる",
-    "開発者の推しカラーテーマはPolar Night",
-    "TheDeskのユーザーエージェントは毎回起動時に変わります。TheDeskと確定させることはできません",
-    "AppData/Roaming/TheDesk(Windows)の中にcutsom.cssを入れるとカスタムCSSを導入できます",
-    "環境設定の「ウィンドウフレーム」は「オフ」がおすすめ",
-    "各トゥートの右上の時刻表示を押すとトゥートのリンクがコピーされます",
-    "各トゥートの左下の公開範囲のアイコンを押すとそのトゥートの本文がコピーされますが挙動にバグがあります",
-    "TheDeskをMisskeyクライアントだと思って使ってはいけません",
-    "この迷文を追加したい場合はapp/maxim.ja.jsonを編集",
-    "本当はTheDesk 21.0.0(Mayu)専用のアイコンを用意していた",
-    "TheDesk 20.x.xと21.x.xではアイコンがちょっと違う",
-    "三大見てはいけないもの: TheDeskのコード、TheDeskのDevTool console、あと一つは？",
-    "この画面がずっと出続けているのは多分yarn construct忘れてる"
-]
--- a/app/nano.html
+++ b/app/nano.html
@@ -128,7 +128,7 @@
 			</select>
 		</div>
 		<button onclick="set()" id="setting">Setting</button>
-		<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post something new"></textarea>
+		<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post someyhing new"></textarea>
 		<button class="btn" onclick="post()">Post</button>
 		<button onclick="window.close()">x</button><br />
 		<div id="timeline_nano">Click "settings" to show TL</div>
--- a/app/opening.html
+++ b/app/opening.html
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-	<head>
-		<title>TheDesk</title>
-		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
-		<meta charset="utf-8" />
-		<style>
-			@font-face {
-				font-family: 'Open Sans';
-				font-style: normal;
-				font-weight: 300;
-				src: local('Open Sans Light'), local('OpenSans-Light'), url('./fonts/OpenSans-Light.ttf') format('truetype');
-			}
-			body {
-				font-family: 'Open Sans';
-				-webkit-app-region: drag;
-				cursor: move;
-				padding: 5px;
-				padding-top: 15px;
-				background-color: #222222;
-				color: white;
-				text-align: center;
-			}
-			.loading {
-				animation: throbber-loader 1000ms 300ms infinite ease-out;
-				background: #3d3d3d;
-				display: inline-block;
-				position: relative;
-				text-indent: -9999px;
-				width: 0.9em;
-				height: 0.9em;
-				margin: 0 .9em;
-			}
-			.loading:before,
-			.loading:after {
-				background: #3d3d3d;
-				content: '\x200B';
-				display: inline-block;
-				width: 0.9em;
-				height: 0.9em;
-				position: absolute;
-				top: 0;
-			}
-			.loading:before {
-				animation: throbber-loader 1000ms 150ms infinite ease-out;
-				left: -1.9em;
-			}
-			.loading:after {
-				animation: throbber-loader 1000ms 450ms infinite ease-out;
-				right: -1.9em;
-			}
-			@keyframes throbber-loader {
-				0% {
-					background: #3d3d3d;
-				}
-				10% {
-					background: #6b9dc8;
-				}
-				40% {
-					background: #3d3d3d;
-				}
-			}
-
-			a,
-			button {
-				-webkit-app-region: no-drag;
-			}
-			h1 {
-				margin: 0;
-            }
-            #maxim {
-                font-size: 0.7rem;
-            }
-		</style>
-	</head>
-
-	<body class="center" style="overflow: hidden;">
-		<img src="./img/desk-animation.svg" style="max-width: 62%;" />
-		<h1>TheDesk</h1>
-		<span id="ver"></span><br />
-		<span class="loading"></span><br />
-		<div class="cp">
-			<span id="maxim"></span><br />
-			<script>
-				if (location.search) {
-					var m = location.search.match(/\?ver=([0-9.]+)&codename=([a-zA-Z]+)&maxim=(.+)/)
-					var ver = m[1]
-					var code = m[2]
-					var maxim = m[3]
-					document.getElementById('ver').innerText = `${ver}(${code})`
-					document.getElementById('maxim').innerText = `${decodeURI(maxim)}`
-				}
-			</script>
-		</div>
-	</body>
-</html>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
cutls	957ef30fc0	WIP: use-strict 'login'	2019-11-25 00:03:33 +09:00
cutls	bae73521e9	WIP: use-strict	2019-11-24 23:53:35 +09:00
cutls	2583c3b80a	Merge branch 'master' into use-strict	2019-11-24 23:35:56 +09:00
cutls	2b6cf60868	WIP: use strict	2019-11-24 22:26:19 +09:00
				`@@ -1,2 +0,0 @@`

				`<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>`