WIP: use-strict 'login'

.gitignore

@@ -23,4 +23,3 @@ app/view/es-AR
 app/git
 *.code-workspace
 releasenote.md
-app/yarn-error.log

README.md

@@ -47,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.
@@ -146,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?  

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で不具合が発生することがあります。  

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;
-}

app/css/master.css

@@ -1,590 +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(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-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;
+  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;
 }

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");
-}

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;
-}

app/img/desk.svg

@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-	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.
--->
 <!-- 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">

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">

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>

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">

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>

app/js/common/about.js

@@ -1,3 +1,4 @@
+'use strict'
 //このソフトについて
 function about() {
 	postMessage(["sendSinmpleIpc", "about"], "*")

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",

app/js/common/hammer.min.js

@@ -1,3 +1,4 @@
+'use strict'
 /*! Hammer.JS - v2.0.8 - 2016-04-23
  * http://hammerjs.github.io/
  *

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) {

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

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));

app/js/common/version.js

@@ -1,6 +1,7 @@
+'use strict'
 //バージョンチェッカー
 function verck(ver, jp) {
-	console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
+	console.log('%c Welcome😊', 'color: red;font-size:200%;')
 	var date = new Date()
 	var show = false
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
@@ -21,7 +22,7 @@ function verck(ver, jp) {
 			if (localStorage.getItem('winstore')) {
 				$('#releasenote').modal('open')
 			}
-			verp = ver.replace('(', '')
+			var verp = ver.replace('(', '')
 			verp = verp.replace('.', '-')
 			verp = verp.replace('.', '-')
 			verp = verp.replace('[', '-')
@@ -40,15 +41,13 @@ function verck(ver, jp) {
 	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')
@@ -219,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
@@ -323,75 +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)
-			show = true
-			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)
-			show = true
-			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()
-				}
-			})
-	}
-	
+		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')

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()
 }

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%"},

app/js/login/instance.js

@@ -1,3 +1,4 @@
+'use strict'
 //インスタンスリスト
 var idata = {
 	"kirishima.cloud": "instance",

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,10 +578,10 @@ 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
 }
 //インスタンスティッカー

app/js/login/logout.js

@@ -1,3 +1,4 @@
+'use strict'
 //ログアウトします
 function logout() {
 	localStorage.removeItem("acct_" + acct_id + "_at");

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>

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,29 +124,23 @@ 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 show = `${lang.lang_img_DLDone}${
 			e.data[1][0]
-		}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
+		}<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])
@@ -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'
-				  })
-			}
-		}
-	}
-}

app/js/platform/first-not-view.js

@@ -1 +1,2 @@
+'use strict'
 //jQuery読む

app/js/platform/first.js

@@ -1,3 +1,4 @@
+'use strict'
 document.title = 'TheDesk'
 $.strip_tags = function(str, allowed) {
 	if (!str) {
@@ -161,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])
 		}
 	}
@@ -205,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
-	}
-}

app/js/platform/nano.js

@@ -1,3 +1,4 @@
+'use strict'
 //TL取得
 var websocket
 function tl(data) {

app/js/platform/preload.js

@@ -1,30 +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', () => {
-	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])
 		}
@@ -34,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') {
@@ -69,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') {
@@ -139,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) {
@@ -231,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) {

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 */

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')

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>'

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'
-	})
-}

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()
 }

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('')

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) {

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)`)

app/js/post/suggest.js

@@ -1,3 +1,4 @@
+'use strict'
 //入力時にハッシュタグと@をサジェスト
 var timer = null
 

app/js/post/use-txtbox.js

@@ -1,3 +1,4 @@
+'use strict'
 /*リプライ*/
 function re(id, ats_cm, acct_id, mode) {
 	clear()

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()
-}

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) {

app/js/tl/datails.js

@@ -1,3 +1,4 @@
+'use strict'
 //トゥートの詳細
 function details(id, acct_id, tlid, mode) {
 	if (mode == 'dm') {

app/js/tl/date.js

@@ -1,3 +1,4 @@
+'use strict'
 //日付パーサー
 function date(str, datetype) {
 	if (datetype == "relative") {

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");

app/js/tl/filter.js

@@ -1,3 +1,4 @@
+'use strict'
 /*メディアフィルター機能*/
 //各TL上方のMedia[On/Off]
 function mediaToggle(tlid) {
@@ -101,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')
@@ -180,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)
 	}
@@ -232,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')

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')

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>';

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)

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)
 						}
 					}
 				})
@@ -242,7 +239,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 					if (obj.type != 'follow') {
 						templete = parse([obj], 'notf', acct_id, 'notf', popup)
 					} 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)
@@ -342,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)
 							}
 						}
 					})
@@ -406,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')

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')

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
 }

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)
 		}
 	}
 }

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, '')

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)
-	}
-}

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')
-}
-

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,18 +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 == 'home') {
-		//ホームならお知らせ「も」取りに行く
-		announ(acct_id, tlid)
 	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
@@ -100,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 + ')')
@@ -141,7 +108,7 @@ 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
@@ -160,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)
@@ -221,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)
@@ -245,16 +207,12 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		} else if (type == 'pub') {
 			var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at
 		} else if (type == 'pub-media') {
-			var start =
-				wss + '/api/v1/streaming/?stream=public:media&access_token=' + at
+			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')
@@ -262,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') {
@@ -304,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)
@@ -323,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)
@@ -378,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') {
@@ -398,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')
@@ -440,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
@@ -472,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
@@ -507,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) +
-				'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)
@@ -583,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') {
@@ -605,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
@@ -640,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) +
-				'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)
@@ -698,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')
@@ -710,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')
@@ -763,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)'
 		}
@@ -779,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 + ')'
@@ -809,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'
@@ -843,21 +732,7 @@ function com(type, data) {
 	} else if (type == 'pub-media') {
 		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') {
@@ -1018,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', '')
 			}
 		})
@@ -1085,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)
 			}
@@ -1141,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)
 			}
@@ -1196,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
+						}
 					}
 				}
 
@@ -1217,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) {
@@ -1251,8 +1113,8 @@ function asReadEnd() {
 			onBeforeOpen: () => {
 				Swal.showLoading()
 			},
-			onClose: () => {},
-		}).then((result) => {})
+			onClose: () => {}
+		}).then(result => {})
 	} else {
 		postMessage(['asReadComp', ''], '*')
 	}
@@ -1278,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) {
@@ -1293,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 {
@@ -1310,52 +1168,3 @@ function getBookmark(acct_id, tlid, more) {
 		}
 	}
 }
-//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
-}

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]], '*')

app/js/ui/layout.js

@@ -1,3 +1,4 @@
+'use strict'
 //レイアウトの設定
 
 var websocketOld = []
@@ -8,7 +9,7 @@ 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')
@@ -234,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 = ''
@@ -292,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 = ''
@@ -374,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">
@@ -383,43 +367,33 @@ 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}
 					<a onclick="mediaToggle('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
@@ -733,7 +707,7 @@ function setToggleTag(tlid) {
 	}
 }
 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>

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");

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");

app/js/ui/post-box.js

@@ -1,3 +1,4 @@
+'use strict'
 /*ささやきボックス(Cr民並感)*/
 //✕隠す
 function hide() {
@@ -122,7 +123,6 @@ $('#timeline-container,#group').click(function(e) {
 	selectedColumn = 0
 	selectedToot = 0
 	localStorage.removeItem('nohide')
-	srcBox('close')
 })
 $('#contextWrap').click(function(e) {
 	$('#contextWrap').addClass('hide')

app/js/ui/radio.js

@@ -1,3 +1,4 @@
+'use strict'
 var r = document.getElementById("radio");
 function Rtoggle() {
     if ($("#radio").hasClass("play")) {

app/js/ui/scroll.js

@@ -1,3 +1,4 @@
+'use strict'
 //スクロールで続きを読む
 function scrollevent() {
 	$('.tl-box').scroll(function() {

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");

app/js/ui/spotify.js

@@ -1,223 +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,
-			})
+				type: "info",
+				title: lang.lang_spotify_acct
+			});
 		}
-	} else if (mode == 'itunes') {
-		postMessage(['itunes', ''], '*')
+	} 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')
-	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
-			var 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.replace(regExp, aaw.album)
-			content = content.replace(regExp, '-')
+			content = content.replace(regExp, arg.album.name);
 		}
-	} else {
-		if(aaw.album) 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 }
-}

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();

app/js/ui/tips.js

@@ -1,3 +1,4 @@
+'use strict'
 //左下のメッセージ
 var todcTrigger = null
 function todo(mes) {
@@ -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'))
+}

app/js/userdata/his-data.js

@@ -1,3 +1,4 @@
+'use strict'
 //ユーザーデータ表示
 //タイムライン
 function utl(user, more, acct_id) {

app/js/userdata/prof-edit.js

@@ -1,3 +1,4 @@
+'use strict'
 //プロフ編集
 //文字系
 function profedit() {

app/js/userdata/showOnTL.js

@@ -1,3 +1,4 @@
+'use strict'
 //ユーザーデータ表示
 localStorage.removeItem("history");
 //コード受信

app/main.js

@@ -55,14 +55,13 @@ if (process.argv.indexOf('--dev') === -1) {
 			'||||     /////\n' +
 			'||||//////'
 	)
-	console.log('If it does not show the window, you might forget `npm run construct`.')
+	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')
-var frame_path = join(app.getPath('userData'), 'frame')
 try {
 	fs.readFileSync(ha_path, 'utf8')
 	app.disableHardwareAcceleration()
@@ -98,18 +97,6 @@ function isFile(file) {
 		if (err.code === 'ENOENT') return false
 	}
 }
-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
-}
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function() {
 	electron.session.defaultSession.clearCache(() => {})
@@ -154,9 +141,7 @@ function createWindow() {
 			x: window_size.x,
 			y: window_size.y,
 			icon: __dirname + '/desk.png',
-			show: false,
-			frame: frame,
-			resizable: true
+			show: false
 		}
 	} else if (platform == 'win32') {
 		var arg = {
@@ -171,8 +156,7 @@ function createWindow() {
 			x: window_size.x,
 			y: window_size.y,
 			simpleFullscreen: true,
-			show: false,
-			frame: frame
+			show: false
 		}
 	} else if (platform == 'darwin') {
 		var arg = {
@@ -187,15 +171,12 @@ function createWindow() {
 			x: window_size.x,
 			y: window_size.y,
 			simpleFullscreen: true,
-			show: false,
-			titleBarStyle: frameTitle,
-			frame: frame,
+			show: false
 		}
 	}
 	mainWindow = new BrowserWindow(arg)
 	mainWindow.once('page-title-updated', () => {
 		mainWindow.show()
-		console.log('Accessibility: ' + app.accessibilitySupportEnabled)
 		if (window_size.max) {
 			mainWindow.maximize()
 		}
@@ -299,11 +280,8 @@ function createWindow() {
 	var platform = process.platform
 	var bit = process.arch
 	Menu.setApplicationMenu(
-		Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame))
+		Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname))
 	)
-	if(!frame) {
-		mainWindow.setMenu(null)
-	}
 	//CSS
 	css.css(mainWindow)
 	//アップデータとダウンロード

app/main/dl.js

@@ -1,122 +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
+				"transparent": false, // ウィンドウの背景を透過
+				"frame": false, // 枠の無いウィンドウ
+				"resizable": false
 			})
-			var lang = fs.readFileSync(lang_path, 'utf8')
-			updatewin.loadURL(base + lang + '/update.html')
-			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', 'ダウンロードを開始します。')
+
+			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;

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;

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": "アプリケーション",

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;

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) {

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
-}

app/package.json

@@ -1,21 +1,19 @@
 {
   "name": "thedesk",
-  "version": "20.3.3",
-  "codename": "Kawaii",
+  "version": "20.0.4",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "construct": "cd view/make && node make --automatic && cd ../../",
-    "dev": "npx electron ./ --dev",
+    "dev": "electron ./ --dev",
     "dist": "build --linux snap",
     "watchview": "node view/make/make.js --automatic --watch",
     "build:js": "node build.js",
-    "build": "node view/make/make.js --automatic && npx electron-builder",
-    "build:all": "npx electron-builder --win --linux",
-    "build:win": "npx electron-builder --win",
-    "build:pwa": "node view/make/make.js --automatic --pwa"
+    "build": "electron-builder",
+    "build:all": "electron-builder --win --linux",
+    "build:win": "electron-builder --win"
   },
   "keywords": [
     "mastodon",
@@ -52,28 +50,27 @@
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.13.0",
-    "custom-electron-titlebar": "^3.2.2-hotfix62",
-    "electron-dl": "^3.0.0",
-    "jimp": "^0.10.3",
-    "jquery": "^3.5.0",
+    "@fortawesome/fontawesome-free": "^5.11.2",
+    "electron-dl": "^1.14.0",
+    "jimp": "^0.8.4",
+    "jquery": "^3.4.1",
     "jquery-ui-dist": "^1.12.1",
-    "json5": "^2.1.3",
+    "materialize-css": "git://github.com/cutls/materialize",
+    "json5": "^2.1.1",
     "lodash": "^4.17.15",
-    "materialize-css": "git://github.com/cutls/materialize#v1-dev",
-    "sumchecker": "^3.0.1",
-    "sweetalert2": "^9.10.12",
-    "system-font-families": "^0.4.1",
-    "vue": "^2.6.11"
+    "sumchecker": "^3.0.0",
+    "sweetalert2": "^9.3.16",
+    "vue": "^2.6.10"
   },
   "optionalDependencies": {
+    "font-manager": "0.3.0",
     "itunes-nowplaying-mac": "0.3.1"
   },
   "devDependencies": {
-    "chokidar": "^3.3.1",
-    "electron": "^8.2.3",
-    "electron-builder": "^22.5.1",
-    "electron-rebuild": "^1.10.1",
+    "chokidar": "^3.3.0",
+    "electron": "^7.1.1",
+    "electron-builder": "^22.1.0",
+    "electron-rebuild": "^1.8.8",
     "readline-sync": "1.4.10"
   },
   "build": {

app/source/version.json

@@ -1,15 +1,5 @@
 {
   "latest":[],
-  "3.1.3": [],
-  "3.1.2": [],
-  "3.1.1": [],
-  "3.1.0": [
-    "ブックマーク機能",
-    "お知らせ機能",
-    "プロフィールをワードフィルターする",
-    "フォローリクエストが通知に表示される"
-  ],
-  "3.0.1": [],
   "3.0.0": [
     "プロフィールディレクトリの表示",
     "ホワイトリスト式のトレンドタグ(3.0の機能)",

app/sw.pwa.js

@@ -1,2 +0,0 @@
-//PWA用
-self.addEventListener('fetch', function(e) {})

app/view/make/acct.sample.html

@@ -1,148 +1,178 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="@@lang@@">
-	<head>
-		<title>Account Manager - TheDesk</title>
-		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
-		<link
-			href="../../@@node_base@@/materialize-css/dist/css/materialize.css"
-			type="text/css"
-			rel="stylesheet"
-		/>
-		<link href="../../css/themes.css" type="text/css" rel="stylesheet" />
-		<link href="../../css/master.css" type="text/css" rel="stylesheet" />
-		<link href="../../css/tl.css" rel="stylesheet" type="text/css" />
-		<link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
-		<link
-			href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css"
-			type="text/css"
-			rel="stylesheet"
-		/>
-		<link href="../../css/acct.css" rel="stylesheet" type="text/css" />
-		<meta charset="utf-8" />
-		@@comment-start@@
-		<script type="text/javascript">
-			var _jipt = []
-			_jipt.push(['project', 'thedesk'])
-		</script>
-		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-		@@comment-end@@
-		@@pwa@@
-	</head>
 
-	<body id="mainView">
-		<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
-		<script type="text/javascript" src="../../js/platform/first.js"></script>
-		<script
-			type="text/javascript"
-			src="../../@@node_base@@/materialize-css/dist/js/materialize.js"
-		></script>
-		<script type="text/javascript" src="main.js"></script>
-		<script
-			type="text/javascript"
-			src="../../@@node_base@@/sweetalert2/dist/sweetalert2.all.min.js"
-		></script>
-		<script>
-			var misskeytoken = false
-		</script>
-		<script type="text/javascript" src="../../js/common/time.js"></script>
-		<div class="hide-first">
-			<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"
-				>@@back@@</a
-			><br />
-			<h5>@@list@@</h5>
-			<div id="acct-list"></div>
-			<div class="divider"></div>
-		</div>
-		<div>
-			<h5>@@add@@</h5>
-			<br />
-			<div id="add">
-				<div class="row">
-					<div class="col s8">
-						@@addAcct@@<br />
-						<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
-						<div id="ins-suggest"></div>
-						<button class="btn waves-effect" onclick="instance()">Login</button><br />
-						@@codesetupwarn@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="linux" />
-							<span>@@codesetup@@</span>
-						</label>
-						<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="misskey" />
-							<span>@@thisismisskey@@</span> </label
-						><br />
-					</div>
-					<div class="col s4 scr" aria-hidden="true">
-						<span style="font-family:Open Sans;">Supports</span>
-						<div id="support" class="collection transparent"></div>
-					</div>
-				</div>
-			</div>
-			<div id="auth" style="display:none">
-				@@codepastewarn@@<br />
-				<input type="text" id="code" placeholder="@@codepaste@@" required />
-				<button class="btn waves-effect" onclick="code()">Auth</button><br />
-				<br />
-				<a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
-				<div id="compt" style="display:none" class="scr">
-					<h5>ログイン前に必ずご確認ください</h5>
-					<span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span
-					>のため以下の機能がご利用いただけません。
-					<span id="compt-warn" style="display:none"
-						>また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span
-					>
-					<ul id="compt-list"></ul>
-				</div>
-			</div>
-			<div id="misskeylogin" style="display:none">
-				<h5>AppSecret</h5>
-				@@misskeylogin@@<br />
-				<input type="hidden" id="misskey-url" />
-				<input type="text" id="misskey-key" placeholder="@@codepaste@@" required />
-				<button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br />
-				<br />
-				<a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
-			</div>
-		</div>
-		<div class="hide-first">
-			<h5>@@mainacct@@</h5>
-			<div class="input-field" style="width:300px">
-				<span data-trans="your_acct">@@selacct@@</span>
-				<br />
-				<select
-					id="main-acct-sel"
-					class="acct-sel"
-					style="color:black"
-					onchange="mainacct()"
-				></select>
-				<label></label>
-			</div>
-			<ul id="domain-list" class="collection transparent"></ul>
-			<div id="instance-data">
-				Some instance data by
-				<a href="https://instances.social" target="_blank">instances.social API</a><br />
-				<h5 id="ins-title"></h5>
-				Administered by:<a id="ins-admin"></a><br />
-				<span id="ins-desc"></span><br />
-				<img src="../../img/loading.svg" id="ins-prof" width="200" /><br />
-				<br />
-				@@domain@@:<span id="ins-name"></span><br />
-				@@connect@@:<span id="ins-connect"></span>@@ko@@<br />
-				@@toots@@:<span id="ins-toot"></span>@@ko@@<br />
-				@@users@@:<span id="ins-user"></span>@@users@@<br />
-				@@safety@@:<span id="ins-per"></span>%<br />
-				@@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br />
-			</div>
-		</div>
-		<script type="text/javascript" src="../../js/ui/theme.js"></script>
-		<script type="text/javascript" src="../../js/ui/tips.js"></script>
-		<script type="text/javascript" src="../../js/platform/end.js"></script>
-		<script type="text/javascript" src="../../js/common/sha256.js"></script>
-		<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
-		<script type="text/javascript" src="../../js/login/instance.js"></script>
-		<script type="text/javascript" src="../../js/login/manager.js"></script>
-		<script type="text/javascript" src="../../js/tl/date.js"></script>
-	</body>
-</html>
+<head>
+      <title>Account Manager - 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/themes.css" type="text/css" rel="stylesheet">
+      <link href="../../css/master.css" type="text/css" rel="stylesheet">
+      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
+      <style>
+            .acct {
+                  display: flex;
+                  justify-content: space-around;
+            }
+
+            .card {
+                  width: 400px;
+                  background-color: #9e9e9e;
+                  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;
+            }
+      </style>
+      <meta charset="utf-8">
+      @@comment-start@@
+      <script type="text/javascript">
+            var _jipt = [];
+            _jipt.push(['project', 'thedesk']);
+      </script>
+      <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+      @@comment-end@@
+</head>
+
+<body id="mainView">
+      <script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
+      <script type="text/javascript" src="../../js/platform/first.js"></script>
+      <script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
+      <script type="text/javascript" src="main.js"></script>
+      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
+      <script>
+            var misskeytoken = false;
+      </script>
+      <script type="text/javascript" src="../../js/common/time.js"></script>
+      <div class="hide-first">
+            <a href="index.html" class="btn waves-effect orange nex"
+                  style="width:100%; max-width:200px;">@@back@@</a><br>
+            <h5>@@list@@</h5>
+            <div id="acct-list"></div>
+            <div class="divider"></div>
+      </div>
+      <div>
+            <h5>@@add@@</h5><br>
+            <div id="add">
+                  <div class="row">
+                        <div class="col s8">
+                              <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
+                              <div id="ins-suggest"></div>
+                              @@codesetupwarn@@<br>
+                              <label>
+                                    <input type="checkbox" class="filled-in" id="linux" />
+                                    <span>@@codesetup@@</span>
+                              </label>
+                              <br>
+                              <label>
+                                    <input type="checkbox" class="filled-in" id="misskey" />
+                                    <span>@@thisismisskey@@</span>
+                              </label><br>
+                              <button class="btn waves-effect" onclick="instance()">Login</button><br>
+                        </div>
+                        <div class="col s4">
+                              <span style="font-family:Open Sans;">Supports</span>
+                              <div id="support" class="collection transparent"></div>
+                        </div>
+                  </div>
+            </div>
+            <div id="auth" style="display:none">
+                  @@codepastewarn@@<br>
+                  <input type="text" id="code" placeholder="@@codepaste@@" required>
+                  <button class="btn waves-effect" onclick="code()">Auth</button><br>
+                  <br>
+                  <a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
+                  <div id="compt" style="display:none">
+                        <h5>ログイン前に必ずご確認ください</h5>
+                        <span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span>のため以下の機能がご利用いただけません。
+                        <span id="compt-warn" style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span>
+                        <ul id="compt-list"></ul>
+                  </div>
+            </div>
+            <div id="misskeylogin" style="display:none">
+                  <h5>AppSecret</h5>
+                  @@misskeylogin@@<br>
+                  <input type="hidden" id="misskey-url">
+                  <input type="text" id="misskey-key" placeholder="@@codepaste@@" required>
+                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
+                  <br>
+                  <a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
+            </div>
+      </div>
+      <div class="hide-first">
+            <h5>@@mainacct@@</h5>
+            <div class="input-field" style="width:300px"><span data-trans="your_acct">@@selacct@@</span>
+                  <br>
+                  <select id="main-acct-sel" class="acct-sel" style="color:black" onchange="mainacct()"></select>
+                  <label></label>
+            </div>
+            Some instance data by <a href="https://instances.social" target="_blank">instances.social API</a><br>
+            <h5 id="ins-title"></h5>
+            Administered by:<a id="ins-admin"></a><br>
+            <span id="ins-desc"></span><br>
+            <img src="../../img/loading.svg" id="ins-prof" width="200"><br>
+            <br>
+            @@domain@@:<span id="ins-name"></span><br>
+            @@connect@@:<span id="ins-connect"></span>@@ko@@<br>
+            @@toots@@:<span id="ins-toot"></span>@@ko@@<br>
+            @@users@@:<span id="ins-user"></span>@@users@@<br>
+            @@safety@@:<span id="ins-per"></span>%<br>
+            @@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
+      </div>
+      <script type="text/javascript" src="../../js/ui/theme.js"></script>
+      <script type="text/javascript" src="../../js/platform/end.js"></script>
+      <script type="text/javascript" src="../../js/common/sha256.js"></script>
+      <script type="text/javascript" src="../../js/login/instance.js"></script>
+      <script type="text/javascript" src="../../js/login/manager.js"></script>
+      <script type="text/javascript" src="../../js/tl/date.js"></script>

app/view/make/language/af-ZA/acct.json

@@ -2,7 +2,6 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
-    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

app/view/make/language/af-ZA/index.json

@@ -1,8 +1,6 @@
 {
     "draghere": "Drag here to upload",
     "close": "Close",
-    "webSrc": "Search on Web",
-    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Show profile of the selecting account",
     "closethisbox": "Close this box",
     "toot": "Toot",
@@ -22,8 +20,6 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
-    "stamp": "Stamp",
-    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -140,7 +136,6 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
-    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",
@@ -173,17 +168,15 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
-    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
-    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

app/view/make/language/af-ZA/main.json

@@ -48,7 +48,6 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
-    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -60,8 +59,6 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
-    "lang_post_syncDetail": "Upload media synchronously",
-    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -69,8 +66,6 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
-    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
-    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -142,8 +137,6 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
-    "lang_layout_tagManager": "Tag timeline manager",
-    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -160,7 +153,6 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
-    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -172,7 +164,6 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
-    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",
@@ -201,19 +192,16 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
-    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "(Voted)",
-    "lang_parse_myvote": "(My own poll)",
+    "lang_parse_voted": "Voted",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
-    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",

app/view/make/language/af-ZA/setting.json

@@ -4,21 +4,18 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
-  "show": "Show",
-  "hide": "Hide",
   "default": "Default",
   "change": "Change",
   "select": "Select",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
-  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification",
+  "popup": "Popup notification(on Windows)",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -36,12 +33,7 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
-  "frame": "Window frame",
-  "frameWarn": "If 'off', the window looks cool.",
-  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
-  "srcUrl": "Search engine",
-  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -102,7 +94,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
@@ -145,8 +137,6 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
-  "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",
@@ -173,8 +163,6 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
-  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
-  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

app/view/make/language/ar-SA/acct.json

@@ -2,7 +2,6 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
-    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

app/view/make/language/ar-SA/index.json

@@ -1,8 +1,6 @@
 {
     "draghere": "Drag here to upload",
     "close": "Close",
-    "webSrc": "Search on Web",
-    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Show profile of the selecting account",
     "closethisbox": "Close this box",
     "toot": "Toot",
@@ -22,8 +20,6 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
-    "stamp": "Stamp",
-    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -140,7 +136,6 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
-    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",
@@ -173,17 +168,15 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
-    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
-    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

app/view/make/language/ar-SA/main.json

@@ -48,7 +48,6 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
-    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -60,8 +59,6 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
-    "lang_post_syncDetail": "Upload media synchronously",
-    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -69,8 +66,6 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
-    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
-    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -142,8 +137,6 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
-    "lang_layout_tagManager": "Tag timeline manager",
-    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -160,7 +153,6 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
-    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -172,7 +164,6 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
-    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",
@@ -201,19 +192,16 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
-    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "(Voted)",
-    "lang_parse_myvote": "(My own poll)",
+    "lang_parse_voted": "Voted",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
-    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",

app/view/make/language/ar-SA/setting.json

@@ -4,21 +4,18 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
-  "show": "Show",
-  "hide": "Hide",
   "default": "Default",
   "change": "Change",
   "select": "Select",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
-  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification",
+  "popup": "Popup notification(on Windows)",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -36,12 +33,7 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
-  "frame": "Window frame",
-  "frameWarn": "If 'off', the window looks cool.",
-  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
-  "srcUrl": "Search engine",
-  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -102,7 +94,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
@@ -145,8 +137,6 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
-  "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",
@@ -173,8 +163,6 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
-  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
-  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",