push

.gitignore

@@ -10,16 +10,12 @@ app/.DS_Store
 .vscode/*
 enq.md
 app/.tkn
-app/node_modules
 app/js/login/tkn.js
+app/package-lock.json
 app/view/en
 app/view/ja
-app/view/ja-KS
 app/view/de
 app/view/bg
 app/view/cs
 app/view/ps
-app/view/es-AR
 app/git
-*.code-workspace
-releasenote.md

.travis.yml

@@ -3,26 +3,21 @@ os:
  - linux
  - osx
 language: node_js
-env:
-  - YARN_GPG=no
 node_js:
 - '10.15.2'
-cache:
-  yarn: true
 script: node -v
 before_deploy:
-  - yarn global add electron-builder
+  - npm install electron-builder -g
   - cd app
   - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
-  - yarn install --no-lockfile --prod
-  - yarn construct
+  - npm install
+  - npm run construct
   - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then ls;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv thedesk-*.zip thedesk.zip;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then yarn add electron-builder;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win --ia32 -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then ls;else :;fi
@@ -50,5 +45,4 @@ deploy:
   on:
     repo: cutls/TheDesk
     tags: true
-branches:
-  only: "/^v?[0-9\\.]+/"
+    all_branches: true

LATEST.md

@@ -0,0 +1,22 @@
+## For Astarte(kirishima.cloud), My Primary Instance
+
+TheDesk :thedesk: Akane (16.1.0)  
+・不具合修正(マウスオーバー,クリックに関する)
+・2.5.0に対する対応(リプ数やendorseなど)
+・軽量化を図った
+・一つのカラムをTwitter(TweetDeck)にできる機能
+・画像の保存先を変えられるように
+・インスタンス情報の拡充
+・デザイン変更
+・トゥートバーを左端に持ってこれるように
+・Windowsのネイティブ通知が復活
+
+ほか
+https://thedesk.top
+ :github: https://github.com/cutls/TheDesk #Desk #DeskUpdate
+
+ ## For Other Instances
+
+TheDesk :thedesk: Akane (16.0.1)  
+
+https://thedesk.top

LICENSE.md

@@ -0,0 +1,8 @@
+# プライバシーポリシー
+
+* TheDeskは「開発者からのお知らせ」配信のためにサーバー(thedesk.top)に常時アクセスしています。
+* 上記の接続によるユーザーの情報提供はありません。(IPアドレス等を含む)
+* thedesk.topのページにおいては、Googleアナリティクスによる解析を採用しています。
+* 配信についてAmazon Web Service CloudFrontを使用しています。CloudFrontにはアクセス解析機能がありますが、これの使用につきましては同プライバシーポリシーに則ります。
+* 接続するインスタンスのプライバシーポリシーはAPIを通じた全てのアクションに対して有効ですので、TheDeskについてもそれらに則ります。
+

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.
@@ -67,10 +80,6 @@ Fellow coder
 
 ## Build
 
-You have to use either **npm** or **yarn**. Whichever you use, it works well.
-
-### npm
-
 ```sh
 git clone https://github.com/cutls/TheDesk
 cd TheDesk/app
@@ -79,25 +88,8 @@ npm install --only=dev
 npm run construct
 ```
 
-### yarn
-
-```sh
-git clone https://github.com/cutls/TheDesk
-cd TheDesk/app
-# Linux or macOS
-yarn install --no-lockfile
-# Windows
-yarn install
-
-yarn construct
-```
-
-run `npm run dev` or `yarn dev` to launch developer version with console(click `view`)
-
 ### electron-builder(Recommended)
-Use scripts(they can work well with npm, **yarn**).  
-
-#### npm
+Use npm scripts.  
 
 ```sh
 # Build for current platform
@@ -111,21 +103,6 @@ npm run build:win
 npm run build:all
 ```
 
-#### yarn
-
-```sh
-# Build for current platform
-yarn build
-
-# Select build target
-## Windows
-yarn build:win
-
-## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
-yarn build:all
-```
-
-
 Config is all on package.json  
 
 ### electron-packager
@@ -146,17 +123,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`フォルダ内で実行
@@ -66,9 +79,6 @@ Linuxビルダー
 
 ## ビルド
 
-npmでもyarnでも好きな方を選んでください。
-
-### npm
 
 ```sh
 git clone https://github.com/cutls/TheDesk
@@ -78,24 +88,8 @@ npm install --only=dev
 npm run construct
 ```
 
-### yarn
-
-```sh
-git clone https://github.com/cutls/TheDesk
-cd TheDesk/app
-# Linux or macOS
-yarn install --no-lockfile
-# Windows
-yarn install
-
-yarn construct
-```
-
 ### electron-builder(推奨)
-
-scriptsを利用します
-
-#### npm
+npm scriptsを利用します
 
 ```sh
 # 実行している環境向けにビルド
@@ -109,20 +103,6 @@ npm run build:win
 npm run build:all
 ```
 
-#### yarn
-
-```sh
-# 実行している環境向けにビルド
-yarn build
-
-# ターゲットを指定してビルド
-## Windows
-yarn build:win
-
-## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
-yarn build:all
-```
-
 ビルド設定はすべてpackage.jsonに記載しています。  
 
 ### electron-packager(非推奨)
@@ -145,17 +125,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,572 +1,514 @@
 /*共通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;
 }
 help {
-	display: none;
+  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;
+.unvisible{
+  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;
+}
+.twitter-tweet {
+  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 #0c7abf;
+}
+.twitter-tweet :before {
+  content: "From Twitter";
+  font-size: 1.8rem;
+  line-height: 1em;
+  font-family: Open Sans;
+  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(--box);
+  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 div {
-	padding-left: 5px;
-	width: 100%;
-	height: 50px;
-	display: flex;
-	align-items: center;
-	cursor: pointer;
+  padding-left: 5px;
+  width: 100%;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
 }
 #left-menu div:hover {
-	background-color: var(--beforehover);
+  background-color: var(--beforehover);
 }
 #left-menu span {
-	margin-left: 5px;
+  margin-left: 5px;
 }
 #left-menu div.active {
-	background-color: var(--emphasized);
+  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;
-}
-#tltype .type span {
-	width: calc(100% - 30px);
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  width: 170px;
+  height: 40px;
+  cursor: pointer;
 }
 #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: relative;
+  color: var(--beforehover);
+  left: -15px;
 }
 .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;
+input, textarea {
+  color: var(--color);
+  font-size: 1rem !important;
+  font-family: inherit;
 }
-.swal2-popup {
-	background-color: var(--notfbox) !important;
+.swal2-popup{
+  background-color: var(--notfbox) !important;
 }
-.swal2-title,
-.swal2-content {
-	color: var(--color) !important;
-}
-#src-contents svg {
-	margin-right: 5px;
-}
-.contributor {
-	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;
-}
-
-@media (max-width: 500px) {
-	#pageSrc {
-		left: 0;
-	}
+.swal2-title, .swal2-content{
+  color: var(--color) !important;
 }
 
 /*スクロールバー*/
 ::-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/userdata.css

@@ -4,9 +4,6 @@
   background-image: url("../../loading.svg");
   overflow-y: hidden;
 }
-#his-data .btn .material-icons{
-  float:left;
-}
 #his-data-content {
   display: flex;
   justify-content: center;
@@ -25,7 +22,6 @@
 }
 #his-float-data {
   height: 100%;
-  overflow-y: hidden;
 }
 #his-leftside {
   width: 500px;
@@ -64,10 +60,10 @@
   padding: 0;
   padding-left: 5px;
 }
-.his-var-content a span.ellipsis:after {
+#his-data a span.ellipsis:after {
   content: "...";
 }
-.his-var-content a:not(.mention) span:last-of-type {
+#his-data a:not(.mention) span:last-of-type {
   display: none;
 }
 #his-data a .rep_ct,
@@ -103,8 +99,7 @@
   width: 20px;
 }
 #his-plus-action .btn {
-  padding-right: 5px;
-  padding-left: 5px;
+  width: 170px;
 }
 .tabs {
   display: flex;
@@ -112,30 +107,10 @@
 .tabs .tab a {
   padding: 8px 12px;
 }
-#his-des {
-  max-height: 250px;
-  overflow-y: scroll;
-}
-#his-sign-action {
-  border: 1px solid;
-  border-radius: 5px;
-  display: flex;
-  align-items: center;
-  padding-left: 10px;
-  padding-right: 10px;
-  flex-wrap: wrap;
-}
-#his-sign-action .btn {
-  flex-basis: 31.2%;
-}
 #his-des .mention {
   color: #039be5;
   cursor: pointer;
 }
-#his-table{
-  max-height: 150px;
-  overflow-y: scroll;
-}
 #his-float-blocked {
   display: flex;
   justify-content: center;

app/index.html

@@ -1,7 +1,3 @@
-<!doctype html>
-<html>
-    <head>
-        <meta http-equiv=”refresh” content=”0;URL=’./view/ja'” />
-        <script>location.href = './view/ja';</script>
-    </head>
-</html>
+<script>
+location.href="./view/ja"
+</script>

app/js/common/keyshortcut.js

@@ -1,197 +1,180 @@
 selectedColumn = 0
 selectedToot = 0
-$(function($) {
+$(function ($) {
 	//キーボードショートカット
-	$(window).keydown(function(e) {
-		var hasFocus = $('input').is(':focus')
-		var hasFocus2 = $('textarea').is(':focus')
-		if (document.getElementById('webview')) {
-			if ($('#webviewsel:checked').val()) {
-				var wv = false
+	$(window).keydown(function (e) {
+		var hasFocus = $('input').is(':focus');
+		var hasFocus2 = $('textarea').is(':focus');
+		if (document.getElementById("webview")) {
+			if ($("#webviewsel:checked").val()) {
+				var wv = false;
 			} else {
-				var wv = true
+				var wv = true;
 			}
 		} else {
-			var wv = true
-		}
-		//Enter
-		if (e.keyCode === 13) {
-			if ($('#src').is(':focus')) {
-				src()
-				return false
-			}
-			if ($('#list-add').is(':focus')) {
-				makeNewList()
-				return false
-			}
+			var wv = true;
 		}
 		//Ctrl+Shift+Enter:Lgen
-		if (event.metaKey || (event.ctrlKey && wv)) {
+		if (event.metaKey || event.ctrlKey && wv) {
 			if (event.shiftKey) {
 				if (e.keyCode === 13) {
-					post('local')
-					return false
+					post('local');
+					return false;
 				}
 			}
 		}
 		//Ctrl+Enter:投稿
-		if (event.metaKey || (event.ctrlKey && wv)) {
+		if (event.metaKey || event.ctrlKey && wv) {
 			if (e.keyCode === 13) {
-				post()
-				return false
+				post();
+				return false;
 			}
 		}
 		//Alt+Enter:セカンダリー
-		if (event.metaKey || (event.altKey && wv)) {
+		if (event.metaKey || event.altKey && wv) {
 			if (e.keyCode === 13) {
-				sec()
-				return false
+				sec();
+				return false;
 			}
 		}
 		//Esc:消す
 		if (e.keyCode === 27 && wv) {
-			hide()
-			return false
+			hide();
+			return false;
 		}
 		//F5リロード
 		if (e.keyCode === 116 && wv) {
-			location.href = 'index.html'
-			return false
+			location.href = "index.html";
+			return false;
 		}
 		//Ctrl+Sift+C:全消し
-		if ((event.metaKey || event.ctrlKey) && event.shiftKey && wv) {
+		if (((event.metaKey || event.ctrlKey) && event.shiftKey) && wv) {
 			if (e.keyCode === 67) {
-				clear()
-				return false
+				clear();
+				return false;
 			}
 		}
 		//Ctrl+Sift+N:NowPlaying
-		if ((event.metaKey || event.ctrlKey) && event.shiftKey && wv) {
+		if (((event.metaKey || event.ctrlKey) && event.shiftKey) && wv) {
 			if (e.keyCode === 78) {
-				show()
+				show();
 				nowplaying()
-				return false
+				return false;
 			}
 		}
 		//input/textareaにフォーカスなし時
-		if (!hasFocus && !hasFocus2 && wv) {
+		if ((!hasFocus && !hasFocus2) && wv) {
 			if (!wv) {
-				return true
+				return true;
 			}
 			//Ctrl+V:いつもの
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 86) {
-					show()
-				}
-			}
-			//Ctrl+F:検索
-			if (event.metaKey || event.ctrlKey) {
-				if (e.keyCode === 70) {
-					srcBox()
+					show();
 				}
 			}
 			//X:開閉
 			if (e.keyCode === 88) {
-				if (!$('#post-box').hasClass('appear')) {
-					show()
-					$('textarea').focus()
+				if (!$("#post-box").hasClass("appear")) {
+					show();
+					$('textarea').focus();
 				} else {
-					hide()
+					hide();
 				}
-				return false
+				return false;
 			}
 			//N:新トゥート
 			if (e.keyCode === 78) {
-				if (!$('#post-box').hasClass('appear')) {
-					show()
+				if (!$("#post-box").hasClass("appear")) {
+					show();
 				}
-				$('textarea').focus()
-				return false
+				$('textarea').focus();
+				return false;
 			}
 			//Ctrl+E:全ての通知未読を既読にする
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 69) {
-					allNotfRead()
-					return false
+					allNotfRead();
+					return false;
 				}
 			}
 			//Ctrl+Space:読み込み
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 32) {
-					parseColumn()
-					return false
+					parseColumn();
+					return false;
 				}
 			}
 			//Ctrl+Sift+S:設定
 			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 83) {
-					location.href = 'setting.html'
-					return false
+					location.href = "setting.html";
+					return false;
 				}
 			}
 			//Ctrl+Sift+M:アカマネ
 			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 77) {
-					location.href = 'acct.html'
-					return false
+					location.href = "acct.html";
+					return false;
 				}
 			}
 			//Ctrl+Sift+P:プロフ
 			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 80) {
 					profShow()
-					return false
+					return false;
 				}
 			}
 			//数字:TL
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode >= 49 && e.keyCode <= 57) {
-					var kz = e.keyCode - 49
-					goColumn(kz)
-					return false
+					var kz = e.keyCode - 49;
+					goColumn(kz);
+					return false;
 				}
 			}
 			//矢印:選択
-			if (e.code == 'ArrowLeft') {
+			if (e.code == "ArrowLeft") {
 				//left
-				if ($('#imagemodal').hasClass('open')) {
-					imgCont('prev')
-					return false
+				if ($("#imagemodal").hasClass("open")) {
+					imgCont('prev');
+					return false;
 				}
 				if (selectedColumn > 0) {
 					selectedColumn--
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false
-			} else if (e.code == 'ArrowUp') {
+				return false;
+			} else if (e.code == "ArrowUp") {
 				//up
-				if ($('#imagemodal').hasClass('open')) {
-					return false
+				if ($("#imagemodal").hasClass("open")) {
+					return false;
 				}
 				if (selectedToot > 0) {
 					selectedToot--
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false
-			} else if (e.code == 'ArrowRight') {
+				return false;
+			} else if (e.code == "ArrowRight") {
 				//right
-				if ($('#imagemodal').hasClass('open')) {
-					imgCont('next')
-					return false
+				if ($("#imagemodal").hasClass("open")) {
+					imgCont('next');
+					return false;
 				}
-				if (selectedColumn < $('.tl-box').length - 1) {
+				if (selectedColumn < $(".tl-box").length - 1) {
 					selectedColumn++
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false
-			} else if (e.code == 'ArrowDown') {
+				return false;
+			} else if (e.code == "ArrowDown") {
 				//down
-				if ($('#imagemodal').hasClass('open')) {
-					return false
+				if ($("#imagemodal").hasClass("open")) {
+					return false;
 				}
 				selectedToot++
 				tootSelector(selectedColumn, selectedToot)
-				return false
+				return false;
 			}
 			//Ctrl+U:0,0選択
 			if (event.ctrlKey || event.metaKey) {
@@ -199,29 +182,29 @@ $(function($) {
 					selectedToot = 0
 					selectedColumn = 0
 					tootSelector(0, 0)
-					return false
+					return false;
 				}
 			}
 			//選択時
 			if (e.keyCode == 70) {
-				var id = $('.selectedToot').attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
+				var id = $(".selectedToot").attr('unique-id')
+				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
 				fav(id, acct_id, false)
-				return false
+				return false;
 			}
 			if (e.keyCode == 66) {
-				var id = $('.selectedToot').attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
+				var id = $(".selectedToot").attr('unique-id')
+				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
 				rt(id, acct_id, false)
-				return false
+				return false;
 			}
 			if (e.keyCode == 82) {
-				var id = $('.selectedToot').attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
-				var ats_cm = $('.selectedToot .rep-btn').attr('data-men')
-				var mode = $('.selectedToot .rep-btn').attr('data-visen')
+				var id = $(".selectedToot").attr('unique-id')
+				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var ats_cm = $('.selectedToot .rep-btn').attr("data-men")
+				var mode = $('.selectedToot .rep-btn').attr("data-visen")
 				re(id, ats_cm, acct_id, mode)
-				return false
+				return false;
 			}
 		}
 		//textareaフォーカス時
@@ -230,27 +213,23 @@ $(function($) {
 				//C+S+(No):ワンクリ
 				if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 					if (e.keyCode >= 49 && e.keyCode <= 51) {
-						var no = e.keyCode - 48
-						if (localStorage.getItem('oks-' + no)) {
-							$('#textarea').val($('#textarea').val() + localStorage.getItem('oks-' + no))
-						}
-						return false
+						var no = e.keyCode - 48;
+						if (localStorage.getItem("oks-" + no)) { $("#textarea").val($("#textarea").val() + localStorage.getItem("oks-" + no)) }
+						return false;
 					}
 				}
 			}
 		}
-	})
+	});
 	//クリアボタン
-	$('#clear').click(function() {
-		clear()
-	})
-})
+	$("#clear").click(function () {
+		clear();
+	});
+});
 //選択する
 function tootSelector(column, toot) {
-	$('.cvo').removeClass('selectedToot')
-	$('#timeline_' + column + ' .cvo')
-		.eq(toot)
-		.addClass('selectedToot')
+	$('.cvo').removeClass("selectedToot")
+	$('#timeline_' + column + ' .cvo').eq(toot).addClass("selectedToot")
 	var scr = $('.tl-box[tlid=' + column + ']').scrollTop()
 	var elem = $('.selectedToot').offset().top
 	var top = elem - $('.tl-box').height() + scr
@@ -265,4 +244,4 @@ function tootSelector(column, toot) {
 			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
 		}
 	}
-}
+}

app/js/common/modal.js

@@ -23,7 +23,4 @@ $(document).ready(function () {
   }
   );
   $('.collapsible').collapsible();
-  $('#videomodal').modal({
-    onCloseEnd: stopVideo
-  });
 });

app/js/common/version.js

@@ -1,400 +1,320 @@
 //バージョンチェッカー
-function verck(ver, jp) {
-	console.log('%c Welcome😊', 'color: red;font-size:200%;')
-	var date = new Date()
+function verck(ver) {
+	localStorage.setItem("ver", ver);
+	console.log("%c Welcome😊", "color: red;font-size:200%;")
+	var date = new Date();
 	var show = false
-	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
+	if (localStorage.getItem("ver") != ver && localStorage.getItem("winstore")) {
 		//ちょっと削除とリンク解析の都合上アレ(s)
 		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
-		if (!localStorage.getItem('usamin_18_6_5_flag')) {
-			localStorage.setItem('usamin_18_6_5_flag', true)
-			var multi = localStorage.getItem('column')
-			var obj = JSON.parse(multi)
+		if (!localStorage.getItem("usamin_18_6_5_flag")) {
+			localStorage.setItem("usamin_18_6_5_flag", true)
+			var multi = localStorage.getItem("column");
+			var obj = JSON.parse(multi);
 			for (var i = 0; i < obj.length; i++) {
-				localStorage.removeItem('card_' + i)
+				localStorage.removeItem("card_" + i);
 			}
 		}
 		//ちょっと削除とリンク解析の都合上アレ(e)
 		show = true
-		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-		$(document).ready(function() {
-			if (localStorage.getItem('winstore')) {
-				$('#releasenote').modal('open')
+		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
+		$(document).ready(function () {
+			if (localStorage.getItem("winstore")) {
+				$('#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()
+			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()
+				$("#release-en").show();
 			}
-		})
+		});
 	}
-	localStorage.setItem('ver', ver)
 	if (!show) {
 		console.log(show)
-		if (
-			date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
-			!localStorage.getItem('showSupportMe')
-		) {
+		if (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')
-				$('#support-btm-en').removeClass('hide')
+			if (lang.language != "ja") {
+				$("#support-btm-ja").addClass("hide");
+				$("#support-btm-en").removeClass("hide");
 			}
-			localStorage.setItem('showSupportMe', nextmonth)
-			$('#support-btm').removeClass('hide')
-			$('#support-btm').animate(
-				{
-					bottom: '0'
-				},
-				{
-					duration: 300
-				}
-			)
+			localStorage.setItem("showSupportMe", nextmonth)
+			$("#support-btm").removeClass("hide")
+			$("#support-btm").animate({
+				'bottom': '0'
+			}, {
+					'duration': 300
+				});
 		}
 	}
-	var platform = localStorage.getItem('platform')
-	console.log('Your platform:' + platform)
-	if (!localStorage.getItem('winstore')) {
-		$('#start').css('display', 'flex')
+	var platform = localStorage.getItem("platform");
+	console.log("Your platform:" + platform)
+	if (!localStorage.getItem("winstore")) {
+		$("#start").css('display', 'flex');
 	}
-	if (
-		localStorage.getItem('winstore') == 'brewcask' ||
-		localStorage.getItem('winstore') == 'snapcraft' ||
-		localStorage.getItem('winstore') == 'winstore'
-	) {
-		var winstore = true
+	if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
+		var winstore = true;
 	} else {
-		var winstore = false
+		var winstore = false;
 	}
-	var l = 5
+	var l = 5;
 	// 生成する文字列に含める文字セット
-	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
-	var cl = c.length
-	var r = ''
+	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
+	var cl = c.length;
+	var r = "";
 	for (var i = 0; i < l; i++) {
-		r += c[Math.floor(Math.random() * cl)]
+		r += c[Math.floor(Math.random() * cl)];
 	}
-	var start = 'https://thedesk.top/ver.json'
+	var start = "https://thedesk.top/ver.json";
 	fetch(start, {
 		method: 'GET'
-	})
-		.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)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(mess) {
-			console.table(mess)
-			if (mess) {
-				//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
-				if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
-					localStorage.setItem('askjp_jp_ua', true)
-					$('#askjp_jp_ua').removeClass('hide')
-				}
-				var platform = localStorage.getItem('platform')
-				if (platform == 'darwin') {
-					var newest = mess.desk_mac
-				} else {
-					var newest = mess.desk
-				}
-				if (newest == ver) {
-					todo(lang.lang_version_usever.replace('{{ver}}', mess.desk))
-					//betaかWinstoreならアプデチェックしない
-				} else if (ver.indexOf('beta') != -1 || winstore) {
-				} else {
-					localStorage.removeItem('instance')
-					if (localStorage.getItem('new-ver-skip')) {
-						if (localStorage.getItem('next-ver') != newest) {
-							postMessage(['sendSinmpleIpc', 'update'], '*')
-						} else {
-							console.warn(lang.lang_version_skipver)
-							todo(lang.lang_version_skipver)
-						}
-					} else {
-						postMessage(['sendSinmpleIpc', 'update'], '*')
-					}
-				}
-			}
-		})
-	if (!localStorage.getItem('last-notice-id')) {
-		localStorage.setItem('last-notice-id', 0)
-	}
-	var start = 'https://thedesk.top/notice?since_id=' + localStorage.getItem('last-notice-id')
-	fetch(start, {
-		method: 'GET'
-	})
-		.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(mess) {
-			if (mess.length < 1) {
-				return false
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (mess) {
+		console.table(mess);
+		if (mess) {
+			var platform = localStorage.getItem("platform");
+			if (platform == "darwin") {
+				var newest = mess.desk_mac;
 			} else {
-				var last = localStorage.getItem('last-notice-id')
-				localStorage.setItem('last-notice-id', mess[0].ID)
-				for (i = 0; i < mess.length; i++) {
-					var obj = mess[i]
-					if (obj.ID * 1 <= last) {
-						break
+				var newest = mess.desk;
+			}
+			if (newest == ver) {
+				todo(lang.lang_version_usever.replace("{{ver}}", mess.desk));
+				//betaかWinstoreならアプデチェックしない
+			} else if (ver.indexOf("beta") != -1 || winstore) {
+
+			} else {
+				localStorage.removeItem("instance")
+				if (localStorage.getItem("new-ver-skip")) {
+					if (localStorage.getItem("next-ver") != newest) {
+						postMessage(["sendSinmpleIpc", "update"], "*")
 					} else {
-						if (obj.type == 'textv2') {
-							if (~obj.languages.indexOf(lang.language)) {
-								var show = true
-								if (obj.toot != '') {
-									var toot =
-										'<button class="btn-flat toast-action" onclick="detEx(\'' +
-										obj.toot +
-										"','main')\">Show</button>"
+						console.warn(lang.lang_version_skipver);
+						todo(lang.lang_version_skipver);
+					}
+				} else {
+					postMessage(["sendSinmpleIpc", "update"], "*")
+				}
+			}
+		}
+	});
+	if (!localStorage.getItem("last-notice-id")) {
+		localStorage.setItem("last-notice-id", 0)
+	}
+	var start = "https://thedesk.top/notice?since_id=" + localStorage.getItem("last-notice-id");
+	fetch(start, {
+		method: 'GET'
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (mess) {
+		if (mess.length < 1) {
+			return false;
+		} else {
+			var last = localStorage.getItem("last-notice-id")
+			localStorage.setItem("last-notice-id", mess[0].ID)
+			for (i = 0; i < mess.length; i++) {
+				var obj = mess[i];
+				if (obj.ID * 1 <= last) {
+					break;
+				} else {
+					if (obj.type == "textv2") {
+						if (~obj.languages.indexOf(lang.language)) {
+							var show = true;
+							if (obj.toot != "") {
+								var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + '\',\'main\')">Show</button>';
+							} else {
+								var toot = "";
+							}
+							if (obj.ver != "") {
+								if (obj.ver == ver) {
+									show = true;
 								} else {
-									var toot = ''
+									show = false;
 								}
-								if (obj.ver != '') {
-									if (obj.ver == ver) {
-										show = true
-									} else {
-										show = false
-									}
-								}
-								if (obj.domain != '') {
-									var multi = localStorage.getItem('multi')
-									if (multi) {
-										show = false
-										var accts = JSON.parse(multi)
-										Object.keys(accts).forEach(function(key) {
-											var acct = accts[key]
-											if (acct.domain == obj.domain) {
-												show = true
-											}
-										})
-									}
-								}
-								if (show) {
-									M.toast({
-										html:
-											escapeHTML(obj.text) +
-											toot +
-											'<span class="sml grey-text">(スライドして消去)</span>',
-										displayLength: 86400
-									})
+							}
+							if (obj.domain != "") {
+								var multi = localStorage.getItem("multi");
+								if (multi) {
+									show = false;
+									var accts = JSON.parse(multi);
+									Object.keys(accts).forEach(function (key) {
+										var acct = accts[key];
+										if (acct.domain == obj.domain) {
+											show = true;
+										}
+									});
 								}
 							}
+							if (show) {
+								M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
+							}
 						}
 					}
 				}
+
 			}
-		})
+		}
+	});
 }
-var infostreaming = false
+var infostreaming = false;
 function infowebsocket() {
-	infows = new WebSocket('wss://thedesk.top/ws/')
-	infows.onopen = function(mess) {
-		console.log([tlid, ':Connect Streaming Info:', mess])
-		infostreaming = true
+	infows = new WebSocket("wss://thedesk.top/ws/");
+	infows.onopen = function (mess) {
+		console.log([tlid, ":Connect Streaming Info:", mess]);
+		infostreaming = true;
 	}
-	infows.onmessage = function(mess) {
-		console.log([tlid, ':Receive Streaming:', JSON.parse(mess.data)])
-		var obj = JSON.parse(mess.data)
-		if (obj.type != 'counter') {
-			if (obj.type == 'textv2') {
+	infows.onmessage = function (mess) {
+		console.log([tlid, ":Receive Streaming:", JSON.parse(mess.data)]);
+		var obj = JSON.parse(mess.data);
+		if (obj.type != "counter") {
+			if (obj.type == "textv2") {
 				if (~obj.languages.indexOf(lang.language)) {
-					localStorage.setItem('last-notice-id', obj.id)
-					var show = true
-					if (obj.toot != '') {
-						var toot =
-							'<button class="btn-flat toast-action" onclick="detEx(\'' +
-							obj.toot +
-							"','main')\">Show</button>"
+					localStorage.setItem("last-notice-id", obj.id)
+					var show = true;
+					if (obj.toot != "") {
+						var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + '\',\'main\')">Show</button>';
 					} else {
-						var toot = ''
+						var toot = "";
 					}
-					if (obj.ver != '') {
+					if (obj.ver != "") {
 						if (obj.ver == ver) {
-							show = true
+							show = true;
 						} else {
-							show = false
+							show = false;
 						}
 					}
-					if (obj.domain != '') {
-						var multi = localStorage.getItem('multi')
+					if (obj.domain != "") {
+						var multi = localStorage.getItem("multi");
 						if (multi) {
-							show = false
-							var accts = JSON.parse(multi)
-							Object.keys(accts).forEach(function(key) {
-								var acct = accts[key]
+							show = false;
+							var accts = JSON.parse(multi);
+							Object.keys(accts).forEach(function (key) {
+								var acct = accts[key];
 								if (acct.domain == obj.domain) {
-									show = true
+									show = true;
 								}
-							})
+							});
 						}
 					}
 					if (show) {
 						console.log(obj.text)
 						console.log(escapeHTML(obj.text))
-						M.toast({
-							html:
-								escapeHTML(obj.text) +
-								toot +
-								'<span class="sml grey-text">(スライドして消去)</span>',
-							displayLength: 86400
-						})
+						M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
 					}
 				}
 			}
 		} else {
-			$('#persons').text(obj.text)
+			$("#persons").text(obj.text);
 		}
 	}
-	infows.onerror = function(error) {
-		infostreaming = false
-		console.error('Error closing:info')
-		console.error(error)
-		return false
-	}
-	infows.onclose = function() {
-		infostreaming = false
-		console.error('Closing:info')
-	}
+	infows.onerror = function (error) {
+		infostreaming = false;
+		console.error("Error closing:info");
+		console.error(error);
+		return false;
+	};
+	infows.onclose = function () {
+		infostreaming = false;
+		console.error("Closing:info");
+	};
 }
-setInterval(function() {
+setInterval(function () {
 	if (!infostreaming) {
-		console.log('try to connect to base-streaming')
-		infowebsocket()
+		console.log("try to connect to base-streaming")
+		infowebsocket();
 	}
-}, 10000)
+}, 10000);
 function openRN() {
-	$('#releasenote').modal('open')
-	if (lang.language == 'ja') {
-		verp = ver.replace('(', '')
-		verp = verp.replace('.', '-')
-		verp = verp.replace('.', '-')
-		verp = verp.replace('[', '-')
-		verp = verp.replace(']', '')
-		verp = verp.replace(')', '')
-		verp = verp.replace(' ', '_')
-		$('#release-' + verp).show()
+	$('#releasenote').modal('open');
+	if (lang.language == "ja") {
+		verp = ver.replace('(', '');
+		verp = verp.replace('.', '-');
+		verp = verp.replace('.', '-');
+		verp = verp.replace('[', '-');
+		verp = verp.replace(']', '');
+		verp = verp.replace(')', '');
+		verp = verp.replace(' ', '_');
+		$("#release-" + verp).show();
 	} else {
-		$('#release-en').show()
+		$("#release-en").show();
 	}
 }
 function closeSupport() {
-	$('#support-btm').animate(
-		{
-			bottom: '-300px'
-		},
-		{
-			duration: 300,
-			complete: function() {
-				$('#support-btm').addClass('hide')
+	$("#support-btm").animate({
+		'bottom': '-300px'
+	}, {
+			'duration': 300,
+			'complete': function () {
+				$("#support-btm").addClass("hide")
 			}
-		}
-	)
+		});
 }
 function storeDialog(platform, ver) {
-	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 (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;
 	}
-	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')
+	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 {
-				localStorage.setItem('winstore', 'localinstall')
+				$("#release-en").show();
 			}
-			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 {
-		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()
-				}
-			})
-	}
-	
+		});
+	})
 }
 function closeStart() {
-	$('#start').css('display', 'none')
-	var platform = localStorage.getItem('platform')
-	var ver = localStorage.getItem('ver')
+	$("#start").css('display', 'none');
+	var platform = localStorage.getItem("platform");
+	var ver = localStorage.getItem("ver");
 	storeDialog(platform, ver)
-}
+}

app/js/emoji/default-emoji.js

@@ -1,105 +1,84 @@
-var defaultemojiList = ['activity', 'flag', 'food', 'nature', 'object', 'people', 'place', 'symbol']
+var defaultemojiList = ["activity", "flag", "food", "nature", "object", "people", "place", "symbol"];
 var defaultemoji = {
-	activity: activity,
-	flag: flag,
-	food: food,
-	nature: nature,
-	object: object,
-	people: people,
-	place: place,
-	symbol: symbol
-}
-if (lang == 'ja') {
-	var defaultemojiname = {
-		activity: '活動',
-		flag: '国旗',
-		food: '食べ物',
-		nature: '自然',
-		object: 'もの',
-		people: 'ひと',
-		place: '場所',
-		symbol: '記号'
-	}
+    activity: activity,
+    flag: flag,
+    food: food,
+    nature: nature,
+    object: object,
+    people: people,
+    place: place,
+    symbol: symbol
+};
+if (lang == "ja") {
+    var defaultemojiname = {
+        activity: "活動",
+        flag: "国旗",
+        food: "食べ物",
+        nature: "自然",
+        object: "もの",
+        people: "ひと",
+        place: "場所",
+        symbol: "記号"
+    };
 } else {
-	var defaultemojiname = {
-		activity: 'Activities',
-		flag: 'Flags',
-		food: 'Foods',
-		nature: 'Nature',
-		object: 'Tools',
-		people: 'People',
-		place: 'Places',
-		symbol: 'Symbols'
-	}
+    var defaultemojiname = {
+        activity: "Activities",
+        flag: "Flags",
+        food: "Foods",
+        nature: "Nature",
+        object: "Tools",
+        people: "People",
+        place: "Places",
+        symbol: "Symbols"
+    };
 }
 
 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">`
-        }
-		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>`
-	})
-	$('#emoji-list').html(emojis)
-	$('#now-emoji').text(lang.lang_defaultemojis_text.replace('{{cat}}', defaultemojiname[target]))
-	$('.emoji-control').addClass('hide')
+    var json = defaultemoji[target];
+    var emojis = "";
+    Object.keys(json).forEach(function (key) {
+        var emoji = json[key];
+        emojis = emojis + '<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]));
+    $(".emoji-control").addClass("hide");
 }
 function customEmoji() {
-	$('#emoji-suggest').val('')
-	$('.emoji-control').removeClass('hide')
-	emojiList('home')
+    $("#emoji-suggest").val("");
+    $(".emoji-control").removeClass("hide");
+    emojiList('home')
 }
 function defEmoji(target) {
-	var selin = $('#textarea').prop('selectionStart')
-	if (!selin) {
-		selin = 0
-	}
-	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 now = $('#textarea').val()
-	var before = now.substr(0, selin)
-	var after = now.substr(selin, now.length)
-	newt = before + emoji + after
-	$('#textarea').val(newt)
-	$('#textarea').focus()
+    var selin = $("#textarea").prop('selectionStart');
+    if (!selin) {
+        selin = 0;
+    }
+    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 now = $("#textarea").val();
+    var before = now.substr(0, selin);
+    var after = now.substr(selin, now.length);
+    newt = before + emoji + after;
+    $("#textarea").val(newt);
+    $("#textarea").focus();
 }
 function faicon() {
-	var json = faicons
-	var emojis = ''
-	Object.keys(json).forEach(function(key) {
-		var emoji = json[key]
-		var eje = emoji.replace(/fa-/g, '')
-		emojis =
-			emojis +
-			'<a onclick="emojiInsert(\'[faicon]' +
-			eje +
-			'[/faicon]\')" class="pointer white-text" style="font-size:24px"><i class="fa ' +
-			emoji +
-			'"></i></a>'
-	})
-	$('#emoji-list').html(emojis)
-	$('#now-emoji').text('faicon')
-	$('.emoji-control').addClass('hide')
-}
+    var json = faicons;
+    var emojis = "";
+    Object.keys(json).forEach(function (key) {
+        var emoji = json[key];
+        var eje = emoji.replace(/fa-/g, "");
+        emojis = emojis + '<a onclick="emojiInsert(\'[faicon]' + eje + '[/faicon]\')" class="pointer white-text" style="font-size:24px"><i class="fa ' + emoji + '"></i></a>';
+    });
+    $("#emoji-list").html(emojis);
+    $("#now-emoji").text("faicon");
+    $(".emoji-control").addClass("hide");
+}

app/js/lang/json5Tojson.js

@@ -0,0 +1,3 @@
+const JSON5 = require('json5')
+const fs = require("fs")
+fs.writeFileSync("main.json", JSON.stringify(JSON5.parse(fs.readFileSync("lang." + process.argv[2] + ".js", 'utf8').replace("var lang = ", ""))))

app/js/lang/lang.bg.js

@@ -0,0 +1,247 @@
+var lang={
+    "language": "en",
+    "lang_toot": "Раздумай",
+    "lang_there": "Да",
+    "lang_nothing": "Няма",
+    "lang_yesno": "Да",
+    "lang_no": "Не",
+    "lang_progress": "Изчакайте...",
+    "lang_edit": "Редактиране",
+    "lang_del": "Изтрий",
+    "lang_add": "Добави",
+    "lang_fatalerroroccured": "Възникнаха някои грешки, моля рестартирайте Desk.",
+    "lang_speech": "Google US English",
+    "lang_lang": "Език",
+    "lang_langlocale": "Английски",
+    "lang_back": "Назад",
+    "lang_set": "Задай",
+    "lang_langadd": "Преведете TheDesk на други езици или проверете TheDesk на <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\"> GitHub </a>. TheDesk се нуждае от вашата помощ.",
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": null,
+    "lang_time_suffixAgo": null,
+    "lang_time_suffixFromNow": null,
+    "lang_time_inPast": null,
+    "lang_time_seconds": "%d s",
+    "lang_time_minute": "1 m",
+    "lang_time_minutes": "%d m",
+    "lang_time_hour": "1 h",
+    "lang_time_hours": "%d h",
+    "lang_time_day": "1 d",
+    "lang_time_days": "%d d",
+    "lang_time_month": "1 month",
+    "lang_time_months": "%d months",
+    "lang_time_year": "y",
+    "lang_time_years": "%d y",
+    "lang_version_usever": "Не е намерена актуализация({{ver}})",
+    "lang_version_skipver": "Актуализацията бе игнорирана.",
+    "lang_version_platform": "Искате ли автоматични актуализации? (За потребителите инсталирали от Microsoft Store, изберете „Не“)",
+    "lang_version_platform_linux": "Искате ли автоматични актуализации? (За потребителите инсталирали от Snapcraft, изберете „Не“)",
+    "lang_version_platform_mac": "Искате ли автоматични актуализации? (За потребителите на Homebrew Cask изберете „Не“)",
+    "lang_login_noauth": "Показване на TL на нерегистрирани профили",
+    "lang_manager_info": "За тази инстанция",
+    "lang_manager_refresh": "Обнови",
+    "lang_manager_delete": "Излизане",
+    "lang_manager_color": "Цвят на профила",
+    "lang_manager_confirm": "е на път да излезе. Продължаване?",
+    "lang_manager_mainAcct": "Готово: изберете основния профил",
+    "lang_manager_def": "По подразбиране",
+    "lang_manager_none": "Няма",
+    "lang_manager_godev": "Отворете DevCenter на Misskey. Ние показваме официални документи, на които се позоваваме.",
+    "lang_manager_logout": "Излизане",
+    "lang_bbmd_misskey": "TheDesk разглежда \"@\" като отговор, но поставя друг параметър. Ако не е включено в Mastodon това означава, че е в Home на Misskey.",
+    "lang_emoji_get": "Вземи емотикони",
+    "lang_emoji_custom": "Персонализирани емотикони",
+    "lang_defaultemojis_text": "Още емотикони {{cat}}",
+    "lang_postimg_previewdis": "не може да се визуализира",
+    "lang_postimg_aftupload": "Не можете да променяте профилите след качването.",
+    "lang_postimg_delete": "Изтрийте това изображение.",
+    "lang_post_tagTL": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?",
+    "lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.",
+    "lang_post_cwtitle": "Авто CW Сигнал",
+    "lang_post_cwtxt": "На път сте да публикувате по-дълга раздумка, отколкото е зададена.\nТекст на предупреждението:",
+    "lang_post_btn1": "Отказ (няма да се публикува)",
+    "lang_post_btn2": "Текстът да се скрива автоматично",
+    "lang_post_btn3": "Продължете към публикуването",
+    "lang_status_favWarn": "Ще отнеме минута раздумката отдалечено да стане любима.",
+    "lang_status_btWarn": "Ще отнеме минута раздумката отдалечено да бъде подсилена.",
+    "lang_status_follow": "Следване",
+    "lang_status_unfollow": "Спри следенето",
+    "lang_status_block": "Блокирай",
+    "lang_status_unblock": "Отблокирай",
+    "lang_status_mute": "Без звук",
+    "lang_status_unmute": "Със звук",
+    "lang_status_redraftTitle": "Изтрий & върни",
+    "lang_status_redraft": "Продължете да изтривате & преработвате? Ще изгубите статуса на тази раздумка. В тази функция може да се съдържат някои грешки. Снимките от тази раздумка ще бъдат изтрити на по-стари от Mastodon 2.4.1.",
+    "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
+    "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
+    "lang_status_unendorse": "Not feature on profile",
+    "lang_status_endorse": "Feature on profile",
+    "lang_status_followers": "Followers",
+    "lang_status_active": "Last status",
+    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
+    "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
+    "lang_cards_check": " check",
+    "lang_cards_pip": "PiP mode",
+    "lang_details_nodata": "No data",
+    "lang_details_filtered": "Filtered toot",
+    "lang_details_embed": "Embed HTML is cliped.",
+    "lang_details_url": "URL of this toot is cliped.",
+    "lang_details_txt": "Content of this toot is cliped.",
+    "lang_filter_nodata": "No data",
+    "lang_filter_errordegree": "Please check a context",
+    "lang_list_nodata": "No data",
+    "lang_list_show": "Show",
+    "lang_list_users": "Users list",
+    "lang_list_nouser": "No users in this list.",
+    "lang_list_add": "Add to the list",
+    "lang_list_add_misskey": "(perhaps this user has been listed)",
+    "lang_list_remove": "Remove from the list",
+    "lang_notf_new": " new notifications",
+    "lang_speech_refresh": "Save value about TTS config",
+    "lang_src_ts": "chronological order",
+    "lang_src_people": " people toot",
+    "lang_tags_always": "Always toots with ",
+    "lang_tags_realtime": "Tag-stream toot",
+    "lang_tags_tagunpin": "Unpin {{tag}}",
+    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_tagwarn": "Автоматично попълване на {{tag}}, ако раздумката няма {{tag}}",
+    "lang_tl_media": "Media",
+    "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_img_DLDone": "Downloaded:",
+    "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
+    "lang_layout_thisacct": "{{notf}} of this account",
+    "lang_layout_delthis": "Remove this column",
+    "lang_layout_setthis": "Preferences of this column",
+    "lang_layout_mediafil": "Media filtering",
+    "lang_layout_linkana": "Auto Link Analyzer",
+    "lang_layout_linkanades": "Auto link analyzer",
+    "lang_layout_tts": "Text to speech ",
+    "lang_layout_reconnect": "Reconnect to streaming API",
+    "lang_layout_headercolor": "Header color of this column",
+    "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
+    "lang_layout_dm": "Direct Message",
+    "lang_layout_webviewmode": "Prefer WebView",
+    "lang_layout_unread": "Unread",
+    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excludingbt": "Показване в BT режим (ИЗКЛ./Изключване BT/ Само в BT)",
+    "lang_layout_leftFold": "Стъпка наляво",
+    "lang_layout_leftUnfold": "Док отдясно",
+    "lang_layout_deleteColumn": "Премахване на тази колона",
+    "lang_layout_deleteColumnDesc": "Премахване на тази колона",
+    "lang_sort_gothis": "Отидете в тази колона",
+    "lang_sort_remthis": "Премахване на тази колона",
+    "lang_spotify_img": "Attach an album artwork",
+    "lang_spotify_imgno": "Not attach an album artwork",
+    "lang_spotify_acct": "Connect TheDesk to Spotify",
+    "lang_spotify_np": "Готово:шаблон на NowPlaying",
+    "lang_setting_npprovide": "NowPlaying provider:{{set}}",
+    "lang_hisdata_frcreq": "Required Mastodon 2.4.3 and above",
+    "lang_hisdata_frcwarn": "Unfollow accounts will be shown.",
+    "lang_hisdata_taketime": "It will take 30s ~ several minutes",
+    "lang_hisdata_notonmisskey": "Misskey is unable to request.",
+    "lang_hisdata_key": "This user is proofed by {{set}}",
+    "lang_showontl_movetxt": "This account was moved",
+    "lang_showontl_movebtn": "Continue on the new account",
+    "lang_showontl_botacct": "[bot]",
+    "lang_showontl_followed": "Following you",
+    "lang_showontl_notf": "Notification ",
+    "lang_showontl_domain": "Domain ",
+    "lang_showontl_listwarn": "Follow to add this user to lists.",
+    "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_parse_mentioned": " replied to you",
+    "lang_parse_faved": " favourited your toot",
+    "lang_parse_bted": " boosted your toot",
+    "lang_parse_btedsimple": " boosted",
+    "lang_parse_polled": "'s poll",
+    "lang_parse_notftime": "Actioned at",
+    "lang_parse_cwshow": "Show",
+    "lang_parse_fulltext": "Full size text:",
+    "lang_parse_autofold": "Auto folded",
+    "lang_parse_more": "More",
+    "lang_parse_url": "URL Analyzer",
+    "lang_parse_tagTL": "Timeline of {{tag}}",
+    "lang_parse_tagtoot": "Toot with {{tag}}",
+    "lang_parse_tagpin": "Pin {{tag}}",
+    "lang_parse_public": "Public",
+    "lang_parse_unlisted": "Unlisted",
+    "lang_parse_private": "Private",
+    "lang_parse_direct": "Direct",
+    "lang_parse_clickcopy": "Click to copy text of this toot",
+    "lang_parse_clickcopyurl": "Click to copy URL of this toot",
+    "lang_parse_trans": "Translate to Japanese",
+    "lang_parse_replyto": "Reply to this toot",
+    "lang_parse_bt": "Boost this toot",
+    "lang_parse_fav": "Favourite this toot",
+    "lang_parse_quote": "Quote this toot",
+    "lang_parse_del": "Изтрийте тази раздумка",
+    "lang_parse_pin": "Pin this toot",
+    "lang_parse_det": "Details via your main account.",
+    "lang_parse_redraft": "Изтрий & върни",
+    "lang_parse_followed": "Followed you",
+    "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_vote": "Vote",
+    "lang_parse_unvoted": "Show the result without voting",
+    "lang_parse_endedvote": "Expired",
+    "lang_parse_thread": "Show thread",
+    "lang_parse_unknown": "Attached file",
+    "lang_parse_nsfw": "NSFW media",
+    "lang_parse_notffilter": "Show this user's notifications",
+    "lang_misskeyparse_renote": "Repost",
+    "lang_misskeyparse_renoteqt": "Renote",
+    "lang_misskeyparse_reaction": "Reaction",
+    "lang_misskeyparse_tagnostr": "No streaming API on Tag TLs",
+    "lang_misskeyparse_listnostr": "No streaming API on List TLs",
+    "lang_misskeyparse_home": "Home",
+    "lang_misskeyparse_followers": "Follower",
+    "lang_misskeyparse_specified": "Specified User",
+    "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
+    "lang_misskeyparse_renoted": " renoted your following post.",
+    "lang_misskeyparse_quoted": " quoted your following post.",
+    "lang_misskeyparse_reacted": " reacted your following post.",
+    "lang_setting_time": "Time format:{{set}}",
+    "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_nsfw": "NSFW:{{set}}",
+    "lang_setting_cw": "CW:{{set}}",
+    "lang_setting_cwtext": "Default CW text:{{set}}",
+    "lang_setting_cws": "Always CW on:{{set}}",
+    "lang_setting_rp": "Reply counter:{{set}}",
+    "lang_setting_vis": "Default visibility:{{set}}",
+    "lang_setting_popup": "Popup notification:{{set}}",
+    "lang_setting_off": "Off",
+    "lang_setting_s": "s",
+    "lang_setting_box": "Default toot box action:{{set}}",
+    "lang_setting_gif": "GIF:{{set}}",
+    "lang_setting_selt": "Автоматично сгъване:{{set1}} линии по-нагоре,{{set2}} букви по-нагоре",
+    "lang_setting_autocw": "Автоматично CW:{{set1}} линии по-нагоре, {{set2}} букви по-нагоре",
+    "lang_setting_width": "Minimam width:{{set}}",
+    "lang_setting_fixwidth": "TweetDeck fixed width:{{set}}px",
+    "lang_setting_img": "After posting an image:{{set}}",
+    "lang_setting_font": "Fonts:{{set}}",
+    "lang_setting_default": "default font",
+    "lang_setting_size": "Font size:{{set}}px",
+    "lang_setting_imgheight": "Image height:{{set}}px",
+    "lang_setting_ticker": "#InstanceTicker:{{set}}px",
+    "lang_setting_animation": "Animation: {{set}}",
+    "lang_setting_tag": "Tag TL:{{set}}",
+    "lang_setting_boxConfirm": "Post box:{{set}}",
+    "lang_setting_ul": "Native locale:{{set}}",
+    "lang_setting_notf": "Native notification:{{set}}",
+    "lang_setting_quote": "Quote format:{{set}}",
+    "lang_setting_via": "Via:{{set}}",
+    "lang_setting_mov": "Action buttons hiding:{{set}}",
+    "lang_setting_setasread": "Notification markers:{{set}}",
+    "lang_setting_main": "Default account:{{set}}",
+    "lang_setting_sec": "Secondary toot button:{{set}}",
+    "lang_setting_ksref": "Keyboard shortcuts are refreshed.",
+    "lang_setting_nomuting": "No client is muted.",
+    "lang_setting_notftest": " Notification test ",
+    "lang_setting_notftestprof": "Your icon is shown.",
+    "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
+    "lang_setting_importwarn": "Всички данни ще бъдат изтрити."
+}

app/js/lang/lang.cs.js

@@ -0,0 +1,247 @@
+var lang={
+    "language": "cs",
+    "lang_toot": "Toot",
+    "lang_there": "Ano",
+    "lang_nothing": "Nic",
+    "lang_yesno": "Ano",
+    "lang_no": "Ne",
+    "lang_progress": "Čekejte...",
+    "lang_edit": "Upravit",
+    "lang_del": "Smazat",
+    "lang_add": "Přidat",
+    "lang_fatalerroroccured": "Vyskytly se nějaké chyby, prosím restartujte TheDesk.",
+    "lang_speech": "Google Čeština",
+    "lang_lang": "Jazyk",
+    "lang_langlocale": "Čeština",
+    "lang_back": "Zpět",
+    "lang_set": "Nastavit",
+    "lang_langadd": "Přeložte TheDesk do jiných jazyků nebo opravte existující překlad na <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHubu</a> nebo <a href=\"https://translate.thedesk.top/\" target=\"_blank\">Crowdinu</a>. TheDesk potřebuje vaši pomoc.",
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": null,
+    "lang_time_suffixAgo": null,
+    "lang_time_suffixFromNow": null,
+    "lang_time_inPast": null,
+    "lang_time_seconds": "%d s",
+    "lang_time_minute": "1 m",
+    "lang_time_minutes": "%d m",
+    "lang_time_hour": "1 h",
+    "lang_time_hours": "%d h",
+    "lang_time_day": "1 d",
+    "lang_time_days": "%d d",
+    "lang_time_month": "1 month",
+    "lang_time_months": "%d months",
+    "lang_time_year": "y",
+    "lang_time_years": "%d y",
+    "lang_version_usever": "Nebyla nalezena žádná aktualizace ({{ver}})",
+    "lang_version_skipver": "Aktualizace byla ignorována.",
+    "lang_version_platform": "Do you want auto-updates?(users installed on Microsoft Store select 'No')",
+    "lang_version_platform_linux": "Do you want auto-updates?(users installed on Snapcraft select 'No')",
+    "lang_version_platform_mac": "Do you want auto-updates?(Homebrew Cask users select 'No')",
+    "lang_login_noauth": "Zobrazit časové osy nepřihlášených účtů",
+    "lang_manager_info": "O tomto serveru",
+    "lang_manager_refresh": "Obnovit",
+    "lang_manager_delete": "Odhlásit",
+    "lang_manager_color": "Barva účtu",
+    "lang_manager_confirm": "se chce odhlásit. Pokračovat?",
+    "lang_manager_mainAcct": "Hotovo: vyberte hlavní účet",
+    "lang_manager_def": "Výchozí",
+    "lang_manager_none": "Žádný",
+    "lang_manager_godev": "Otevřené vývojářské centrum softwaru Misskey. Zobrazujeme také oficiální dokumentaci.",
+    "lang_manager_logout": "Logout",
+    "lang_bbmd_misskey": "TheDesk považuje „@“ za odpověď, ale vkládá ho do jiných parametrů. „Neuvedeno“ na Mastodonu znamená „Domů“ na Misskey.",
+    "lang_emoji_get": "Získat emoji",
+    "lang_emoji_custom": "Vlastní emoji",
+    "lang_defaultemojis_text": "Emojis about {{cat}}",
+    "lang_postimg_previewdis": "nelze vytvořit náhled",
+    "lang_postimg_aftupload": "Po nahrání nemůžete změnit účty.",
+    "lang_postimg_delete": "Delete this image.",
+    "lang_post_tagTL": "Tento toot neobsahuje výchozí hashtag. Tento toot nebude zobrazen na výchozí časové ose. Pokračovat?",
+    "lang_post_tagVis": "Tento toot (ne „veřejný“ toot) není zobrazen na časové ose tohoto hashtagu.",
+    "lang_post_cwtitle": "Automatické varování o obsahu",
+    "lang_post_cwtxt": "Chcete napsat delší toot, než jste nastavil/a.\nText varování:",
+    "lang_post_btn1": "Zrušit (příspěvek nebude publikován)",
+    "lang_post_btn2": "Skrýt text automaticky",
+    "lang_post_btn3": "Pokračovat k přispívání",
+    "lang_status_favWarn": "Oblíbení vzdáleného tootu bude chvíli trvat.",
+    "lang_status_btWarn": "Boostnutí vzdáleného tootu bude chvíli trvat.",
+    "lang_status_follow": "Sledovat",
+    "lang_status_unfollow": "Přestat sledovat",
+    "lang_status_block": "Blokovat",
+    "lang_status_unblock": "Odblokovat",
+    "lang_status_mute": "Ignorovat",
+    "lang_status_unmute": "Přestat ignorovat",
+    "lang_status_redraftTitle": "Delete & redraft",
+    "lang_status_redraft": "Chcete pokračovat k vymazání a přepsání? Ztratíte odpovědi na tento toot. Tato funkce může obashovat několik chyb. Obrázky v tomto tootu budou na verzi Mastodonu starší než 2.4.1 smazány.",
+    "lang_status_emphas": ": tooty tohoto uživatele jsou zdůrazněny. Po této akci prosím obnovte stránku.",
+    "lang_status_unemphas": ": tooty tohoto uživatele nejsou zdůrazněny. Po této akci prosím obnovte stránku.",
+    "lang_status_unendorse": "Nepředstavit na profilu",
+    "lang_status_endorse": "Představit na profilu",
+    "lang_status_followers": "Followers",
+    "lang_status_active": "Last status",
+    "lang_suggest_nodata": "Pro zobrazení návrhu prosím získejte seznam emoji.",
+    "lang_usetxtbox_reply": "Režim odpovězení. Pro vymazání stiskněte Ctrl+Shift+C.",
+    "lang_cards_check": " kontrolovat",
+    "lang_cards_pip": "Režim PiP",
+    "lang_details_nodata": "Žádná data",
+    "lang_details_filtered": "Filtrovaný toot",
+    "lang_details_embed": "HTML pro vložení je zkopírován.",
+    "lang_details_url": "URL adresa tohoto tootu je zkopírována.",
+    "lang_details_txt": "Obsah tohoto tootu je zkopírován.",
+    "lang_filter_nodata": "Žádná data",
+    "lang_filter_errordegree": "Prosím zkontrolujte kontext",
+    "lang_list_nodata": "Žádná data",
+    "lang_list_show": "Zobrazit",
+    "lang_list_users": "Seznam uživatelů",
+    "lang_list_nouser": "Žádní uživatelé na tomto seznamu.",
+    "lang_list_add": "Přidat na seznam",
+    "lang_list_add_misskey": "(perhaps this user has been listed)",
+    "lang_list_remove": "Odstranit ze seznamu",
+    "lang_notf_new": " nových oznámení",
+    "lang_speech_refresh": "Uložit hodnotu nastavení TTS",
+    "lang_src_ts": "chronologické pořadí",
+    "lang_src_people": " lidí tootují",
+    "lang_tags_always": "Vždy tootnout s ",
+    "lang_tags_realtime": "Tag-stream toot",
+    "lang_tags_tagunpin": "Odepnout {{tag}}",
+    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_tagwarn": "Auto complete {{tag}}, if toot without {{tag}}",
+    "lang_tl_media": "Média",
+    "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_img_DLDone": "Downloaded:",
+    "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
+    "lang_layout_thisacct": "{{notf}} tohoto účtu",
+    "lang_layout_delthis": "Odstranit tento sloupec",
+    "lang_layout_setthis": "Nastavení tohoto sloupce",
+    "lang_layout_mediafil": "Filtrování médií",
+    "lang_layout_linkana": "Automatický analyzátor odkazů",
+    "lang_layout_linkanades": "Automatický analyzátor odkazů",
+    "lang_layout_tts": "Převod textu na řeč ",
+    "lang_layout_reconnect": "Reconnect to streaming API",
+    "lang_layout_headercolor": "Header color of this column",
+    "lang_layout_nodata": "[Žádná data]<br>Obnovte stránku klávesami F5/⌘+R",
+    "lang_layout_dm": "Přímá zpráva",
+    "lang_layout_webviewmode": "Preferovat WebView",
+    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_leftFold": "Stack to the left",
+    "lang_layout_leftUnfold": "Dock on the right",
+    "lang_layout_deleteColumn": "Delete this column",
+    "lang_layout_deleteColumnDesc": "Delete this column",
+    "lang_layout_unread": "Unread",
+    "lang_sort_gothis": "Go to this column",
+    "lang_sort_remthis": "Delete this column",
+    "lang_spotify_img": "Attach an album artwork",
+    "lang_spotify_imgno": "Not attach an album artwork",
+    "lang_spotify_acct": "Spojit TheDesk se Spotify",
+    "lang_spotify_np": "Hotovo: šablona NowPlaying",
+    "lang_setting_npprovide": "NowPlaying provider:{{set}}",
+    "lang_hisdata_frcreq": "Vyžaduje Mastodon 2.4.3 nebo vyšší verzi",
+    "lang_hisdata_frcwarn": "Budou zobrazeny již nesledované účty.",
+    "lang_hisdata_taketime": "It will take 30s ~ several minutes",
+    "lang_hisdata_notonmisskey": "Misskey is unable to request.",
+    "lang_hisdata_key": "This user is proofed by {{set}}",
+    "lang_showontl_movetxt": "Tento účet byl přesunut",
+    "lang_showontl_movebtn": "Continue on the new account",
+    "lang_showontl_botacct": "[robot]",
+    "lang_showontl_followed": "Sledují vás",
+    "lang_showontl_notf": "Oznámení ",
+    "lang_showontl_domain": "Doména ",
+    "lang_showontl_listwarn": "Follow to add this user to lists.",
+    "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_parse_mentioned": " vám odpověděl/a",
+    "lang_parse_faved": " si oblíbil/a váš toot",
+    "lang_parse_bted": " boostnul/a váš toot",
+    "lang_parse_btedsimple": " boostnul/a",
+    "lang_parse_polled": "'s poll",
+    "lang_parse_notftime": "Provedeno",
+    "lang_parse_cwshow": "Zobrazit",
+    "lang_parse_fulltext": "Celý text:",
+    "lang_parse_autofold": "Auto folded",
+    "lang_parse_more": "Více",
+    "lang_parse_url": "Analyzátor URL",
+    "lang_parse_tagTL": "Časová osa {{tag}}",
+    "lang_parse_tagtoot": "Tootnout s hashtagem {{tag}}",
+    "lang_parse_tagpin": "Připnout {{tag}}",
+    "lang_parse_public": "Veřejný",
+    "lang_parse_unlisted": "Neuvedený",
+    "lang_parse_private": "Soukromý",
+    "lang_parse_direct": "Přímý",
+    "lang_parse_clickcopy": "Klikněte pro zkopírování textu tohoto tootu",
+    "lang_parse_clickcopyurl": "Klikněte pro zkopírování URL adresy tohoto tootu",
+    "lang_parse_trans": "Přeložit do japonštiny",
+    "lang_parse_replyto": "Odpovědět na tento toot",
+    "lang_parse_bt": "Boostnout tento toot",
+    "lang_parse_fav": "Oblíbit si tento toot",
+    "lang_parse_quote": "Citovat tento toot",
+    "lang_parse_del": "Smazat tento toot",
+    "lang_parse_pin": "Připnout tento toot",
+    "lang_parse_det": "Details via your main account.",
+    "lang_parse_redraft": "Vymazat a přepsat",
+    "lang_parse_followed": "vás nyní sleduje",
+    "lang_parse_clientop": "Operace tohoto klienta",
+    "lang_parse_clienttxt": " bude",
+    "lang_parse_clientno": "nic nedělat",
+    "lang_parse_clientemp": "zdůrazněna (nebo nezdůrazněna)",
+    "lang_parse_clientmute": "ztlumena",
+    "lang_parse_mute": " bude ztlumena. To můžete odstranit v nastavení.",
+    "lang_parse_voted": "Voted",
+    "lang_parse_vote": "Vote",
+    "lang_parse_unvoted": "Show the result without voting",
+    "lang_parse_endedvote": "Expired",
+    "lang_parse_thread": "Show thread",
+    "lang_parse_unknown": "Attached file",
+    "lang_parse_nsfw": "NSFW media",
+    "lang_parse_notffilter": "Show this user's notifications",
+    "lang_misskeyparse_renote": "Znovusdílení",
+    "lang_misskeyparse_renoteqt": "Renotování",
+    "lang_misskeyparse_reaction": "Reakce",
+    "lang_misskeyparse_tagnostr": "Žádné streamovací API na časových osách hashtagů",
+    "lang_misskeyparse_listnostr": "Žádné streamovací API na časových osách seznamů",
+    "lang_misskeyparse_home": "Domů",
+    "lang_misskeyparse_followers": "Sledující",
+    "lang_misskeyparse_specified": "Určený uživatel",
+    "lang_misskeyparse_qt": "Režim renotování (citace) Misskey: pro vymazání stiskněte Ctrl+Shift+Enter",
+    "lang_misskeyparse_renoted": " renotoval/a váš následující příspěvek.",
+    "lang_misskeyparse_quoted": " citoval/a váš následující příspěvek.",
+    "lang_misskeyparse_reacted": " reagoval/a na váš následující příspěvek.",
+    "lang_setting_time": "Časový formát: {{set}}",
+    "lang_setting_theme": "Motiv: {{set}}",
+    "lang_setting_nsfw": "Citlivý obsah: {{set}}",
+    "lang_setting_cw": "Varování: {{set}}",
+    "lang_setting_cwtext": "Výchozí text varování: {{set}}",
+    "lang_setting_cws": "Vždy zapnout varování na: {{set}}",
+    "lang_setting_rp": "Počitadlo odpovědí: {{set}}",
+    "lang_setting_vis": "Výchozí viditelnost: {{set}}",
+    "lang_setting_popup": "Popupové oznámení: {{set}}",
+    "lang_setting_off": "Vyl",
+    "lang_setting_s": "s",
+    "lang_setting_box": "Výchozí akce tootového pole: {{set}}",
+    "lang_setting_gif": "GIF: {{set}}",
+    "lang_setting_selt": "Auto fold:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_autocw": "Auto CW:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_width": "Minimam width:{{set}}",
+    "lang_setting_fixwidth": "TweetDeck fixed width:{{set}}px",
+    "lang_setting_img": "After posting an image:{{set}}",
+    "lang_setting_font": "Písma: {{set}}",
+    "lang_setting_default": "výchozí písmo",
+    "lang_setting_size": "Velikost písma: {{set}} px",
+    "lang_setting_imgheight": "Výška obrázků: {{set}} px",
+    "lang_setting_ticker": "#InstanceTicker: {{set}} px",
+    "lang_setting_animation": "Animation: {{set}}",
+    "lang_setting_tag": "Časová osa hashtagu: {{set}}",
+    "lang_setting_boxConfirm": "Post box:{{set}}",
+    "lang_setting_ul": "Native locale:{{set}}",
+    "lang_setting_notf": "Native notification:{{set}}",
+    "lang_setting_quote": "Formát citace: {{set}}",
+    "lang_setting_via": "Přes: {{set}}",
+    "lang_setting_mov": "Action buttons hiding:{{set}}",
+    "lang_setting_setasread": "Notification markers:{{set}}",
+    "lang_setting_main": "Default account:{{set}}",
+    "lang_setting_sec": "Secondary toot button:{{set}}",
+    "lang_setting_ksref": "Keyboard shortcuts are refreshed.",
+    "lang_setting_nomuting": "Žádný klient není ztlumen.",
+    "lang_setting_notftest": " Test oznámení ",
+    "lang_setting_notftestprof": "Vaše ikona je zobrazena.",
+    "lang_setting_exportwarn": "Budou exportována pouze důležitá data. Tato data musíte udržet v bezpečí.",
+    "lang_setting_importwarn": "Všechna data budou smazána."
+}

app/js/lang/lang.de.js

@@ -0,0 +1,247 @@
+var lang={
+    "language": "en",
+    "lang_toot": "Tröt",
+    "lang_there": "Ja",
+    "lang_nothing": "Ohne",
+    "lang_yesno": "Ja",
+    "lang_no": "Nein",
+    "lang_progress": "Warten...",
+    "lang_edit": "Bearbeiten",
+    "lang_del": "Löschen",
+    "lang_add": "Hinzufügen",
+    "lang_fatalerroroccured": "Ein Fehler ist aufgetreten, bitte starten Sie TheDesk neu.",
+    "lang_speech": "Google US Englisch",
+    "lang_lang": "Sprache",
+    "lang_langlocale": "Englisch",
+    "lang_back": "Zurück",
+    "lang_set": "Setzen",
+    "lang_langadd": "Übersetzen oder korrigieren Sie TheDesk in andere Sprachen auf <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk benötigt Ihre Hilfe.",
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": null,
+    "lang_time_suffixAgo": null,
+    "lang_time_suffixFromNow": null,
+    "lang_time_inPast": null,
+    "lang_time_seconds": "%d s",
+    "lang_time_minute": "1 m",
+    "lang_time_minutes": "%d m",
+    "lang_time_hour": "1 h",
+    "lang_time_hours": "%d h",
+    "lang_time_day": "1 d",
+    "lang_time_days": "%d d",
+    "lang_time_month": "1 month",
+    "lang_time_months": "%d months",
+    "lang_time_year": "y",
+    "lang_time_years": "%d y",
+    "lang_version_usever": "Keine Aktualisierung gefunden({{ver}})",
+    "lang_version_skipver": "Update wurde ignoriert.",
+    "lang_version_platform": "Möchten Sie automatische Updates?(Benutzer im Microsoft Store wählen 'Nein')",
+    "lang_version_platform_linux": "Möchten Sie automatische Updates?(Benutzer auf Snapcraft wählen 'Nein')",
+    "lang_version_platform_mac": "Möchten Sie automatische Updates?(Homebrew Cask Benutzer wählen 'Nein')",
+    "lang_login_noauth": "Verläufe von nicht angemeldeten Konten anzeigen",
+    "lang_manager_info": "Über diese Instanz",
+    "lang_manager_refresh": "Aktualisieren",
+    "lang_manager_delete": "Abmelden",
+    "lang_manager_color": "Kontofarbe",
+    "lang_manager_confirm": "ist im Begriff, sich auszuloggen. Fortfahren?",
+    "lang_manager_mainAcct": "Fertig:Hauptkonto wählen",
+    "lang_manager_def": "Standard",
+    "lang_manager_none": "Ohne",
+    "lang_manager_godev": "Öffnen Sie das DevCenter von Misskey. Wir zeigen auch ein offizielles Dokument als Referenz.",
+    "lang_manager_logout": "Abmelden",
+    "lang_bbmd_misskey": "TheDesk betrachtet \"@\" als Antwort, setzt aber einen anderen Parameter. Nicht auf Mastodon gelistet bedeutet Home on Misskey.",
+    "lang_emoji_get": "Hole Emojis",
+    "lang_emoji_custom": "Eigene Emojis",
+    "lang_defaultemojis_text": "Emojis über {{cat}}",
+    "lang_postimg_previewdis": "keine Vorschau",
+    "lang_postimg_aftupload": "Sie können die Konten nach dem Hochladen nicht mehr ändern.",
+    "lang_postimg_delete": "Dieses Bild löschen.",
+    "lang_post_tagTL": "Dieses Tröt enthält keinen Standard-Tag. Er wird in dem lokalen Verlauf nicht angezeigt. Fortfahren?",
+    "lang_post_tagVis": "Dieser Tröt (nicht 'öffentlicher' Tröt) wird nicht in diesem Tag-Verlauf angezeigt.",
+    "lang_post_cwtitle": "Auto CW Alert",
+    "lang_post_cwtxt": "Du bist dabei, länger zu posten, als du eingestellt hast.\nWarntext:",
+    "lang_post_btn1": "Abbrechen (wird nicht gesendet)",
+    "lang_post_btn2": "Text automatisch ausblenden",
+    "lang_post_btn3": "Weiter mit Senden",
+    "lang_status_favWarn": "Es braucht einen Moment, um ein entferntes Tröt zu favorisieren.",
+    "lang_status_btWarn": "Es braucht einen Moment, um ein entferntes Tröt zu verstärken.",
+    "lang_status_follow": "Folgen",
+    "lang_status_unfollow": "Nicht mehr folgen",
+    "lang_status_block": "Blockieren",
+    "lang_status_unblock": "Freigeben",
+    "lang_status_mute": "Stummschalten",
+    "lang_status_unmute": "Stummschalten aufheben",
+    "lang_status_redraftTitle": "Löschen & Neuentwerfen",
+    "lang_status_redraft": "Weiter mit löschen & neu entwerfen? Du verlierst den Status dieses Tröts. Diese Aktion kann einige Fehler enthalten. Bilder dieses Tröts werden auf älteren Versionen als Mastodon 2.4.1 gelöscht.",
+    "lang_status_emphas": "'s Tröts werden hervorgehoben. Bitte laden Sie nach dieser Aktion neu.",
+    "lang_status_unemphas": "'s Tröts werden nicht hervorgehoben. Bitte laden Sie nach dieser Aktion neu.",
+    "lang_status_unendorse": "Nicht auf dem Profil zeigen",
+    "lang_status_endorse": "Auf dem Profil zeigen",
+    "lang_status_followers": "Followers",
+    "lang_status_active": "Last status",
+    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
+    "lang_usetxtbox_reply": "Antwortmodus. Strg+Umschalt+C zum Löschen.",
+    "lang_cards_check": " überprüfen",
+    "lang_cards_pip": "PiP mode",
+    "lang_details_nodata": "Keine Daten",
+    "lang_details_filtered": "Gefilterter Tröt",
+    "lang_details_embed": "Eingefügtes HTML wurde entfernt.",
+    "lang_details_url": "URL dieses Tröts wurde entfernt.",
+    "lang_details_txt": "Inhalt dieses Tröts wurde entfernt.",
+    "lang_filter_nodata": "Keine Daten",
+    "lang_filter_errordegree": "Bitte überprüfen Sie den Kontext",
+    "lang_list_nodata": "Keine Daten",
+    "lang_list_show": "Anzeigen",
+    "lang_list_users": "Benutzerliste",
+    "lang_list_nouser": "Keine Benutzer in dieser Liste.",
+    "lang_list_add": "Zur Liste hinzufügen",
+    "lang_list_add_misskey": "(vielleicht wurde dieser Benutzer aufgelistet)",
+    "lang_list_remove": "Aus Liste entfernen",
+    "lang_notf_new": " neue Benachrichtigungen",
+    "lang_speech_refresh": "Sichern der Vorlesefunktionseinstellungen",
+    "lang_src_ts": "chronologische Reihenfolge",
+    "lang_src_people": " Leute Tröt",
+    "lang_tags_always": "Immer Tröten mit ",
+    "lang_tags_realtime": "Tag-Stream Tröt",
+    "lang_tags_tagunpin": "{{tag}} entsperren",
+    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_tagwarn": "Automatisch {{tag}} anfügen, wenn Tröt ohne {{tag}} ist",
+    "lang_tl_media": "Medien",
+    "lang_tl_reconnect": "Mit Streaming API erneut verbinden",
+    "lang_img_DLDone": "Heruntergeladen:",
+    "lang_layout_gotop": "Gehen Sie zum Anfang dieser Spalte. Wenn das Symbol rot ist, kann diese Spalte keine Verbindung zur Streaming-API herstellen. Bitte neu laden.",
+    "lang_layout_thisacct": "{{notf}} dieses Kontos",
+    "lang_layout_delthis": "Diese Spalte löschen",
+    "lang_layout_setthis": "Einstellungen dieser Spalte",
+    "lang_layout_mediafil": "Medien filtern",
+    "lang_layout_linkana": "Automatische Link-Analyse",
+    "lang_layout_linkanades": "Automatische Link-Analyse",
+    "lang_layout_tts": "Sprachausgabe ",
+    "lang_layout_reconnect": "Mit Streaming API erneut verbinden",
+    "lang_layout_headercolor": "Kopfzeilenfarbe dieser Spalte",
+    "lang_layout_nodata": "[Keine Daten]<br>F5/⌘+R zum Neu laden",
+    "lang_layout_dm": "Direkte Nachricht",
+    "lang_layout_webviewmode": "Web-Ansicht bevorzugen",
+    "lang_excluded": "Ausgeschlossene Benachrichtigungsart",
+    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_leftFold": "Nach links Stapeln",
+    "lang_layout_leftUnfold": "Rechts Anheften",
+    "lang_layout_deleteColumn": "Diese Spalte löschen",
+    "lang_layout_deleteColumnDesc": "Diese Spalte löschen",
+    "lang_layout_unread": "Unread",
+    "lang_sort_gothis": "Gehe zu dieser Spalte",
+    "lang_sort_remthis": "Diese Spalte löschen",
+    "lang_spotify_img": "Albumcover anhängen",
+    "lang_spotify_imgno": "Kein Albumcover anhängen",
+    "lang_spotify_acct": "TheDesk mit Spotify verbinden",
+    "lang_spotify_np": "Done:Vorlage für NowPlaying",
+    "lang_setting_npprovide": "NowPlaying Provider:{{set}}",
+    "lang_hisdata_frcreq": "Benötigte Mastodon 2.4.3 und höher",
+    "lang_hisdata_frcwarn": "Unfollow accounts will be shown.",
+    "lang_hisdata_taketime": "Es dauert 30s bis mehrere Minuten",
+    "lang_hisdata_notonmisskey": "Misskey kann nicht angefordert werden.",
+    "lang_hisdata_key": "Dieser Benutzer ist von {{set}} überprüft",
+    "lang_showontl_movetxt": "Dieses Konto wurde verschoben",
+    "lang_showontl_movebtn": "Auf dem neuen Konto fortfahren",
+    "lang_showontl_botacct": "[bot]",
+    "lang_showontl_followed": "Folgt dir",
+    "lang_showontl_notf": "Benachrichtigung ",
+    "lang_showontl_domain": "Domain ",
+    "lang_showontl_listwarn": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
+    "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_parse_mentioned": " hat dir geantwortet",
+    "lang_parse_faved": " favorisierte deinen Tröt",
+    "lang_parse_bted": " hat deinen Tröt verstärkt",
+    "lang_parse_btedsimple": " verstärkt",
+    "lang_parse_polled": "'s Umfrage",
+    "lang_parse_notftime": "Bearbeitet am",
+    "lang_parse_cwshow": "Anzeigen",
+    "lang_parse_fulltext": "Full size text:",
+    "lang_parse_autofold": "Automatisches Zusammenfalten",
+    "lang_parse_more": "Mehr",
+    "lang_parse_url": "URL-Analyse",
+    "lang_parse_tagTL": "Verlauf von {{tag}}",
+    "lang_parse_tagtoot": "Tröt mit {{tag}}",
+    "lang_parse_tagpin": "Pin {{tag}}",
+    "lang_parse_public": "Öffentlich",
+    "lang_parse_unlisted": "Nicht aufgeführt",
+    "lang_parse_private": "Privat",
+    "lang_parse_direct": "Direkt",
+    "lang_parse_clickcopy": "Klicken, um den Text dieses Tröts zu kopieren",
+    "lang_parse_clickcopyurl": "Klicken, um die URL dieses Tröts zu kopieren",
+    "lang_parse_trans": "Übersetzen nach Japanisch",
+    "lang_parse_replyto": "Auf diesen Tröt antworten",
+    "lang_parse_bt": "Diesen Tröt verstärken",
+    "lang_parse_fav": "Diesen Tröt favorisieren",
+    "lang_parse_quote": "Diesen Tröt zitieren",
+    "lang_parse_del": "Diesen Tröt löschen",
+    "lang_parse_pin": "Dieses Tröt fixieren",
+    "lang_parse_det": "Details über Ihr Hauptkonto.",
+    "lang_parse_redraft": "Löschen & Neuentwerfen",
+    "lang_parse_followed": "Folgt dir",
+    "lang_parse_clientop": "Aktion dieses Clients",
+    "lang_parse_clienttxt": " wird",
+    "lang_parse_clientno": "Nichts unternehmen",
+    "lang_parse_clientemp": "Hervorgehoben(/nicht hervorgehoben)",
+    "lang_parse_clientmute": "Stumm",
+    "lang_parse_mute": " wird stumm gemacht. Kann in den Einstellungen wieder entfernt werden.",
+    "lang_parse_voted": "Abgestimmt",
+    "lang_parse_vote": "Abstimmen",
+    "lang_parse_unvoted": "Ergebnis ohne Abstimmung anzeigen",
+    "lang_parse_endedvote": "Abgelaufen",
+    "lang_parse_thread": "Konversation anzeigen",
+    "lang_parse_unknown": "Angehängte Datei",
+    "lang_parse_nsfw": "NSFW Medien",
+    "lang_parse_notffilter": "Benachrichtigungen dieses Benutzers anzeigen",
+    "lang_misskeyparse_renote": "Weiterleiten",
+    "lang_misskeyparse_renoteqt": "Renote",
+    "lang_misskeyparse_reaction": "Reaktion",
+    "lang_misskeyparse_tagnostr": "Keine Streaming-API für Tag-Verläufe",
+    "lang_misskeyparse_listnostr": "Keine Streaming-API fpr Listen-Verläufe",
+    "lang_misskeyparse_home": "Startseite",
+    "lang_misskeyparse_followers": "Abonnent",
+    "lang_misskeyparse_specified": "Ausgewählte Benutzer",
+    "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
+    "lang_misskeyparse_renoted": " hat deinen folgenden Beitrag zurückgewiesen.",
+    "lang_misskeyparse_quoted": " zitierte deinen folgenden Beitrag.",
+    "lang_misskeyparse_reacted": " hat auf Ihren folgenden Beitrag reagiert.",
+    "lang_setting_time": "Zeitformat:{{set}}",
+    "lang_setting_theme": "Design:{{set}}",
+    "lang_setting_nsfw": "NSFW:{{set}}",
+    "lang_setting_cw": "CW:{{set}}",
+    "lang_setting_cwtext": "Default CW text:{{set}}",
+    "lang_setting_cws": "Always CW on:{{set}}",
+    "lang_setting_rp": "Antwortzähler:{{set}}",
+    "lang_setting_vis": "Standardsichtbarkeit:{{set}}",
+    "lang_setting_popup": "Popup-Benachrichtigung:{{set}}",
+    "lang_setting_off": "Aus",
+    "lang_setting_s": "s",
+    "lang_setting_box": "Standard-Tröt-Box-Aktion:{{set}}",
+    "lang_setting_gif": "GIF:{{set}}",
+    "lang_setting_selt": "Auto-Falten:{{set1}} Zeilen und höher, {{set2}} Buchstaben und höher",
+    "lang_setting_autocw": "Auto CW:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_width": "Minimale Breite:{{set}}",
+    "lang_setting_fixwidth": "TweetDeck feste Breite:{{set}}px",
+    "lang_setting_img": "Nach dem Posten eines Bildes:{{set}}",
+    "lang_setting_font": "Schriftart:{{set}}",
+    "lang_setting_default": "Standard-Schriftart",
+    "lang_setting_size": "Schriftgröße:{{set}}px",
+    "lang_setting_imgheight": "Bildhöhe:{{set}}px",
+    "lang_setting_ticker": "#InstanceTicker:{{set}}px",
+    "lang_setting_animation": "Animation: {{set}}",
+    "lang_setting_tag": "Tag-Verlauf:{{set}}",
+    "lang_setting_boxConfirm": "Postfach:{{set}}",
+    "lang_setting_ul": "Muttersprache:{{set}}",
+    "lang_setting_notf": "System Benachrichtigungen:{{set}}",
+    "lang_setting_quote": "Zitierformat:{{set}}",
+    "lang_setting_via": "Via:{{set}}",
+    "lang_setting_mov": "Aktionstasten verstecken:{{set}}",
+    "lang_setting_setasread": "Benachrichtigungs-Markierungen:{{set}}",
+    "lang_setting_main": "Standard-Konto:{{set}}",
+    "lang_setting_sec": "Zweite Tröt-Taste:{{set}}",
+    "lang_setting_ksref": "Tastaturkürzel werden aktualisiert.",
+    "lang_setting_nomuting": "Kein Client ist stumm.",
+    "lang_setting_notftest": " Benachrichtigungen testen ",
+    "lang_setting_notftestprof": "Ihr Symbol wird angezeigt.",
+    "lang_setting_exportwarn": "Nur wichtige Daten werden exportiert. Sie müssen diese Daten sichern.",
+    "lang_setting_importwarn": "Alle Daten werden gelöscht."
+}

app/js/lang/lang.en.js

@@ -0,0 +1,280 @@
+//commonError
+var lang = {
+    "language": "en",
+    "lang_toot": "Toot",
+    "lang_there": "Yes",
+    "lang_nothing": "None",
+    "lang_yesno": "Yes",
+    "lang_no": "No",
+    "lang_progress": "Wait...",
+    "lang_edit": "Edit",
+    "lang_del": "Delete",
+    "lang_add": "Add",
+    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_speech": "Google US English",
+    //language.html
+    "lang_lang": "Language",
+    "lang_langlocale": "English",
+    "lang_back": "Back",
+    "lang_set": "Set",
+    "lang_langadd": "Translate TheDesk to other languages or proofread TheDesk on <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk needs your help.",
+    //common/time.js
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": null,
+    "lang_time_suffixAgo": null,
+    "lang_time_suffixFromNow": null,
+    "lang_time_inPast": null,
+    "lang_time_seconds": "%d s",
+    "lang_time_minute": "1 m",
+    "lang_time_minutes": "%d m",
+    "lang_time_hour": "1 h",
+    "lang_time_hours": "%d h",
+    "lang_time_day": "1 d",
+    "lang_time_days": "%d d",
+    "lang_time_month": "1 month",
+    "lang_time_months": "%d months",
+    "lang_time_year": "y",
+    "lang_time_years": "%d y",
+    //common/version.js
+    "lang_version_usever": "No update is found({{ver}})",
+    "lang_version_skipver": "Update was ignored.",
+    "lang_version_platform": "Do you want auto-updates?(users installed on Microsoft Store select 'No')",
+    "lang_version_platform_linux": "Do you want auto-updates?(users installed on Snapcraft select 'No')",
+    "lang_version_platform_mac": "Do you want auto-updates?(Homebrew Cask users select 'No')",
+    //login
+    //login/login.js
+    "lang_login_noauth": "Show TL of unlogined accounts",
+    //login/manager.js
+    "lang_manager_info": "About this instance",
+    "lang_manager_refresh": "Refresh",
+    "lang_manager_delete": "Logout",
+    "lang_manager_color": "Account Color",
+    "lang_manager_confirm": "is about to logout. Continue?",
+    "lang_manager_mainAcct": "Done:choose main account",
+    "lang_manager_def": "Default",
+    "lang_manager_none": "None",
+    "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
+    "lang_manager_logout": "Logout",
+    //post/bb-md.js
+    "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
+    //post/emoji.js
+    "lang_emoji_get": "Get emojis",
+    "lang_emoji_custom": "Custom emojis",
+    "lang_defaultemojis_text": "Emojis about {{cat}}",
+    //post/img.js
+    "lang_postimg_previewdis": "cannot preview",
+    "lang_postimg_aftupload": "You cannot change accounts after uploading.",
+    "lang_postimg_failupload": "Failed",
+    "lang_postimg_delete": "Delete this image.",
+    //post/post.js
+    "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",
+    "lang_post_cwtxt": "You are about to post longer toot than you set.\nWarning text:",
+    "lang_post_btn1": "Cancel (will not post)",
+    "lang_post_btn2": "Make text hidden automatically",
+    "lang_post_btn3": "Continue to post",
+    //post/status.js
+    "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",
+    "lang_status_unfollow": "Unfollow",
+    "lang_status_block": "Block",
+    "lang_status_unblock": "Unblock",
+    "lang_status_mute": "Mute",
+    "lang_status_unmute": "Unmute",
+    "lang_status_redraftTitle": "Delete & redraft",
+    "lang_status_redraft": "Continue to delete & redraft? You lose statuses of this toot. This fanction may contain some bugs. Images of this toot will be deleted on older than Mastodon 2.4.1.",
+    "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
+    "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
+    "lang_status_unendorse": "Not feature on profile",
+    "lang_status_endorse": "Feature on profile",
+    "lang_status_followers": "Followers",
+    "lang_status_active": "Last status",
+    //post/suggest.js
+    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
+    //post/use-txtbox.js
+    "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
+    //tl/card.js
+    "lang_cards_check": " check",
+    "lang_cards_pip": "PiP mode",
+    //tl/details.js
+    "lang_details_nodata": "No data",
+    "lang_details_filtered": "Filtered toot",
+    "lang_details_embed": "Embed HTML is cliped.",
+    "lang_details_url": "URL of this toot is cliped.",
+    "lang_details_txt": "Content of this toot is cliped.",
+    //tl/filter.js
+    "lang_filter_nodata": "No data",
+    "lang_filter_errordegree": "Please check a context",
+    //tl/list.js
+    "lang_list_nodata": "No data",
+    "lang_list_show": "Show",
+    "lang_list_users": "Users list",
+    "lang_list_nouser": "No users in this list.",
+    "lang_list_add": "Add to the list",
+    "lang_list_add_misskey": "(perhaps this user has been listed)",
+    "lang_list_remove": "Remove from the list",
+    //tl/notification.js
+    "lang_notf_new": " new notifications",
+    //tl/speech.js
+    "lang_speech_refresh": "Save value about TTS config",
+    //tl/src.js
+    "lang_src_ts": "chronological order",
+    "lang_src_people": " people toot",
+    //tl/tag.js
+    "lang_tags_always": "Always toots with ",
+    "lang_tags_realtime": "Tag-stream toot",
+    "lang_tags_tagunpin": "Unpin {{tag}}",
+    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_tagwarn": "Auto complete {{tag}}, if toot without {{tag}}",
+    //tl/tl.js
+    "lang_tl_media": "Media",
+    "lang_tl_reconnect": "Reconnect to streaming API",
+    //ui/img.js
+    "lang_img_DLDone": "Downloaded:",
+    //ui/layout.js
+    "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
+    "lang_layout_thisacct": "{{notf}} of this account",
+    "lang_layout_delthis": "Remove this column",
+    "lang_layout_setthis": "Preferences of this column",
+    "lang_layout_mediafil": "Media filtering",
+    "lang_layout_linkana": "Auto Link Analyzer",
+    "lang_layout_linkanades": "Auto link analyzer",
+    "lang_layout_tts": "Text to speech ",
+    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_headercolor": "Header color of this column",
+    "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
+    "lang_layout_dm": "Direct Message",
+    "lang_layout_webviewmode": "Prefer WebView",
+    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_leftFold": "Stack to the left",
+    "lang_layout_leftUnfold": "Dock on the right",
+    "lang_layout_deleteColumn": "Delete this column",
+    "lang_layout_deleteColumnDesc": "Delete this column",
+    "lang_layout_unread": "Unread",
+    //ui/sort.js
+    "lang_sort_gothis": "Go to this column",
+    "lang_sort_remthis": "Delete this column",
+    //ui/spotify.js
+    "lang_spotify_img": "Attach an album artwork",
+    "lang_spotify_imgno": "Not attach an album artwork",
+    "lang_spotify_acct": "Connect TheDesk to Spotify",
+    "lang_spotify_np": "Done:templete of NowPlaying",
+    "lang_setting_npprovide": "NowPlaying provider:{{set}}",
+    //userdata/his-data.js
+    "lang_hisdata_frcreq": "Required Mastodon 2.4.3 and above",
+    "lang_hisdata_frcwarn": "Unfollow accounts will be shown.",
+    "lang_hisdata_taketime": "It will take 30s ~ several minutes",
+    "lang_hisdata_notonmisskey": "Misskey is unable to request.",
+    "lang_hisdata_key": "This user is proofed by {{set}}",
+    //userdata/showOnTL.js
+    "lang_showontl_movetxt": "This account was moved",
+    "lang_showontl_movebtn": "Continue on the new account",
+    "lang_showontl_botacct": "[bot]",
+    "lang_showontl_followed": "Following you",
+    "lang_showontl_notf": "Notification ",
+    "lang_showontl_domain": "Domain ",
+    "lang_showontl_listwarn": "Follow to add this user to lists.",
+    "lang_showontl_verified": "This website is verified by owner at ",
+    //parse
+    "lang_parse_mentioned": " replied to you",
+    "lang_parse_faved": " favourited your toot",
+    "lang_parse_bted": " boosted your toot",
+    "lang_parse_btedsimple": " boosted",
+    "lang_parse_polled": "'s poll",
+    "lang_parse_notftime": "Actioned at",
+    "lang_parse_cwshow": "Show",
+    "lang_parse_fulltext": "Full size text:",
+    "lang_parse_autofold": "Auto folded",
+    "lang_parse_more": "More",
+    "lang_parse_url": "URL Analyzer",
+    "lang_parse_tagTL": "Timeline of {{tag}}",
+    "lang_parse_tagtoot": "Toot with {{tag}}",
+    "lang_parse_tagpin": "Pin {{tag}}",
+    "lang_parse_public": "Public",
+    "lang_parse_unlisted": "Unlisted",
+    "lang_parse_private": "Private",
+    "lang_parse_direct": "Direct",
+    "lang_parse_clickcopy": "Click to copy text of this toot",
+    "lang_parse_clickcopyurl": "Click to copy URL of this toot",
+    "lang_parse_trans": "Translate to Japanese",
+    "lang_parse_replyto": "Reply to this toot",
+    "lang_parse_bt": "Boost this toot",
+    "lang_parse_fav": "Favourite this toot",
+    "lang_parse_quote": "Quote this toot",
+    "lang_parse_del": "Delete this toot",
+    "lang_parse_pin": "Pin this toot",
+    "lang_parse_det": "Details via your main account.",
+    "lang_parse_redraft": "Delete & re-draft",
+    "lang_parse_followed": "Followed you",
+    "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_vote": "Vote",
+    "lang_parse_unvoted": "Show the result without voting",
+    "lang_parse_endedvote": "Expired",
+    "lang_parse_thread": "Show thread",
+    "lang_parse_unknown": "Attached file",
+    "lang_parse_nsfw": "sensitive media",
+    "lang_parse_notffilter": "Show this user's notifications",
+    //misskey
+    "lang_misskeyparse_renote": "Repost",
+    "lang_misskeyparse_renoteqt": "Renote",
+    "lang_misskeyparse_reaction": "Reaction",
+    "lang_misskeyparse_tagnostr": "No streaming API on Tag TLs",
+    "lang_misskeyparse_listnostr": "No streaming API on List TLs",
+    "lang_misskeyparse_home": "Home",
+    "lang_misskeyparse_followers": "Follower",
+    "lang_misskeyparse_specified": "Specified User",
+    "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
+    "lang_misskeyparse_renoted": " renoted your following post.",
+    "lang_misskeyparse_quoted": " quoted your following post.",
+    "lang_misskeyparse_reacted": " reacted your following post.",
+    //setting
+    "lang_setting_time": "Time format:{{set}}",
+    "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_nsfw": "Sensitive media:{{set}}",
+    "lang_setting_cw": "CW:{{set}}",
+    "lang_setting_cwtext": "Default CW text:{{set}}",
+    "lang_setting_cws": "Always CW on:{{set}}",
+    "lang_setting_rp": "Reply counter:{{set}}",
+    "lang_setting_vis": "Default visibility:{{set}}",
+    "lang_setting_popup": "Popup notification:{{set}}",
+    "lang_setting_off": "Off",
+    "lang_setting_s": "s",
+    "lang_setting_box": "Default toot box action:{{set}}",
+    "lang_setting_gif": "GIF:{{set}}",
+    "lang_setting_selt": "Auto fold:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_autocw": "Auto CW:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_width": "Minimam width:{{set}}",
+    "lang_setting_fixwidth": "TweetDeck fixed width:{{set}}px",
+    "lang_setting_img": "After posting an image:{{set}}",
+    "lang_setting_font": "Fonts:{{set}}",
+    "lang_setting_default": "default font",
+    "lang_setting_size": "Font size:{{set}}px",
+    "lang_setting_imgheight": "Image height:{{set}}px",
+    "lang_setting_ticker": "#InstanceTicker:{{set}}px",
+    "lang_setting_animation": "Animation: {{set}}",
+    "lang_setting_tag": "Tag TL:{{set}}",
+    "lang_setting_boxConfirm": "Post box:{{set}}",
+    "lang_setting_ul": "Native locale:{{set}}",
+    "lang_setting_notf": "Native notification:{{set}}",
+    "lang_setting_quote": "Quote format:{{set}}",
+    "lang_setting_via": "Via:{{set}}",
+    "lang_setting_mov": "Action buttons hiding:{{set}}",
+    "lang_setting_setasread": "Notification markers:{{set}}",
+    "lang_setting_main": "Default account:{{set}}",
+    "lang_setting_sec": "Secondary toot button:{{set}}",
+    "lang_setting_ksref": "Keyboard shortcuts are refreshed.",
+    "lang_setting_nomuting": "No client is muted.",
+    "lang_setting_notftest": " Notification test ",
+    "lang_setting_notftestprof": "Your icon is shown.",
+    "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
+    "lang_setting_importwarn": "All data will be deleted.",
+}

app/js/lang/lang.ja.js

@@ -0,0 +1,280 @@
+//commonError
+var lang = {
+    "language": "ja",
+    "lang_toot": "トゥート",
+    "lang_there": "あり",
+    "lang_nothing": "なし",
+    "lang_yesno": "はい",
+    "lang_no": "いいえ",
+    "lang_progress": "処理中",
+    "lang_edit": "編集",
+    "lang_del": "削除",
+    "lang_add": "追加",
+    "lang_fatalerroroccured": "エラーが発生しました。しばらく待ってから再起動してください。",
+    "lang_speech": "Google 日本語",
+    //language.html
+    "lang_lang": "言語",
+    "lang_langlocale": "日本語",
+    "lang_back": "戻る",
+    "lang_set": "設定",
+    "lang_langadd": "<a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>から翻訳に参加できます。英語の校正(緊急)や他言語に翻訳していただける方を募集しております。",
+    //common/time.js
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": "今から",
+    "lang_time_suffixAgo": "",
+    "lang_time_suffixFromNow": "",
+    "lang_time_inPast": '',
+    "lang_time_seconds": "%d秒前",
+    "lang_time_minute": "1分前",
+    "lang_time_minutes": "%d分前",
+    "lang_time_hour": "1時間前",
+    "lang_time_hours": "%d時間前",
+    "lang_time_day": "昨日",
+    "lang_time_days": "%d日前",
+    "lang_time_month": "昨月",
+    "lang_time_months": "%dヶ月前",
+    "lang_time_year": "去年",
+    "lang_time_years": "%d年前",
+    //common/version.js
+    "lang_version_usever": "お使いのバージョン{{ver}}は最新です。",
+    "lang_version_skipver": "アップデートはスキップされました。",
+    "lang_version_platform": "このソフトウェアはMicrosoft Storeからダウンロードされましたか？通常はホームページからインストールするため「いいえ」を選んでください。「はい」を選ぶとMicrosoft Storeからアップデートが提供され、アップデートの通知を出しません。",
+    "lang_version_platform_linux": "このソフトウェアはSnapcraft(snapd)からインストールしましたか？通常はホームページからインストールするため「いいえ」を選んでください。「はい」を選ぶとSnapcraftからアップデートが提供され、アップデートの通知を出しません。",
+    "lang_version_platform_mac": "このソフトウェアはHomebrew Caskからインストールしましたか？通常はホームページからインストールするため「いいえ」を選んでください。「はい」を選ぶとアップデートの通知を出しません。",
+    //login
+    //login/login.js
+    "lang_login_noauth": "認証せずに見る",
+    //login/manager.js
+    "lang_manager_info": "インスタンス情報",
+    "lang_manager_refresh": "情報更新",
+    "lang_manager_delete": "削除",
+    "lang_manager_color": "アカウントカラーを選択",
+    "lang_manager_confirm": "を削除します。",
+    "lang_manager_mainAcct": "メインアカウントを設定しました。",
+    "lang_manager_def": "既定",
+    "lang_manager_none": "なし",
+    "lang_manager_godev": "MisskeyのDevセンターに移動します。同時に開かれるドキュメントを参考にログインしてください。",
+    "lang_manager_logout": "ログアウト",
+    //post/bb-md.js
+    "lang_bbmd_misskey": "TheDeskにおけるMisskeyでは、@を返信として扱いますが、全ての@は消去され別パラメータに入力されます。また、「未収載」を「ホーム」として扱います。",
+    //post/emoji.js
+    "lang_emoji_get": "絵文字リストを取得",
+    "lang_emoji_custom": "カスタム絵文字",
+    "lang_defaultemojis_text": "{{cat}}の絵文字",
+    //post/img.js
+    "lang_postimg_previewdis": "プレビューできません。",
+    "lang_postimg_aftupload": "アップロード後はアカウントを切り替えられません。",
+    "lang_postimg_failupload": "アップロードに失敗しました。",
+    "lang_postimg_delete": "この画像を削除します",
+    //post/post.js
+    "lang_post_tagTL": "デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。",
+    "lang_post_tagVis": "公開範囲が「公開」以外だと、タグTLに表示されません。(一部インスタンスを除く)",
+    "lang_post_cwtitle": "長文投稿の警告",
+    "lang_post_cwtxt": "指定文字数、行数を超えるトゥートを行おうとしています。\n自動CWのタイトル:",
+    "lang_post_btn1": "キャンセル(投稿しない)",
+    "lang_post_btn2": "自動でCWを付ける",
+    "lang_post_btn3": "そのまま投稿",
+    //post/status.js
+    "lang_status_favWarn": "お気に入り登録しました。インスタンスが違うときは時間がかかる場合があります。",
+    "lang_status_btWarn": "ブーストしました。インスタンスが違うときは時間がかかる場合があります。",
+    "lang_status_follow": "フォロー",
+    "lang_status_unfollow": "フォロー解除",
+    "lang_status_block": "ブロック",
+    "lang_status_unblock": "ブロック解除",
+    "lang_status_mute": "ミュート",
+    "lang_status_unmute": "ミュート解除",
+    "lang_status_redraftTitle": "削除して再編集",
+    "lang_status_redraft": "削除して再編集しますか？そのトゥートの全てのデータがリセットされます。この機能はベータ版です。画像は~v2.4.1で破棄されます。",
+    "lang_status_emphas": "を強調します。リロードしてください。",
+    "lang_status_unemphas": "を強調解除します。リロードしてください。",
+    "lang_status_unendorse": "紹介解除",
+    "lang_status_endorse": "プロフで紹介する",
+    "lang_status_followers": "フォロワー",
+    "lang_status_active": "最新トゥート",
+    //post/suggest.js
+    "lang_suggest_nodata": "サジェストのために絵文字リストを取得してください。",
+    //post/use-txtbox.js
+    "lang_usetxtbox_reply": "返信モードです。クリアするときはCtrl+Shift+Cを押してください。",
+    //tl/card.js
+    "lang_cards_check": "チェック",
+    "lang_cards_pip": "ながら観モード",
+    //tl/details.js
+    "lang_details_nodata": "データなし",
+    "lang_details_filtered": "フィルターされました。",
+    "lang_details_embed": "埋め込みHTMLがコピーされました。",
+    "lang_details_url": "トゥートURLがコピーされました。",
+    "lang_details_txt": "トゥート本文がコピーされました。",
+    //tl/filter.js
+    "lang_filter_nodata": "フィルターはありません",
+    "lang_filter_errordegree": "適応範囲を最低一つ以上チェックしてください。",
+    //tl/list.js
+    "lang_list_nodata": "リストはありません",
+    "lang_list_show": "表示",
+    "lang_list_users": "ユーザー一覧",
+    "lang_list_nouser": "ユーザーはいません",
+    "lang_list_add": "リストに追加",
+    "lang_list_add_misskey": "(重複追加の可能性があります)",
+    "lang_list_remove": "リストから削除",
+    //tl/notification.js
+    "lang_notf_new": "件の新しい通知",
+    //tl/speech.js
+    "lang_speech_refresh": "音声読み上げ設定を更新しました。",
+    //tl/src.js
+    "lang_src_ts": "時系列",
+    "lang_src_people": "人がトゥート",
+    //tl/tag.js
+    "lang_tags_always": "常に",
+    "lang_tags_realtime": "実況",
+    "lang_tags_tagunpin": "{{tag}}をよく使うタグから削除",
+    "lang_tags_unrealtime": "実況解除",
+    "lang_tags_tagwarn": "{{tag}}がない場合自動で補完されます。",
+    //tl/tl.js
+    "lang_tl_media": "メディア",
+    "lang_tl_reconnect": "Streamingに再接続しました",
+    //ui/img.js
+    "lang_img_DLDone": "ダウンロード先:",
+    //ui/layout.js
+    "lang_layout_gotop": "一番上へ。アイコンが赤のときはストリーミングに接続できていません。F5等で再読込をお試し下さい。",
+    "lang_layout_thisacct": "このアカウントの{{notf}}",
+    "lang_layout_delthis": "このカラムを削除",
+    "lang_layout_setthis": "このカラムの設定",
+    "lang_layout_mediafil": "メディアフィルター",
+    "lang_layout_linkana": "リンク解析",
+    "lang_layout_linkanades": "リンクの解析を切り替え",
+    "lang_layout_tts": "読み上げ",
+    "lang_layout_reconnect": "カラム再読込",
+    "lang_layout_headercolor": "TLヘッダーカラー",
+    "lang_layout_nodata": "[ここにトゥートはありません。]<br>F5/⌘+Rで再読込できます。",
+    "lang_layout_dm": "ダイレクトメッセージ",
+    "lang_layout_webviewmode": "WebView優先",
+    "lang_excluded": "除外する通知",
+    "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTのみ)",
+    "lang_layout_leftFold": "左へ重ねる",
+    "lang_layout_leftUnfold": "右へ出す",
+    "lang_layout_deleteColumn": "カラム削除",
+    "lang_layout_deleteColumnDesc": "カラムを削除しますか？",
+    "lang_layout_unread": "未読",
+    //ui/sort.js
+    "lang_sort_gothis": "このカラムへ",
+    "lang_sort_remthis": "このカラムを削除",
+    //ui/spotify.js
+    "lang_spotify_img": "アルバムアートワークを添付します。",
+    "lang_spotify_imgno": "アルバムアートワークを添付しません。",
+    "lang_spotify_acct": "アカウント連携をしてください。",
+    "lang_spotify_np": "NowPlaying文書を更新しました。",
+    "lang_setting_npprovide": "NowPlayingのソースを{{set}}に設定しました。",
+    //userdata/his-data.js
+    "lang_hisdata_frcreq": "Mastodon 2.4.3~が必要です",
+    "lang_hisdata_frcwarn": "非フォローだけど絡みがある時に表示されます。",
+    "lang_hisdata_taketime": "30秒から数分かかります",
+    "lang_hisdata_notonmisskey": "このシステムはMisskeyにはありません。",
+    "lang_hisdata_key": "このユーザーの信頼性は{{set}}によって示されています",
+    //userdata/showOnTL.js
+    "lang_showontl_movetxt": "このアカウントは移行しています",
+    "lang_showontl_movebtn": "移行先を見る",
+    "lang_showontl_botacct": "botアカウント",
+    "lang_showontl_followed": "フォローされています",
+    "lang_showontl_notf": "通知",
+    "lang_showontl_domain": "ドメイン",
+    "lang_showontl_listwarn": "リストに追加するためにはフォローが必要です。",
+    "lang_showontl_verified": "このユーザーの所持するWebサイトであると証明されています。",
+    //parse
+    "lang_parse_mentioned": "が返信しました",
+    "lang_parse_faved": "がお気に入り登録しました",
+    "lang_parse_bted": "がブーストしました",
+    "lang_parse_btedsimple": "がブースト",
+    "lang_parse_polled": "のアンケート",
+    "lang_parse_notftime": "通知された時間",
+    "lang_parse_cwshow": "見る",
+    "lang_parse_fulltext": "以下全文",
+    "lang_parse_autofold": "自動折り畳み",
+    "lang_parse_more": "続き...",
+    "lang_parse_url": "URL解析",
+    "lang_parse_tagTL": "{{tag}}のタイムライン",
+    "lang_parse_tagtoot": "{{tag}}でトゥート",
+    "lang_parse_tagpin": "{{tag}}をよく使うタグへ",
+    "lang_parse_public": "公開",
+    "lang_parse_unlisted": "未収載",
+    "lang_parse_private": "非公開",
+    "lang_parse_direct": "ダイレクト",
+    "lang_parse_clickcopy": "クリックして本文をコピー",
+    "lang_parse_clickcopyurl": "クリックしてトゥートURLをコピー",
+    "lang_parse_trans": "このトゥートを日本語に翻訳",
+    "lang_parse_replyto": "このトゥートに返信",
+    "lang_parse_bt": "このトゥートをブースト",
+    "lang_parse_fav": "このトゥートをお気に入り登録",
+    "lang_parse_quote": "このトゥートを引用",
+    "lang_parse_del": "このトゥートを削除",
+    "lang_parse_pin": "このトゥートをピン留め",
+    "lang_parse_det": "詳細(メインアカウント経由)",
+    "lang_parse_redraft": "このトゥートを削除して再編集",
+    "lang_parse_followed": "フォローされました。",
+    "lang_parse_clientop": "クライアント操作",
+    "lang_parse_clienttxt": " に対する処理を選択してください。",
+    "lang_parse_clientno": "何もしない",
+    "lang_parse_clientemp": "強調表示/解除",
+    "lang_parse_clientmute": "ミュート",
+    "lang_parse_mute": "ミュートします。設定から解除できます。",
+    "lang_parse_voted": "投票済みです",
+    "lang_parse_vote": "投票",
+    "lang_parse_unvoted": "結果だけ見る",
+    "lang_parse_endedvote": "終了済み",
+    "lang_parse_thread": "会話を表示",
+    "lang_parse_unknown": "添付ファイル",
+    "lang_parse_nsfw": "閲覧注意",
+    "lang_parse_notffilter": "このユーザーの通知のみを表示",
+    //misskey
+    "lang_misskeyparse_renote": "再投稿",
+    "lang_misskeyparse_renoteqt": "引用",
+    "lang_misskeyparse_reaction": "リアクション",
+    "lang_misskeyparse_tagnostr": "タグTLはストリーミング非対応です。",
+    "lang_misskeyparse_listnostr": "リストTLはストリーミング非対応です。",
+    "lang_misskeyparse_home": "ホーム",
+    "lang_misskeyparse_followers": "フォロワー",
+    "lang_misskeyparse_specified": "ユーザー指定",
+    "lang_misskeyparse_qt": "MisskeyのRenote(引用モード)中:Ctrl+Shift+Cでクリア",
+    "lang_misskeyparse_renoted": "がRepost",
+    "lang_misskeyparse_quoted": "が引用",
+    "lang_misskeyparse_reacted": "がリアクション",
+    //setting
+    "lang_setting_time": "時間設定を{{set}}に設定しました。",
+    "lang_setting_theme": "テーマ設定を{{set}}に設定しました。",
+    "lang_setting_nsfw": "画像表示設定を{{set}}に設定しました。",
+    "lang_setting_cw": "テキスト表示設定を{{set}}に設定しました。",
+    "lang_setting_cwtext": "デフォルトの警告文を「{{set}}」に設定しました。",
+    "lang_setting_cws": "標準でCW:{{set}}",
+    "lang_setting_rp": "リプライ数表示:{{set}}",
+    "lang_setting_vis": "デフォルトの公開設定を{{set}}に設定しました。",
+    "lang_setting_popup": "ポップアップお知らせを{{set}}に設定しました。",
+    "lang_setting_off": "オフ",
+    "lang_setting_s": "秒",
+    "lang_setting_box": "デフォルトでのボックスの挙動を{{set}}に設定しました。",
+    "lang_setting_gif": "アイコンアニメーション再生を{{set}}に設定しました。",
+    "lang_setting_selt": "{{set1}}行以上または{{set2}}文字以上でテキストを隠します。",
+    "lang_setting_autocw": "{{set1}}行以上または{{set2}}文字以上で警告を表示します。",
+    "lang_setting_width": "横幅最低を{{set}}pxに設定しました。",
+    "lang_setting_fixwidth": "TweetDeckの横幅を{{set}}pxに設定しました。",
+    "lang_setting_img": "画像投稿後の設定を「{{set}}」に設定しました。",
+    "lang_setting_font": "フォントを{{set}}に設定しました。",
+    "lang_setting_default": "デフォルト",
+    "lang_setting_size": "フォントサイズを{{set}}pxに設定しました。",
+    "lang_setting_imgheight": "画像高さを{{set}}pxに設定しました。",
+    "lang_setting_ticker": "#InstanceTicker使用を{{set}}に設定しました。",
+    "lang_setting_animation": "アニメーションを{{set}}に設定しました。",
+    "lang_setting_tag": "タグの取得範囲を「{{set}}」に設定しました。",
+    "lang_setting_boxConfirm": "投稿ボックスを{{set}}",
+    "lang_setting_ul": "独自ロケール設定を{{set}}に設定しました。",
+    "lang_setting_notf": "ネイティブ通知を{{set}}に設定しました。",
+    "lang_setting_quote": "引用形式を{{set}}に設定しました。",
+    "lang_setting_via": "via表示を{{set}}に設定しました。",
+    "lang_setting_mov": "アクションボタン非表示を{{set}}に設定しました。",
+    "lang_setting_setasread": "通知カラム存在時新着非表示を{{set}}に設定しました。",
+    "lang_setting_main": "起動時・投稿時のアカウントを{{set}}に設定しました。",
+    "lang_setting_sec": "セカンダリートゥートボタン:{{set}}",
+    "lang_setting_ksref": "キーボードショートカットが更新されました。",
+    "lang_setting_nomuting": "ミュートしているクライアントはありません。",
+    "lang_setting_notftest": "通知テスト",
+    "lang_setting_notftestprof": "アイコンはあなたのアカウントのものです。",
+    "lang_setting_exportwarn": "重要なデータのみエクスポートされます。エクスポートされたデータは外部に公開しないでください。全ての認証データが含まれています。",
+    "lang_setting_importwarn": "全てのデータがリセットされます。"
+}

app/js/lang/lang.ps.js

@@ -0,0 +1,206 @@
+var lang = {
+    "language": "crwdns1960:0crwdne1960:0",
+    "lang_toot": "crwdns1962:0crwdne1962:0",
+    "lang_there": "crwdns1964:0crwdne1964:0",
+    "lang_nothing": "crwdns1966:0crwdne1966:0",
+    "lang_yesno": "crwdns1968:0crwdne1968:0",
+    "lang_no": "crwdns1970:0crwdne1970:0",
+    "lang_progress": "crwdns1972:0crwdne1972:0",
+    "lang_edit": "crwdns1974:0crwdne1974:0",
+    "lang_del": "crwdns1976:0crwdne1976:0",
+    "lang_add": "crwdns1978:0crwdne1978:0",
+    "lang_fatalerroroccured": "crwdns1980:0crwdne1980:0",
+    "lang_speech": "crwdns1982:0crwdne1982:0",
+    "lang_lang": "crwdns1984:0crwdne1984:0",
+    "lang_langlocale": "crwdns1986:0crwdne1986:0",
+    "lang_back": "crwdns1988:0crwdne1988:0",
+    "lang_set": "crwdns1990:0crwdne1990:0",
+    "lang_langadd": "crwdns2364:0crwdne2364:0",
+    "lang_version_usever": "crwdns1994:0{{ver}}crwdne1994:0",
+    "lang_version_skipver": "crwdns1996:0crwdne1996:0",
+    "lang_login_noauth": "crwdns1998:0crwdne1998:0",
+    "lang_manager_info": "crwdns2000:0crwdne2000:0",
+    "lang_manager_refresh": "crwdns2002:0crwdne2002:0",
+    "lang_manager_delete": "crwdns2004:0crwdne2004:0",
+    "lang_manager_color": "crwdns2006:0crwdne2006:0",
+    "lang_manager_confirm": "crwdns2008:0crwdne2008:0",
+    "lang_manager_mainAcct": "crwdns2010:0crwdne2010:0",
+    "lang_manager_def": "crwdns2012:0crwdne2012:0",
+    "lang_manager_none": "crwdns2014:0crwdne2014:0",
+    "lang_manager_godev": "crwdns2016:0crwdne2016:0",
+    "lang_bbmd_misskey": "crwdns2018:0crwdne2018:0",
+    "lang_emoji_get": "crwdns2020:0crwdne2020:0",
+    "lang_emoji_custom": "crwdns2022:0crwdne2022:0",
+    "lang_defaultemojis_text": "crwdns2388:0{{cat}}crwdne2388:0",
+    "lang_postimg_previewdis": "crwdns2024:0crwdne2024:0",
+    "lang_postimg_aftupload": "crwdns2026:0crwdne2026:0",
+    "lang_post_tagTL": "crwdns2028:0crwdne2028:0",
+    "lang_post_tagVis": "crwdns2030:0crwdne2030:0",
+    "lang_post_cwtitle": "crwdns2032:0crwdne2032:0",
+    "lang_post_cwtxt": "crwdns2034:0crwdne2034:0",
+    "lang_post_btn1": "crwdns2036:0crwdne2036:0",
+    "lang_post_btn2": "crwdns2038:0crwdne2038:0",
+    "lang_post_btn3": "crwdns2040:0crwdne2040:0",
+    "lang_status_favWarn": "crwdns2042:0crwdne2042:0",
+    "lang_status_btWarn": "crwdns2044:0crwdne2044:0",
+    "lang_status_follow": "crwdns2046:0crwdne2046:0",
+    "lang_status_unfollow": "crwdns2048:0crwdne2048:0",
+    "lang_status_block": "crwdns2050:0crwdne2050:0",
+    "lang_status_unblock": "crwdns2052:0crwdne2052:0",
+    "lang_status_mute": "crwdns2054:0crwdne2054:0",
+    "lang_status_unmute": "crwdns2056:0crwdne2056:0",
+    "lang_status_redraft": "crwdns2058:0crwdne2058:0",
+    "lang_status_emphas": "crwdns2060:0crwdne2060:0",
+    "lang_status_unemphas": "crwdns2062:0crwdne2062:0",
+    "lang_status_unendorse": "crwdns2064:0crwdne2064:0",
+    "lang_status_endorse": "crwdns2066:0crwdne2066:0",
+    "lang_suggest_nodata": "crwdns2068:0crwdne2068:0",
+    "lang_usetxtbox_reply": "crwdns2070:0crwdne2070:0",
+    "lang_cards_check": "crwdns2072:0crwdne2072:0",
+    "lang_cards_pip": "crwdns2074:0crwdne2074:0",
+    "lang_details_nodata": "crwdns2076:0crwdne2076:0",
+    "lang_details_filtered": "crwdns2078:0crwdne2078:0",
+    "lang_details_embed": "crwdns2080:0crwdne2080:0",
+    "lang_details_url": "crwdns2082:0crwdne2082:0",
+    "lang_details_txt": "crwdns2084:0crwdne2084:0",
+    "lang_filter_nodata": "crwdns2086:0crwdne2086:0",
+    "lang_filter_errordegree": "crwdns2088:0crwdne2088:0",
+    "lang_list_nodata": "crwdns2090:0crwdne2090:0",
+    "lang_list_show": "crwdns2092:0crwdne2092:0",
+    "lang_list_users": "crwdns2094:0crwdne2094:0",
+    "lang_list_nouser": "crwdns2096:0crwdne2096:0",
+    "lang_list_add": "crwdns2098:0crwdne2098:0",
+    "lang_list_remove": "crwdns2100:0crwdne2100:0",
+    "lang_notf_new": "crwdns2102:0crwdne2102:0",
+    "lang_speech_refresh": "crwdns2348:0crwdne2348:0",
+    "lang_src_ts": "crwdns2106:0crwdne2106:0",
+    "lang_src_people": "crwdns2108:0crwdne2108:0",
+    "lang_tags_always": "crwdns2110:0crwdne2110:0",
+    "lang_tags_realtime": "crwdns2112:0crwdne2112:0",
+    "lang_tags_tagunpin": "crwdns2114:0{{tag}}crwdne2114:0",
+    "lang_tags_tagwarn": "crwdns2116:0{{tag}}crwdne2116:0",
+    "lang_tl_media": "crwdns2118:0crwdne2118:0",
+    "lang_tl_reconnect": "crwdns2120:0crwdne2120:0",
+    "lang_layout_gotop": "crwdns2122:0crwdne2122:0",
+    "lang_layout_thisacct": "crwdns2124:0{{notf}}crwdne2124:0",
+    "lang_layout_delthis": "crwdns2126:0crwdne2126:0",
+    "lang_layout_setthis": "crwdns2128:0crwdne2128:0",
+    "lang_layout_mediafil": "crwdns2130:0crwdne2130:0",
+    "lang_layout_linkana": "crwdns2132:0crwdne2132:0",
+    "lang_layout_linkanades": "crwdns2134:0crwdne2134:0",
+    "lang_layout_tts": "crwdns2136:0crwdne2136:0",
+    "lang_layout_reconnect": "crwdns2138:0crwdne2138:0",
+    "lang_layout_headercolor": "crwdns2140:0crwdne2140:0",
+    "lang_layout_nodata": "crwdns2142:0crwdne2142:0",
+    "lang_layout_dm": "crwdns2144:0crwdne2144:0",
+    "lang_layout_webviewmode": "crwdns2146:0crwdne2146:0",
+    "lang_excluded": "crwdns2368:0crwdne2368:0",
+    "lang_layout_excludingbt": "crwdns2390:0crwdne2390:0",
+    "lang_spotify_img": "crwdns2148:0crwdne2148:0",
+    "lang_spotify_imgno": "crwdns2150:0crwdne2150:0",
+    "lang_spotify_acct": "crwdns2152:0crwdne2152:0",
+    "lang_spotify_np": "crwdns2154:0crwdne2154:0",
+    "lang_setting_npprovide": "crwdns2370:0{{set}}crwdne2370:0",
+    "lang_hisdata_frcreq": "crwdns2156:0crwdne2156:0",
+    "lang_hisdata_frcwarn": "crwdns2158:0crwdne2158:0",
+    "lang_hisdata_taketime": "crwdns2160:0crwdne2160:0",
+    "lang_hisdata_notonmisskey": "crwdns2162:0crwdne2162:0",
+    "lang_showontl_movetxt": "crwdns2164:0crwdne2164:0",
+    "lang_showontl_movebtn": "crwdns2166:0crwdne2166:0",
+    "lang_showontl_botacct": "crwdns2168:0[bot]crwdne2168:0",
+    "lang_showontl_followed": "crwdns2170:0crwdne2170:0",
+    "lang_showontl_notf": "crwdns2172:0crwdne2172:0",
+    "lang_showontl_domain": "crwdns2174:0crwdne2174:0",
+    "lang_showontl_listwarn": "crwdns2176:0crwdne2176:0",
+    "lang_parse_mentioned": "crwdns2178:0crwdne2178:0",
+    "lang_parse_faved": "crwdns2180:0crwdne2180:0",
+    "lang_parse_bted": "crwdns2182:0crwdne2182:0",
+    "lang_parse_btedsimple": "crwdns2184:0crwdne2184:0",
+    "lang_parse_notftime": "crwdns2186:0crwdne2186:0",
+    "lang_parse_cwshow": "crwdns2188:0crwdne2188:0",
+    "lang_parse_fulltext": "crwdns2190:0crwdne2190:0",
+    "lang_parse_autofold": "crwdns2192:0crwdne2192:0",
+    "lang_parse_more": "crwdns2194:0crwdne2194:0",
+    "lang_parse_url": "crwdns2196:0crwdne2196:0",
+    "lang_parse_tagTL": "crwdns2198:0{{tag}}crwdne2198:0",
+    "lang_parse_tagtoot": "crwdns2200:0{{tag}}crwdne2200:0",
+    "lang_parse_tagpin": "crwdns2202:0{{tag}}crwdne2202:0",
+    "lang_parse_public": "crwdns2204:0crwdne2204:0",
+    "lang_parse_unlisted": "crwdns2206:0crwdne2206:0",
+    "lang_parse_private": "crwdns2208:0crwdne2208:0",
+    "lang_parse_direct": "crwdns2210:0crwdne2210:0",
+    "lang_parse_clickcopy": "crwdns2212:0crwdne2212:0",
+    "lang_parse_clickcopyurl": "crwdns2214:0crwdne2214:0",
+    "lang_parse_trans": "crwdns2216:0crwdne2216:0",
+    "lang_parse_replyto": "crwdns2218:0crwdne2218:0",
+    "lang_parse_bt": "crwdns2220:0crwdne2220:0",
+    "lang_parse_fav": "crwdns2222:0crwdne2222:0",
+    "lang_parse_quote": "crwdns2224:0crwdne2224:0",
+    "lang_parse_del": "crwdns2226:0crwdne2226:0",
+    "lang_parse_pin": "crwdns2228:0crwdne2228:0",
+    "lang_parse_det": "crwdns2230:0crwdne2230:0",
+    "lang_parse_redraft": "crwdns2232:0crwdne2232:0",
+    "lang_parse_followed": "crwdns2234:0crwdne2234:0",
+    "lang_parse_clientop": "crwdns2236:0crwdne2236:0",
+    "lang_parse_clienttxt": "crwdns2238:0crwdne2238:0",
+    "lang_parse_clientno": "crwdns2240:0crwdne2240:0",
+    "lang_parse_clientemp": "crwdns2242:0crwdne2242:0",
+    "lang_parse_clientmute": "crwdns2244:0crwdne2244:0",
+    "lang_parse_mute": "crwdns2246:0crwdne2246:0",
+    "lang_parse_voted": "crwdns2392:0crwdne2392:0",
+    "lang_parse_vote": "crwdns2394:0crwdne2394:0",
+    "lang_parse_unvoted": "crwdns2396:0crwdne2396:0",
+    "lang_parse_endedvote": "crwdns2398:0crwdne2398:0",
+    "lang_misskeyparse_renote": "crwdns2248:0crwdne2248:0",
+    "lang_misskeyparse_renoteqt": "crwdns2250:0crwdne2250:0",
+    "lang_misskeyparse_reaction": "crwdns2252:0crwdne2252:0",
+    "lang_misskeyparse_tagnostr": "crwdns2254:0crwdne2254:0",
+    "lang_misskeyparse_listnostr": "crwdns2256:0crwdne2256:0",
+    "lang_misskeyparse_home": "crwdns2258:0crwdne2258:0",
+    "lang_misskeyparse_followers": "crwdns2260:0crwdne2260:0",
+    "lang_misskeyparse_specified": "crwdns2262:0crwdne2262:0",
+    "lang_misskeyparse_qt": "crwdns2264:0crwdne2264:0",
+    "lang_misskeyparse_renoted": "crwdns2266:0crwdne2266:0",
+    "lang_misskeyparse_quoted": "crwdns2268:0crwdne2268:0",
+    "lang_misskeyparse_reacted": "crwdns2372:0crwdne2372:0",
+    "lang_setting_time": "crwdns2272:0{{set}}crwdne2272:0",
+    "lang_setting_theme": "crwdns2274:0{{set}}crwdne2274:0",
+    "lang_setting_nsfw": "crwdns2276:0{{set}}crwdne2276:0",
+    "lang_setting_cw": "crwdns2278:0{{set}}crwdne2278:0",
+    "lang_setting_cwtext": "crwdns2280:0{{set}}crwdne2280:0",
+    "lang_setting_cws": "crwdns2282:0{{set}}crwdne2282:0",
+    "lang_setting_rp": "crwdns2284:0{{set}}crwdne2284:0",
+    "lang_setting_vis": "crwdns2286:0{{set}}crwdne2286:0",
+    "lang_setting_popup": "crwdns2288:0{{set}}crwdne2288:0",
+    "lang_setting_off": "crwdns2290:0crwdne2290:0",
+    "lang_setting_s": "crwdns2292:0crwdne2292:0",
+    "lang_setting_box": "crwdns2294:0{{set}}crwdne2294:0",
+    "lang_setting_gif": "crwdns2296:0{{set}}crwdne2296:0",
+    "lang_setting_selt": "crwdns2298:0{{set1}}crwdnd2298:0{{set2}}crwdne2298:0",
+    "lang_setting_autocw": "crwdns2300:0{{set1}}crwdnd2300:0{{set2}}crwdne2300:0",
+    "lang_setting_width": "crwdns2302:0{{set}}crwdne2302:0",
+    "lang_setting_fixwidth": "crwdns2386:0{{set}}crwdne2386:0",
+    "lang_setting_img": "crwdns2304:0{{set}}crwdne2304:0",
+    "lang_setting_font": "crwdns2306:0{{set}}crwdne2306:0",
+    "lang_setting_default": "crwdns2308:0crwdne2308:0",
+    "lang_setting_size": "crwdns2310:0{{set}}crwdne2310:0",
+    "lang_setting_imgheight": "crwdns2312:0{{set}}crwdne2312:0",
+    "lang_setting_ticker": "crwdns2314:0{{set}}crwdne2314:0",
+    "lang_setting_animation": "crwdns2400:0{{set}}crwdne2400:0",
+    "lang_setting_tag": "crwdns2316:0{{set}}crwdne2316:0",
+    "lang_setting_boxConfirm": "crwdns2318:0{{set}}crwdne2318:0",
+    "lang_setting_ul": "crwdns2320:0{{set}}crwdne2320:0",
+    "lang_setting_notf": "crwdns2322:0{{set}}crwdne2322:0",
+    "lang_setting_quote": "crwdns2324:0{{set}}crwdne2324:0",
+    "lang_setting_via": "crwdns2326:0{{set}}crwdne2326:0",
+    "lang_setting_mov": "crwdns2328:0{{set}}crwdne2328:0",
+    "lang_setting_setasread": "crwdns2330:0{{set}}crwdne2330:0",
+    "lang_setting_main": "crwdns2332:0{{set}}crwdne2332:0",
+    "lang_setting_sec": "crwdns2334:0{{set}}crwdne2334:0",
+    "lang_setting_ksref": "crwdns2336:0crwdne2336:0",
+    "lang_setting_nomuting": "crwdns2338:0crwdne2338:0",
+    "lang_setting_notftest": "crwdns2340:0crwdne2340:0",
+    "lang_setting_notftestprof": "crwdns2342:0crwdne2342:0",
+    "lang_setting_exportwarn": "crwdns2344:0crwdne2344:0",
+    "lang_setting_importwarn": "crwdns2346:0crwdne2346:0"
+}

app/js/login/login.js

@@ -2,104 +2,90 @@
 //最初に読むやつ
 //アスタルテ判定初期化
 
-localStorage.removeItem('kirishima')
-localStorage.removeItem('quoters')
-localStorage.removeItem('imas')
-localStorage.removeItem('image')
-localStorage.removeItem('stable')
-localStorage.setItem('mode_misskey.xyz', 'misskey')
+localStorage.removeItem("kirishima")
+localStorage.removeItem("quoters")
+localStorage.removeItem("imas")
+localStorage.removeItem("image");
+localStorage.removeItem("stable")
+localStorage.setItem("mode_misskey.xyz", "misskey")
 function ck() {
-	var main = localStorage.getItem('main')
+	var main = localStorage.getItem("main");
 	if (!main) {
-		localStorage.setItem('main', 0)
+		localStorage.setItem("main", 0)
 	}
-
+	var domainz = localStorage.getItem("domain_0");
+	var at = localStorage.getItem("acct_0_at");
 	//コード受信
 	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 == 'manager' || mode == 'login') {
-			code(codex, mode)
+		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+		var mode = m[1];
+		var codex = m[2];
+		if (mode == "manager" || mode == "login") {
+			code(codex, mode);
 		} else {
 		}
 	}
-	var multi = localStorage.getItem('multi')
-	if (!multi || multi == '[]') {
-		var date = new Date()
-		localStorage.setItem('showSupportMe', date.getMonth() + 2)
-		location.href = 'acct.html?mode=first&code=true'
+	var multi = localStorage.getItem("multi");
+	if (!multi || multi == "[]") {
+		var date = new Date();
+		localStorage.setItem("showSupportMe", date.getMonth() + 2)
+		location.href = "acct.html?mode=first&code=true"
 	} else {
-		var obj = JSON.parse(multi)
-		var jp = false
-		Object.keys(obj).forEach(function(key) {
-			var acct = obj[key]
+		var obj = JSON.parse(multi);
+		Object.keys(obj).forEach(function (key) {
+			var acct = obj[key];
 			if (acct.domain) {
 				refresh(key, true)
 			}
-			if (acct.domain == 'mstdn.jp') {
-				jp = true
-			}
-		})
+		});
 		if (obj[0].domain) {
-			$('#tl').show()
-			ticker()
-			multiSelector(false)
-			verck(ver, jp)
-			$('.stw').show()
-			$('#something-wrong img').attr('src', '../../img/thinking.svg')
+			$("#tl").show();
+			ticker();
+			multiSelector(false);
+			verck(ver);
+			$(".stw").show()
+			$("#something-wrong img").attr("src", "../../img/thinking.svg")
 		}
 	}
 }
-ck()
+ck();
+
 
 //ログインポップアップ
 function login(url) {
-	if ($('#linux:checked').val() == 'on') {
-		var red = 'urn:ietf:wg:oauth:2.0:oob'
+	if ($('#linux:checked').val() == "on") {
+		var red = "urn:ietf:wg:oauth:2.0:oob"
 	} else {
-		var red = 'thedesk://login'
+		var red = 'thedesk://login';
 	}
-	localStorage.setItem('redirect', red)
-	var start = 'https://' + url + '/api/v1/apps'
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('POST', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.responseType = 'json'
-	httpreq.send(
-		JSON.stringify({
-			scopes: 'read write follow',
-			client_name: 'TheDesk(PC)',
-			redirect_uris: red,
-			website: 'https://thedesk.top'
-		})
-	)
-	httpreq.onreadystatechange = function() {
+	localStorage.setItem("redirect", red);
+	var start = "https://" + url + "/api/v1/apps";
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify({
+		scopes: 'read write follow',
+		client_name: "TheDesk(PC)",
+		redirect_uris: red,
+		website: "https://thedesk.top"
+	}));
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, json)
-			}
-			var auth =
-				'https://' +
-				url +
-				'/oauth/authorize?client_id=' +
-				json['client_id'] +
-				'&client_secret=' +
-				json['client_secret'] +
-				'&response_type=code&redirect_uri=' +
-				red +
-				'&scope=read+write+follow'
-			localStorage.setItem('domain_' + acct_id, url)
-			localStorage.setItem('client_id', json['client_id'])
-			localStorage.setItem('client_secret', json['client_secret'])
-			$('#auth').show()
-			$('#masara').hide()
-			postMessage(['openUrl', auth], '*')
+			var json = httpreq.response;
+			var auth = "https://" + url + "/oauth/authorize?client_id=" + json[
+				"client_id"] + "&client_secret=" + json["client_secret"] +
+				"&response_type=code&redirect_uri=" + red + "&scope=read+write+follow";
+			localStorage.setItem("domain_" + acct_id, url);
+			localStorage.setItem("client_id", json["client_id"]);
+			localStorage.setItem("client_secret", json["client_secret"]);
+			$("#auth").show();
+			$("#masara").hide();
+			postMessage(["openUrl", auth], "*")
 
-			if ($('#linux:checked').val() == 'on') {
+			if ($('#linux:checked').val() == "on") {
 			} else {
-				postMessage(['sendSinmpleIpc', 'quit'], '*')
+				postMessage(["sendSinmpleIpc", "quit"], "*")
 			}
 		}
 	}
@@ -107,507 +93,441 @@ function login(url) {
 
 //テキストボックスにURL入れた
 function instance() {
-	var url = $('#url').val()
-	login(url)
+	var url = $("#url").val();
+	login(url);
 }
 
+
 //コードを入れた後認証
 function code(code, mode) {
-	var red = localStorage.getItem('redirect')
-	localStorage.removeItem('redirect')
+	var red = localStorage.getItem("redirect");
+	localStorage.removeItem("redirect")
 	if (!code) {
-		var code = $('#code').val()
+		var code = $("#code").val();
 	}
-	if (localStorage.getItem('domain_tmp')) {
-		var url = localStorage.getItem('domain_tmp')
+	if (localStorage.getItem("domain_tmp")) {
+		var url = localStorage.getItem("domain_tmp");
 	} else {
-		var url = localStorage.getItem('domain_' + acct_id)
+		var url = localStorage.getItem("domain_" + acct_id);
 	}
-	var start = 'https://' + url + '/oauth/token'
-	var id = localStorage.getItem('client_id')
-	var secret = localStorage.getItem('client_secret')
+	var start = "https://" + url + "/oauth/token";
+	var id = localStorage.getItem("client_id");
+	var secret = localStorage.getItem("client_secret");
 	fetch(start, {
 		method: 'POST',
 		headers: {
 			'content-type': 'application/json'
 		},
 		body: JSON.stringify({
-			grant_type: 'authorization_code',
+			grant_type: "authorization_code",
 			redirect_uri: red,
 			client_id: id,
 			client_secret: secret,
 			code: code
 		})
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		todo(json);
+		if (json["access_token"]) {
+			localStorage.setItem(url + "_at", json["access_token"]);
+			if (mode == "manager") {
+				getdataAdv(url, json["access_token"]);
+			} else {
+				getdata();
 			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			todo(json)
-			if (json['access_token']) {
-				localStorage.setItem(url + '_at', json['access_token'])
-				if (mode == 'manager') {
-					getdataAdv(url, json['access_token'])
-				} else {
-					getdata()
-				}
-			}
-		})
+
+		}
+	});
 }
 
 //ユーザーデータ取得(最初)
 function getdata() {
-	var acct_id = 0
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
+	var acct_id = 0;
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json.error) {
+			console.error("Error:" + json.error);
+			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
+			return;
 		}
-	})
-		.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) {
-				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
-				return
-			}
-			var avatar = json['avatar']
-			//missingがmissingなやつ
-			if (avatar == '/avatars/original/missing.png') {
-				avatar = './img/missing.svg'
-			}
-			var obj = [
-				{
-					at: at,
-					name: json['display_name'],
-					domain: domain,
-					user: json['acct'],
-					prof: avatar,
-					id: json['id'],
-					vis: json['source']['privacy']
-				}
-			]
-			var json = JSON.stringify(obj)
-			localStorage.setItem('multi', json)
-			localStorage.setItem('name_' + acct_id, json['display_name'])
-			localStorage.setItem('user_' + acct_id, json['acct'])
-			localStorage.setItem('user-id_' + acct_id, json['id'])
-			localStorage.setItem('prof_' + acct_id, avatar)
-			$('#masara').hide()
-			$('#auth').hide()
-			$('#tl').show()
-			parseColumn()
-			ckdb()
-		})
+		var avatar = json["avatar"];
+		//missingがmissingなやつ
+		if (avatar == "/avatars/original/missing.png") {
+			avatar = "./img/missing.svg";
+		}
+		var obj = [{
+			at: at,
+			name: json["display_name"],
+			domain: domain,
+			user: json["acct"],
+			prof: avatar,
+			id: json["id"],
+			vis: json["source"]["privacy"]
+		}];
+		var json = JSON.stringify(obj);
+		localStorage.setItem("multi", json);
+		localStorage.setItem("name_" + acct_id, json["display_name"]);
+		localStorage.setItem("user_" + acct_id, json["acct"]);
+		localStorage.setItem("user-id_" + acct_id, json["id"]);
+		localStorage.setItem("prof_" + acct_id, avatar);
+		$("#masara").hide();
+		$("#auth").hide();
+		$("#tl").show();
+		parseColumn()
+		ckdb();
+	});
 }
 //ユーザーデータ取得(追加)
 function getdataAdv(domain, at) {
-	var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
+	var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json.error) {
+			console.error("Error:" + json.error);
+			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
+			return;
 		}
-	})
-		.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) {
-				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
-				return
-			}
-			var avatar = json['avatar']
-			//missingがmissingなやつ
-			if (avatar == '/avatars/original/missing.png') {
-				avatar = '../../img/missing.svg'
-			}
-			if (json['source']['privacy']) {
-				var priv = json['source']['privacy']
-			} else {
-				var priv = 'public'
-			}
-			var add = {
-				at: at,
-				name: json['display_name'],
-				domain: domain,
-				user: json['acct'],
-				prof: avatar,
-				id: json['id'],
-				vis: priv
-			}
-			var multi = localStorage.getItem('multi')
-			var obj = JSON.parse(multi)
-			var target = obj.lengtth
-			obj.push(add)
-			localStorage.setItem('name_' + target, json['display_name'])
-			localStorage.setItem('user_' + target, json['acct'])
-			localStorage.setItem('user-id_' + target, json['id'])
-			localStorage.setItem('prof_' + target, avatar)
-			var json = JSON.stringify(obj)
-			localStorage.setItem('multi', json)
-			location.href = 'index.html'
-		})
+		var avatar = json["avatar"];
+		//missingがmissingなやつ
+		if (avatar == "/avatars/original/missing.png") {
+			avatar = "../../img/missing.svg";
+		}
+		if (json["source"]["privacy"]) {
+			var priv = json["source"]["privacy"];
+		} else {
+			var priv = "public";
+		}
+		var add = {
+			at: at,
+			name: json["display_name"],
+			domain: domain,
+			user: json["acct"],
+			prof: avatar,
+			id: json["id"],
+			vis: priv
+		};
+		var multi = localStorage.getItem("multi");
+		var obj = JSON.parse(multi);
+		var target = obj.lengtth;
+		obj.push(add);
+		localStorage.setItem("name_" + target, json["display_name"]);
+		localStorage.setItem("user_" + target, json["acct"]);
+		localStorage.setItem("user-id_" + target, json["id"]);
+		localStorage.setItem("prof_" + target, avatar);
+		var json = JSON.stringify(obj);
+		localStorage.setItem("multi", json);
+		location.href = "index.html";
+	});
 }
 //ユーザーデータ更新
 function refresh(target, loadskip) {
-	var multi = localStorage.getItem('multi')
-	var obj = JSON.parse(multi)
-	if (obj[target].mode == 'misskey') {
+	var multi = localStorage.getItem("multi");
+	var obj = JSON.parse(multi);
+	if (obj[target].mode == "misskey") {
 		return
 	}
-	var start = 'https://' + obj[target].domain + '/api/v1/accounts/verify_credentials'
+	var start = "https://" + obj[target].domain +
+		"/api/v1/accounts/verify_credentials";
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + obj[target].at
+			'Authorization': 'Bearer ' + obj[target].at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json.error) {
+			console.error("Error:" + json.error);
+			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
+			return;
 		}
-	})
-		.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) {
-				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
-				return
-			}
-			var avatar = json['avatar']
-			//missingがmissingなやつ
-			if (avatar == '/avatars/original/missing.png' || !avatar) {
-				avatar = './img/missing.svg'
-			}
-			var ref = {
-				at: obj[target].at,
-				name: json['display_name'],
-				domain: obj[target].domain,
-				user: json['acct'],
-				prof: avatar,
-				id: json['id'],
-				vis: json['source']['privacy']
-			}
-			if (obj[target].background) {
-				ref.background = obj[target].background
-			}
-			if (obj[target].text) {
-				ref.text = obj[target].text
-			}
-			localStorage.setItem('name_' + target, json['display_name'])
-			localStorage.setItem('user_' + target, json['acct'])
-			localStorage.setItem('user-id_' + target, json['id'])
-			localStorage.setItem('prof_' + target, avatar)
-			localStorage.setItem('follow_' + target, json['following_count'])
-			if (json['source']['sensitive']) {
-				localStorage.setItem('nsfw_' + target, 'true')
-			} else {
-				localStorage.removeItem('nsfw_' + target)
-			}
-			obj[target] = ref
-			var json = JSON.stringify(obj)
-			localStorage.setItem('multi', json)
-			if (!loadskip) {
-				load()
-			}
-		})
+		var avatar = json["avatar"];
+		//missingがmissingなやつ
+		if (avatar == "/avatars/original/missing.png" || !avatar) {
+			avatar = "./img/missing.svg";
+		}
+		var ref = {
+			at: obj[target].at,
+			name: json["display_name"],
+			domain: obj[target].domain,
+			user: json["acct"],
+			prof: avatar,
+			id: json["id"],
+			vis: json["source"]["privacy"]
+		};
+		localStorage.setItem("name_" + target, json["display_name"]);
+		localStorage.setItem("user_" + target, json["acct"]);
+		localStorage.setItem("user-id_" + target, json["id"]);
+		localStorage.setItem("prof_" + target, avatar);
+		localStorage.setItem("follow_" + target, json["following_count"]);
+		console.log(obj)
+		var json = JSON.stringify(obj);
+		localStorage.setItem("multi", json);
+		if (!loadskip) {
+			load();
+		}
+	});
 }
 //MarkdownやBBCodeの対応、文字数制限をチェック
 //絶対ストリーミングを閉じさせないマン
 function ckdb(acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	localStorage.removeItem('home_' + acct_id)
-	localStorage.removeItem('bb_' + acct_id)
-	localStorage.removeItem('md_' + acct_id)
-	localStorage.removeItem('local_' + acct_id)
-	localStorage.removeItem('public_' + acct_id)
-	localStorage.removeItem('notification_' + acct_id)
-	localStorage.removeItem('post_' + acct_id)
-	localStorage.removeItem('fav_' + acct_id)
-	localStorage.removeItem('bt_' + acct_id)
-	localStorage.removeItem('followlocale_' + acct_id)
-	if (domain == 'kirishima.cloud') {
-		localStorage.setItem('kirishima', 'true')
-	} else if (domain == 'imastodon.net') {
-		localStorage.setItem('imas', 'true')
-		$('.imasonly').show()
+	var domain = localStorage.getItem("domain_" + acct_id);
+	localStorage.removeItem("home_" + acct_id);
+	localStorage.removeItem("bb_" + acct_id);
+	localStorage.removeItem("md_" + acct_id);
+	localStorage.removeItem("local_" + acct_id);
+	localStorage.removeItem("public_" + acct_id);
+	localStorage.removeItem("notification_" + acct_id);
+	localStorage.removeItem("post_" + acct_id);
+	localStorage.removeItem("fav_" + acct_id);
+	localStorage.removeItem("bt_" + acct_id);
+	localStorage.removeItem("followlocale_" + acct_id);
+	if (domain == "kirishima.cloud") {
+		localStorage.setItem("kirishima", "true");
+	} else if (domain == "imastodon.net") {
+		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'))
-		if (json[quoteMarker] == 'enabled') {
-			localStorage.setItem('quoters', 'true')
-			localStorage.setItem('quote_' + acct_id, 'true')
+	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"));
+		if (json[quoteMarker] == "enabled") {
+			localStorage.setItem("quoters", "true");
+			localStorage.setItem("quote_" + acct_id, "true");
 		}
 		if (json[bbcode]) {
-			if (json[bbcode] == 'enabled') {
-				localStorage.setItem('bb_' + acct_id, 'true')
+			if (json[bbcode] == "enabled") {
+				localStorage.setItem("bb_" + acct_id, "true");
 			} else {
-				localStorage.removeItem('bb_' + acct_id)
-				$("[data-activates='bbcode']").addClass('disabled')
-				$("[data-activates='bbcode']").prop('disabled', true)
+				localStorage.removeItem("bb_" + acct_id);
+				$("[data-activates='bbcode']").addClass("disabled");
+				$("[data-activates='bbcode']").prop("disabled", true);
 			}
 		} else {
-			localStorage.removeItem('bb_' + acct_id)
-			$("[data-activates='bbcode']").addClass('disabled')
-			$("[data-activates='bbcode']").addClass('disabled', true)
+			localStorage.removeItem("bb_" + acct_id);
+			$("[data-activates='bbcode']").addClass("disabled");
+			$("[data-activates='bbcode']").addClass("disabled", true);
 		}
 
-		if (json[domain + '_markdown'] == 'enabled') {
-			localStorage.setItem('md_' + acct_id, 'true')
-			$('.markdown').show()
+		if (json[domain + "_markdown"] == "enabled") {
+			localStorage.setItem("md_" + acct_id, "true");
+			$(".markdown").show();
 		} else {
-			$('.anti-markdown').hide()
-			$('.markdown').hide()
-			localStorage.removeItem('bb_' + acct_id)
+			$(".anti-markdown").hide();
+			$(".markdown").hide();
+			localStorage.removeItem("bb_" + acct_id);
 		}
-		if (json[domain + '_home']) {
-			localStorage.setItem('home_' + acct_id, json[domain + '_home'])
+		if (json[domain + "_home"]) {
+			localStorage.setItem("home_" + acct_id, json[domain + "_home"]);
 		}
-		if (json[domain + '_local']) {
-			localStorage.setItem('local_' + acct_id, json[domain + '_local'])
+		if (json[domain + "_local"]) {
+			localStorage.setItem("local_" + acct_id, json[domain + "_local"]);
 		}
-		if (json[domain + '_public']) {
-			localStorage.setItem('public_' + acct_id, json[domain + '_public'])
+		if (json[domain + "_public"]) {
+			localStorage.setItem("public_" + acct_id, json[domain + "_public"]);
 		}
-		if (json[domain + '_notification']) {
-			localStorage.setItem('notification_' + acct_id, json[domain + '_notification'])
+		if (json[domain + "_notification"]) {
+			localStorage.setItem("notification_" + acct_id, json[domain + "_notification"]);
 		}
-		if (json[domain + '_post']) {
-			localStorage.setItem('post_' + acct_id, json[domain + '_post'])
+		if (json[domain + "_post"]) {
+			localStorage.setItem("post_" + acct_id, json[domain + "_post"]);
 		}
-		if (json[domain + '_fav']) {
-			localStorage.setItem('fav_' + acct_id, json[domain + '_fav'])
+		if (json[domain + "_fav"]) {
+			localStorage.setItem("fav_" + acct_id, json[domain + "_fav"]);
 		}
-		if (json[domain + '_bt']) {
-			localStorage.setItem('bt_' + acct_id, json[domain + '_bt'])
+		if (json[domain + "_bt"]) {
+			localStorage.setItem("bt_" + acct_id, json[domain + "_bt"]);
 		}
-		if (json[domain + '_follow']) {
-			localStorage.setItem('followlocale_' + acct_id, json[domain + '_follow'])
+		if (json[domain + "_follow"]) {
+			localStorage.setItem("followlocale_" + acct_id, json[domain + "_follow"]);
 		}
 	}
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
-		var start = 'https://' + domain + '/api/v1/instance'
+	if (localStorage.getItem("mode_" + domain) != "misskey") {
+		var start = "https://" + domain + "/api/v1/instance";
 		fetch(start, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json'
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			console.error(error);
+		}).then(function (json) {
+			if (json.error) {
+				console.error(json.error);
+				return;
 			}
-		})
-			.then(function(response) {
-				return response.json()
-			})
-			.catch(function(error) {
-				console.error(error)
-			})
-			.then(function(json) {
-				if (json.error) {
-					console.error(json.error)
-					return
+			if (json) {
+				if (json["max_toot_chars"]) {
+					localStorage.setItem("letters_" + acct_id, json["max_toot_chars"]);
 				}
-				if (json) {
-					if (json['max_toot_chars']) {
-						localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
-					}
-					if (json['urls']['streaming_api']) {
-						localStorage.setItem('streaming_' + acct_id, json['urls']['streaming_api'])
-					} else {
-						localStorage.removeItem('streaming_' + acct_id)
-					}
+				if (json["urls"]["streaming_api"]) {
+					localStorage.setItem("streaming_" + acct_id, json["urls"]["streaming_api"]);
 				}
-			})
+			}
+		});
+
 	} else {
 	}
+
+
 }
 
 //アカウントを選択…を実装
 function multiSelector(parseC) {
-	var multi = localStorage.getItem('multi')
+	var multi = localStorage.getItem("multi");
 	if (!multi) {
-		var obj = []
-		var json = JSON.stringify(obj)
-		localStorage.setItem('multi', json)
+		var obj = [];
+		var json = JSON.stringify(obj);
+		localStorage.setItem("multi", json);
 	} else {
-		var obj = JSON.parse(multi)
+		var obj = JSON.parse(multi);
 	}
-	var templete
-	if (localStorage.getItem('mainuse') == 'main') {
-		var last = localStorage.getItem('main')
-	} else if (localStorage.getItem('last-use')) {
-		var last = localStorage.getItem('last-use')
-		if (last == 'webview' || last == 'noauth') {
-			last = '0'
+	var templete;
+	if (localStorage.getItem("mainuse") == "main") {
+		var last = localStorage.getItem("main");
+	} else if (localStorage.getItem("last-use")) {
+		var last = localStorage.getItem("last-use");
+		if (last == "webview" || last == "noauth") {
+			last = "0";
 		}
 	} else {
-		var last = '0'
+		var last = "0";
 	}
-	last = last + ''
-	var sel
+	last = last + "";
+	var sel;
 	if (obj.length < 1) {
-		$('#src-acct-sel').html('<option value="tootsearch">Tootsearch</option>')
-		$('#add-acct-sel').html('<option value="noauth">' + lang.lang_login_noauth + '</option>')
+		$("#src-acct-sel").html('<option value="tootsearch">Tootsearch</option>');
+		$("#add-acct-sel").html('<option value="noauth">' + lang.lang_login_noauth + '</option>');
 	} else {
-		Object.keys(obj).forEach(function(key) {
-			var acct = obj[key]
-			var list = key * 1 + 1
-			if (key + '' === last) {
-				sel = 'selected'
-				var domain = acct.domain
-				localStorage.setItem('domain_' + key, domain)
-				if (idata[domain + '_letters']) {
-					$('#textarea').attr('data-length', idata[domain + '_letters'])
+		Object.keys(obj).forEach(function (key) {
+			var acct = obj[key];
+			var list = key * 1 + 1;
+			if (key+"" === last) {
+				sel = "selected";
+				var domain = acct.domain;
+				localStorage.setItem("domain_" + key, domain);
+				if (idata[domain + "_letters"]) {
+					$("#textarea").attr("data-length", idata[domain + "_letters"])
 				} else {
-					var maxletters = localStorage.getItem('letters_' + key)
+					var maxletters = localStorage.getItem("letters_" + key);
 					if (maxletters > 0) {
-						$('#textarea').attr('data-length', maxletters)
+						$("#textarea").attr("data-length", maxletters)
 					} else {
-						$('#textarea').attr('data-length', 500)
+						$("#textarea").attr("data-length", 500)
 					}
 				}
-				if (idata[domain + '_glitch']) {
-					$('#local-button').removeClass('hide')
+				if (idata[domain + "_glitch"]) {
+					$("#local-button").removeClass("hide")
 				}
-				var profimg = acct.prof
+				var profimg = acct.prof;
 				//localStorage.setItem("prof_" + key, profimg);
 				if (!profimg) {
-					profimg = '../../img/missing.svg'
+					profimg = "../../img/missing.svg";
 				}
-				$('#acct-sel-prof').attr('src', profimg)
+				$("#acct-sel-prof").attr("src", profimg);
 				if (domain) {
-					var cc = '(' + domain + ')'
+					var cc = "(" + domain + ")";
 				} else {
-					var cc = ''
+					var cc = "";
 				}
-				$('#toot-post-btn').text(lang.lang_toot + cc)
-				if (acct.background && acct.background != 'def' && acct.text && acct.text != 'def') {
-					$('#toot-post-btn').removeClass('indigo')
-					$('#toot-post-btn').css('background-color', '#' + acct.background)
-					$('#toot-post-btn').css('color', acct.text)
+				$("#toot-post-btn").text(lang.lang_toot + cc);
+				if (acct.background && acct.background != "def" && acct.text && acct.text != "def") {
+					$("#toot-post-btn").removeClass("indigo");
+					$("#toot-post-btn").css("background-color", "#" + acct.background);
+					$("#toot-post-btn").css("color", acct.text);
 				} else {
 				}
-				if (domain == 'kirishima.cloud') {
-					$('#faicon-btn').show()
+				if (domain == "kirishima.cloud") {
+					$("#faicon-btn").show();
 				} else {
-					$('#faicon-btn').hide()
+					$("#faicon-btn").hide();
 				}
-				if (domain == 'imastodon.net') {
-					trendTag()
+				if (domain == "imastodon.net") {
+					trendTag();
 				} else {
-					$('#trendtag').html('')
+					$("#trendtag").html("");
 				}
 			} else {
-				sel = ''
+				sel = "";
 			}
-			templete =
-				'<option value="' +
-				key +
-				'" data-icon="' +
-				acct.prof +
-				'" class="left circle" ' +
-				sel +
-				'>' +
-				acct.user +
-				'@' +
-				acct.domain +
-				'</option>'
-			$('.acct-sel').append(templete)
-		})
-		$('#src-acct-sel').append('<option value="tootsearch">Tootsearch</option>')
-		$('#add-acct-sel').append(
-			'<option value="noauth">' +
-				lang.lang_login_noauth +
-				'</option><option value="webview">Twitter</option>'
-		)
-		$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
+			templete = '<option value="' + key + '" data-icon="' + acct.prof +
+				'" class="left circle" ' + sel + '>' + acct.user + '@' + acct.domain +
+				'</option>';
+			$(".acct-sel").append(templete);
+
+		});
+		$("#src-acct-sel").append('<option value="tootsearch">Tootsearch</option>');
+		$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
+		$("#dir-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option>');
 	}
-	$('select').formSelect()
-	if (!parseC) {
-		parseColumn(null, true)
+	$('select').formSelect();
+	if(!parseC){
+		parseColumn(null, true);
 	}
 }
 
 //バージョンエンコ
 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, '')
-	return 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, "");
+	return ver;
 }
 //インスタンスティッカー
 function ticker() {
-	var start = 'https://toot.app/toot/'
+	var start = "https://toot.app/toot/";
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json'
+		},
+	}).then(function (response) {
+
+		return response.json();
+	}).catch(function (error) {
+		console.error(error);
+	}).then(function (json) {
+		console.log(json)
+		if (json) {
+			localStorage.setItem("ticker", JSON.stringify(json));
 		}
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			console.error(error)
-		})
-		.then(function(json) {
-			if (json) {
-				localStorage.setItem('ticker', JSON.stringify(json))
-			}
-		})
-}
+	});
+}

app/js/platform/end.js

@@ -1,219 +1,186 @@
 //プラットフォーム別　最後に読むやつ
-//リンクを外部で開くか内部で出すか
+//リンクを外部で開くか内部で出すか 
 $(document).on('click', 'a', e => {
-	var $a = $(e.target)
-	var url = $a.attr('href')
+	var $a = $(e.target);
+	var url = $a.attr('href');
 	if (!url) {
-		var url = $a.parent().attr('href')
+		var url = $a.parent().attr('href');
 	}
-	var urls = []
+	var urls = [];
 	if (url) {
-		urls = url.match(/https?:\/\/(.+)/)
+		urls = url.match(/https?:\/\/(.+)/);
 		//トゥートのURLぽかったら
-		toot = url.match(/https:\/\/([^+_]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
-		if (!toot) {
+		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]+)/)
+			toot = url.match(/https:\/\/([^+_]+)\/users\/([a-zA-Z0-9_]+)\/statuses\/([0-9]+)/);
 		}
 		//タグのURLぽかったら
-		var tags = []
-		tags = url.match(/https:\/\/([^+_]+)\/tags\/([_a-zA-Z0-9\&=+\%]+)/)
+		var tags = [];
+		tags = url.match(
+			/https:\/\/([^+_]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
+		);
 		//メンションっぽかったら
-		var ats = []
-		ats = url.match(/https:\/\/([^+_]+)\/@([_a-zA-Z0-9\&=+\%]+)/)
+		var ats = [];
+		ats = url.match(
+			/https:\/\/([^+_]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
+		);
 		if (toot) {
 			if (toot[1]) {
-				var acct_id = $a.parent().attr('data-acct')
+				var acct_id = $a.parent().attr("data-acct");
 				if (!acct_id) {
-					acct_id = 0
+					acct_id = 0;
 				}
-				$a.parent().addClass('loadp')
-				$a.parent().text('Loading...')
-				detEx(url, acct_id)
+				$a.parent().addClass("loadp")
+				$a.parent().text("Loading...")
+				detEx(url, acct_id);
 			}
+
 		} else if (tags) {
 			if (tags[2]) {
-				var acct_id = $a.parent().attr('data-acct')
+				var acct_id = $a.parent().attr("data-acct");
 				if (!acct_id) {
-					acct_id = 0
+					acct_id = 0;
 				}
 				tl('tag', decodeURI(tags[2]), acct_id, 'add')
 			}
 		} else if (ats) {
 			if (ats[2]) {
 				//Quesdon判定
-				if (!~ats[2].indexOf('@')) {
-					udgEx(url, 'main')
+				if (!~ats[2].indexOf("@")) {
+					udgEx(ats[2] + "@" + ats[1], "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]) {
-					if (~url.indexOf('thedeks.top')) {
+					if (~url.indexOf("thedeks.top")) {
 						//alert("If you recieve this alert, let the developer(Cutls@kirishima.cloud) know it with a screenshot.");
-						url = 'https://thedesk.top'
+						url = "https://thedesk.top";
 					}
-					postMessage(['openUrl', url], '*')
+					postMessage(["openUrl", url], "*")
 				} else {
-					location.href = url
+
+					location.href = url;
 				}
 			} else {
-				location.href = url
+				location.href = url;
 			}
 		}
 	}
-	return false
-})
+	return false;
+});
 
 //よく使うライブラリ
 
 //コピー
 function execCopy(string) {
-	postMessage(['copy', string], '*')
-	return true
+	var temp = $("#copy");
+	temp.val(string);
+	temp.select();
+	var result = document.execCommand('copy');
+	return result;
 }
 function progshow(e) {
 	if (e.lengthComputable) {
-		var percent = e.loaded / e.total
-		console.log('Progress: ' + percent * 100)
-		$('#imgsel').hide()
+		var percent = e.loaded / e.total;
+		console.log("Progress: " + percent * 100);
+		$("#imgsel").hide();
 		if (percent < 1) {
-			$('#imgup').text(Math.floor(percent * 100) + '%')
+			$("#imgup").text(Math.floor(percent * 100) + "%");
 		} else {
-			$('#imgup').text(lang.lang_progress)
+			$("#imgup").text(lang.lang_progress);
 		}
 	}
 }
 function opendev() {
-	var webview = document.getElementById('webview')
-	webview.openDevTools()
+	var webview = document.getElementById("webview");
+	webview.openDevTools();
 	/*webview.sendInputEvent({
 		type: "keyDown",
 		keyCode: '2'
 	  });
 	  */
 }
-var soundFile
 function playSound() {
-	window.AudioContext = window.AudioContext || window.webkitAudioContext
-	if (soundFile) {
-		soundFile.stop()
-	}
-	context = new AudioContext()
-	context.createBufferSource().start(0)
-	context.decodeAudioData(request.response, function(buf) {
-		//console.log("Playing:" , source)
-		source.buffer = buf
-		source.loop = false
-	})
-	source = context.createBufferSource()
-	volumeControl = context.createGain()
-	source.connect(volumeControl)
-	volumeControl.connect(context.destination)
-	var cvol = localStorage.getItem('customVol')
-	if (cvol) {
-		vol = cvol
-	} else {
-		vol = 0.8
-	}
-	volumeControl.gain.value = vol
-	source.start(0)
-	soundFile = source
-
-	function newFunction() {
-		var source
-		return source
-	}
+	window.AudioContext = window.AudioContext || window.webkitAudioContext;
+	context = new AudioContext();
+	context.createBufferSource().start(0);
+	context.decodeAudioData(request.response, function (buf) {
+		console.log("Playing:" + source)
+		source.buffer = buf;
+		source.loop = false;
+	});
+	source = context.createBufferSource();
+	volumeControl = context.createGain();
+	source.connect(volumeControl);
+	volumeControl.connect(context.destination);
+	volumeControl.gain.value = 0.8
+	source.start(0);
 }
 function nano() {
-	postMessage(['nano', null], '*')
+	postMessage(["nano", null], "*")
 }
-onmessage = function(e) {
-	if (e.data[0] == 'details') {
+onmessage = function (e) {
+	if (e.data[0] == "details") {
 		details(e.data[1][0], e.data[1][1])
-	} else if (e.data[0] == 'udg') {
+	} 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])
-	} 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>`
-		M.toast({ html: show, displayLength: 5000 })
-	} else if (e.data[0] == 'parseColumn') {
+	} else if (e.data[0] == "media") {
+		media(e.data[1][0], e.data[1][1], e.data[1][2])
+	} else if (e.data[0] == "post") {
+		post("pass")
+	} else if (e.data[0] == "toastSaved") {
+		M.toast({ html: lang.lang_img_DLDone + e.data[1][0] + '<button class="btn-flat toast-action" onclick="openFinder(\'' + e.data[1][1] + '\')">Show</button>', displayLength: 5000 })
+	} else if (e.data[0] == "parseColumn") {
 		parseColumn(e.data[1])
-	} else if (e.data[0] == 'exportSettingsCore') {
+	} else if (e.data[0] == "exportSettingsCore") {
 		var exp = exportSettingsCore()
-		postMessage(['exportSettingsCoreComplete', [e.data[1], exp]], '*')
-	} else if (e.data[0] == 'importSettingsCore') {
+		postMessage(["exportSettingsCoreComplete", [e.data[1], exp]], "*")
+	} else if (e.data[0] == "importSettingsCore") {
 		importSettingsCore(e.data[1])
-	} else if (e.data[0] == 'fontList') {
+	}else if (e.data[0] == "fontList") {
 		fontList(e.data[1])
-	} else if (e.data[0] == 'customSoundSave') {
+	} else if (e.data[0] == "customSoundSave") {
 		customSoundSave(e.data[1][0], e.data[1][1])
-	} else if (e.data[0] == 'ctLoadCore') {
+	} else if (e.data[0] == "ctLoadCore") {
 		ctLoadCore(e.data[1])
-	} else if (e.data[0] == 'ctLoad') {
+	} else if (e.data[0] == "ctLoad") {
 		ctLoad()
-	} else if (e.data[0] == 'customConnect') {
+	} else if (e.data[0] == "customConnect") {
 		customConnect(e.data[1])
-	} else if (e.data[0] == 'clearCustomImport') {
+	} else if (e.data[0] == "clearCustomImport") {
 		clearCustomImport()
-	} else if (e.data[0] == 'npCore') {
-		npCore(e.data[1])
-	} else if (e.data[0] == 'renderMem') {
+	} else if (e.data[0] == "npCore") {
+		npCore(e.data[1]);
+	} else if (e.data[0] == "renderMem") {
 		renderMem(e.data[1][0], e.data[1][1], e.data[1][2])
-	} else if (e.data[0] == 'updateProg') {
-		updateProg(e.data[1])
-	} else if (e.data[0] == 'updateMess') {
-		updateMess(e.data[1])
-	} else if (e.data[0] == 'renderAbout') {
-		renderAbout(e.data[1])
-	} else if (e.data[0] == 'asRead') {
-		asRead()
-	} else if (e.data[0] == 'asReadEnd') {
-		asReadEnd()
-	} else if (e.data[0] == 'logData') {
-		$('#logs').val(e.data[1])
-		var obj = document.getElementById('logs')
-		obj.scrollTop = obj.scrollHeight
-	} else if (e.data[0] == 'alert') {
+	} else if (e.data[0] == "updateProg") {
+		updateProg(e.data[1]);
+	} else if (e.data[0] == "updateMess") {
+		updateMess(e.data[1]);
+	} else if (e.data[0] == "renderAbout") {
+		renderAbout(e.data[1]);
+	} else if (e.data[0] == "alert") {
 		Swal.fire({
 			type: 'info',
 			title: e.data[1]
 		})
 	}
 }
-/* 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'
-				  })
-			}
+window.addEventListener('load', function() {
+	if ('serviceWorker' in navigator) {
+		navigator.serviceWorker.register("/sw.js")
+			.then(function(registration) {
+				console.log("serviceWorker registed.");
+			}).catch(function(error) {
+				console.warn("serviceWorker error.", error);
+			});
 		}
-	}
-}
+	});

app/js/platform/first.js

@@ -1,285 +1,205 @@
-document.title = 'TheDesk'
-$.strip_tags = function(str, allowed) {
-	if (!str) {
-		return ''
+function postMessage(e){
+	if(e[0]=="openUrl"){
+		window.open(e[1])
 	}
-	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join('')
-	var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
-		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
-	return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
-		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
-	})
+	return false;
 }
+document.title="TheDesk"
+$.strip_tags = function (str, allowed) {
+	if (!str) {
+		return "";
+	}
+	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
+		.join('');
+	var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
+		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
+	return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
+		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
+	});
+};
 function escapeHTML(str) {
 	if (!str) {
-		return ''
+		return "";
 	}
-	return str
-		.replace(/&/g, '&amp;')
+	return str.replace(/&/g, '&amp;')
 		.replace(/</g, '&lt;')
 		.replace(/>/g, '&gt;')
 		.replace(/"/g, '&quot;')
-		.replace(/'/g, '&#039;')
+		.replace(/'/g, '&#039;');
 }
 //PHPのnl2brと同様
 function nl2br(str) {
 	if (!str) {
-		return ''
+		return "";
 	}
-	str = str.replace(/\r\n/g, '<br />')
-	str = str.replace(/(\n|\r)/g, '<br />')
-	return str
+	str = str.replace(/\r\n/g, "<br />");
+	str = str.replace(/(\n|\r)/g, "<br />");
+	return str;
 }
 function br2nl(str) {
 	if (!str) {
-		return ''
+		return "";
 	}
-	str = str.replace(/<br \/>/g, '\r\n')
-	return str
+	str = str.replace(/<br \/>/g, "\r\n");
+	return str;
 }
 function formattime(date) {
-	var str = date.getFullYear() + '-'
+	var str = date.getFullYear() + "-";
 	if (date.getMonth() + 1 < 10) {
-		str = str + '0' + (date.getMonth() + 1) + '-'
+		str = str + "0" + (date.getMonth() + 1) + "-";
 	} else {
-		str = str + (date.getMonth() + 1) + '-'
+		str = str + (date.getMonth() + 1) + "-";
 	}
 	if (date.getDate() < 10) {
-		str = str + '0' + date.getDate()
+		str = str + "0" + date.getDate()
 	} else {
 		str = str + date.getDate()
 	}
-	str = str + 'T'
+	str = str + "T";
 	if (date.getHours() < 10) {
-		str = str + '0' + date.getHours() + ':'
+		str = str + "0" + date.getHours() + ":"
 	} else {
-		str = str + date.getHours() + ':'
+		str = str + date.getHours() + ":"
 	}
 	if (date.getMinutes() < 10) {
-		str = str + '0' + date.getMinutes()
+		str = str + "0" + date.getMinutes()
 	} else {
 		str = str + date.getMinutes()
 	}
-	return escapeHTML(str)
+	return escapeHTML(str);
 }
 function formattimeutc(date) {
-	var str = date.getUTCFullYear() + '-'
+	var str = date.getUTCFullYear() + "-";
 	if (date.getUTCMonth() + 1 < 10) {
-		str = str + '0' + (date.getUTCMonth() + 1) + '-'
+		str = str + "0" + (date.getUTCMonth() + 1) + "-";
 	} else {
-		str = str + (date.getUTCMonth() + 1) + '-'
+		str = str + (date.getUTCMonth() + 1) + "-";
 	}
 	if (date.getUTCDate() < 10) {
-		str = str + '0' + date.getUTCDate()
+		str = str + "0" + date.getUTCDate()
 	} else {
 		str = str + date.getUTCDate()
 	}
-	str = str + 'T'
+	str = str + "T";
 	if (date.getUTCHours() < 10) {
-		str = str + '0' + date.getUTCHours() + ':'
+		str = str + "0" + date.getUTCHours() + ":"
 	} else {
-		str = str + date.getUTCHours() + ':'
+		str = str + date.getUTCHours() + ":"
 	}
 	if (date.getUTCMinutes() < 10) {
-		str = str + '0' + date.getUTCMinutes()
+		str = str + "0" + date.getUTCMinutes()
 	} else {
 		str = str + date.getUTCMinutes()
 	}
-	return escapeHTML(str)
+	return escapeHTML(str);
 }
-postMessage(['sendSinmpleIpc', 'custom-css-request'], '*')
+postMessage(["sendSinmpleIpc", "custom-css-request"], "*")
 function makeCID() {
-	return (
-		randomStr(8) +
-		'-' +
-		randomStr(4) +
-		'-' +
-		randomStr(4) +
-		'-' +
-		randomStr(4) +
-		'-' +
-		randomStr(12)
-	)
+	return randomStr(8) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(12);
 }
 function randomStr(l) {
 	// 生成する文字列に含める文字セット
-	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
-	var cl = c.length
-	var r = ''
+	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
+	var cl = c.length;
+	var r = "";
 	for (var i = 0; i < l; i++) {
-		r += c[Math.floor(Math.random() * cl)]
+		r += c[Math.floor(Math.random() * cl)];
 	}
-	return r
+	return r;
 }
 function rgbToHex(color) {
 	// HEXに変換したものを代入する変数
-	var hex = ''
+	var hex = '';
 
 	// 第1引数がHEXのとき変換処理は必要ないのでそのままreturn
 	// IE8の場合はjQueryのcss()関数でHEXを返すので除外
 	if (color.match(/^#[a-f\d]{3}$|^#[a-f\d]{6}$/i)) {
-		return color
+		return color;
 	}
 
 	// 正規表現
-	var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/)
+	var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/);
 
 	// 正規表現でマッチしたとき
 	if (regex) {
-		var rgb = [
-			// RGBからHEXへ変換
-			parseInt(regex[1]).toString(16),
-			parseInt(regex[2]).toString(16),
-			parseInt(regex[3]).toString(16)
-		]
+		var rgb =
+			[
+				// RGBからHEXへ変換
+				parseInt(regex[1]).toString(16),
+				parseInt(regex[2]).toString(16),
+				parseInt(regex[3]).toString(16)
+			];
 
 		for (var i = 0; i < rgb.length; ++i) {
 			// rgb(1,1,1)のようなときHEXに変換すると1桁になる
 			// 1桁のときは前に0を足す
 			if (rgb[i].length == 1) {
-				rgb[i] = '0' + rgb[i]
+				rgb[i] = '0' + rgb[i];
 			}
-			hex += rgb[i]
+			hex += rgb[i];
 		}
 
-		return hex
+		return hex;
 	}
 
-	console.error(color + ':第1引数はRGB形式で入力')
+	console.error(color + ':第1引数はRGB形式で入力');
 }
 /*マルチバイト用切り出し*/
-$.isSurrogatePear = function(upper, lower) {
-	return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
-}
-$.mb_strlen = function(str) {
-	var splitter = new GraphemeSplitter()
-	var arr = splitter.splitGraphemes(str)
-	return arr.length
-}
-$.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) {
-			newarr.push(arr[i])
+$.isSurrogatePear = function (upper, lower) {
+	return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <= 0xDFFF;
+};
+$.mb_strlen = function (str) {
+	var ret = 0;
+	for (var i = 0; i < str.length; i++ , ret++) {
+		var upper = str.charCodeAt(i);
+		var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
+		if ($.isSurrogatePear(upper, lower)) {
+			i++;
 		}
 	}
-	return newarr.join('')
-}
+	return ret;
+};
+$.mb_substr = function (str, begin, end) {
+	var ret = '';
+	for (var i = 0, len = 0; i < str.length; i++ , len++) {
+		var upper = str.charCodeAt(i);
+		var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
+		var s = '';
+		if ($.isSurrogatePear(upper, lower)) {
+			i++;
+			s = String.fromCharCode(upper, lower);
+		} else {
+			s = String.fromCharCode(upper);
+		}
+		if (begin <= len && len < end) {
+			ret += s;
+		}
+	}
+	return ret;
+};
 //ソートするやつ
 function object_array_sort(data, key, order, fn) {
-	var num_a = -1
-	var num_b = 1
+	var num_a = -1;
+	var num_b = 1;
 	if (order === 'asc') {
-		num_a = 1
-		num_b = -1
+		num_a = 1;
+		num_b = -1;
 	}
-	data = data.sort(function(a, b) {
-		var x = a[key]
-		var y = b[key]
-		if (x > y) return num_a
-		if (x < y) return num_b
-		return 0
-	})
-	var arrObj = {}
+	data = data.sort(function (a, b) {
+		var x = a[key];
+		var y = b[key];
+		if (x > y) return num_a;
+		if (x < y) return num_b;
+		return 0;
+	});
+	var arrObj = {};
 	for (var i = 0; i < data.length; i++) {
-		arrObj[data[i]['family']] = data[i]
+		arrObj[data[i]['family']] = data[i];
 	}
-	data = []
+	data = [];
 	for (var key in arrObj) {
-		data.push(arrObj[key])
-	}
-	fn(data)
-}
-function setLog(txt1, txt2, txt3) {
-	//url,statuscode,responsetext
-	var text = new Date().toUTCString()
-	text = text + ',' + txt1 + ',' + txt2 + ',' + escapeCsv(txt3)
-	console.error(text)
-	postMessage(['log', text], '*')
-}
-function escapeCsv(str) {
-	if (!str) {
-		return str
-	}
-	var result
-	result = str.toString().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
+		data.push(arrObj[key]);
 	}
+	fn(data);
 }
+localStorage.removeItem("errors");

app/js/platform/nano.js

@@ -1,263 +1,136 @@
+
 //TL取得
-var websocket
 function tl(data) {
-	var tlid = 0
-	if (websocket) {
-		websocket.close()
-	}
-	var acct_id = $('#post-acct-sel').val()
-	var type = $('#type-sel').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
+	var tlid = 0;
+	var acct_id = $("#post-acct-sel").val();
+	var type = $("#type-sel").val();
+	var domain = localStorage.getItem("domain_" + acct_id);
 	//タグの場合はカラム追加して描画
 	if (!type) {
 		//デフォルト
-		var type = 'local'
+		var type = "local";
 	}
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	$('#notice_nano').text(
-		cap(type, data) + ' TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
-	)
-	var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data)
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	$("#notice_nano").text(cap(type, data) + " TL(" + localStorage.getItem(
+		"user_" + acct_id) + "@" + domain + ")");
+	var start = "https://" + domain + "/api/v1/timelines/" + com(type, data);
 	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) {
-			console.error(error)
-		})
-		.then(function(json) {
-			var templete = parse([json[0]], '', acct_id, tlid)
-			$('#timeline_nano').html(templete)
-			jQuery('time.timeago').timeago()
-			$('#menu').addClass('hide')
-		})
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		console.error(error);
+	}).then(function (json) {
+		var templete = parse([json[0]], '', acct_id, tlid);
+		$("#timeline_nano").html(templete);
+		jQuery("time.timeago").timeago();
+	});
 	//Streaming接続
-	var tlid = 0
-	if (type == 'home') {
-		var start = 'wss://' + domain + '/api/v1/streaming/?stream=user&access_token=' + at
-	} else if (type == 'pub') {
-		var start = 'wss://' + domain + '/api/v1/streaming/?stream=public&access_token=' + at
-	} else if (type == 'local') {
-		var start = 'wss://' + domain + '/api/v1/streaming/?stream=public:local&access_token=' + at
-	} else if (type == 'tag') {
-		var start =
-			'wss://' + domain + '/api/v1/streaming/?stream=hashtag&tag=' + data + '&access_token=' + at
+	var websocket = [];
+	var tlid = 0;
+	if (type == "home") {
+		var start = "wss://" + domain +
+			"/api/v1/streaming/?stream=user&access_token=" + at;
+	} else if (type == "pub") {
+		var start = "wss://" + domain +
+			"/api/v1/streaming/?stream=public&access_token=" + at;
+	} else if (type == "local") {
+		var start = "wss://" + domain +
+			"/api/v1/streaming/?stream=public:local&access_token=" + at;
+	} else if (type == "tag") {
+		var start = "wss://" + domain +
+			"/api/v1/streaming/?stream=hashtag&tag=" + data + "&access_token=" + at;
 	}
-	websocket = new WebSocket(start)
-	websocket.onopen = function(mess) {
-		$('#notice_icon_' + tlid).removeClass('red-text')
+	var wsid = websocket.length;
+	websocket[wsid] = new WebSocket(start);
+	websocket[wsid].onopen = function (mess) {
+		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
-	websocket.onmessage = function(mess) {
-		var typeA = JSON.parse(mess.data).event
-		if (typeA == 'update') {
-			var obj = JSON.parse(JSON.parse(mess.data).payload)
-			var templete = parse([obj], '', acct_id, tlid)
-			jQuery('time.timeago').timeago()
-			$('#timeline_nano').html(templete)
+	websocket[wsid].onmessage = function (mess) {
+		var typeA = JSON.parse(mess.data).event;
+		if (typeA == "delete") {
+			var obj = JSON.parse(mess.data).payload;
+			$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
+			$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
+		} else if (typeA == "update") {
+			var obj = JSON.parse(JSON.parse(mess.data).payload);
+			var templete = parse([obj], '', acct_id, tlid);
+			$("#timeline_nano").html(templete);
+		}
+		websocket[wsid].onclose = function (mess) {
+			console.error("Close Streaming API:" + type);
 		}
 	}
-	websocket.onerror = function(error) {
-		console.error('WebSocket Error ' + error)
-	}
-	websocket.onclose = function(mess) {
-		console.error('Close Streaming API:' + type)
-	}
+	websocket[wsid].onerror = function (error) {
+		console.error('WebSocket Error ' + error);
+	};
 }
 //TLのタイトル
 function cap(type, data) {
-	if (type == 'home') {
-		return 'Home'
-	} else if (type == 'local') {
-		return 'Local'
-	} else if (type == 'pub') {
-		return 'Public'
-	} else if (type == 'tag') {
-		return '#' + data
-	} else if (type == 'list') {
-		return 'List(id:' + data + ')'
-	} else if (type == 'notf') {
-		return 'Notification'
+	if (type == "home") {
+		return "Home"
+	} else if (type == "local") {
+		return "Local"
+	} else if (type == "pub") {
+		return "Public"
+	} else if (type == "tag") {
+		return "#" + data
+	} else if (type == "list") {
+		return "List(id:" + data + ")"
+	} else if (type == "notf") {
+		return "Notification"
 	}
 }
 
 //TLのURL
 function com(type, data) {
-	if (type == 'home') {
-		return 'home?'
-	} else if (type == 'local') {
-		return 'public?local=true&'
-	} else if (type == 'pub') {
-		return 'public?'
-	} else if (type == 'tag') {
-		return 'tag/' + data + '?'
+	if (type == "home") {
+		return "home?"
+	} else if (type == "local") {
+		return "public?local=true&"
+	} else if (type == "pub") {
+		return "public?"
+	} else if (type == "tag") {
+		return "tag/" + data + "?"
 	}
-	if (type == 'list') {
-		return 'list/' + data + '?'
+	if (type == "list") {
+		return "list/" + data + "?"
 	}
 }
 
 //TLのアイコン
 function icon(type) {
-	if (type == 'home') {
-		return 'home'
-	} else if (type == 'local') {
-		return 'people_outline'
-	} else if (type == 'pub') {
-		return 'language'
-	} else if (type == 'tag') {
-		return 'search'
+	if (type == "home") {
+		return "home"
+	} else if (type == "local") {
+		return "people_outline"
+	} else if (type == "pub") {
+		return "language"
+	} else if (type == "tag") {
+		return "search"
 	}
-	if (type == 'list') {
-		return 'subject'
+	if (type == "list") {
+		return "subject"
 	}
 }
-function todo() {}
-function todc() {}
-function hide() {}
-$(function($) {
+function todo() { }
+function todc() { }
+function hide() { }
+$(function ($) {
 	//キーボードショートカット
-	$(window).keydown(function(e) {
-		var hasFocus = $('input').is(':focus')
-		var hasFocus2 = $('textarea').is(':focus')
+	$(window).keydown(function (e) {
+		var hasFocus = $('input').is(':focus');
+		var hasFocus2 = $('textarea').is(':focus');
 		//Ctrl+Enter:投稿
 		if (event.ctrlKey) {
 			if (e.keyCode === 13) {
-				post()
-				return false
+				post();
+				return false;
 			}
 		}
-	})
-})
-function set() {
-	$('#menu').toggleClass('hide')
-	if ($('#menu').hasClass('hide')) {
-		$('#setting').text('Setting')
-	} else {
-		$('#setting').text('Close')
-	}
-}
-
-var multi = localStorage.getItem('multi')
-if (!multi) {
-	var obj = [
-		{
-			at: localStorage.getItem(localStorage.getItem('domain_' + acct_id) + '_at'),
-			name: localStorage.getItem('name_' + acct_id),
-			domain: localStorage.getItem('domain_' + acct_id),
-			user: localStorage.getItem('user_' + acct_id),
-			prof: localStorage.getItem('prof_' + acct_id)
-		}
-	]
-	var json = JSON.stringify(obj)
-	localStorage.setItem('multi', json)
-} else {
-	var obj = JSON.parse(multi)
-}
-var templete
-var last = localStorage.getItem('last-use')
-var sel
-Object.keys(obj).forEach(function(key) {
-	var acct = obj[key]
-	var list = key * 1 + 1
-	if (key == last) {
-		sel = 'selected'
-	} else {
-		sel = ''
-	}
-	templete = `<option value="${key}" ${sel}>${acct.user}@${acct.domain}</option>`
-	$('#post-acct-sel').append(templete)
-})
-function mov() {
-	return false
-}
-function resetmv() {
-	return false
-}
-function post() {
-	var acct_id = $('#post-acct-sel').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/statuses'
-	var str = $('#textarea').val()
-	var toot = {
-		status: str
-	}
-	var vis = loadVis(acct_id)
-	toot.visibility = vis
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('POST', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = 'json'
-	httpreq.send(JSON.stringify(toot))
-	httpreq.onreadystatechange = function() {
-		if (httpreq.readyState === 4) {
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
-			$('#textarea').val('')
-		}
-	}
-}
-function loadVis(acct_id) {
-	var vist = localStorage.getItem('vis')
-	if (!vist) {
-		return 'public'
-	} else {
-		if (vist == 'memory') {
-			var memory = localStorage.getItem('vis-memory-' + acct_id)
-			if (!memory) {
-				memory = 'public'
-			}
-			return memory
-		} else if (vist == 'server' || vist == 'useapi') {
-			var multi = localStorage.getItem('multi')
-			var obj = JSON.parse(multi)
-			var memory = obj[acct_id]['vis']
-			if (!memory) {
-				memory = 'public'
-			}
-			return memory
-		} else {
-			return vist
-		}
-	}
-}
-function loader() {
-	var acct_id = $('#post-acct-sel').val()
-	console.log(loadVis(acct_id))
-	$('#vis-sel').val(loadVis(acct_id))
-}
-loader()
-$('textarea').height(15) //init
-$('textarea').css('lineHeight', '1rem') //init
-
-$('textarea').on('input', function(evt) {
-	if (evt.target.scrollHeight > evt.target.offsetHeight) {
-		$(evt.target).height(evt.target.scrollHeight)
-	} else {
-		var lineHeight = Number(
-			$(evt.target)
-				.css('lineHeight')
-				.split('px')[0]
-		)
-		while (true) {
-			$(evt.target).height($(evt.target).height() - lineHeight)
-			if (evt.target.scrollHeight > evt.target.offsetHeight) {
-				$(evt.target).height(evt.target.scrollHeight)
-				break
-			}
-		}
-	}
-})
+	});
+});

app/js/platform/preload.js

@@ -1,244 +1,172 @@
-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('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?:\/\/(.+)/)
-		if (urls) {
-			shell.openExternal(e.data[1])
-		}
-	} else if (e.data[0] == 'sendSinmpleIpc') {
-		ipc.send(e.data[1], '')
-	} else if (e.data[0] == 'dialogStore') {
-		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') {
-		console.log(e.data[1])
-		ipc.send('native-notf', e.data[1])
-	} else if (e.data[0] == 'dialogClient') {
-		ipc.send('dialogClient', e.data[1])
-	} else if (e.data[0] == 'generalDL') {
-		ipc.send('general-dl', e.data[1])
-	} else if (e.data[0] == 'openFinder') {
-		ipc.send('open-finder', e.data[1])
-	} else if (e.data[0] == 'columnDel') {
-		ipc.send('column-del', e.data[1])
-	} else if (e.data[0] == 'lang') {
-		ipc.send('lang', e.data[1])
-	} else if (e.data[0] == 'exportSettings') {
-		ipc.send('exportSettings', e.data[1])
-	} else if (e.data[0] == 'exportSettingsCoreComplete') {
-		ipc.send('export', e.data[1])
-	} else if (e.data[0] == 'importSettings') {
-		ipc.send('importSettings', e.data[1])
-	} else if (e.data[0] == 'customSound') {
-		ipc.send('customSound', e.data[1])
-	} else if (e.data[0] == 'themeJsonDelete') {
-		ipc.send('theme-json-delete', e.data[1])
-	} else if (e.data[0] == 'themeJsonCreate') {
-		ipc.send('theme-json-create', e.data[1])
-	} else if (e.data[0] == 'themeJsonRequest') {
-		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') {
-		ipc.send('aboutData', '')
-	} else if (e.data[0] == 'itunes') {
-		console.log('NowPlaying')
-		ipc.send('itunes', e.data[1])
-	} else if (e.data[0] == 'themeCSSRequest') {
-		ipc.send('theme-css-request', e.data[1])
-	} else if (e.data[0] == 'customCSSRequest') {
-		ipc.send('custom-css-request', e.data[1])
-	} else if (e.data[0] == 'downloadButton') {
-		ipc.send('download-btn', e.data[1])
-	} else if (e.data[0] == 'nano') {
-		ipc.send('nano', null)
-	} else if (e.data[0] == 'asReadComp') {
-		ipc.send('sendMarkersComplete', null)
-	} else if (e.data[0] == 'copy') {
-		ipc.send('copy', e.data[1])
-	} else if (e.data[0] == 'log') {
-		ipc.send('log', e.data[1])
-	}
+var electron = require("electron");
+const shell = electron.shell;
+var ipc = electron.ipcRenderer;
+onmessage = function (e) {
+    if (e.data[0] == "openUrl") {
+        urls = e.data[1].match(/https?:\/\/(.+)/);
+        if (urls) {
+            shell.openExternal(e.data[1]);
+        }
+    } else if (e.data[0] == "sendSinmpleIpc") {
+        ipc.send(e.data[1], "")
+    } else if (e.data[0] == "dialogStore") {
+        ipc.send("dialogStore", e.data[1])
+    } else if (e.data[0] == "bmpImage") {
+        ipc.send('bmp-image', e.data[1]);
+    } else if (e.data[0] == "dialogCW") {
+        ipc.send("dialogCW", e.data[1])
+    } else if (e.data[0] == "nativeNotf") {
+        console.log(e.data[1])
+        ipc.send('native-notf', e.data[1]);
+    } else if (e.data[0] == "dialogClient") {
+        ipc.send("dialogClient", e.data[1])
+    } else if (e.data[0] == "generalDL") {
+        ipc.send('general-dl', e.data[1]);
+    } else if (e.data[0] == "openFinder") {
+        ipc.send('open-finder', e.data[1]);
+    } else if (e.data[0] == "columnDel") {
+        ipc.send('column-del', e.data[1]);
+    } else if (e.data[0] == "lang") {
+        ipc.send('lang', e.data[1]);
+    } else if (e.data[0] == "exportSettings") {
+        ipc.send('exportSettings', e.data[1]);
+    }  else if (e.data[0] == "exportSettingsCoreComplete") {
+        ipc.send('export', e.data[1]);
+    } else if (e.data[0] == "importSettings") {
+        ipc.send('importSettings', e.data[1]);
+    } else if (e.data[0] == "customSound") {
+        ipc.send('customSound', e.data[1]);
+    } else if (e.data[0] == "themeJsonDelete") {
+        ipc.send('theme-json-delete', e.data[1]);
+    } else if (e.data[0] == "themeJsonCreate") {
+        ipc.send('theme-json-create', e.data[1]);
+    } else if (e.data[0] == "themeJsonRequest") {
+        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] == "aboutData") {
+        ipc.send('aboutData', "");
+    } else if (e.data[0] == "itunes") {
+        console.log("NowPlaying")
+        ipc.send("itunes", e.data[1])
+    } else if (e.data[0] == "themeCSSRequest") {
+        ipc.send('theme-css-request', e.data[1]);
+    } else if (e.data[0] == "customCSSRequest") {
+        ipc.send('custom-css-request', e.data[1]);
+    } else if (e.data[0] == "downloadButton") {
+        ipc.send('download-btn', e.data[1]);
+    } else if (e.data[0] == "nano") {
+        ipc.send('nano', null);
+    }
 }
 //version.js
-ipc.send('getPlatform', '')
-ipc.on('platform', function(event, args) {
-	localStorage.setItem('platform', args[0])
-	localStorage.setItem('bit', args[1])
-	localStorage.setItem('about', JSON.stringify([args[2], args[3], args[4], args[5]]))
+ipc.send("getPlatform", "")
+ipc.on('platform', function (event, args) {
+    localStorage.setItem("platform", args[0])
+    localStorage.setItem("bit", args[1])
+    localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4], args[5]]))
 })
 
-ipc.on('reload', function(event, arg) {
-	location.reload()
+ipc.on('reload', function (event, arg) {
+    location.reload();
 })
 //Native Notf
-ipc.on('shownotf', function(event, args) {
-	if (args['type'] == 'toot') {
-		postMessage(['details', [id, acct_id]], '*')
-	} else if (args['type'] == 'userdata') {
-		postMessage(['udg', [user, acct_id]], '*')
-	}
+ipc.on('shownotf', function (event, args) {
+    if (args["type"] == "toot") {
+        postMessage(["details", [id, acct_id]], "*")
+    } else if (args["type"] == "userdata") {
+        postMessage(["udg", [user, acct_id]], "*")
+    }
 })
 
 //first.js
-ipc.on('custom-css-response', function(event, arg) {
-	if (arg == '') {
-		return false
-	}
-	var styleNode = document.createElement('style')
-	styleNode.setAttribute('type', 'text/css')
+ipc.on('custom-css-response', function (event, arg) {
+    if (arg == "") { return false; }
+    var styleNode = document.createElement("style");
+    styleNode.setAttribute("type", "text/css")
 
-	var content = document.createTextNode(arg)
-	styleNode.append(content)
-	document.getElementsByTagName('head')[0].append(styleNode)
+    var content = document.createTextNode(arg)
+    styleNode.append(content)
+    document.getElementsByTagName("head")[0].append(styleNode)
 })
-ipc.on('theme-css-response', function(event, arg) {
-	if (arg == '') {
-		return false
-	}
-	var styleNode = document.createElement('style')
-	styleNode.setAttribute('type', 'text/css')
+ipc.on('theme-css-response', function (event, arg) {
+    if (arg == "") { return false; }
+    var styleNode = document.createElement("style");
+    styleNode.setAttribute("type", "text/css")
 
-	var content = document.createTextNode(arg)
-	styleNode.append(content)
-	document.getElementsByTagName('head')[0].append(styleNode)
+    var content = document.createTextNode(arg)
+    styleNode.append(content)
+    document.getElementsByTagName("head")[0].append(styleNode)
 })
 //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]]], '*')
-	}
-})
+ipc.on('bmp-img-comp', function (event, b64) {
+    postMessage(["media", [b64[0], "image/png", b64[1]]], "*")
+});
 //ui,img.js
-ipc.on('general-dl-prog', function(event, arg) {
-	console.log('Progress: ' + arg)
+ipc.on('general-dl-prog', function (event, arg) {
+    console.log("Progress: " + arg);
 })
-ipc.on('general-dl-message', function(event, arg) {
-	var argC = arg.replace(/\\/g, '\\\\') + '\\\\.'
-	console.log('saved')
-	postMessage(['toastSaved', [arg, argC]], '*')
+ipc.on('general-dl-message', function (event, arg) {
+    var argC = arg.replace(/\\/g, "\\\\") + "\\\\.";
+    console.log("saved")
+    postMessage(["toastSaved", [arg, argC]], "*")
 })
 //setting.js
-ipc.on('langres', function(event, arg) {
-	location.href = '../' + arg + '/setting.html'
-})
-ipc.on('exportSettingsFile', function(event, arg) {
-	postMessage(['exportSettingsCore', arg], '*')
-})
-ipc.on('exportAllComplete', function(event, arg) {
-	postMessage(['alert', 'Complete'], '*')
-})
-ipc.on('config', function(event, arg) {
-	postMessage(['importSettingsCore', arg], '*')
-})
-ipc.on('savefolder', function(event, arg) {
-	localStorage.setItem('savefolder', arg)
-})
-ipc.on('font-list', function(event, arg) {
-	postMessage(['fontList', arg], '*')
-})
-ipc.on('customSoundRender', function(event, args) {
-	postMessage(['customSoundSave', [args[0], args[1]]], '*')
-})
-ipc.on('theme-json-list-response', function(event, args) {
-	postMessage(['ctLoadCore', args], '*')
-})
-ipc.on('theme-json-delete-complete', function(event, args) {
-	postMessage(['ctLoad', ''], '*')
-})
-ipc.on('theme-json-response', function(event, args) {
-	postMessage(['customConnect', args], '*')
-})
-ipc.on('theme-json-create-complete', function(event, args) {
-	postMessage(['clearCustomImport', ''], '*')
-	postMessage(['ctLoad', ''], '*')
-})
+ipc.on('langres', function (event, arg) {
+    location.href = "../" + arg + "/setting.html"
+});
+ipc.on('exportSettingsFile', function (event, arg) {
+    postMessage(["exportSettingsCore", arg], "*")
+});
+ipc.on('exportAllComplete', function (event, arg) {
+    postMessage(["alert", "Complete"], "*")
+});
+ipc.on('config', function (event, arg) {
+    postMessage(["importSettingsCore", arg], "*")
+});
+ipc.on('savefolder', function (event, arg) {
+    localStorage.setItem("savefolder", arg);
+});
+ipc.on('font-list', function (event, arg) {
+    postMessage(["fontList", arg], "*")
+});
+ipc.on('customSoundRender', function (event, args) {
+    postMessage(["customSoundSave", [args[0], args[1]]], "*")
+});
+ipc.on('theme-json-list-response', function (event, args) {
+    postMessage(["ctLoadCore", args], "*")
+});
+ipc.on('theme-json-delete-complete', function (event, args) {
+    postMessage(["ctLoad", ""], "*")
+});
+ipc.on('theme-json-response', function (event, args) {
+    postMessage(["customConnect", args], "*")
+});
+ipc.on('theme-json-create-complete', function (event, args) {
+    postMessage(["clearCustomImport", ""], "*")
+    postMessage(["ctLoad", ""], "*")
+});
 //spotify.js
-ipc.on('itunes-np', function(event, arg) {
-	postMessage(['npCore', arg], '*')
+ipc.on('itunes-np', function (event, arg) {
+    postMessage(["npCore", arg], "*")
 })
 //tips.js
-ipc.on('memory', function(event, arg) {
-	var use = arg[0]
-	var cpu = arg[1]
-	var total = arg[2]
-	postMessage(['renderMem', [use, cpu, total]], '*')
-})
-//log
-ipc.on('logData', function(event, args) {
-	postMessage(['logData', args], '*')
+ipc.on('memory', function (event, arg) {
+    var use = arg[0];
+    var cpu = arg[1];
+    var total = arg[2]
+    postMessage(["renderMem", [use, cpu, total]], "*")
 })
 //update.html
-ipc.on('prog', function(event, arg) {
-	postMessage(['updateProg', arg], '*')
+ipc.on('prog', function (event, arg) {
+    postMessage(["updateProg", arg], "*")
 })
-ipc.on('mess', function(event, arg) {
-	postMessage(['updateMess', arg], '*')
+ipc.on('mess', function (event, arg) {
+    postMessage(["updateMess", arg], "*")
 })
-ipc.on('asRead', function(event, arg) {
-	postMessage(['asRead', ''], '*')
-})
-ipc.on('asReadEnd', function(event, arg) {
-	postMessage(['asReadEnd', ''], '*')
-})
-var webviewDom = document.getElementById('webview')
+var webviewDom = document.getElementById('webview');
 if (webviewDom) {
-	webviewDom.addEventListener('new-window', function(e) {
-		shell.openExternal(e.url)
-	})
+    webviewDom.addEventListener('new-window', function (e) {
+        shell.openExternal(e.url);
+    });
 }

app/js/platform/punycode.js

@@ -1,15 +1,18 @@
 /*! https://mths.be/punycode v1.4.1 by @mathias */
 ;(function(root) {
+
 	/** Detect free variables */
-	var freeExports = typeof exports == 'object' && exports && !exports.nodeType && exports
-	var freeModule = typeof module == 'object' && module && !module.nodeType && module
-	var freeGlobal = typeof global == 'object' && global
+	var freeExports = typeof exports == 'object' && exports &&
+		!exports.nodeType && exports;
+	var freeModule = typeof module == 'object' && module &&
+		!module.nodeType && module;
+	var freeGlobal = typeof global == 'object' && global;
 	if (
 		freeGlobal.global === freeGlobal ||
 		freeGlobal.window === freeGlobal ||
 		freeGlobal.self === freeGlobal
 	) {
-		root = freeGlobal
+		root = freeGlobal;
 	}
 
 	/**
@@ -18,33 +21,39 @@
 	 * @type Object
 	 */
 	var punycode,
-		/** Highest positive signed 32-bit float value */
-		maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
-		/** Bootstring parameters */
-		base = 36,
-		tMin = 1,
-		tMax = 26,
-		skew = 38,
-		damp = 700,
-		initialBias = 72,
-		initialN = 128, // 0x80
-		delimiter = '-', // '\x2D'
-		/** Regular expressions */
-		regexPunycode = /^xn--/,
-		regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
-		regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
-		/** Error messages */
-		errors = {
-			overflow: 'Overflow: input needs wider integers to process',
-			'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
-			'invalid-input': 'Invalid input'
-		},
-		/** Convenience shortcuts */
-		baseMinusTMin = base - tMin,
-		floor = Math.floor,
-		stringFromCharCode = String.fromCharCode,
-		/** Temporary variable */
-		key
+
+	/** Highest positive signed 32-bit float value */
+	maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
+
+	/** Bootstring parameters */
+	base = 36,
+	tMin = 1,
+	tMax = 26,
+	skew = 38,
+	damp = 700,
+	initialBias = 72,
+	initialN = 128, // 0x80
+	delimiter = '-', // '\x2D'
+
+	/** Regular expressions */
+	regexPunycode = /^xn--/,
+	regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
+	regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
+
+	/** Error messages */
+	errors = {
+		'overflow': 'Overflow: input needs wider integers to process',
+		'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
+		'invalid-input': 'Invalid input'
+	},
+
+	/** Convenience shortcuts */
+	baseMinusTMin = base - tMin,
+	floor = Math.floor,
+	stringFromCharCode = String.fromCharCode,
+
+	/** Temporary variable */
+	key;
 
 	/*--------------------------------------------------------------------------*/
 
@@ -55,7 +64,7 @@
 	 * @returns {Error} Throws a `RangeError` with the applicable error message.
 	 */
 	function error(type) {
-		throw new RangeError(errors[type])
+		throw new RangeError(errors[type]);
 	}
 
 	/**
@@ -67,12 +76,12 @@
 	 * @returns {Array} A new array of values returned by the callback function.
 	 */
 	function map(array, fn) {
-		var length = array.length
-		var result = []
+		var length = array.length;
+		var result = [];
 		while (length--) {
-			result[length] = fn(array[length])
+			result[length] = fn(array[length]);
 		}
-		return result
+		return result;
 	}
 
 	/**
@@ -86,19 +95,19 @@
 	 * function.
 	 */
 	function mapDomain(string, fn) {
-		var parts = string.split('@')
-		var result = ''
+		var parts = string.split('@');
+		var result = '';
 		if (parts.length > 1) {
 			// In email addresses, only the domain name should be punycoded. Leave
 			// the local part (i.e. everything up to `@`) intact.
-			result = parts[0] + '@'
-			string = parts[1]
+			result = parts[0] + '@';
+			string = parts[1];
 		}
 		// Avoid `split(regex)` for IE8 compatibility. See #17.
-		string = string.replace(regexSeparators, '\x2E')
-		var labels = string.split('.')
-		var encoded = map(labels, fn).join('.')
-		return result + encoded
+		string = string.replace(regexSeparators, '\x2E');
+		var labels = string.split('.');
+		var encoded = map(labels, fn).join('.');
+		return result + encoded;
 	}
 
 	/**
@@ -116,29 +125,28 @@
 	 */
 	function ucs2decode(string) {
 		var output = [],
-			counter = 0,
-			length = string.length,
-			value,
-			extra
+		    counter = 0,
+		    length = string.length,
+		    value,
+		    extra;
 		while (counter < length) {
-			value = string.charCodeAt(counter++)
-			if (value >= 0xd800 && value <= 0xdbff && counter < length) {
+			value = string.charCodeAt(counter++);
+			if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
 				// high surrogate, and there is a next character
-				extra = string.charCodeAt(counter++)
-				if ((extra & 0xfc00) == 0xdc00) {
-					// low surrogate
-					output.push(((value & 0x3ff) << 10) + (extra & 0x3ff) + 0x10000)
+				extra = string.charCodeAt(counter++);
+				if ((extra & 0xFC00) == 0xDC00) { // low surrogate
+					output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
 				} else {
 					// unmatched surrogate; only append this code unit, in case the next
 					// code unit is the high surrogate of a surrogate pair
-					output.push(value)
-					counter--
+					output.push(value);
+					counter--;
 				}
 			} else {
-				output.push(value)
+				output.push(value);
 			}
 		}
-		return output
+		return output;
 	}
 
 	/**
@@ -151,15 +159,15 @@
 	 */
 	function ucs2encode(array) {
 		return map(array, function(value) {
-			var output = ''
-			if (value > 0xffff) {
-				value -= 0x10000
-				output += stringFromCharCode(((value >>> 10) & 0x3ff) | 0xd800)
-				value = 0xdc00 | (value & 0x3ff)
+			var output = '';
+			if (value > 0xFFFF) {
+				value -= 0x10000;
+				output += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800);
+				value = 0xDC00 | value & 0x3FF;
 			}
-			output += stringFromCharCode(value)
-			return output
-		}).join('')
+			output += stringFromCharCode(value);
+			return output;
+		}).join('');
 	}
 
 	/**
@@ -173,15 +181,15 @@
 	 */
 	function basicToDigit(codePoint) {
 		if (codePoint - 48 < 10) {
-			return codePoint - 22
+			return codePoint - 22;
 		}
 		if (codePoint - 65 < 26) {
-			return codePoint - 65
+			return codePoint - 65;
 		}
 		if (codePoint - 97 < 26) {
-			return codePoint - 97
+			return codePoint - 97;
 		}
-		return base
+		return base;
 	}
 
 	/**
@@ -198,7 +206,7 @@
 	function digitToBasic(digit, flag) {
 		//  0..25 map to ASCII a..z or A..Z
 		// 26..35 map to ASCII 0..9
-		return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5)
+		return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
 	}
 
 	/**
@@ -207,13 +215,13 @@
 	 * @private
 	 */
 	function adapt(delta, numPoints, firstTime) {
-		var k = 0
-		delta = firstTime ? floor(delta / damp) : delta >> 1
-		delta += floor(delta / numPoints)
-		for (; /* no initialization */ delta > (baseMinusTMin * tMax) >> 1; k += base) {
-			delta = floor(delta / baseMinusTMin)
+		var k = 0;
+		delta = firstTime ? floor(delta / damp) : delta >> 1;
+		delta += floor(delta / numPoints);
+		for (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {
+			delta = floor(delta / baseMinusTMin);
 		}
-		return floor(k + ((baseMinusTMin + 1) * delta) / (delta + skew))
+		return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
 	}
 
 	/**
@@ -226,91 +234,95 @@
 	function decode(input) {
 		// Don't use UCS-2
 		var output = [],
-			inputLength = input.length,
-			out,
-			i = 0,
-			n = initialN,
-			bias = initialBias,
-			basic,
-			j,
-			index,
-			oldi,
-			w,
-			k,
-			digit,
-			t,
-			/** Cached calculation results */
-			baseMinusT
+		    inputLength = input.length,
+		    out,
+		    i = 0,
+		    n = initialN,
+		    bias = initialBias,
+		    basic,
+		    j,
+		    index,
+		    oldi,
+		    w,
+		    k,
+		    digit,
+		    t,
+		    /** Cached calculation results */
+		    baseMinusT;
 
 		// Handle the basic code points: let `basic` be the number of input code
 		// points before the last delimiter, or `0` if there is none, then copy
 		// the first basic code points to the output.
 
-		basic = input.lastIndexOf(delimiter)
+		basic = input.lastIndexOf(delimiter);
 		if (basic < 0) {
-			basic = 0
+			basic = 0;
 		}
 
 		for (j = 0; j < basic; ++j) {
 			// if it's not a basic code point
 			if (input.charCodeAt(j) >= 0x80) {
-				error('not-basic')
+				error('not-basic');
 			}
-			output.push(input.charCodeAt(j))
+			output.push(input.charCodeAt(j));
 		}
 
 		// Main decoding loop: start just after the last delimiter if any basic code
 		// points were copied; start at the beginning otherwise.
 
-		for (index = basic > 0 ? basic + 1 : 0; index < inputLength /* no final expression */; ) {
+		for (index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
+
 			// `index` is the index of the next character to be consumed.
 			// Decode a generalized variable-length integer into `delta`,
 			// which gets added to `i`. The overflow checking is easier
 			// if we increase `i` as we go, then subtract off its starting
 			// value at the end to obtain `delta`.
-			for (oldi = i, w = 1, k = base /* no condition */; ; k += base) {
+			for (oldi = i, w = 1, k = base; /* no condition */; k += base) {
+
 				if (index >= inputLength) {
-					error('invalid-input')
+					error('invalid-input');
 				}
 
-				digit = basicToDigit(input.charCodeAt(index++))
+				digit = basicToDigit(input.charCodeAt(index++));
 
 				if (digit >= base || digit > floor((maxInt - i) / w)) {
-					error('overflow')
+					error('overflow');
 				}
 
-				i += digit * w
-				t = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias
+				i += digit * w;
+				t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
 
 				if (digit < t) {
-					break
+					break;
 				}
 
-				baseMinusT = base - t
+				baseMinusT = base - t;
 				if (w > floor(maxInt / baseMinusT)) {
-					error('overflow')
+					error('overflow');
 				}
 
-				w *= baseMinusT
+				w *= baseMinusT;
+
 			}
 
-			out = output.length + 1
-			bias = adapt(i - oldi, out, oldi == 0)
+			out = output.length + 1;
+			bias = adapt(i - oldi, out, oldi == 0);
 
 			// `i` was supposed to wrap around from `out` to `0`,
 			// incrementing `n` each time, so we'll fix that now:
 			if (floor(i / out) > maxInt - n) {
-				error('overflow')
+				error('overflow');
 			}
 
-			n += floor(i / out)
-			i %= out
+			n += floor(i / out);
+			i %= out;
 
 			// Insert `n` at position `i` of the output
-			output.splice(i++, 0, n)
+			output.splice(i++, 0, n);
+
 		}
 
-		return ucs2encode(output)
+		return ucs2encode(output);
 	}
 
 	/**
@@ -322,105 +334,109 @@
 	 */
 	function encode(input) {
 		var n,
-			delta,
-			handledCPCount,
-			basicLength,
-			bias,
-			j,
-			m,
-			q,
-			k,
-			t,
-			currentValue,
-			output = [],
-			/** `inputLength` will hold the number of code points in `input`. */
-			inputLength,
-			/** Cached calculation results */
-			handledCPCountPlusOne,
-			baseMinusT,
-			qMinusT
+		    delta,
+		    handledCPCount,
+		    basicLength,
+		    bias,
+		    j,
+		    m,
+		    q,
+		    k,
+		    t,
+		    currentValue,
+		    output = [],
+		    /** `inputLength` will hold the number of code points in `input`. */
+		    inputLength,
+		    /** Cached calculation results */
+		    handledCPCountPlusOne,
+		    baseMinusT,
+		    qMinusT;
 
 		// Convert the input in UCS-2 to Unicode
-		input = ucs2decode(input)
+		input = ucs2decode(input);
 
 		// Cache the length
-		inputLength = input.length
+		inputLength = input.length;
 
 		// Initialize the state
-		n = initialN
-		delta = 0
-		bias = initialBias
+		n = initialN;
+		delta = 0;
+		bias = initialBias;
 
 		// Handle the basic code points
 		for (j = 0; j < inputLength; ++j) {
-			currentValue = input[j]
+			currentValue = input[j];
 			if (currentValue < 0x80) {
-				output.push(stringFromCharCode(currentValue))
+				output.push(stringFromCharCode(currentValue));
 			}
 		}
 
-		handledCPCount = basicLength = output.length
+		handledCPCount = basicLength = output.length;
 
 		// `handledCPCount` is the number of code points that have been handled;
 		// `basicLength` is the number of basic code points.
 
 		// Finish the basic string - if it is not empty - with a delimiter
 		if (basicLength) {
-			output.push(delimiter)
+			output.push(delimiter);
 		}
 
 		// Main encoding loop:
 		while (handledCPCount < inputLength) {
+
 			// All non-basic code points < n have been handled already. Find the next
 			// larger one:
 			for (m = maxInt, j = 0; j < inputLength; ++j) {
-				currentValue = input[j]
+				currentValue = input[j];
 				if (currentValue >= n && currentValue < m) {
-					m = currentValue
+					m = currentValue;
 				}
 			}
 
 			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
 			// but guard against overflow
-			handledCPCountPlusOne = handledCPCount + 1
+			handledCPCountPlusOne = handledCPCount + 1;
 			if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
-				error('overflow')
+				error('overflow');
 			}
 
-			delta += (m - n) * handledCPCountPlusOne
-			n = m
+			delta += (m - n) * handledCPCountPlusOne;
+			n = m;
 
 			for (j = 0; j < inputLength; ++j) {
-				currentValue = input[j]
+				currentValue = input[j];
 
 				if (currentValue < n && ++delta > maxInt) {
-					error('overflow')
+					error('overflow');
 				}
 
 				if (currentValue == n) {
 					// Represent delta as a generalized variable-length integer
-					for (q = delta, k = base /* no condition */; ; k += base) {
-						t = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias
+					for (q = delta, k = base; /* no condition */; k += base) {
+						t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
 						if (q < t) {
-							break
+							break;
 						}
-						qMinusT = q - t
-						baseMinusT = base - t
-						output.push(stringFromCharCode(digitToBasic(t + (qMinusT % baseMinusT), 0)))
-						q = floor(qMinusT / baseMinusT)
+						qMinusT = q - t;
+						baseMinusT = base - t;
+						output.push(
+							stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
+						);
+						q = floor(qMinusT / baseMinusT);
 					}
 
-					output.push(stringFromCharCode(digitToBasic(q, 0)))
-					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength)
-					delta = 0
-					++handledCPCount
+					output.push(stringFromCharCode(digitToBasic(q, 0)));
+					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
+					delta = 0;
+					++handledCPCount;
 				}
 			}
 
-			++delta
-			++n
+			++delta;
+			++n;
+
 		}
-		return output.join('')
+		return output.join('');
 	}
 
 	/**
@@ -436,8 +452,10 @@
 	 */
 	function toUnicode(input) {
 		return mapDomain(input, function(string) {
-			return regexPunycode.test(string) ? decode(string.slice(4).toLowerCase()) : string
-		})
+			return regexPunycode.test(string)
+				? decode(string.slice(4).toLowerCase())
+				: string;
+		});
 	}
 
 	/**
@@ -453,8 +471,10 @@
 	 */
 	function toASCII(input) {
 		return mapDomain(input, function(string) {
-			return regexNonASCII.test(string) ? 'xn--' + encode(string) : string
-		})
+			return regexNonASCII.test(string)
+				? 'xn--' + encode(string)
+				: string;
+		});
 	}
 
 	/*--------------------------------------------------------------------------*/
@@ -466,7 +486,7 @@
 		 * @memberOf punycode
 		 * @type String
 		 */
-		version: '1.4.1',
+		'version': '1.4.1',
 		/**
 		 * An object of methods to convert from JavaScript's internal character
 		 * representation (UCS-2) to Unicode code points, and back.
@@ -474,35 +494,40 @@
 		 * @memberOf punycode
 		 * @type Object
 		 */
-		ucs2: {
-			decode: ucs2decode,
-			encode: ucs2encode
+		'ucs2': {
+			'decode': ucs2decode,
+			'encode': ucs2encode
 		},
-		decode: decode,
-		encode: encode,
-		toASCII: toASCII,
-		toUnicode: toUnicode
-	}
+		'decode': decode,
+		'encode': encode,
+		'toASCII': toASCII,
+		'toUnicode': toUnicode
+	};
 
 	/** Expose `punycode` */
 	// Some AMD build optimizers, like r.js, check for specific condition patterns
 	// like the following:
-	if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
+	if (
+		typeof define == 'function' &&
+		typeof define.amd == 'object' &&
+		define.amd
+	) {
 		define('punycode', function() {
-			return punycode
-		})
+			return punycode;
+		});
 	} else if (freeExports && freeModule) {
 		if (module.exports == freeExports) {
 			// in Node.js, io.js, or RingoJS v0.8.0+
-			freeModule.exports = punycode
+			freeModule.exports = punycode;
 		} else {
 			// in Narwhal or RingoJS v0.7.0-
 			for (key in punycode) {
-				punycode.hasOwnProperty(key) && (freeExports[key] = punycode[key])
+				punycode.hasOwnProperty(key) && (freeExports[key] = punycode[key]);
 			}
 		}
 	} else {
 		// in Rhino or a web browser
-		root.punycode = punycode
+		root.punycode = punycode;
 	}
-})(this)
+
+}(this));

app/js/post/bb-md.js

@@ -1,346 +1,316 @@
 //BBCodeとMarkdownの入力・パーサー
 //アカウント変えた時にBBとかMDとか
 function mdCheck() {
-	var acct_id = $('#post-acct-sel').val()
-	var profimg = localStorage.getItem('prof_' + acct_id)
+	var acct_id = $("#post-acct-sel").val();
+	var profimg = localStorage.getItem("prof_" + acct_id);
 	if (!profimg) {
-		profimg = '../../img/missing.svg'
+		profimg = "../../img/missing.svg";
 	}
-	$('#acct-sel-prof').attr('src', profimg)
-	if (localStorage.getItem('post_' + acct_id)) {
-		$('#toot-post-btn').text(
-			localStorage.getItem('post_' + acct_id) +
-				'(' +
-				localStorage.getItem('domain_' + acct_id) +
-				')'
-		)
+	$("#acct-sel-prof").attr("src", profimg);
+	if (localStorage.getItem("post_" + acct_id)) {
+		$("#toot-post-btn").text(localStorage.getItem("post_" + acct_id) + "(" + localStorage.getItem("domain_" + acct_id) + ")");
 	} else {
-		$('#toot-post-btn').text(lang.lang_toot + '(' + localStorage.getItem('domain_' + acct_id) + ')')
+		$("#toot-post-btn").text(lang.lang_toot + "(" + localStorage.getItem("domain_" + acct_id) + ")");
 	}
-	if (!localStorage.getItem('bb_' + acct_id) && !localStorage.getItem('md_' + acct_id)) {
-		$('.markdown').addClass('hide')
-		$('.anti-markdown').addClass('hide')
+	if (!localStorage.getItem("bb_" + acct_id) && !localStorage.getItem("md_" + acct_id)) {
+		$(".markdown").addClass("hide");
+		$(".anti-markdown").addClass("hide");
 	} else {
-		$('.anti-markdown').removeClass('hide')
+		$(".anti-markdown").removeClass("hide");
 	}
-	if ($('.markdown').hasClass('hide')) {
-		localStorage.setItem('md', 'hide')
+	if ($(".markdown").hasClass("hide")) {
+		localStorage.setItem("md", "hide");
 	} else {
-		localStorage.removeItem('md')
+		localStorage.removeItem("md");
 	}
-	var domain = localStorage.getItem('domain_' + acct_id)
-	if (domain == 'itabashi.0j0.jp') {
-		$('#limited-button').removeClass('hide')
+	var domain = localStorage.getItem("domain_" + acct_id);
+	if (domain == "itabashi.0j0.jp") {
+		$("#limited-button").removeClass("hide");
 	} else {
-		$('#limited-button').addClass('hide')
+		$("#limited-button").addClass("hide");
 	}
-	if (domain == 'kirishima.cloud') {
-		$('#faicon-btn').show()
+	if (domain == "kirishima.cloud") {
+		$("#faicon-btn").show();
 	} else {
-		$('#faicon-btn').hide()
+		$("#faicon-btn").hide();
 	}
-	if (domain == 'imastodon.net') {
-		trendTag()
+	if (domain == "imastodon.net") {
+		trendTag();
 	} else {
-		$('#trendtag').html('')
+		$("#trendtag").html("");
 	}
-	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+	if (localStorage.getItem("mode_" + domain) == "misskey") {
 		M.toast({ html: lang.lang_bbmd_misskey, displayLength: 5000 })
 	}
-	if (idata[domain + '_letters']) {
-		$('#textarea').attr('data-length', idata[domain + '_letters'])
+	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')
+	if (idata[domain + "_glitch"] === "true") {
+		$("#local-button").removeClass("hide");
 	} else {
-		$('#local-button').addClass('hide')
+		$("#local-button").addClass("hide");
 	}
-	var multi = localStorage.getItem('multi')
+	var multi = localStorage.getItem("multi");
 	if (multi) {
-		var obj = JSON.parse(multi)
-		if (
-			obj[acct_id].background &&
-			obj[acct_id].background != 'def' &&
-			obj[acct_id].text &&
-			obj[acct_id].text != 'def'
-		) {
-			$('#toot-post-btn').removeClass('indigo')
-			$('#toot-post-btn').css('background-color', '#' + obj[acct_id].background)
-			$('#toot-post-btn').css('color', obj[acct_id].text)
+		var obj = JSON.parse(multi);
+		if (obj[acct_id].background && obj[acct_id].background != "def" && obj[acct_id].text && obj[acct_id].text != "def") {
+			$("#toot-post-btn").removeClass("indigo");
+			$("#toot-post-btn").css("background-color", "#" + obj[acct_id].background);
+			$("#toot-post-btn").css("color", obj[acct_id].text);
 		} else {
-			$('#toot-post-btn').css('background-color', '')
-			$('#toot-post-btn').css('color', '')
-			$('#toot-post-btn').addClass('indigo')
+			$("#toot-post-btn").css("background-color", "");
+			$("#toot-post-btn").css("color", "");
+			$("#toot-post-btn").addClass("indigo");
+
 		}
 	}
-	loadVis()
+	loadVis();
 }
 //BOXのトグルボタン
 function mdToggle() {
-	$('.markdown').toggleClass('hide')
-	$('.anti-markdown').toggleClass('hide')
-	if ($('.markdown').hasClass('hide')) {
-		localStorage.setItem('md', 'hide')
+	$(".markdown").toggleClass("hide");
+	$(".anti-markdown").toggleClass("hide");
+	if ($(".markdown").hasClass("hide")) {
+		localStorage.setItem("md", "hide");
 	} else {
-		localStorage.removeItem('md')
+		localStorage.removeItem("md");
 	}
+
 }
 //最初に読み込みます(MD対応インスタンスかチェック)
-if (localStorage.getItem('md') == 'hide') {
-	$('.markdown').addClass('hide')
-	$('.anti-markdown').removeClass('hide')
+if (localStorage.getItem("md") == "hide") {
+	$(".markdown").addClass("hide");
+	$(".anti-markdown").removeClass("hide");
 }
 //タグを選んだ時に(BB版)
 function tagsel(tag) {
-	var acct_id = $('#post-acct-sel').val()
-	if (!localStorage.getItem('bb_' + acct_id)) {
-		return false
+	var acct_id = $("#post-acct-sel").val();
+	if (!localStorage.getItem("bb_" + acct_id)) {
+		return false;
 	}
-	if (tag == 'large' || tag == 'size' || tag == 'color' || tag == 'colorhex') {
-		var sub = $('#' + tag).val()
-		var sub = sub.replace(/#/g, '')
-		surroundHTML(tag + '=' + sub, tag)
-	} else if (tag == 'flip=vertical' || tag == 'flip=horizontal') {
-		surroundHTML(tag, 'flip')
+	if (tag == "large" || tag == "size" || tag == "color" || tag == "colorhex") {
+		var sub = $("#" + tag).val();
+		var sub = sub.replace(/#/g, "");
+		surroundHTML(tag + "=" + sub, tag);
+	} else if (tag == "flip=vertical" || tag == "flip=horizontal") {
+		surroundHTML(tag, "flip");
 	} else {
-		surroundHTML(tag, tag)
+		surroundHTML(tag, tag);
 	}
-	$('#textarea').focus()
+	$("#textarea").focus();
 }
 //HTMLをエスケープしてXSSを防ぐ
 function escape_html(string) {
 	if (typeof string !== 'string') {
-		return string
+		return string;
 	}
-	return string.replace(/[&'`"<>]/g, function(match) {
+	return string.replace(/[&'`"<>]/g, function (match) {
 		return {
 			'&': '&amp;',
 			"'": '&#x27;',
 			'`': '&#x60;',
 			'"': '&quot;',
 			'<': '&lt;',
-			'>': '&gt;'
+			'>': '&gt;',
 		}[match]
-	})
+	});
 }
 //テキストボックスで選択したやつをタグで囲む(BB版)
 function surroundHTML(tagS, tagE) {
-	var acct_id = $('#post-acct-sel').val()
-	if (!localStorage.getItem('bb_' + acct_id)) {
-		return false
+	var acct_id = $("#post-acct-sel").val();
+	if (!localStorage.getItem("bb_" + acct_id)) {
+		return false;
 	}
-	var target = document.getElementById('textarea')
-	var pos = getAreaRange(target)
+	var target = document.getElementById("textarea");
+	var pos = getAreaRange(target);
 
-	var val = target.value
-	var range = val.slice(pos.start, pos.end)
-	var beforeNode = val.slice(0, pos.start)
-	var afterNode = val.slice(pos.end)
-	var insertNode
+	var val = target.value;
+	var range = val.slice(pos.start, pos.end);
+	var beforeNode = val.slice(0, pos.start);
+	var afterNode = val.slice(pos.end);
+	var insertNode;
 	if (range || pos.start != pos.end) {
-		insertNode = '[' + tagS + ']' + range + '[/' + tagE + ']'
-		target.value = beforeNode + insertNode + afterNode
-	} else if (pos.start == pos.end) {
-		insertNode = '[' + tagS + ']' + '[/' + tagE + ']'
-		target.value = beforeNode + insertNode + afterNode
+		insertNode = '[' + tagS + ']' + range + '[/' + tagE + ']';
+		target.value = beforeNode + insertNode + afterNode;
+	}
+
+	else if (pos.start == pos.end) {
+		insertNode = '[' + tagS + ']' + '[/' + tagE + ']';
+		target.value = beforeNode + insertNode + afterNode;
 	}
 }
 function markdown(tag, ck, br, space) {
-	if (space == 'before') {
-		tagE = tag
-		tag = ' ' + tag
+	if (space == "before") {
+		tagE = tag;
+		tag = " " + tag;
 	} else {
-		tagE = tag
+		tagE = tag;
 	}
-	surroundMD(tag, tagE, ck, br)
-	$('#textarea').focus()
+	surroundMD(tag, tagE, ck, br);
+	$("#textarea").focus();
 }
 function surroundMD(tagS, tagE, ck, br) {
-	var acct_id = $('#post-acct-sel').val()
-	if (!localStorage.getItem('md_' + acct_id)) {
-		return false
+	var acct_id = $("#post-acct-sel").val();
+	if (!localStorage.getItem("md_" + acct_id)) {
+		return false;
 	}
-	var target = document.getElementById('textarea')
-	var pos = getAreaRange(target)
+	var target = document.getElementById("textarea");
+	var pos = getAreaRange(target);
 
-	var val = target.value
-	var range = val.slice(pos.start, pos.end)
-	var beforeNode = val.slice(0, pos.start)
-	var afterNode = val.slice(pos.end)
-	var insertNode
-	if (br == 'yes') {
-		var br = '\n'
+	var val = target.value;
+	var range = val.slice(pos.start, pos.end);
+	var beforeNode = val.slice(0, pos.start);
+	var afterNode = val.slice(pos.end);
+	var insertNode;
+	if (br == "yes") {
+		var br = "\n";
 	} else {
-		var br = ''
+		var br = "";
 	}
 
-	if ((range || pos.start != pos.end) && ck == 'yes') {
-		insertNode = tagS + range + tagE
-		target.value = beforeNode + insertNode + br + afterNode
-	} else if (pos.start == pos.end || ck == 'no') {
-		insertNode = tagS + range
-		target.value = beforeNode + insertNode + br + afterNode
+	if ((range || pos.start != pos.end) && ck == "yes") {
+		insertNode = tagS + range + tagE;
+		target.value = beforeNode + insertNode + br + afterNode;
+	}
+
+	else if (pos.start == pos.end || ck == "no") {
+		insertNode = tagS + range;
+		target.value = beforeNode + insertNode + br + afterNode;
 	}
 }
 
 //テキストボックスの前後チェック
 function getAreaRange(obj) {
-	var pos = new Object()
+	var pos = new Object();
 	if (window.getSelection()) {
-		pos.start = obj.selectionStart
-		pos.end = obj.selectionEnd
+		pos.start = obj.selectionStart;
+		pos.end = obj.selectionEnd;
 	}
 
-	return pos
+	return pos;
 }
 
 //Markdownのリンク挿入
 function markdownLink() {
-	var acct_id = $('#post-acct-sel').val()
-	if (!localStorage.getItem('md_' + acct_id)) {
-		return false
+	var acct_id = $("#post-acct-sel").val();
+	if (!localStorage.getItem("md_" + acct_id)) {
+		return false;
 	}
-	var linkIns = '[' + $('#linkt').val() + ']' + '(' + $('#link2').val() + ')'
-	if (linkIns != '[]()') {
-		$('#textarea').val($('#textarea').val() + linkIns)
-		$('#linkt').val('')
-		$('#link2').val('')
-		$('#textarea').focus()
+	var linkIns = "[" + $("#linkt").val() + "]" + "(" + $("#link2").val() + ")";
+	if (linkIns != "[]()") {
+		$("#textarea").val($("#textarea").val() + linkIns);
+		$("#linkt").val("");
+		$("#link2").val("");
+		$("#textarea").focus();
 	}
 }
 //Markdownのimg挿入
 function markdownImage() {
-	var acct_id = $('#post-acct-sel').val()
-	if (!localStorage.getItem('md_' + acct_id)) {
-		return false
+	var acct_id = $("#post-acct-sel").val();
+	if (!localStorage.getItem("md_" + acct_id)) {
+		return false;
 	}
-	var imgIns = '![' + $('#image').val() + ']' + '(' + $('#image2').val() + ')'
-	if (imgIns != '![]()') {
-		$('#textarea').val($('#textarea').val() + imgIns)
-		$('#image').val('')
-		$('#image2').val('')
-		$('#textarea').focus()
+	var imgIns = "![" + $("#image").val() + "]" + "(" + $("#image2").val() + ")";
+	if (imgIns != "![]()") {
+		$("#textarea").val($("#textarea").val() + imgIns);
+		$("#image").val("");
+		$("#image2").val("");
+		$("#textarea").focus();
 	}
 }
 //文字数をチェック(hタグ用)
 function str_count(all, part) {
-	return (all.match(new RegExp(part, 'g')) || []).length
+	return (all.match(new RegExp(part, "g")) || []).length;
 }
 
 //プレビュー
 function preview() {
-	$('#preview-field').show()
-	$('#toot-field').hide()
-	$('#preview-btn').hide()
-	var bb = escape_html($('#textarea').val())
+	$("#preview-field").show();
+	$("#toot-field").hide();
+	$("#preview-btn").hide();
+	var bb = escape_html($("#textarea").val());
 	//quote
-	var bb = bb.replace(/>(.+)$/g, '<blockquote>$1</blockquote>')
+	var bb = bb.replace(/>(.+)$/g, '<blockquote>$1<\/blockquote>');
 	//spin
-	var bb = bb.replace(/\[spin\](.+)\[\/spin\]/g, '<span class="fa fa-spin">$1</span>')
+	var bb = bb.replace(/\[spin\](.+)\[\/spin\]/g, '<span class="fa fa-spin">$1<\/span>');
 	//pulse
-	var bb = bb.replace(/\[pulse\](.+)\[\/pulse\]/g, '<span class="bbcode-pulse-loading">$1</span>')
+	var bb = bb.replace(/\[pulse\](.+)\[\/pulse\]/g, '<span class="bbcode-pulse-loading">$1<\/span>');
 	//large
-	var bb = bb.replace(
-		/\[large=([0-9]{1,2})x\](.+)\[\/large\]/g,
-		'<span class="fa fa-$1x">$2</span>'
-	)
+	var bb = bb.replace(/\[large=([0-9]{1,2})x\](.+)\[\/large\]/g, '<span class="fa fa-$1x">$2<\/span>');
 	//vertical
-	var bb = bb.replace(
-		/\[flip=vertical\](.+)\[\/flip\]/g,
-		'<span class="fa fa-flip-vertical">$1</span>'
-	)
+	var bb = bb.replace(/\[flip=vertical\](.+)\[\/flip\]/g, '<span class="fa fa-flip-vertical">$1<\/span>');
 	//horizontal
-	var bb = bb.replace(
-		/\[flip=horizontal\](.+)\[\/flip\]/g,
-		'<span class="fa fa-flip-horizontal">$1</span>'
-	)
+	var bb = bb.replace(/\[flip=horizontal\](.+)\[\/flip\]/g, '<span class="fa fa-flip-horizontal">$1<\/span>');
 	//b
-	var bb = bb.replace(/\[b\](.+)\[\/b\]/g, '<b>$1</b>')
+	var bb = bb.replace(/\[b\](.+)\[\/b\]/g, '<b>$1<\/b>');
 	//i
-	var bb = bb.replace(/\[i\](.+)\[\/i\]/g, '<i>$1</i>')
+	var bb = bb.replace(/\[i\](.+)\[\/i\]/g, '<i>$1<\/i>');
 	//u
-	var bb = bb.replace(/\[u\](.+)\[\/u\]/g, '<u>$1</u>')
+	var bb = bb.replace(/\[u\](.+)\[\/u\]/g, '<u>$1<\/u>');
 	//s
-	var bb = bb.replace(/\[s\](.+)\[\/s\]/g, '<s>$1</s>')
+	var bb = bb.replace(/\[s\](.+)\[\/s\]/g, '<s>$1<\/s>');
 	//size
-	var bb = bb.replace(
-		/\[size=([0-9]{1,2})\](.+)\[\/size\]/g,
-		'<span style="font-size:$1px">$2</span>'
-	)
+	var bb = bb.replace(/\[size=([0-9]{1,2})\](.+)\[\/size\]/g, '<span style="font-size:$1px">$2<\/span>');
 	//colorhex
-	var bb = bb.replace(
-		/\[colorhex=([A-Fa-f0-9]+)\](.+)\[\/colorhex\]/g,
-		'<span style="color:#$1">$2</span>'
-	)
+	var bb = bb.replace(/\[colorhex=([A-Fa-f0-9]+)\](.+)\[\/colorhex\]/g, '<span style="color:#$1">$2<\/span>');
 	//code
-	var bb = bb.replace(/`(.+)`/g, '<code>$1</code>')
+	var bb = bb.replace(/`(.+)`/g, '<code>$1<\/code>');
 	//head
-	var m
-	m = bb.match(/^#{1,6}(.+)$/gm)
+	var m;
+	m = bb.match(/^#{1,6}(.+)$/gm);
 	if (m) {
 		for (let i = 0; i < m.length; i++) {
-			var t = m[i].match(/^#{1,6}(.+)$/)
-			var indexct = '<h' + str_count(m[i], '#') + '>' + t[1] + '</h' + str_count(m[i], '#') + '>'
-			var bb = bb.replace(new RegExp(m[i], ''), indexct)
+			var t = m[i].match(/^#{1,6}(.+)$/);
+			var indexct = '<h' + str_count(m[i], "#") + '>' + t[1] + '</h' + str_count(m[i], "#") + '>';
+			var bb = bb.replace(new RegExp(m[i], ""), indexct);
 		}
 	}
 	//list(ul)
-	var li
-	li = bb.match(/^\- (.+)$/gm)
+	var li;
+	li = bb.match(/^\- (.+)$/gm);
 	if (li) {
 		for (let l = 0; l < li.length; l++) {
-			var u = li[l].match(/^\- (.+)$/)
-			var listUl = '<li>' + u[1] + '</li>'
+			var u = li[l].match(/^\- (.+)$/);
+			var listUl = '<li>' + u[1] + '</li>';
 			if (l == 0) {
-				listUl = '<ul>' + listUl
+				listUl = '<ul>' + listUl;
 			}
 			if (l == li.length - 1) {
-				listUl = listUl + '</ul>'
+				listUl = listUl + '</ul>';
 			}
-			var bb = bb.replace(new RegExp(li[l], ''), listUl)
+			var bb = bb.replace(new RegExp(li[l], ""), listUl);
 		}
 	}
 	//list(ol)
-	var li
-	li = bb.match(/^1\. (.+)$/gm)
+	var li;
+	li = bb.match(/^1\. (.+)$/gm);
 	if (li) {
 		for (let l = 0; l < li.length; l++) {
-			var u = li[l].match(/^1\. (.+)$/)
-			var listUl = '<li>' + u[1] + '</li>'
+			var u = li[l].match(/^1\. (.+)$/);
+			var listUl = '<li>' + u[1] + '</li>';
 			if (l === 0) {
-				listUl = '<ol>' + listUl
+				listUl = '<ol>' + listUl;
 			}
 			if (l === li.length - 1) {
-				listUl = listUl + '</ol>'
+				listUl = listUl + '</ol>';
 			}
-			var bb = bb.replace(new RegExp(li[l], ''), listUl)
+			var bb = bb.replace(new RegExp(li[l], ""), listUl);
 		}
 	}
 	//img
-	var bb = bb.replace(
-		/!\[(.+)\]\((https:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g,
-		'<img src="$2" text="$1" style="width:100%">'
-	)
+	var bb = bb.replace(/!\[(.+)\]\((https:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g, '<img src="$2" text="$1" style="width:100%">');
 	//link
-	var bb = bb.replace(
-		/\[(.+)\]\((https?:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g,
-		'<a href="$2" target="_blank">$1</a>'
-	)
-	bb = nl2br(bb)
-	bb = bb.replace(new RegExp('</li><br />', 'g'), '')
-	$('#md-preview').html(bb)
+	var bb = bb.replace(/\[(.+)\]\((https?:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g, '<a href="$2" target="_blank">$1<\/a>');
+	bb = nl2br(bb);
+	bb = bb.replace(new RegExp("</li><br />", "g"), "");
+	$("#md-preview").html(bb);
 }
 //Editで戻る
 function previewEdit() {
-	$('#preview-field').hide()
-	$('#toot-field').show()
-	$('#preview-btn').show()
-	$('#md-preview').html('')
-}
+	$("#preview-field").hide();
+	$("#toot-field").show();
+	$("#preview-btn").show();
+	$("#md-preview").html("");
+}

app/js/post/emoji.js

@@ -1,349 +1,227 @@
 //絵文字ピッカー
 //最初に読み込む
-$('#emoji-before').addClass('disabled')
-$('#emoji-next').addClass('disabled')
+$("#emoji-before").addClass("disabled");
+$("#emoji-next").addClass("disabled");
 
 //絵文字ボタンのトグル
 function emojiToggle(reaction) {
-	var acct_id = $('#post-acct-sel').val()
-	var selin = $('#textarea').prop('selectionStart')
+	var acct_id = $("#post-acct-sel").val();
+	var selin = $("#textarea").prop('selectionStart');
 	if (!selin) {
-		selin = 0
+		selin = 0;
 	}
-	if ($('#emoji').hasClass('hide')) {
-		$('#emoji').removeClass('hide')
-		$('#right-side').show()
-		$('#right-side').css('width', '300px')
-		$('#left-side').css('width', 'calc(100% - 300px)')
-		var width = localStorage.getItem('postbox-width')
+	if ($("#emoji").hasClass("hide")) {
+		$("#emoji").removeClass("hide")
+		$("#right-side").show()
+		$("#right-side").css("width", "300px")
+		$("#left-side").css("width", "calc(100% - 300px)")
+		var width = localStorage.getItem("postbox-width");
 		if (width) {
-			width = width.replace('px', '') * 1 + 300
+			width = width.replace("px", "") * 1 + 300
 		} else {
 			width = 600
 		}
-		$('#post-box').css('width', width + 'px')
-		$('#suggest').html('')
-		if (!localStorage.getItem('emojis_' + acct_id)) {
-			var html = `<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet('true');">${lang.lang_emoji_get}</button>`
-			$('#emoji-list').html(html)
+		$("#post-box").css("width", width + "px")
+		$("#suggest").html("");
+		if (!localStorage.getItem("emoji_" + acct_id)) {
+			var html =
+				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">' + lang.lang_emoji_get + '</button>';
+			$("#emoji-list").html(html);
 		} else {
-			emojiList('home', reaction)
+			emojiList('home', reaction);
 		}
 	} else {
-		$('#poll').addClass('hide')
-		$('#right-side').hide()
-		$('#right-side').css('width', '300px')
-		$('#emoji').addClass('hide')
-		$('#suggest').html('')
-		$('#left-side').css('width', '100%')
-		var width = localStorage.getItem('postbox-width')
+		$("#poll").addClass("hide")
+		$("#right-side").hide()
+		$("#right-side").css("width", "300px")
+		$("#emoji").addClass("hide")
+		$("#suggest").html("");
+		$("#left-side").css("width", "100%")
+		var width = localStorage.getItem("postbox-width");
 		if (width) {
-			width = width.replace('px', '') * 1
+			width = width.replace("px", "") * 1
 		} else {
 			width = 300
 		}
-		$('#post-box').css('width', width + 'px')
+		$("#post-box").css("width", width + "px")
 	}
+
+
 }
 
 //絵文字リスト挿入
 function emojiGet(parse, started) {
-	$('#emoji-list').text('Loading...')
-	var acct_id = $('#post-acct-sel').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
-		var start = 'https://' + domain + '/api/v1/custom_emojis'
+	$('#emoji-list').text('Loading...');
+	var acct_id = $("#post-acct-sel").val();
+	var domain = localStorage.getItem("domain_" + acct_id);
+	if (localStorage.getItem("mode_" + domain) != "misskey") {
+		var start = "https://" + domain + "/api/v1/custom_emojis";
 		fetch(start, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json'
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (parse == "true") {
+				$('#emoji-list').text('Parsing...');
+				//絵文字をマストドン公式と同順にソート
+				json.sort(function (a, b) {
+					if (a.shortcode < b.shortcode) return -1;
+					if (a.shortcode > b.shortcode) return 1;
+					return 0;
+				});
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
+			} else {
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
 			}
-		})
-			.then(function(response) {
-				if (!response.ok) {
-					response.text().then(function(text) {
-						setLog(response.url, response.status, text)
-					})
-				}
-				return response.json()
-			})
-			.catch(function(error) {
-				todo(error)
-				setLog(start, 'JSON', error)
-				console.error(error)
-			})
-			.then(function(json) {
-				if (parse == 'true') {
-					$('#emoji-list').text('Parsing...')
-					var md = {
-						categorized: {},
-						uncategorized: []
-					}
-					var if_categorized = false
-					Object.keys(json).forEach(function(key) {
-						var emoji = json[key]
-						if (emoji.visible_in_picker) {
-							var listed = true
-						} else {
-							var listed = false
-						}
-						if (emoji.category) {
-							var cat = emoji.category
-							if (!md['categorized'][cat]) {
-								md['categorized'][cat] = []
-							}
-							md['categorized'][cat].push({
-								shortcode: emoji.shortcode,
-								url: emoji.url,
-								listed: listed
-							})
-							if_categorized = true
-						} else {
-							md['uncategorized'].push({
-								shortcode: emoji.shortcode,
-								url: emoji.url,
-								listed: listed
-							})
-						}
-					})
-					console.log(md)
-					//絵文字をマストドン公式と同順にソート
-					md['uncategorized'].sort(function(a, b) {
-						if (a.shortcode < b.shortcode) return -1
-						if (a.shortcode > b.shortcode) return 1
-						return 0
-					})
-					Object.keys(md['categorized']).forEach(function(key) {
-						md['categorized'][key].sort(function(a, b) {
-							if (a.shortcode < b.shortcode) return -1
-							if (a.shortcode > b.shortcode) return 1
-							return 0
-						})
-					})
-
-					md['if_categorized'] = if_categorized
-					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
-				} else {
-					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
-				}
-				localStorage.setItem('emojiseek', 0)
-				if (!started) {
-					emojiList('home')
-				}
-			})
+			localStorage.setItem("emojiseek", 0);
+			if (!started) {
+				emojiList('home')
+			}
+		});
 	} else {
-		var start = 'https://' + domain + '/api/meta'
+		var start = "https://" + domain + "/api/meta";
 		fetch(start, {
 			method: 'POST',
 			headers: {
 				'content-type': 'application/json'
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json.enableEmojiReaction) {
+				localStorage.setItem("emojiReaction_" + acct_id, "true");
+			} else {
+				localStorage.setItem("emojiReaction_" + acct_id, "disabled");
 			}
-		})
-			.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.enableEmojiReaction) {
-					localStorage.setItem('emojiReaction_' + acct_id, 'true')
-				} else {
-					localStorage.setItem('emojiReaction_' + acct_id, 'disabled')
-				}
-				var emojis = json.emojis
-				var md = { uncategorized: [] }
-				Object.keys(emojis).forEach(function(key) {
-					var emoji = emojis[key]
-					md['uncategorized'].push({
-						shortcode: emoji.name,
-						url: emoji.url,
-						listed: true
-					})
+			var emojis = json.emojis;
+			var md = [];
+			Object.keys(emojis).forEach(function (key) {
+				var emoji = emojis[key];
+				md.push({
+					"shortcode": emoji.name,
+					"url": emoji.url
 				})
-				md['if_categorized'] = false
-				if (parse == 'true') {
-					$('#emoji-list').text('Parsing...')
-					//絵文字をマストドン公式と同順にソート
-					md['uncategorized'].sort(function(a, b) {
-						if (a.shortcode < b.shortcode) return -1
-						if (a.shortcode > b.shortcode) return 1
-						return 0
-					})
-					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
-				} else {
-					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
-				}
-				localStorage.setItem('emojiseek', 0)
-				if (!started) {
-					emojiList('home')
-				}
-			})
+			});
+			if (parse == "true") {
+				$('#emoji-list').text('Parsing...');
+				//絵文字をマストドン公式と同順にソート
+				md.sort(function (a, b) {
+					if (a.shortcode < b.shortcode) return -1;
+					if (a.shortcode > b.shortcode) return 1;
+					return 0;
+				});
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+			} else {
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+			}
+			localStorage.setItem("emojiseek", 0);
+			if (!started) {
+				emojiList('home')
+			}
+		});
 	}
 }
 
 //リストの描画
 function emojiList(target, 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'
-	) {
-		console.error('Disabled')
+	$("#now-emoji").text(lang.lang_emoji_custom);
+	var acct_id = $("#post-acct-sel").val();
+	if (reaction && localStorage.getItem("emojiReaction_" + acct_id) != "true") {
+		console.error("Disabled")
 		clear()
-		hide()
-		return false
+		hide();
+		return false;
 	}
-	var start = localStorage.getItem('emojiseek')
-	if (target == 'next') {
-		var start = start * 1 + 127
-		localStorage.setItem('emojiseek', start)
-	} else if (target == 'before') {
-		var start = start - 127
-		localStorage.setItem('emojiseek', start)
+	var start = localStorage.getItem("emojiseek");
+	if (target == "next") {
+		var start = start * 1 + 127;
+		localStorage.setItem("emojiseek", start);
+	} else if (target == "before") {
+		var start = start - 127;
+		localStorage.setItem("emojiseek", start);
 	} else {
-		var start = 0
-		localStorage.getItem('emojiseek', 0)
+		var start = 0;
+		localStorage.getItem("emojiseek", 0)
 	}
-	var html = ''
-	var raw = JSON.parse(localStorage.getItem('emojis_' + acct_id))
-	console.log(raw)
-	if (raw.if_categorized) {
-		var obj = [
-			{
-				divider: true,
-				cat: lang.lang_emoji_uncat
-			}
-		]
-		var cats = raw['uncategorized']
-		obj = obj.concat(cats)
-		Object.keys(raw['categorized']).forEach(function(key) {
-			var cats = raw['categorized'][key]
-			obj = obj.concat([
-				{
-					divider: true,
-					cat: key
-				}
-			])
-			obj = obj.concat(cats)
-		})
-	} else {
-		var obj = raw['uncategorized']
-	}
-	console.log(obj)
-
-	var num = obj.length
+	var html = '';
+	var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
+	var num = obj.length;
 	if (num < start) {
-		var start = 0
-		localStorage.setItem('emojiseek', start)
+		var start = 0;
+		localStorage.setItem("emojiseek", start);
 	}
-	var page = Math.ceil(num / 126)
-	$('#emoji-sum').text(page)
-	var ct = Math.ceil(start / 126)
+	var page = Math.ceil(num / 126);
+	$("#emoji-sum").text(page);
+	var ct = Math.ceil(start / 126);
 	if (ct === 0) {
-		if (num > 0) {
-			var ct = 1
-		}
-		$('#emoji-before').addClass('disabled')
+		var ct = 1;
+		$("#emoji-before").addClass("disabled");
 	} else {
-		$('#emoji-before').removeClass('disabled')
+		$("#emoji-before").removeClass("disabled");
 	}
-	if (page != 1) {
-		$('#emoji-next').removeClass('disabled')
-	} else {
-		$('#emoji-next').addClass('disabled')
-	}
-	$('#emoji-count').text(ct)
+	$("#emoji-next").removeClass("disabled");
+	$("#emoji-count").text(ct);
 	for (i = start; i < start + 126; i++) {
-		var emoji = obj[i]
+		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"></a>';
 			} else {
-				if (emoji.divider) {
-					html = html + '<p style="margin-bottom:0">' + emoji.cat + '</p>'
-				} else {
-					if (emoji.listed) {
-						html =
-							html +
-							`<a onclick="emojiInsert(':${emoji.shortcode}:')" class="pointer"><img src="${emoji.url}" width="20" title="${emoji.shortcode}"></a>`
-					}
-				}
+				html = html + '<a onclick="emojiInsert(\':' + emoji.shortcode +
+					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
 			}
+
 		}
 	}
-	$('#emoji-list').html(html)
+	$("#emoji-list").html(html);
 }
 
 //絵文字など様々なものをテキストボックスに挿入
 function emojiInsert(code, del) {
-	if (localStorage.getItem('emoji-zero-width') == 'yes') {
-		var blankBefore = '​'
-		var blankAfter = '​'
+	var now = $("#textarea").val();
+	var selin = $("#textarea").prop('selectionStart');
+	if (localStorage.getItem("emoji-zero-width") == "yes") {
+		var blank = "​";
 	} else {
-		var blankBefore = ' '
-		var blankAfter = ' '
+		var blank = " ";
 	}
-	var textarea = document.querySelector('#textarea')
-	var sentence = textarea.value
-	var len = sentence.length
-	var pos = textarea.selectionStart
-	if (del) {
-		var delLen = del.length
+	var before = now.substr(0, selin);
+	if (before.slice(-1) != " ") {
+		before = before + blank
+	}
+	var after = now.substr(selin, now.length);
+	if (after.slice(-1) != " ") {
+		after = blank + after
+	}
+	newt = before + code + after;
+	if (!del) {
+		$("#textarea").val(newt);
+		//emoji();
 	} else {
-		var delLen = 0
+		var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
+		var now = now.replace(regExp, "");
+		$("#textarea").val(now + blank + code);
 	}
-	var before = sentence.substr(0, pos - delLen)
-	var last = before.substr(-1, 1)
-	if (last == ' ') blankBefore = ''
-	var after = sentence.substr(pos, len)
-	var start = after.substr(0, 1)
-	if (start == ' ') blankAfter = ''
-	if (len == 0) {
-		var word = code
-	} else if (len == pos) {
-		var word = blankBefore + code
-	} else if (pos == 0) {
-		var word = code + blankAfter
-	} else {
-		var word = blankBefore + code + blankAfter
-	}
-	sentence = before + word + after
-	textarea.value = sentence
+
+	$("#textarea").focus();
 }
 //改行挿入
 function brInsert(code) {
-	if (!$('#post-box').hasClass('appear')) {
-		localStorage.setItem('nohide', true)
-		show()
+	if (!$('#post-box').hasClass("appear")) {
+		localStorage.setItem("nohide", true);
+		show();
 	}
-	var now = $('#textarea').val()
-	$('#textarea').val(now + code)
-	$('#textarea').focus()
+	var now = $("#textarea").val();
+	$("#textarea").val(now + code);
+	$("#textarea").focus();
 }

app/js/post/img.js

@@ -1,252 +1,219 @@
 //ドラッグ・アンド・ドロップからアップロードまで。uiのimg.jsとは異なります。
-var obj = $('body')
-var system
+var obj = $("body");
+var system;
 //ドラッグスタート
-obj.on('dragstart', function(e) {
-	system = 'locked'
-})
+obj.on('dragstart', function (e) {
+	system = "locked"
+});
 //何もなくファイルが通過
-obj.on('dragend', function(e) {
-	system = ''
-})
+obj.on('dragend', function (e) {
+	system = "";
+});
 //ドラッグファイルが画面上に
-obj.on('dragenter', function(e) {
-	if (system != 'locked') {
-		$('#drag').css('display', 'flex')
+obj.on('dragenter', function (e) {
+	if (system != "locked") {
+		$("#drag").css('display', 'flex');
 	}
-})
-$('body').on('dragover', function(e) {
-	e.stopPropagation()
-	e.preventDefault()
-})
+
+});
+$("body").on('dragover', function (e) {
+	e.stopPropagation();
+	e.preventDefault();
+});
 //ドロップした
-$('body').on('drop', function(e) {
-	if (system != 'locked') {
-		$('#drag').css('display', 'none')
-		e.preventDefault()
-		var files = e.originalEvent.dataTransfer.files
-		pimg(files)
+$("body").on('drop', function (e) {
+	if (system != "locked") {
+		$("#drag").css('display', 'none');
+		e.preventDefault();
+		var files = e.originalEvent.dataTransfer.files;
+		pimg(files);
 	}
-})
+});
 //何もなくファイルが通過
-$('#drag').on('dragleave', function(e) {
-	$('#drag').css('display', 'none')
-})
+$("#drag").on('dragleave', function (e) {
+	$("#drag").css('display', 'none');
+});
 
 //複数アップ
 function pimg(files) {
-	console.table(files)
+	console.table(files);
 	for (i = 0; i < files.length; i++) {
-		var dot = files[i].path.match(/\.(.+)$/)[1]
-		if (dot == 'bmp' || dot == 'BMP') {
-			postMessage(['bmpImage', [files[i].path, i]], '*')
-			todo(lang.lang_progress)
+		var dot = files[i].path.match(/\.(.+)$/)[1];
+		if (dot == "bmp" || dot == "BMP") {
+			postMessage(["bmpImage", [files[i].path, i]], "*")
+			todo(lang.lang_progress);
+
 		} else {
-			handleFileUpload(files[i], obj, i)
+			handleFileUpload(files[i], obj, i);
 		}
 	}
 }
 //ドラッグ・アンド・ドロップを終了
 function closedrop() {
-	$('#drag').css('display', 'none')
+	$("#drag").css('display', 'none');
 }
 //ファイル選択
 function fileselect() {
-	postMessage(['sendSinmpleIpc', 'file-select'], '*')
+	postMessage(["sendSinmpleIpc", "file-select"], "*")
 }
 
 //ファイル読み込み
 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)
+	var fr = new FileReader();
+	fr.onload = function (evt) {
+		var b64 = evt.target.result;
+		$('#b64-box').val(b64);
+		var ret = media(b64, files["type"], no)
 	}
-	fr.readAsDataURL(files)
-	$('#mec').append(files['name'] + '/')
+	fr.readAsDataURL(files);
+	$("#mec").append(files["name"] + "/");
 }
 
 //ファイルアップロード
-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
-	}
-	var l = 4
-	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
-	var cl = c.length
-	var r = ''
+function media(b64, type, no) {
+	var l = 4;
+	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
+	var cl = c.length;
+	var r = "";
 	for (var i = 0; i < l; i++) {
-		r += c[Math.floor(Math.random() * cl)]
+		r += c[Math.floor(Math.random() * cl)];
 	}
-	if ($('#media').val()) {
-		$('#media').val($('#media').val() + ',' + 'tmp_' + r)
+	if ($("#media").val()) {
+		$("#media").val($("#media").val() + ',' + "tmp_" + r);
 	} else {
-		$('#media').val('tmp_' + r)
+		$("#media").val("tmp_" + r);
 	}
-	$('.toot-btn-group').prop('disabled', true)
-	$('#post-acct-sel').prop('disabled', true)
-	localStorage.setItem('image', 'busy')
-	todo('Image Upload...')
-	var media = toBlob(b64, type)
-	var fd = new FormData()
-	fd.append('file', media)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var httpreq = new XMLHttpRequest()
-	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		var start = 'https://' + domain + '/api/drive/files/create'
-		httpreq.open('POST', start, true)
-		httpreq.upload.addEventListener('progress', progshow, false)
-		httpreq.responseType = 'json'
-		if ($('#nsfw').hasClass('nsfw-avail')) {
-			var nsfw = true
+	$(".toot-btn-group").prop("disabled", true);
+	$("#post-acct-sel").prop("disabled", true);
+	localStorage.setItem("image", "busy");
+	todo("Image Upload...");
+	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") {
+		var start = "https://" + domain + "/api/drive/files/create";
+		httpreq.open('POST', start, true);
+		httpreq.upload.addEventListener("progress", progshow, false);
+		httpreq.responseType = "json";
+		if ($("#nsfw").hasClass("nsfw-avail")) {
+			var nsfw = true;
 		} else {
-			var nsfw = false
+			var nsfw = false;
 		}
-		var previewer = 'url'
-		fd.append('i', at)
-		httpreq.send(fd)
+		var previewer = "url"
+		fd.append('i', at);
+		//fd.append('isSensitive', nsfw);
+		httpreq.send(fd);
 	} else {
-		var previewer = 'preview_url'
-		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 previewer = "preview_url"
+		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() {
+	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()
-			}
+			var json = httpreq.response;
 			if (!json.id) {
-				todc()
-				$('#imgup').text('')
-				$('.toot-btn-group').prop('disabled', false)
-				$('#post-acct-sel').prop('disabled', false)
-				$('select').formSelect()
-				$('#imgsel').show()
+				todc();
+				$("#imgup").text("");
+				$(".toot-btn-group").prop("disabled", false);
+				$("#post-acct-sel").prop("disabled", false);
+				$('select').formSelect();
+				$("#imgsel").show();
 				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
 				return false
 			}
-			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}">`
-				$('#preview').append(html)
+			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"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';
+				$('#preview').append(html);
 			} else {
-				$('#preview').append(lang.lang_postimg_previewdis)
+				$('#preview').append(lang.lang_postimg_previewdis);
 			}
 			if (!img) {
-				var img = 'no-act'
+				var img = "no-act";
 			}
-			if (img != 'inline') {
-				var mediav = $('#media').val()
-				var regExp = new RegExp('tmp_' + r, 'g')
-				mediav = mediav.replace(regExp, json['id'])
-				$('#media').val(mediav)
+			if (img != "inline") {
+				var mediav = $("#media").val();
+				var regExp = new RegExp("tmp_" + r, "g");
+				mediav = mediav.replace(regExp, json["id"]);
+				$("#media").val(mediav);
+
 			}
-			if (img == 'url' && json['text_url']) {
-				$('#textarea').val($('#textarea').val() + ' ' + 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)
+			todc();
+			$(".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')
+			$("#imgup").text("");
+			$("#imgsel").show();
+			localStorage.removeItem("image");
 		}
 	}
 }
 
 //Base64からBlobへ
 function toBlob(base64, type) {
-	var bin = atob(base64.replace(/^.*,/, ''))
-	var buffer = new Uint8Array(bin.length)
+	var bin = atob(base64.replace(/^.*,/, ''));
+	var buffer = new Uint8Array(bin.length);
 	for (var i = 0; i < bin.length; i++) {
-		buffer[i] = bin.charCodeAt(i)
+		buffer[i] = bin.charCodeAt(i);
 	}
 	// Blobを作成
 	try {
 		var blob = new Blob([new Uint8Array(buffer)], {
 			type: type
-		})
+		});
 	} catch (e) {
-		return false
+		return false;
 	}
 
-	return blob
+	return blob;
 }
 //画像を貼り付けたら…
-var element = document.querySelector('#textarea')
-element.addEventListener('paste', function(e) {
+var element = document.querySelector("#textarea");
+element.addEventListener("paste", function (e) {
 	if (!e.clipboardData || !e.clipboardData.items) {
-		return true
+		return true;
 	}
 	// DataTransferItemList に画像が含まれいない場合は終了する
-	var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'))
+	var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'));
 	if (imageItems.length == 0) {
-		console.warn('it is not image')
-		return true
+		console.warn("it is not image")
+		return true;
 	}
 
 	// ファイルとして得る
 	// DataTransferItem の kind は file なので getAsString ではなく getAsFile を呼ぶ
-	var imageFile = imageItems[0].getAsFile()
-	var imageType = imageItems[0].type
+	var imageFile = imageItems[0].getAsFile();
+	var imageType = imageItems[0].type;
 
 	// FileReaderで読み込む
-	var fr = new FileReader()
-	fr.onload = function(e) {
+	var fr = new FileReader();
+	fr.onload = function (e) {
 		// onload内ではe.target.resultにbase64が入っているのであとは煮るなり焼くなり
-		var base64 = e.target.result
-		var mediav = $('#media').val()
+		var base64 = e.target.result;
+		var mediav = $("#media").val();
 		if (mediav) {
-			var i = mediav.split(',').length
+			var i = mediav.split(",").length;
 		}
 		// DataTransferItem の type に mime tipes があるのでそれを使う
 		media(base64, imageType, i)
-	}
-	fr.readAsDataURL(imageFile)
+	};
+	fr.readAsDataURL(imageFile);
 
 	// 画像以外がペーストされたときのために、元に戻しておく
-})
+});
 function deleteImage(key) {
 	Swal.fire({
 		title: lang.lang_postimg_delete,
@@ -256,80 +223,19 @@ function deleteImage(key) {
 		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
 		cancelButtonText: lang.lang_no
-	}).then(result => {
+	}).then((result) => {
 		if (result.value) {
-			var media = $('#media').val()
-			var arr = media.split(',')
+			var media = $("#media").val();
+			var arr = media.split(",");
 			for (var i = 0; i < media.length; i++) {
 				if (arr[i] == key) {
-					arr.splice(i, 1)
-					break
+					arr.splice(i, 1);
+					break;
 				}
 			}
-			$('#media').val(arr.join(','))
-			$('#preview [data-media=' + key + ']').remove()
+			$("#media").val(arr.join(","));
+			$('#preview [data-media=' + key + ']').remove();
 		}
 	})
-}
-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
 
-	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')
-	}
 }

app/js/post/misskeystatus.js

@@ -1,278 +1,241 @@
 //Renpost
 function renote(id, acct_id, remote) {
-	if ($('#pub_' + id).hasClass('rted')) {
-		return false
-	}
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/notes/create'
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
-		return false
-	}
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('POST', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.responseType = 'json'
-	httpreq.send(JSON.stringify({ i: at, renoteId: id }))
-	httpreq.onreadystatechange = function() {
-		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, json)
-			}
-			console.log(['Success: renote', json])
-			$('[toot-id=' + id + ']').addClass('rted')
-			$('.rt_' + id).toggleClass('teal-text')
-		}
-	}
+    if ($("#pub_" + id).hasClass("rted")) {
+        return false;
+    }
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    var start = "https://" + domain + "/api/notes/create";
+    if (localStorage.getItem("mode_" + domain) != "misskey") {
+        return false;
+    }
+    var httpreq = new XMLHttpRequest();
+    httpreq.open('POST', start, true);
+    httpreq.setRequestHeader('Content-Type', 'application/json');
+    httpreq.responseType = "json";
+    httpreq.send(JSON.stringify({ i: at, renoteId: id }));
+    httpreq.onreadystatechange = function () {
+        if (httpreq.readyState === 4) {
+            var json = httpreq.response;
+            console.log(["Success: renote", json]);
+            $("[toot-id=" + id + "]").addClass("rted");
+            $(".rt_" + id).toggleClass("teal-text");
+        }
+    }
 }
 //Renote
 function renoteqt(id, acct_id) {
-	localStorage.setItem('nohide', true)
-	show()
-	$('#reply').val('renote_' + id)
-	$('#rec').text('Renote')
-	$('#post-acct-sel').val(acct_id)
-	$('#post-acct-sel').prop('disabled', true)
-	$('select').formSelect()
-	$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
-	$('#textarea').focus()
+    localStorage.setItem("nohide", true);
+    show();
+    $("#reply").val("renote_" + id);
+    $("#rec").text("Renote");
+    $("#post-acct-sel").val(acct_id);
+    $("#post-acct-sel").prop("disabled", true);
+    $('select').formSelect();
+    $("#textarea").attr("placeholder", lang.lang_misskeyparse_qt);
+    $("#textarea").focus();
 }
 //Reply
 function misskeyreply(id, acct_id) {
-	localStorage.setItem('nohide', true)
-	show()
-	$('#reply').val(id)
-	$('#rec').text('Renote')
-	$('#post-acct-sel').val(acct_id)
-	$('#post-acct-sel').prop('disabled', true)
-	$('select').formSelect()
-	$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
-	$('#textarea').focus()
+    localStorage.setItem("nohide", true);
+    show();
+    $("#reply").val(id);
+    $("#rec").text("Renote");
+    $("#post-acct-sel").val(acct_id);
+    $("#post-acct-sel").prop("disabled", true);
+    $('select').formSelect();
+    $("#textarea").attr("placeholder", lang.lang_misskeyparse_qt);
+    $("#textarea").focus();
 }
 //Reaction
 function reactiontoggle(id, acct_id, tlid) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/notes/show'
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
-		return false
-	}
-	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 }))
-	httpreq.onreadystatechange = function() {
-		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, json)
-			}
-			console.log(['Success: reaction', json])
-			if (json.reactions) {
-				var reactions = [
-					'like',
-					'love',
-					'laugh',
-					'hmm',
-					'surprise',
-					'congrats',
-					'angry',
-					'confused',
-					'pudding',
-					'rip'
-				]
-				for (var i = 0; i < reactions.length; i++) {
-					if (json.reactions[reactions[i]]) {
-						$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(json.reactions[reactions[i]])
-						$('#pub_' + id + ' .re-' + reactions[i]).removeClass('hide')
-					} else {
-						$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(0)
-						if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
-							$('#pub_' + id + ' .re-' + reactions[i]).addClass('hide')
-						} else {
-							$('#pub_' + id + ' .re-' + reactions[i]).removeClass('hide')
-						}
-						$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(json.reactions[reactions[i]])
-					}
-				}
-				$('#pub_' + id + ' .reactions').removeClass('hide')
-				$('#pub_' + id + ' .reactions').toggleClass('fullreact')
-			} else {
-				if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
-					$('#pub_' + id + ' .reactions').addClass('hide')
-					$('#pub_' + id + ' .reactions').removeClass('fullreact')
-				} else {
-					$('#pub_' + id + ' .reactions').removeClass('hide')
-					$('#pub_' + id + ' .reaction').removeClass('hide')
-					$('#pub_' + id + ' .reactions').addClass('fullreact')
-				}
-			}
-		}
-	}
-	$('#pub_' + id + ' .freeReact').toggleClass('hide')
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    var start = "https://" + domain + "/api/notes/show";
+    if (localStorage.getItem("mode_" + domain) != "misskey") {
+        return false;
+    }
+    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 }));
+    httpreq.onreadystatechange = function () {
+        if (httpreq.readyState === 4) {
+            var json = httpreq.response;
+            console.log(["Success: reaction", json]);
+            if (json.reactions) {
+                var reactions = ["like", "love", "laugh", "hmm", "surprise", "congrats", "angry", "confused", "pudding", "rip"];
+                for (var i = 0; i < reactions.length; i++) {
+                    if (json.reactions[reactions[i]]) {
+                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
+                        $("#pub_" + id + " .re-" + reactions[i]).removeClass("hide")
+                    } else {
+                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(0)
+                        if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
+                            $("#pub_" + id + " .re-" + reactions[i]).addClass("hide")
+                        } else {
+                            $("#pub_" + id + " .re-" + reactions[i]).removeClass("hide")
+                        }
+                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
+                    }
+                }
+                $("#pub_" + id + " .reactions").removeClass("hide");
+                $("#pub_" + id + " .reactions").toggleClass("fullreact")
+            } else {
+                if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
+                    $("#pub_" + id + " .reactions").addClass("hide")
+                    $("#pub_" + id + " .reactions").removeClass("fullreact")
+                } else {
+                    $("#pub_" + id + " .reactions").removeClass("hide");
+                    $("#pub_" + id + " .reaction").removeClass("hide");
+                    $("#pub_" + id + " .reactions").addClass("fullreact");
+                }
+            }
+        }
+    }
+    $("#pub_" + id + " .freeReact").toggleClass("hide");
 }
 //reactioncustom
 function reactioncustom(acct_id, id) {
-	$('#reply').val(id)
-	$('#media').val('misskey')
-	$('#unreact').hide()
-	$('#addreact').removeClass('hide')
-	$('#post-acct-sel').val(acct_id)
-	$('select').formSelect()
-	localStorage.setItem('nohide', true)
-	show()
-	emojiToggle(true)
-	$('#left-side').hide()
-	$('#default-emoji').hide()
+    $("#reply").val(id);
+    $("#unreact").hide();
+    $("#addreact").removeClass("hide");
+    $("#post-acct-sel").val(acct_id);
+    $('select').formSelect();
+    localStorage.setItem("nohide", true);
+    show()
+    emojiToggle(true)
+    $("#left-side").hide();
+    $("#default-emoji").hide();
 }
 function reactRefresh(acct_id, id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/notes/show'
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    var start = "https://" + domain + "/api/notes/show";
 
-	var req = {}
-	req.i = at
-	req.noteId = id
-	var i = {
-		method: 'POST',
-		body: JSON.stringify(req)
-	}
-	fetch(start, i)
-		.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) {
-				return false
-			}
-			var poll = ''
-			if (json.error) {
-				$('[toot-id=' + id + ']').hide()
-				$('[toot-id=' + id + ']').remove()
-			} else {
-				reactRefreshCore(json)
-			}
-		})
+    var req = {};
+    req.i = at;
+    req.noteId = id;
+    var i = {
+        method: "POST",
+        body: JSON.stringify(req),
+    }
+    fetch(start, i,
+    ).then(function (response) {
+        return response.json();
+    }).catch(function (error) {
+        todo(error);
+        console.error(error);
+    }).then(function (json) {
+        if (!json) {
+            return false;
+        }
+        var poll = "";
+        if (json.error) {
+            $("[toot-id=" + id + "]").hide();
+            $("[toot-id=" + id + "]").remove();
+        } else {
+            reactRefreshCore(json)
+        }
+    });
 }
 function reactRefreshCore(json) {
-	var id = json.id
-	if (json.reactions) {
-		$('#pub_' + id + ' .reactions').removeClass('hide')
-		var regExp = new RegExp(':', 'g')
-		Object.keys(json.reactions).forEach(function(keye) {
-			keyeClass = keye.replace(regExp, '')
-			if (json.reactions[keye]) {
-				$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(json.reactions[keye])
-				$('#pub_' + id + ' .re-' + keyeClass).removeClass('hide')
-			} else {
-				$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(0)
-				if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
-					$('#pub_' + id + ' .re-' + keyeClass).addClass('hide')
-				}
-				$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(json.reactions[keye])
-			}
-		})
-	}
+    var id = json.id;
+    if (json.reactions) {
+        $("#pub_" + id + " .reactions").removeClass("hide")
+        var regExp = new RegExp(":", "g");
+        Object.keys(json.reactions).forEach(function (keye) {
+            keyeClass = keye.replace(regExp, '');
+            if (json.reactions[keye]) {
+                $("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
+                $("#pub_" + id + " .re-" + keyeClass).removeClass("hide")
+            } else {
+                $("#pub_" + id + " .re-" + keyeClass + "ct").text(0)
+                if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
+                    $("#pub_" + id + " .re-" + keyeClass).addClass("hide")
+                }
+                $("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
+            }
+        });
+    }
 }
 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)
-	}
-	clear()
-	hide()
+    var acct_id = $("#post-acct-sel").val();
+    var id = $("#reply").val();
+    reaction(emoji, id, acct_id, null)
+    clear();
+    hide();
 }
 function reaction(mode, id, acct_id, tlid) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if ($('.fav_' + id).hasClass('yellow-text')) {
-		var flag = 'delete'
-	} else {
-		var flag = 'create'
-	}
-	var start = 'https://' + domain + '/api/notes/reactions/' + flag
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
-		return false
-	}
-	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, reaction: mode }))
-	httpreq.onreadystatechange = function() {
-		if (httpreq.readyState === 4) {
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
-			$('.fav_' + id).toggleClass('yellow-text')
-		}
-	}
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    if ($(".fav_" + id).hasClass("yellow-text")) {
+        var flag = "delete";
+    } else {
+        var flag = "create";
+    }
+    var start = "https://" + domain + "/api/notes/reactions/" + flag;
+    if (localStorage.getItem("mode_" + domain) != "misskey") {
+        return false;
+    }
+    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, reaction: mode }));
+    httpreq.onreadystatechange = function () {
+        if (httpreq.readyState === 4) {
+            $(".fav_" + id).toggleClass("yellow-text");
+        }
+    }
 }
 //Vote
 function vote(acct_id, id, to) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/notes/polls/vote'
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
-		return false
-	}
-	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, choice: to }))
-	httpreq.onreadystatechange = function() {
-		voterefresh(acct_id, id)
-	}
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    var start = "https://" + domain + "/api/notes/polls/vote";
+    if (localStorage.getItem("mode_" + domain) != "misskey") {
+        return false;
+    }
+    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, choice: to }));
+    httpreq.onreadystatechange = function () {
+        voterefresh(acct_id, id)
+    }
 }
 function voterefresh(acct_id, id) {
-	var httpreqd = new XMLHttpRequest()
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/notes/show'
-	httpreqd.open('POST', start, true)
-	httpreqd.setRequestHeader('Content-Type', 'application/json')
-	httpreqd.responseType = 'json'
-	httpreqd.send(JSON.stringify({ i: at, noteId: id }))
-	httpreqd.onreadystatechange = function() {
-		if (httpreqd.readyState == 4) {
-			var json = httpreqd.response
-			if (this.status !== 200) {
-				setLog(start, this.status, json)
-			}
-			if (!json) {
-				return false
-			}
-			var poll = ''
-			if (json.poll) {
-				var choices = json.poll.choices
-				Object.keys(choices).forEach(function(keyc) {
-					var choice = choices[keyc]
-					if (choice.isVoted) {
-						var myvote = twemoji.parse('✅')
-					} else {
-						var myvote = ''
-					}
-					poll = poll + `<div class="pointer vote" onclick="vote('${acct_id}','${json.id}',"${choice.id}')">${escapeHTML(choice.text)}(${choice.votes})${myvote})</div>`
-				})
-				$('.vote_' + json.id).html(poll)
-			}
-		}
-	}
-}
+    var httpreqd = new XMLHttpRequest();
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    var start = "https://" + domain + "/api/notes/show";
+    httpreqd.open('POST', start, true);
+    httpreqd.setRequestHeader('Content-Type', 'application/json');
+    httpreqd.responseType = 'json';
+    httpreqd.send(JSON.stringify({ i: at, noteId: id }));
+    httpreqd.onreadystatechange = function () {
+        if (httpreqd.readyState == 4) {
+            var json = httpreqd.response;
+            if (!json) {
+                return false;
+            }
+            var poll = "";
+            if (json.poll) {
+                var choices = json.poll.choices;
+                Object.keys(choices).forEach(function (keyc) {
+                    var choice = choices[keyc];
+                    if (choice.isVoted) {
+                        var myvote = twemoji.parse("✅");
+                    } else {
+                        var myvote = "";
+                    }
+                    poll = poll + '<div class="pointer vote" onclick="vote(\'' + acct_id + '\',\'' + json.id + '\',' + choice.id + ')">' + escapeHTML(choice.text) + '(' + choice.votes + '' + myvote + ')</div>';
+                });
+                $(".vote_" + json.id).html(poll)
+            }
+        }
+    }
+}

app/js/post/post.js

@@ -1,46 +1,35 @@
 /*投稿系*/
 //投稿
 function sec() {
-	var mode = localStorage.getItem('sec')
-	var acct_id = $('#post-acct-sel').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
-	if (~domain.indexOf('kirishima.cloud') >= 0 && mode == 'local') {
-		mode = 'unlisted'
+	var mode = localStorage.getItem("sec");
+	var acct_id = $("#post-acct-sel").val();
+	var domain = localStorage.getItem("domain_" + acct_id);
+	if (~domain.indexOf("kirishima.cloud") >= 0 && mode == "local") {
+		mode = "unlisted";
 	}
-	post(null, mode)
+	post(null, mode);
 }
 function post(mode, postvis) {
-	if ($('#toot-post-btn').prop('disabled')) {
-		return false
+	if ($("#toot-post-btn").prop("disabled")) {
+		return false;
 	}
-	var str = $('#textarea').val()
-	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()
+	var str = $("#textarea").val();
+	var acct_id = $("#post-acct-sel").val();
+	localStorage.setItem("last-use", acct_id);
+	var domain = localStorage.getItem("domain_" + acct_id);
+	if (!localStorage.getItem("cw_sentence")) {
+		var cw_sent = 500;
 	} else {
-		var user = localStorage.getItem('user_' + acct_id)
-		var ideKey = Math.floor(Date.now() / 1000) + '/TheDesk/' + user + '@' + domain
-		$('#ideKey').val(ideKey)
+		var cw_sent = localStorage.getItem("cw_sentence");
 	}
-	if (!localStorage.getItem('cw_sentence')) {
-		var cw_sent = 500
+	if (!localStorage.getItem("cw_letters")) {
+		var cw_ltres = 7000;
 	} else {
-		var cw_sent = localStorage.getItem('cw_sentence')
+		var cw_ltres = localStorage.getItem("cw_letters");
 	}
-	if (!localStorage.getItem('cw_letters')) {
-		var cw_ltres = 7000
-	} else {
-		var cw_ltres = localStorage.getItem('cw_letters')
-	}
-	if (domain != 'kirishima.cloud') {
-		if (
-			mode != 'pass' &&
-			!$('#cw').hasClass('cw-avail') &&
-			(str.length > cw_sent || str.split('\n').length - 1 > cw_ltres)
-		) {
-			var plus = str.replace(/\n/g, '').slice(0, 10) + '...'
+	if (domain != "kirishima.cloud") {
+		if (mode != "pass" && !$("#cw").hasClass("cw-avail") && (str.length > cw_sent || (str.split("\n").length - 1) > cw_ltres)) {
+			var plus = str.replace(/\n/g, "").slice(0, 10) + "...";
 			Swal.fire({
 				title: lang.lang_post_cwtitle,
 				text: lang.lang_post_cwtxt + plus,
@@ -51,34 +40,34 @@ function post(mode, postvis) {
 				confirmButtonText: lang.lang_post_btn2,
 				cancelButtonText: lang.lang_post_btn3,
 				showCloseButton: true,
-				focusConfirm: false
-			}).then(result => {
-				if (result.dismiss == 'cancel') {
+				focusConfirm: false,
+			}).then((result) => {
+				if (result.dismiss == "cancel") {
 					//btn3:sonomama
-					post('pass')
+					post("pass")
 				} else if (result.value) {
 					//btn2:auto-CW
-					$('#cw-text').show()
-					$('#cw').addClass('yellow-text')
-					$('#cw').addClass('cw-avail')
-					$('#cw-text').val(plus)
-					post('pass')
+					$("#cw-text").show();
+					$("#cw").addClass("yellow-text");
+					$("#cw").addClass("cw-avail");
+					$("#cw-text").val(plus);
+					post("pass")
 				}
 			})
-			return false
+			return false;
 		}
 	}
-	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		misskeyPost()
-		return
+	if (localStorage.getItem("mode_" + domain) == "misskey") {
+		misskeyPost();
+		return;
 	}
-	$('.toot-btn-group').prop('disabled', true)
-	todo('Posting')
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/statuses'
-	var reply = $('#reply').val()
-	if (str.indexOf(localStorage.getItem('stable')) == -1) {
-		str + ' #' + localStorage.getItem('stable')
+	$(".toot-btn-group").prop("disabled", true);
+	todo("Posting");
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/statuses";
+	var reply = $("#reply").val();
+	if (str.indexOf(localStorage.getItem("stable")) == -1) {
+		str + " #" + localStorage.getItem("stable");
 	}
 	var toot = {
 		status: str
@@ -86,66 +75,66 @@ function post(mode, postvis) {
 	if (reply) {
 		toot.in_reply_to_id = reply
 	}
-	var media = $('#media').val()
+	var media = $("#media").val();
 	if (media) {
-		toot.media_ids = media.split(',')
+		toot.media_ids = media.split(",");
 	}
-	var quote = $('#quote').val()
+	var quote = $("#quote").val();
 	if (quote) {
-		toot.quote_id = quote
+		toot.quote_id = quote;
 	}
-	if ($('#nsfw').hasClass('nsfw-avail')) {
-		var nsfw = 'true'
-		toot.sensitive = nsfw
+	if ($("#nsfw").hasClass("nsfw-avail")) {
+		var nsfw = "true";
+		toot.sensitive = nsfw;
 	} else {
-		var nsfw = 'false'
+		var nsfw = "false";
 	}
 	if (postvis) {
-		var vis = postvis
+		var vis = postvis;
 	} else {
-		var vis = $('#vis').text()
+		var vis = $("#vis").text();
 	}
-	if (vis != 'inherit' && vis != 'local') {
-		toot.visibility = vis
-	} else if (vis == 'local') {
-		toot.status = str + '👁️'
+	if (vis != "inherit" && vis != "local") {
+		toot.visibility = vis;
+	} else if (vis == "local") {
+		toot.status = str + "👁️";
 	}
-	if ($('#cw').hasClass('cw-avail')) {
-		var spo = $('#cw-text').val()
-		cw()
-		toot.spoiler_text = spo
+	if ($("#cw").hasClass("cw-avail")) {
+		var spo = $("#cw-text").val();
+		cw();
+		toot.spoiler_text = spo;
 	} else {
-		var spo = ''
+		var spo = "";
 	}
-	if ($('#sch-box').hasClass('sch-avail')) {
-		var scheduled = formattimeutc(new Date(Date.parse($('#sch-date').val())))
-		console.log('This toot will be posted at:' + scheduled)
-		schedule()
-		toot.scheduled_at = scheduled
+	if ($("#sch-box").hasClass("sch-avail")) {
+		var scheduled = formattimeutc(new Date(Date.parse($("#sch-date").val())))
+		console.log("This toot will be posted at:" + scheduled)
+		schedule();
+		toot.scheduled_at = scheduled;
 	} else {
-		var scheduled = ''
+		var scheduled = "";
 	}
-	if (!$('#poll').hasClass('hide')) {
-		var options = []
-		$('.mastodon-choice').map(function() {
-			var choice = $(this).val()
-			if (choice != '') {
-				options.push(choice)
+	if (!$("#poll").hasClass("hide")) {
+		var options = [];
+		$(".mastodon-choice").map(function () {
+			var choice = $(this).val();
+			if (choice != "") {
+				options.push(choice);
 			}
-		})
-		if ($('#poll-multiple:checked').val() == '1') {
-			var mul = true
+		});
+		if ($("#poll-multiple:checked").val() == "1") {
+			var mul = true;
 		} else {
-			var mul = false
+			var mul = false;
 		}
-		if ($('#poll-until:checked').val() == '1') {
-			var htt = true
+		if ($("#poll-until:checked").val() == "1") {
+			var htt = true;
 		} else {
-			var htt = false
+			var htt = false;
 		}
-		var exin = pollCalc()
+		var exin = pollCalc();
 		if (!exin) {
-			todc('Error: Poll expires_in param')
+			todc("Error: Poll expires_in param")
 		}
 		toot.poll = {
 			options: options,
@@ -154,180 +143,154 @@ function post(mode, postvis) {
 			hide_totals: htt
 		}
 	}
-	console.table(toot)
-	var httpreq = new XMLHttpRequest()
-	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() {
+	console.table(toot);
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify(toot));
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, json)
-			} else {
-				$('#ideKey').val('')
+			var json = httpreq.response;
+			var box = localStorage.getItem("box");
+			if (box == "yes" || !box) {
+				$("#textarea").blur();
+				hide();
 			}
-			var box = localStorage.getItem('box')
-			if (box == 'yes' || !box) {
-				$('#textarea').blur()
-				hide()
-			}
-			$('.toot-btn-group').prop('disabled', false)
-			todc()
-			clear()
+			$(".toot-btn-group").prop("disabled", false);
+			todc();
+			clear();
 		}
 	}
 }
 function misskeyPost() {
-	var str = $('#textarea').val()
-	var acct_id = $('#post-acct-sel').val()
-	localStorage.setItem('last-use', acct_id)
-	var domain = localStorage.getItem('domain_' + acct_id)
-	$('.toot-btn-group').prop('disabled', true)
-	todo('Posting')
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/notes/create'
-	var reply = $('#reply').val()
+	var str = $("#textarea").val();
+	var acct_id = $("#post-acct-sel").val();
+	localStorage.setItem("last-use", acct_id);
+	var domain = localStorage.getItem("domain_" + acct_id);
+	$(".toot-btn-group").prop("disabled", true);
+	todo("Posting");
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/notes/create";
+	var reply = $("#reply").val();
 	var toot = {
 		text: str
 	}
 	if (reply) {
-		if (reply.indexOf('renote') !== -1) {
-			toot.renoteId = reply.replace('renote_', '')
+		if (reply.indexOf("renote") !== -1) {
+			toot.renoteId = reply.replace("renote_", "")
 		} else {
 			toot.replyId = reply
 		}
 	}
 
-	var media = $('#media').val()
+	var media = $("#media").val();
 	if (media) {
-		toot.mediaIds = media.split(',')
+		toot.mediaIds = media.split(",");
 	}
-	if ($('#nsfw').hasClass('nsfw-avail')) {
-		var nsfw = 'true'
-		toot.sensitive = nsfw
+	if ($("#nsfw").hasClass("nsfw-avail")) {
+		var nsfw = "true";
+		toot.sensitive = nsfw;
 	} else {
-		var nsfw = 'false'
+		var nsfw = "false";
 	}
-	var vis = $('#vis').text()
-	if (vis == 'unlisted') {
-		vis = 'home'
-	} else if (vis == 'direct') {
-		vis = 'specified'
-		toot.visibleUserIds = str
-			.match(/@([a-zA-Z0-9_@.-]+)(\s|$)/g)
-			.join('')
-			.split('@')
+	var vis = $("#vis").text();
+	if (vis == "unlisted") {
+		vis = "home"
+	} else if (vis == "direct") {
+		vis = "specified";
+		toot.visibleUserIds = str.match(/@([a-zA-Z0-9_@.-]+)(\s|$)/g).join('').split("@");
 	}
-	if (vis != 'inherit') {
-		toot.visibility = vis
+	if (vis != "inherit") {
+		toot.visibility = vis;
 	}
-	if ($('#cw').hasClass('cw-avail')) {
-		var spo = $('#cw-text').val()
-		cw()
-		toot.cw = spo
+	if ($("#cw").hasClass("cw-avail")) {
+		var spo = $("#cw-text").val();
+		cw();
+		toot.cw = spo;
 	} else {
-		var spo = ''
+		var spo = "";
 	}
-	toot.i = at
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('POST', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.responseType = 'json'
-	httpreq.send(JSON.stringify(toot))
-	httpreq.onreadystatechange = function() {
+	toot.i = at;
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify(toot));
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			if (str.indexOf(localStorage.getItem('stable')) == -1) {
-				localStorage.removeItem('stable')
+			if (str.indexOf(localStorage.getItem("stable")) == -1) {
+				localStorage.removeItem("stable")
 			}
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, json)
+			var json = httpreq.response;
+			console.log(["Success: toot", json]);
+			var box = localStorage.getItem("box");
+			if (box == "yes") {
+				hide();
+			} else if (box == "hide") {
+				$("body").addClass("mini-post");
+				$(".mini-btn").text("expand_less");
 			}
-			console.log(['Success: toot', json])
-			var box = localStorage.getItem('box')
-			if (box == 'yes') {
-				hide()
-			} else if (box == 'hide') {
-				$('body').addClass('mini-post')
-				$('.mini-btn').text('expand_less')
-			}
-			$('.toot-btn-group').prop('disabled', false)
-			todc()
-			clear()
+			$(".toot-btn-group").prop("disabled", false);
+			todc();
+			clear();
 		}
 	}
 }
 
 //クリア(Shift+C)
 function clear() {
-	$('#textarea').val('')
-	$('#ideKey').val('')
-	if (localStorage.getItem('stable')) {
-		$('#textarea').val('#' + localStorage.getItem('stable') + ' ')
+	$("#textarea").val("");
+	if (localStorage.getItem("stable")) {
+		$("#textarea").val("#" + localStorage.getItem("stable") + " ")
 	}
-	$('#textarea').attr('placeholder', lang.lang_toot)
-	$('#reply').val('')
-	$('#quote').val('')
-	$('#media').val('')
-	var cwt = localStorage.getItem('cw-text')
+	$("#textarea").attr("placeholder", lang.lang_toot);
+	$("#reply").val("");
+	$("#quote").val("");
+	$("#media").val("");
+	var cwt = localStorage.getItem("cw-text");
 	if (cwt) {
-		$('#cw-text').val(cwt)
+		$("#cw-text").val(cwt);
 	} else {
-		$('#cw-text').val('')
+		$("#cw-text").val("");
 	}
-	var acw = localStorage.getItem('always-cw')
-	if (acw != 'yes') {
-		$('#cw').removeClass('yellow-text')
-		$('#cw').removeClass('cw-avail')
-		$('#cw-text').hide()
+	var acw = localStorage.getItem("always-cw");
+	if (acw != "yes") {
+		$("#cw").removeClass("yellow-text");
+		$("#cw").removeClass("cw-avail");
+		$("#cw-text").hide();
 	} else {
-		$('#cw').addClass('yellow-text')
-		$('#cw').addClass('cw-avail')
-		$('#cw-text').show()
+		$("#cw").addClass("yellow-text");
+		$("#cw").addClass("cw-avail");
+		$("#cw-text").show();
 	}
-	$('#rec').text(lang.lang_no)
-	$('#mec').text(lang.lang_nothing)
-	loadVis()
-	$('#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('')
-	$('.toot-btn-group').prop('disabled', false)
-	$('#post-acct-sel').prop('disabled', false)
-	$('#days_poll').val(0)
-	$('#hours_poll').val(0)
-	$('#mins_poll').val(6)
-	$('#poll').addClass('hide')
-	$('#pollsta').text(lang.lang_no)
-	$('.mastodon-choice').map(function() {
-		$(this).val('')
-	})
-	localStorage.removeItem('image')
-	if (localStorage.getItem('mainuse') == 'main') {
-		$('#post-acct-sel').val(localStorage.getItem('main'))
+	$("#rec").text(lang.lang_no);
+	$("#mec").text(lang.lang_nothing);
+	loadVis();
+	$("#nsfw").removeClass("yellow-text");
+	$("#nsfw").html("visibility_off");
+	$("#nsfw").removeClass("nsfw-avail");
+	$("#nsc").text(lang.lang_nothing);
+	$("#drag").css("background-color", "#e0e0e0");
+	$("#preview").html("");
+	$(".toot-btn-group").prop("disabled", false);
+	$("#post-acct-sel").prop("disabled", false);
+	$("#days_poll").val(0);
+	$("#hours_poll").val(0);
+	$("#mins_poll").val(6);
+	$("#poll").addClass("hide")
+	$("#pollsta").text(lang.lang_no)
+	$(".mastodon-choice").map(function () {
+		$(this).val("");
+	});
+	localStorage.removeItem("image");
+	if (localStorage.getItem("mainuse") == "main") {
+		$("#post-acct-sel").val(localStorage.getItem("main"));
 	}
-	$('#emoji').addClass('hide')
-	$('select').formSelect()
-	$('#default-emoji').show()
-	$('#unreact').show()
-	$('#addreact').addClass('hide')
-	$('#right-side').hide()
-	$('#right-side').css('width', '300px')
-	$('#left-side').css('width', '100%')
-	var width = localStorage.getItem('postbox-width')
-	if (width) {
-		width = width.replace('px', '') * 1
-	} else {
-		width = 300
-	}
-	$('#post-box').css('width', width)
-	mdCheck()
-}
+	$('select').formSelect();
+	$("#left-side").show();
+	$("#default-emoji").show();
+	$("#unreact").show();
+	$("#addreact").addClass("hide");
+}

app/js/post/secure.js

@@ -1,128 +1,130 @@
 /*保護系*/
 //画像保護
 function nsfw() {
-	if ($('#nsfw').hasClass('nsfw-avail')) {
-		$('#nsfw').removeClass('yellow-text')
-		$('#nsfw').html('visibility_off')
-		$('#nsfw').removeClass('nsfw-avail')
+	if ($("#nsfw").hasClass("nsfw-avail")) {
+		$("#nsfw").removeClass("yellow-text");
+		$("#nsfw").html("visibility_off");
+		$("#nsfw").removeClass("nsfw-avail");
 	} else {
-		$('#nsfw').addClass('yellow-text')
-		$('#nsfw').html('visibility')
-		$('#nsfw').addClass('nsfw-avail')
+		$("#nsfw").addClass("yellow-text");
+		$("#nsfw").html("visibility");
+		$("#nsfw").addClass("nsfw-avail");
 	}
 }
 
 //投稿公開範囲
 function vis(set) {
-	$('#vis').text(set)
-	$('#vis-icon').removeClass('red-text')
-	$('#vis-icon').removeClass('orange-text')
-	$('#vis-icon').removeClass('blue-text')
-	$('#vis-icon').removeClass('purple-text')
-	$('#vis-icon').removeClass('light-blue-text')
-	$('#vis-icon').removeClass('teal-text')
-	if (set == 'public') {
-		$('#vis-icon').text('public')
-		$('#vis-icon').addClass('purple-text')
-	} else if (set == 'unlisted') {
-		$('#vis-icon').text('lock_open')
-		$('#vis-icon').addClass('blue-text')
-	} else if (set == 'private') {
-		$('#vis-icon').text('lock')
-		$('#vis-icon').addClass('orange-text')
-	} else if (set == 'direct') {
-		$('#vis-icon').text('mail')
-		$('#vis-icon').addClass('red-text')
-	} else if (set == 'limited') {
-		$('#vis-icon').text('group')
-		$('#vis-icon').addClass('teal-text')
-	} else if (set == 'local') {
-		$('#vis-icon').text('visibility')
-		$('#vis-icon').addClass('light-blue-text')
+	$("#vis").text(set);
+	$("#vis-icon").removeClass("red-text");
+	$("#vis-icon").removeClass("orange-text");
+	$("#vis-icon").removeClass("blue-text");
+	$("#vis-icon").removeClass("purple-text");
+	$("#vis-icon").removeClass("light-blue-text");
+	$("#vis-icon").removeClass("teal-text");
+	if (set == "public") {
+		$("#vis-icon").text("public");
+		$("#vis-icon").addClass("purple-text");
+	} else if (set == "unlisted") {
+		$("#vis-icon").text("lock_open");
+		$("#vis-icon").addClass("blue-text");
+	} else if (set == "private") {
+		$("#vis-icon").text("lock");
+		$("#vis-icon").addClass("orange-text");
+	} else if (set == "direct") {
+		$("#vis-icon").text("mail");
+		$("#vis-icon").addClass("red-text");
+	} else if (set == "limited") {
+		$("#vis-icon").text("group");
+		$("#vis-icon").addClass("teal-text");
+	} else if (set == "local") {
+		$("#vis-icon").text("visibility");
+		$("#vis-icon").addClass("light-blue-text");
 	}
-	var vis = localStorage.getItem('vis')
-	if (vis == 'memory') {
-		var acct_id = $('#post-acct-sel').val()
-		localStorage.setItem('vis-memory-' + acct_id, set)
+	var vis = localStorage.getItem("vis");
+	if (vis == "memory") {
+		var acct_id = $("#post-acct-sel").val();
+		localStorage.setItem("vis-memory-" + acct_id, set);
 	}
 	var ins = M.Dropdown.getInstance($('#dropdown1'))
-	if (ins) {
-		ins.close()
+	if(ins){
+		ins.close();
 	}
 }
 function loadVis() {
-	var vist = localStorage.getItem('vis')
+	var vist = localStorage.getItem("vis");
 	if (!vist) {
-		vis('public')
+		vis("public");
 	} else {
-		if (vist == 'memory') {
-			var acct_id = $('#post-acct-sel').val()
-			var memory = localStorage.getItem('vis-memory-' + acct_id)
+		if (vist == "memory") {
+			var acct_id = $("#post-acct-sel").val();
+			var memory = localStorage.getItem("vis-memory-" + acct_id);
 			if (!memory) {
-				memory = 'public'
+				memory = "public";
 			}
-			vis(memory)
-		} else if (vist == 'useapi') {
-			var acct_id = $('#post-acct-sel').val()
-			var multi = localStorage.getItem('multi')
-			var obj = JSON.parse(multi)
-			var memory = obj[acct_id]['vis']
+			vis(memory);
+		} else if (vist == "useapi") {
+			var acct_id = $("#post-acct-sel").val();
+			var multi = localStorage.getItem("multi");
+			var obj = JSON.parse(multi);
+			var memory = obj[acct_id]["vis"];
 			if (!memory) {
-				memory = 'public'
+				memory = "public";
 			}
-			vis(memory)
+			vis(memory);
 		} else {
-			vis(vist)
+			vis(vist);
 		}
 	}
 }
-loadVis()
+loadVis();
 
 //コンテントワーニング
 function cw() {
-	if ($('#cw').hasClass('cw-avail')) {
-		$('#cw-text').val()
-		$('#cw-text').hide()
-		$('#cw').removeClass('yellow-text')
-		$('#cw').removeClass('cw-avail')
+	if ($("#cw").hasClass("cw-avail")) {
+		$("#cw-text").val();
+		$("#cw-text").hide();
+		$("#cw").removeClass("yellow-text");
+		$("#cw").removeClass("cw-avail");
 	} else {
-		$('#cw-text').show()
-		$('#cw').addClass('yellow-text')
-		$('#cw').addClass('cw-avail')
-		var cwt = localStorage.getItem('cw-text')
+		$("#cw-text").show();
+		$("#cw").addClass("yellow-text");
+		$("#cw").addClass("cw-avail");
+		var cwt = localStorage.getItem("cw-text");
 		if (cwt) {
-			$('#cw-text').val(cwt)
+			$("#cw-text").val(cwt);
 		}
 	}
 }
 //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) {
-		var acct_id = $('#post-acct-sel').val()
-		var domain = localStorage.getItem('domain_' + acct_id)
-		var cwlen = $('#cw-text').val().length
+$(function () {
+	$('#cw-text').on('change', function (event) {
+		var acct_id = $("#post-acct-sel").val();
+		var domain = localStorage.getItem("domain_" + acct_id);
+		var cwlen = $('#cw-text').val().length;
 
-		if (idata[domain + '_letters']) {
-			$('#textarea').attr('data-length', idata[domain + '_letters'] - cwlen)
+		if (idata[domain + "_letters"]) {
+			$("#textarea").attr("data-length", idata[domain + "_letters"] - cwlen)
 		} else {
-			$('#textarea').attr('data-length', 500 - cwlen)
+			$("#textarea").attr("data-length", 500 - cwlen)
 		}
-	})
-})
+
+
+	});
+});
 //スケジュール
 function schedule() {
-	if ($('#sch-box').hasClass('sch-avail')) {
-		$('#sch-box').hide()
-		$('#sch-box').removeClass('sch-avail')
+	if ($("#sch-box").hasClass("sch-avail")) {
+		$("#sch-box").hide();
+		$("#sch-box").removeClass("sch-avail");
 	} else {
-		var date = new Date()
+		var date = new Date();
 
-		$('#sch-box').show()
-		$('#sch-date').val(formattime(date))
-		$('#sch-box').addClass('sch-avail')
+		$("#sch-box").show();
+		$("#sch-date").val(formattime(date));
+		$("#sch-box").addClass("sch-avail");
 	}
 }

app/js/post/suggest.js

@@ -1,279 +1,278 @@
 //入力時にハッシュタグと@をサジェスト
-var timer = null
+var timer = null;
 
-var input = document.getElementById('textarea')
+var input = document.getElementById("textarea");
 
-var prev_val = input.value
-var oldSuggest
-var suggest
+var prev_val = input.value;
+var oldSuggest;
+var suggest;
 
-input.addEventListener(
-	'focus',
-	function() {
-		localStorage.removeItem('cursor')
-		var acct_id = $('#post-acct-sel').val()
-		$('#suggest').html('')
-		window.clearInterval(timer)
-		timer = window.setInterval(function() {
-			var new_val = input.value
-			if (new_val == '') {
-				$('#suggest').html('')
-				if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
-					$('#right-side').hide()
-					$('#right-side').css('width', '300px')
-					$('#left-side').css('width', '100%')
-					var width = localStorage.getItem('postbox-width')
-					if (width) {
-						width = width.replace('px', '') * 1
-					} else {
-						width = 300
-					}
-					$('#post-box').css('width', width + 'px')
-				}
-				return
-			}
-			if (prev_val != new_val) {
-				var tag = new_val.match(/#(\S{3,})/)
-				var acct = new_val.match(/@(\S{3,})/)
-				if (tag && tag[1]) {
-					var q = tag[1]
-				} else if (acct && acct[1]) {
-					var q = acct[1]
+input.addEventListener("focus", function () {
+	localStorage.removeItem("cursor");
+	var acct_id = $("#post-acct-sel").val();
+	$("#suggest").html("");
+	window.clearInterval(timer);
+	timer = window.setInterval(function () {
+		var new_val = input.value;
+		if (new_val == "") {
+			$("#suggest").html("");
+			if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
+				$("#right-side").hide()
+				$("#right-side").css("width", "300px")
+				$("#left-side").css("width", "100%")
+				var width = localStorage.getItem("postbox-width");
+				if (width) {
+					width = width.replace("px", "") * 1
 				} else {
-					$('#suggest').html('')
-					if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
-						$('#right-side').hide()
-						$('#right-side').css('width', '300px')
-						$('#left-side').css('width', '100%')
-						var width = localStorage.getItem('postbox-width')
+					width = 300
+				}
+				$("#post-box").css("width", width + "px")
+			}
+			return;
+		}
+		if (prev_val != new_val) {
+			var semoji = new_val.match(/:(\S{3,})/);
+			if (semoji) {
+				var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
+				if (!obj) {
+					var ehtml = lang.lang_suggest_nodata;
+				} else {
+					var num = obj.length;
+					var ehtml = "";
+					for (i = 0; i < num; i++) {
+						var emoji = obj[i];
+						if (~emoji.shortcode.indexOf(semoji[1])) {
+							if (emoji) {
+								ehtml = ehtml + '<a onclick="emojiInsert(\':' + emoji.shortcode +
+									': \',\':' + semoji[1] + '\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+							}
+						}
+					}
+				}
+				if (ehtml != "") {
+					$("#right-side").show()
+					$("#right-side").css("width", "200px")
+					$("#left-side").css("width", "calc(100% - 200px)")
+					var width = localStorage.getItem("postbox-width");
+					if (width) {
+						width = width.replace("px", "") * 1 + 200
+					} else {
+						width = 600
+					}
+					$("#post-box").css("width", width + "px")
+					$("#poll").addClass("hide")
+					$("#emoji").addClass("hide")
+				} else {
+					if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
+						$("#right-side").hide()
+						$("#right-side").css("width", "300px")
+						$("#left-side").css("width", "100%")
+						var width = localStorage.getItem("postbox-width");
 						if (width) {
-							width = width.replace('px', '') * 1
+							width = width.replace("px", "") * 1
 						} else {
 							width = 300
 						}
-						$('#post-box').css('width', width + 'px')
+						$("#post-box").css("width", width + "px")
 					}
-					return
-				}
-				var domain = localStorage.getItem('domain_' + acct_id)
-				var at = localStorage.getItem('acct_' + acct_id + '_at')
-				suggest = 'https://' + domain + '/api/v2/search?q=' + q
-				if (suggest != oldSuggest) {
-					console.log('Try to get suggest at ' + suggest)
-					fetch(suggest, {
-						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(['Search', json])
-							//ハッシュタグ
-							if (json.hashtags[0] && tag) {
-								if (tag[1]) {
-									var tags = []
-									Object.keys(json.hashtags).forEach(function(key4) {
-										var tag = json.hashtags[key4]
-										var his = tag.history
-										var uses =
-											his[0].uses * 1 +
-											his[1].uses * 1 +
-											his[2].uses * 1 +
-											his[3].uses * 1 +
-											his[4].uses * 1 +
-											his[5].uses * 1 +
-											his[6].uses * 1
-										tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
-											tag.name
-										)}','#${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
-
-										var item = {
-											uses: uses,
-											html: tagHTML
-										}
-										tags.push(item)
-									})
-									var num_a = -1
-									var num_b = 1
-									tags = tags.sort(function(a, b) {
-										var x = a['uses']
-										var y = b['uses']
-										if (x > y) return num_a
-										if (x < y) return num_b
-										return 0
-									})
-									var ins = ''
-									var nev = false
-									Object.keys(tags).forEach(function(key7) {
-										ins = ins + tags[key7].html
-										if (key7 <= 0 && !nev) {
-											ins = ins + '<br>'
-											nev = true
-										}
-									})
-									$('#suggest').html(ins)
-									$('#right-side').show()
-									$('#right-side').css('width', '200px')
-									$('#left-side').css('width', 'calc(100% - 200px)')
-									var width = localStorage.getItem('postbox-width')
-									if (width) {
-										width = width.replace('px', '') * 1 + 200
-									} else {
-										width = 500
-									}
-									$('#post-box').css('width', width + 'px')
-									$('#poll').addClass('hide')
-									$('#emoji').addClass('hide')
-								}
-							} else if (json.accounts[0] && acct[1]) {
-								var accts = ''
-								Object.keys(json.accounts).forEach(function(key3) {
-									var acct = json.accounts[key3]
-									if (acct.acct != q) {
-										//Instance Actorって…
-										if (acct.username.indexOf('.') < 0) {
-											accts =
-												accts +
-												`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
-										}
-									}
-								})
-								$('#right-side').show()
-								$('#right-side').css('width', '200px')
-								$('#left-side').css('width', 'calc(100% - 200px)')
-								var width = localStorage.getItem('postbox-width')
-								if (width) {
-									width = width.replace('px', '') * 1 + 200
-								} else {
-									width = 500
-								}
-								$('#post-box').css('width', width + 'px')
-								$('#suggest').html(accts)
-								$('#poll').addClass('hide')
-								$('#emoji').addClass('hide')
-							} else {
-								if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
-									$('#right-side').hide()
-									$('#right-side').css('width', '300px')
-									$('#left-side').css('width', '100%')
-									var width = localStorage.getItem('postbox-width')
-									if (width) {
-										width = width.replace('px', '') * 1
-									} else {
-										width = 300
-									}
-									$('#post-box').css('width', width + 'px')
-								}
-							}
-						})
 				}
+				$("#suggest").html(ehtml);
 			}
-			oldSuggest = suggest
-			prev_value = new_val
-		}, 1000)
-	},
-	false
-)
 
-input.addEventListener(
-	'blur',
-	function() {
-		window.clearInterval(timer)
-		favTag()
-	},
-	false
-)
+			var tag = new_val.match(/#(\S{3,})/);
+			var acct = new_val.match(/@(\S{3,})/);
+			if (tag && tag[1]) {
+				var q = tag[1];
+			} else if (acct && acct[1]) {
+				var q = acct[1];
+			} else {
+				$("#suggest").html("");
+				if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
+					$("#right-side").hide()
+					$("#right-side").css("width", "300px")
+					$("#left-side").css("width", "100%")
+					var width = localStorage.getItem("postbox-width");
+					if (width) {
+						width = width.replace("px", "") * 1
+					} else {
+						width = 300
+					}
+					$("#post-box").css("width", width + "px")
+				}
+				return;
+			}
+			var domain = localStorage.getItem("domain_" + acct_id);
+			var at = localStorage.getItem("acct_" + acct_id + "_at");
+			suggest = "https://" + domain + "/api/v2/search?q=" + q
+			if (suggest != oldSuggest) {
+				console.log("Try to get suggest at " + suggest)
+				fetch(suggest, {
+					method: 'GET',
+					headers: {
+						'content-type': 'application/json',
+						'Authorization': 'Bearer ' + at
+					},
+				}).then(function (response) {
+					return response.json();
+				}).catch(function (error) {
+					todo(error);
+					console.error(error);
+				}).then(function (json) {
+					console.log(["Search", json]);
+					//ハッシュタグ
+					if (json.hashtags[0] && tag) {
+						if (tag[1]) {
+							var tags = [];
+							Object.keys(json.hashtags).forEach(function (key4) {
+								var tag = json.hashtags[key4];
+								var his = tag.history;
+								var uses = his[0].uses * 1 + his[1].uses * 1 + his[2].uses * 1 + his[3].uses * 1 + his[4].uses * 1 + his[5].uses * 1 + his[6].uses * 1;
+								tagHTML = '<br><a onclick="tagInsert(\'#' + escapeHTML(tag.name) + '\',\'#' + q + '\')" class="pointer">#' +
+									escapeHTML(tag.name) + '</a>&nbsp;' + uses + 'toot(s)'
+								var item = {
+									"uses": uses,
+									"html": tagHTML
+								}
+								tags.push(item)
+							});
+							var num_a = -1;
+							var num_b = 1;
+							tags = tags.sort(function (a, b) {
+								var x = a["uses"];
+								var y = b["uses"];
+								if (x > y) return num_a;
+								if (x < y) return num_b;
+								return 0;
+							});
+							var ins = ""
+							var nev = false
+							Object.keys(tags).forEach(function (key7) {
+								ins = ins + tags[key7].html
+								if (key7 <= 0 && !nev) {
+									ins = ins + '<br>'
+									nev = true
+								}
+							});
+							$("#suggest").html(ins);
+							$("#right-side").show()
+							$("#right-side").css("width", "200px")
+							$("#left-side").css("width", "calc(100% - 200px)")
+							var width = localStorage.getItem("postbox-width");
+							if (width) {
+								width = width.replace("px", "") * 1 + 200
+							} else {
+								width = 600
+							}
+							$("#post-box").css("width", width + "px")
+							$("#poll").addClass("hide")
+							$("#emoji").addClass("hide")
+						}
+					} else if (json.accounts[0] && acct[1]) {
+						var accts = "";
+						Object.keys(json.accounts).forEach(function (key3) {
+							var acct = json.accounts[key3];
+							if (acct.acct != q) {
+								//Instance Actorって…
+								if (acct.username.indexOf(".") < 0) {
+									accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
+										'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
+								}
+							}
+						});
+						$("#right-side").show()
+						$("#right-side").css("width", "200px")
+						$("#left-side").css("width", "calc(100% - 200px)")
+						var width = localStorage.getItem("postbox-width");
+						if (width) {
+							width = width.replace("px", "") * 1 + 200
+						} else {
+							width = 600
+						}
+						$("#post-box").css("width", width + "px")
+						$("#suggest").html(accts);
+						$("#poll").addClass("hide")
+						$("#emoji").addClass("hide")
+					} else {
+						if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
+							$("#right-side").hide()
+							$("#right-side").css("width", "300px")
+							$("#left-side").css("width", "100%")
+							var width = localStorage.getItem("postbox-width");
+							if (width) {
+								width = width.replace("px", "") * 1
+							} else {
+								width = 300
+							}
+							$("#post-box").css("width", width + "px")
+						}
+					}
+				});
+			}
+		};
+		oldSuggest = suggest;
+		prev_value = new_val;
+	}, 1000);
+}, false);
+
+input.addEventListener("blur", function () {
+	window.clearInterval(timer);
+	favTag();
+}, false);
 function tagInsert(code, del) {
-	var blankBefore = ' '
-	var blankAfter = ' '
-	var textarea = document.querySelector('#textarea')
-	var sentence = textarea.value
-	var len = sentence.length
-	var pos = textarea.selectionStart
-	if (del) {
-		var delLen = del.length
+	var now = $("#textarea").val();
+	var selin = $("#textarea").prop('selectionStart');
+	if (!del) {
 	} else {
-		var delLen = 0
+		var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
+		var now = now.replace(regExp, "");
+		selin = selin - del.length;
 	}
-	var before = sentence.substr(0, pos - delLen)
-	var last = before.substr(-1, 1)
-	if (last == ' ') blankBefore = ''
-	var after = sentence.substr(pos, len)
-	var start = after.substr(0, 1)
-	if (start == ' ') blankAfter = ''
-	if (len == 0) {
-		var word = code
-	} else if (len == pos) {
-		var word = blankBefore + code
-	} else if (pos == 0) {
-		var word = code + blankAfter
+	if (selin > 0) {
+		var before = now.substr(0, selin);
+		var after = now.substr(selin, now.length);
+		newt = before + " " + code + " " + after;
 	} else {
-		var word = blankBefore + code + blankAfter
+		newt = code + " " + now;
 	}
-	sentence = before + word + after
-	textarea.value = sentence
-	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
-		$('#right-side').hide()
-		$('#right-side').css('width', '300px')
-		$('#left-side').css('width', '50%')
-		var width = localStorage.getItem('postbox-width').replace('px', '') * 1
+	$("#textarea").val(newt);
+	$("#textarea").focus();
+	if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
+		$("#right-side").hide()
+		$("#right-side").css("width", "300px")
+		$("#left-side").css("width", "50%")
+		var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
 		if (!width) {
 			width = 300
 		}
-		$('#post-box').css('width', width + 'px')
+		$("#post-box").css("width", width + "px")
 	}
-	$('#suggest').html('')
+	$("#suggest").html("");
 }
 function cgNPs(q) {
-	suggest = 'https://cg.toot.app/api/v1/search/light?q=' + q
+	suggest = "https://cg.toot.app/api/v1/search/light?q=" + q
 	if (suggest != oldSuggest) {
-		console.log('Try to get suggest at ' + suggest)
+		console.log("Try to get suggest at " + suggest)
 		fetch(suggest, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json'
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json[0]) {
+				var tags = "";
+				Object.keys(json).forEach(function (key4) {
+					var tag = json[key4];
+					tags = tags + '<a onclick="cgNP(\'' + json[key4] + '\')" class="pointer">' + escapeHTML(json[key4]) + '</a>  ';
+				});
+				$("#suggest").html("Cinderella NowPlaying:" + tags);
+			} else {
+				$("#suggest").html("Cinderella NowPlaying:Not Found");
 			}
-		})
-			.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[0]) {
-					var tags = ''
-					Object.keys(json).forEach(function(key4) {
-						var tag = json[key4]
-						tags =
-							tags +
-							`<a onclick="cgNp('${json[key4]}')" class="pointer">${escapeHTML(json[key4])}</a>`
-					})
-					$('#suggest').html('Cinderella NowPlaying:' + tags)
-				} else {
-					$('#suggest').html('Cinderella NowPlaying:Not Found')
-				}
-			})
+		});
 	}
-}
+}

app/js/post/use-txtbox.js

@@ -1,81 +1,79 @@
 /*リプライ*/
 function re(id, ats_cm, acct_id, mode) {
-	clear()
-	var ats = ats_cm.split(',')
-	localStorage.setItem('nohide', true)
-	show()
-	$('#reply').val(id)
+	clear();
+	var ats = ats_cm.split(',');
+	localStorage.setItem("nohide", true);
+	show();
+	$("#reply").val(id);
 	for (var i = 0; i < ats.length; i++) {
-		var at = ats[i]
-		var te = $('#textarea').val()
-		if (at != localStorage.getItem('user_' + acct_id)) {
-			$('#textarea').val('@' + at + ' ' + te)
+		var at = ats[i];
+		var te = $("#textarea").val();
+		if (at != localStorage.getItem("user_" + acct_id)) {
+			$("#textarea").val("@" + at + " " + te);
 		}
 	}
-	$('#rec').text(lang.lang_yesno)
-	$('#post-acct-sel').val(acct_id)
-	$('#post-acct-sel').prop('disabled', true)
-	$('select').formSelect()
-	mdCheck()
-	$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
-	$('#textarea').focus()
-	var profimg = localStorage.getItem('prof_' + acct_id)
+	$("#rec").text(lang.lang_yesno);
+	$("#post-acct-sel").val(acct_id);
+	$("#post-acct-sel").prop("disabled", true);
+	$('select').formSelect();
+	$("#textarea").attr("placeholder", lang.lang_usetxtbox_reply);
+	$("#textarea").focus();
+	var profimg = localStorage.getItem("prof_" + acct_id);
 	if (!profimg) {
-		profimg = '../../img/missing.svg'
+		profimg = "../../img/missing.svg";
 	}
-	$('#acct-sel-prof').attr('src', profimg)
-	vis(mode)
+	$("#acct-sel-prof").attr("src", profimg);
+	vis(mode);
 }
 function reEx(id) {
-	$('#tootmodal').modal('close')
-	var at = $('#tootmodal').attr('data-user')
-	var acct_id = $('#status-acct-sel').val()
-	var mode = $('#tootmodal .vis-data').attr('data-vis')
-	re(id, at, acct_id, mode)
+	$('#tootmodal').modal('close');
+	var at = $("#tootmodal").attr("data-user");
+	var acct_id = $("#status-acct-sel").val();
+	var mode = $("#tootmodal .vis-data").attr("data-vis");
+	re(id, at, acct_id, mode);
 }
 //引用
 function qt(id, acct_id, at, url) {
-	localStorage.setItem('nohide', true)
-	var qt = localStorage.getItem('quote')
+	localStorage.setItem("nohide", true);
+	var qt = localStorage.getItem("quote");
 	if (!qt) {
-		var qt = 'simple'
+		var qt = "simple";
 	}
-	if (qt == 'nothing') {
-		return false
+	if (qt == "nothing") {
+		return false;
 	}
-	if (qt == 'simple') {
-		show()
-		$('#textarea').val('\n' + url)
-	} else if (qt == 'mention') {
-		show()
-		$('#textarea').val('\n' + url + ' From:@' + at)
-	} else if (qt == 'full') {
-		show()
-		var html = $('[toot-id=' + id + '] .toot').html()
-		html = html.match(/^<p>(.+)<\/p>$/)[1]
-		html = html.replace(/<br\s?\/?>/, '\n')
-		html = html.replace(/<p>/, '\n')
-		html = html.replace(/<\/p>/, '\n')
-		html = $.strip_tags(html)
-		$('#textarea').val('\n' + '@' + at + ' ' + html + '\n' + url)
-	} else if (qt == 'apiQuote') {
-		clear()
-		localStorage.setItem('nohide', true)
-		show()
-		$('#quote').val(id)
-		$('#post-acct-sel').val(acct_id)
-		$('#post-acct-sel').prop('disabled', true)
-		$('select').formSelect()
-		$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
-		$('#textarea').focus()
-		var profimg = localStorage.getItem('prof_' + acct_id)
+	if (qt == "simple") {
+		show();
+		$("#textarea").val("\n" + url);
+	} else if (qt == "mention") {
+		show();
+		$("#textarea").val("\n" + url + " From:@" + at);
+	} else if (qt == "full") {
+		show();
+		var html = $("[toot-id=" + id + "] .toot").html();
+		html = html.match(/^<p>(.+)<\/p>$/)[1];
+		html = html.replace(/<br\s?\/?>/, "\n");
+		html = html.replace(/<p>/, "\n");
+		html = html.replace(/<\/p>/, "\n");
+		html = $.strip_tags(html);
+		$("#textarea").val("\n" + "@" + at + " " + html + "\n" + url);
+	} else if (qt == "apiQuote") {
+		clear();
+		localStorage.setItem("nohide", true);
+		show();
+		$("#quote").val(id);
+		$("#post-acct-sel").val(acct_id);
+		$("#post-acct-sel").prop("disabled", true);
+		$('select').formSelect();
+		$("#textarea").attr("placeholder", lang.lang_usetxtbox_reply);
+		$("#textarea").focus();
+		var profimg = localStorage.getItem("prof_" + acct_id);
 		if (!profimg) {
-			profimg = '../../img/missing.svg'
+			profimg = "../../img/missing.svg";
 		}
-		$('#acct-sel-prof').attr('src', profimg)
+		$("#acct-sel-prof").attr("src", profimg);
 	}
-	$('#post-acct-sel').val(acct_id)
-	$('select').formSelect()
-	mdCheck()
-	$('#textarea').focus()
-}
+	$("#post-acct-sel").val(acct_id);
+	$('select').formSelect();
+	$("#textarea").focus();
+}

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

@@ -4,389 +4,278 @@ function additional(acct_id, tlid) {
 	//メンション系
 	//$(".mention").attr("href", "");
 
-	$('#timeline-container .mention').addClass('parsed')
+	$("#timeline-container .mention").addClass("parsed");
 
-	$('#timeline-container .hashtag, #timeline-container [rel=tag]').each(function(i, elem) {
-		var tags = $(this)
-			.attr('href')
-			.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/tags?\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/)
+	$("#timeline-container .hashtag").each(function (i, elem) {
+		var tags = $(this).attr("href").match(
+			/https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
+		);
+		$(this).attr("href", "#");
 		if (tags) {
-			var tagThis = tags[2]
-		} else {
-			var tagThis = $(this).attr('data-regTag')
-		}
+			if (tags[2]) {
+				$(this).attr("onclick", 'tagShow(\'' + tags[2] + '\')');
+			}
 
-		if (tagThis) {
-			$(this).attr('href', "javascript:tagShow('" + tagThis + "')")
-			
 		}
-	})
+	});
 
 	//トゥートサムネ
-	$('#timeline_' + tlid + ' .toot a:not(.parsed)').each(function(i, elem) {
-		var text = $(this).attr('href')
+	$("#timeline_" + tlid + " .toot a:not(.parsed)").each(function (i, elem) {
+		var domain = localStorage.getItem("domain_" + acct_id);
+		var at = localStorage.getItem("acct_" + acct_id + "_at");
+		var card = localStorage.getItem("card_" + tlid);
+		var text = $(this).attr('href');
 		if (text) {
-			if (text.indexOf('twimg.com') === -1) {
+			if (text.indexOf("twimg.com") === -1) {
 				var urls = text.match(
 					/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
-				)
+				);
 			}
 		} else {
-			text = ''
+			text = ""
 			var urls = []
 		}
 
 		//トゥートのURLぽかったら
-		toot = text.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
+		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)
+				$(this).attr("data-acct", acct_id);
 			}
 		}
 		if (urls) {
-			$(this).remove()
+			$(this).remove();
+		} else if (!card) {
+			var id = $(this).parents('.cvo').attr("toot-id");
+			if (localStorage.getItem("mode_" + domain) == "misskey") {
+				var start = "https://" + domain + "/url?url=" + text;
+				fetch(start, {
+					method: 'GET',
+					headers: {
+						'content-type': 'application/json'
+					},
+					//body: JSON.stringify({})
+				}).then(function (response) {
+					return response.json();
+				}).catch(function (error) {
+					todo(error);
+					console.error(error);
+				}).then(function (json) {
+					if (json.title) {
+						$("[toot-id=" + id + "] .additional").html(
+							"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
+							escapeHTML(json.description) + "</span>");
+						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
+						$("[toot-id=" + id + "]").addClass("parsed");
+					}
+				});
+			}
+
 		} else {
-			$(this).attr('title', text)
+			$(this).attr("title", text);
 		}
-	})
-	$('i.unparsed').each(function(i, elem) {
-		var dem = $(this).text()
-		var dom = $(this)
-		var start = './js/emoji/emoji-map.json'
-		var xmlHttpRequest = new XMLHttpRequest()
-		xmlHttpRequest.onreadystatechange = function() {
+	});
+	$("i.unparsed").each(function (i, elem) {
+		var dem = $(this).text();
+		var dom = $(this);
+		var start = "./js/emoji/emoji-map.json";
+		var xmlHttpRequest = new XMLHttpRequest();
+		xmlHttpRequest.onreadystatechange = function () {
 			if (this.readyState === 4 && this.status === 200) {
 				if (this.response) {
-					var json = this.response
-					if (this.status !== 200) {
-						setLog(start, this.status, this.response)
-					}
-					var emojis = json.emojis
+					var json = this.response;
+					var emojis = json.emojis;
 					for (i = 0; i < emojis.length; i++) {
-						var emojie = emojis[i]
-						var regExp = new RegExp(dem, 'g')
+						var emojie = emojis[i];
+						var regExp = new RegExp(dem, "g");
 						if (emojie.emoji.match(regExp)) {
-							var sc = emojie.name
-							var sc = 'twa-' + sc.replace(/_/g, '-')
-							dom.addClass(sc)
-							dom.text('')
-							dom.removeClass('unparsed')
-							break
+							var sc = emojie.name;
+							var sc = "twa-" + sc.replace(/_/g, "-");
+							dom.addClass(sc);
+							dom.text("");
+							dom.removeClass("unparsed");
+							break;
 						}
 					}
 				}
 			}
 		}
-		xmlHttpRequest.open('GET', start, true)
-		xmlHttpRequest.responseType = 'json'
-		xmlHttpRequest.send(null)
-	})
+		xmlHttpRequest.open('GET', start, true);
+		xmlHttpRequest.responseType = 'json';
+		xmlHttpRequest.send(null);
+	});
 
-	$('#timeline_' + tlid + ' .toot:not(:has(a:not(.add-show,.parsed)))').each(function(i, elem) {
-		$(this)
-			.parent()
-			.find('.add-show')
-			.hide()
-	})
+	$("#timeline_" + tlid + " .toot:not(:has(a:not(.add-show,.parsed)))").each(function (i, elem) {
+		$(this).parent().find(".add-show").hide();
+	});
 	//Markdownイメージビューワー
-	$('#timeline_' + tlid + ' .toot a:not(.img-parsed):has(img)').each(function(i, elem) {
-		var ilink = $(this).attr('href')
-		var id = $(this)
-			.parents('.cvo')
-			.attr('toot-id')
-		$(this).attr('href', `javascript:imgv('${id}','${i}')`)
-		$(this).attr('data-type', 'image')
-		$(this).attr('id', id + '-image-' + i)
-		$(this).attr('data-url', ilink)
-		$(this).addClass('img-parsed')
-	})
+	$("#timeline_" + tlid + " .toot a:not(.img-parsed):has(img)").each(function (i, elem) {
+		var ilink = $(this).attr("href");
+		var id = $(this).parents('.cvo').attr("toot-id");
+		$(this).attr("href", "#");
+		$(this).attr("onclick", "imgv('" + id + "','" + i + "')");
+		$(this).attr("data-type", "image");
+		$(this).attr("id", id + "-image-" + i);
+		$(this).attr("data-url", ilink);
+		$(this).addClass("img-parsed");
+	});
 }
 
 function additionalIndv(tlid, acct_id, id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var text = $('[toot-id=' + id + '] .toot a').attr('href')
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var text = $("[toot-id=" + id + "] .toot a").attr('href');
 	var urls = text.match(
 		/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
-	)
+	);
 	if (urls) {
-		$('[toot-id=' + id + '] .toot a').remove()
+		$("[toot-id=" + id + "] .toot a").remove();
 	} else {
-		if (localStorage.getItem('mode_' + domain) == 'misskey') {
-			var start = 'https://' + domain + '/url?url=' + text
+		if (localStorage.getItem("mode_" + domain) == "misskey") {
+			var start = "https://" + domain + "/url?url=" + text;
 			fetch(start, {
 				method: 'GET',
 				headers: {
 					'content-type': 'application/json'
-				}
+				},
 				//body: JSON.stringify({})
-			})
-				.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.title) {
-						$('[toot-id=' + id + '] .additional').html(
-							`<span class="gray">URL${lang.lang_cards_check}:<br>Title:${escapeHTML(
-								json.title
-							)}<br>${escapeHTML(json.description)}</span>`
-						)
-						$('[toot-id=' + id + '] a:not(.parsed)').addClass('parsed')
-						$('[toot-id=' + id + ']').addClass('parsed')
-					}
-				})
+			}).then(function (response) {
+				return response.json();
+			}).catch(function (error) {
+				todo(error);
+				console.error(error);
+			}).then(function (json) {
+				if (json.title) {
+					$("[toot-id=" + id + "] .additional").html(
+						"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
+						escapeHTML(json.description) + "</span>");
+					$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
+					$("[toot-id=" + id + "]").addClass("parsed");
+				}
+			});
 		} else {
-			var id = $('[toot-id=' + id + '] .toot a')
-				.parents('.cvo')
-				.attr('toot-id')
-			var start = 'https://' + domain + '/api/v1/statuses/' + id
+			var id = $("[toot-id=" + id + "] .toot a").parents('.cvo').attr("toot-id");
+			var start = "https://" + domain + "/api/v1/statuses/" + id;
 			fetch(start, {
 				method: 'GET',
 				headers: {
 					'content-type': 'application/json',
-					Authorization: 'Bearer ' + at
-				}
+					'Authorization': 'Bearer ' + at
+				},
 				//body: JSON.stringify({})
-			})
-				.then(function(response) {
-					if (!response.ok) {
-						response.text().then(function(text) {
-							setLog(response.url, response.status, text)
-						})
+			}).then(function (response) {
+				return response.json();
+			}).catch(function (error) {
+				todo(error);
+				console.error(error);
+			}).then(function (json) {
+				json = json.card;
+				//このリンク鳥やんけ、ってとき
+				if (json.provider_name == "Twitter") {
+					if (json.image) {
+						var twiImg = '<br><img src="' + json.image + '" style="max-width:100%" onclick="imgv(\'twi_' + id + '\', 0, \'twitter\');" id="twi_' + id + '-image-0" data-url="' + json.image + '" data-type="image">';
+					} else {
+						var twiImg = '';
 					}
-					return response.json()
-				})
-				.catch(function(error) {
-					todo(error)
-					setLog(start, 'JSON', error)
-					console.error(error)
-				})
-				.then(function(json) {
-					cards = json.card
-					var analyze = cardHtml(cards, acct_id, id)
-					$('[toot-id=' + id + '] .additional').html(analyze)
+					$("[toot-id=" + id + "] .additional").html(
+						'<div class="twitter-tweet"><b>' + escapeHTML(json.author_name) + '</b><br>' + escapeHTML(json.description) + twiImg + '</div>');
+				} else if (json.provider_name == "pixiv") {
+					if (json.image) {
+						var pxvImg = '<br><img src="' + json.image + '" style="max-width:100%" onclick="imgv(\'pixiv_' + id + '\', 0, \'pixiv\');" id="pixiv_' + id + '-image-0" data-url="' + json.embed_url + '" data-type="image">';
+					} else {
+						var pxvImg = '';
+					}
+					$("[toot-id=" + id + "] .additional").html(
+						'<div class="pixiv-post"><b><a href="' + json.author_url + '" target="_blank">' + escapeHTML(json.author_name) + '</a></b><br>' + escapeHTML(json.title) + pxvImg + '</div>');
+				} else {
 					if (json.title) {
-						$('[toot-id=' + id + '] a:not(.parsed)').addClass('parsed')
-						$('[toot-id=' + id + ']').addClass('parsed')
+						$("[toot-id=" + id + "] .additional").html(
+							"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
+							escapeHTML(json.description) + "</span>");
 					}
-				})
-		}
-	}
-}
-function cardHtml(json, acct_id, id) {
-	var analyze = ''
-	var domain = json.url.match(/^https?:\/{2,}(.*?)(?:\/|\?|#|$)/)[1];
-	var ok = [
-		"pixiv.net",
-		"twitter.com",
-		"mobile.twitter.com",
-		"open.spotify.com",
-		"youtube.com",
-		"youtu.be",
-		"m.youtube.com",
-		"www.youtube.com",
-		"nicovideo.jp",
-		"twitcasting.tv"
-	]
-	var isHad = _.includes(ok, domain);
-	if (json.provider_name == 'pixiv') {
-		if (json.image) {
-			var pxvImg = `
-			<br><img src="${json.image}" style="max-width:100%" 
-					onclick="imgv('pixiv_${id}',0,'pixiv')" id="pixiv_${id}-image-0" 
-					data-url="${json.embed_url}" 
-				data-type="image">
-			`
-		} else {
-			var pxvImg = ''
-		}
-		analyze = `<div class="pixiv-post"><b><a href="
-				${json.author_url}
-				" target="_blank">
-				${escapeHTML(json.author_name)}
-				</a></b><br>
-				${escapeHTML(json.title)}
-				${pxvImg}
-				</div>`
-	} else {
-		if (json.title) {
-			analyze = `<span class="gray">URL
-					${lang.lang_cards_check}
-					:<br>Title:
-					${escapeHTML(json.title)}
-					<br>
-					${escapeHTML(json.description)}
-					</span>`
+					if (json.html) {
+						$("[toot-id=" + id + "] .additional").html(json.html + '<i class="material-icons sml pointer" onclick="pip(\'' + id + '\')" title="' + lang.lang_cards_pip + '">picture_in_picture_alt</i>');
+
+					}
+				}
+				if (json.title) {
+					$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
+					$("[toot-id=" + id + "]").addClass("parsed");
+				}
+			});
 		}
 
-		if (json.html || json.provider_name == 'Twitter') {
-			if(isHad) {
-				var prved = `<img class="emoji" draggable="false" alt="✅" 
-					src="https://twemoji.maxcdn.com/v/12.1.3/72x72/2705.png">`
-				var title = lang.lang_cards_trusted
-			}else{
-				var prved = '<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/26a0.png">'
-				var title = lang.lang_cards_untrusted
-			}
-			analyze =`<a onclick="cardHtmlShow('${acct_id}','${id}')" class="add-show pointer" title="${title}">
-			${lang.lang_parse_html}(${domain})${prved}
-			</a>${analyze}<br>`
-		}
 	}
-	return analyze
-}
-function cardHtmlShow(acct_id, id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var text = $('[toot-id=' + id + '] .toot a').attr('href')
-	var urls = text.match(
-		/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
-	)
-	var id = $('[toot-id=' + id + '] .toot a')
-		.parents('.cvo')
-		.attr('toot-id')
-	var start = 'https://' + domain + '/api/v1/statuses/' + id
-	fetch(start, {
-		method: 'GET',
-		headers: {
-			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
-		}
-		//body: JSON.stringify({})
-	})
-		.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) {
-			json = json.card
-			if (json.html) {
-				analyze =
-					json.html +
-					`<i class="material-icons sml pointer" onclick="pip('
-								${id}
-								')" title="
-								${lang.lang_cards_pip}
-								">picture_in_picture_alt</i>`
-			}
-			if (json.provider_name == 'Twitter') {
-				var url = json.author_url
-				var status = json.url.match(/^https:\/\/twitter.com\/[_a-zA-Z0-9-]+\/status\/([0-9]+)/);
-				var statusId = false
-				if(status){
-					if(status.length > 0){
-						var statusId = status[1]
-					}
-				}
-				console.log(statusId)
-				if(statusId){
-					url = json.url
-					analyze = `
-					<blockquote class="twitter-tweet" data-dnt="true"><strong>${json.author_name}</strong><br>${json.description}<a href="${url}">${json.url}</a></blockquote>
-					<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script> 
-					`
-				}
-			}
-			$('[toot-id=' + id + '] .additional').html(analyze)
-		})
 }
+
 //各TL上方のLink[On/Off]
 function cardToggle(tlid) {
-	var card = localStorage.getItem('card_' + tlid)
+	var card = localStorage.getItem("card_" + tlid);
 	if (!card) {
-		localStorage.setItem('card_' + tlid, 'true')
-		$('#sta-card-' + tlid).text('Off')
-		$('#sta-card-' + tlid).css('color', 'red')
+		localStorage.setItem("card_" + tlid, "true");
+		$("#sta-card-" + tlid).text("Off");
+		$("#sta-card-" + tlid).css("color", 'red');
 	} else {
-		localStorage.removeItem('card_' + tlid)
-		$('#sta-card-' + tlid).text('On')
-		$('#sta-card-' + tlid).css('color', '#009688')
+		localStorage.removeItem("card_" + tlid);
+		$("#sta-card-" + tlid).text("On");
+		$("#sta-card-" + tlid).css("color", '#009688');
 	}
 }
 //各TL上方のLink[On/Off]をチェック
 function cardCheck(tlid) {
-	var card = localStorage.getItem('card_' + tlid)
+	var card = localStorage.getItem("card_" + tlid);
 	if (!card) {
-		$('#sta-card-' + tlid).text('On')
-		$('#sta-card-' + tlid).css('color', '#009688')
+		$("#sta-card-" + tlid).text("On");
+		$("#sta-card-" + tlid).css("color", '#009688');
 	} else {
-		$('#sta-card-' + tlid).text('Off')
-		$('#sta-card-' + tlid).css('color', 'red')
+		$("#sta-card-" + tlid).text("Off");
+		$("#sta-card-" + tlid).css("color", 'red');
 	}
 }
 
 function mov(id, tlid, type) {
-	var click = false
-	if (tlid == 'notf') {
-		var tlide = '[data-notf=' + acct_id + ']'
-	} else if (tlid == 'user') {
-		var tlide = '#his-data'
+	if (tlid == "notf") {
+		var tlide = "[data-notf=" + acct_id + "]";
+	} else if (tlid == "user") {
+		var tlide = "#his-data";
 	} else {
-		var tlide = '[tlid=' + tlid + ']'
+		var tlide = "[tlid=" + tlid + "]";
 	}
-	var mouseover = localStorage.getItem('mouseover')
+	var mouseover = localStorage.getItem("mouseover");
 	if (!mouseover) {
-		mouseover = ''
+		mouseover = "";
 	}
-	if (mouseover == 'yes') {
-		mouseover = 'hide'
-	} else if (mouseover == 'click') {
-		if (type == 'mv') {
-			mouseover = ''
+	if (mouseover == "yes") {
+		mouseover = "hide";
+	} else if (mouseover == "click") {
+		if (type == "mv") {
+			mouseover = "";
 		} else {
-			mouseover = 'hide'
+			mouseover = "hide";
 		}
-		click = true
-	} else if (mouseover == 'no') {
-		mouseover = ''
+	} else if (mouseover == "no") {
+		mouseover = "";
 	}
-	if (mouseover == 'hide') {
-		if (click) {
-			$(tlide + ' [toot-id=' + id + ']').toggleClass('hide-actions')
-		} else {
-			$(tlide + ' [toot-id=' + id + ']').removeClass('hide-actions')
-		}
-
-		//$(tlide + " [toot-id=" + id + "] .area-vis").toggleClass("hide")
-		//$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
-		//$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
+	if (mouseover == "hide") {
+		$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
+		$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
 	}
 }
 
 function resetmv(type) {
-	var mouseover = localStorage.getItem('mouseover')
+	var mouseover = localStorage.getItem("mouseover");
 	if (!mouseover) {
-		mouseover = ''
-	} else if (mouseover == 'yes') {
-		mouseover = 'hide'
-	} else if (mouseover == 'no') {
-		mouseover = ''
-	} else if (mouseover == 'click' && type != 'mv') {
-		mouseover = 'hide'
+		mouseover = "";
+	} else if (mouseover == "yes") {
+		mouseover = "hide";
+	} else if (mouseover == "no") {
+		mouseover = "";
+	} else if (mouseover == "click" && type != "mv") {
+		mouseover = "hide";
 	}
-	if (mouseover == 'hide') {
-		$('.cvo').addClass('hide-actions')
-		//$(".area-vis").addClass("hide");
-		//$(".area-actions").addClass("hide");
-		//$(".area-side").addClass("hide");
+	if (mouseover == "hide") {
+		$(".area-actions").addClass("hide");
+		$(".area-side").addClass("hide");
 	}
-}
+
+}

app/js/tl/directory.js

@@ -1,76 +1,69 @@
 //ディレクトリ
 //ディレクトリトグル
 function dirMenu() {
-	$("#dir-contents").html("");
-	directory();
-	$("#left-menu div").removeClass("active");
-	$("#dirMenu").addClass("active");
-	$(".menu-content").addClass("hide");
-	$("#dir-box").removeClass("hide");
+    $("#dir-contents").html("");
+    directory();
+    $("#left-menu div").removeClass("active");
+    $("#dirMenu").addClass("active");
+    $(".menu-content").addClass("hide");
+    $("#dir-box").removeClass("hide");
 }
 function dirselCk() {
-	var acct = $("#dir-acct-sel").val();
-	if (acct == "noauth") {
-		$("#dirNoAuth").removeClass("hide");
-	} else {
-		$("#dirNoAuth").addClass("hide");
-		directory();
-	}
+    var acct = $("#dir-acct-sel").val();
+    if (acct == "noauth") {
+        $("#dirNoAuth").removeClass("hide");
+    } else {
+        $("#dirNoAuth").addClass("hide");
+        directory();
+    }
 }
 function directory(isMore) {
-	var order = $("[name=sort]:checked").val();
-	if (!order) {
-		order = "active";
-	}
-	var local_only = $("#local_only:checked").val();
-	if (local_only) {
-		local_only = "true";
-	} else {
-		local_only = "false";
-	}
-	var acct_id = $("#dir-acct-sel").val();
-	if (acct_id == "noauth") {
-		var domain = $("#dirNoAuth-url").val();
-		var at = "";
-	} else {
-		var domain = localStorage.getItem("domain_" + acct_id);
-		var at = localStorage.getItem("acct_" + acct_id + "_at");
-	}
-	if (isMore) {
-		var addOffset = $("#dir-contents .cvo").length;
-	} else {
-		var addOffset = 0;
-		$("#dir-contents").html("");
-	}
-	var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset;
-	console.log(start);
-	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) {
-			setLog(start, "JSON", error);
-			console.error(error);
-		})
-		.then(function(json) {
-			if (json) {
-				$("#moreDir").removeClass("disabled");
-				var html = userparse(json, null, acct_id, "dir", null);
-				$("#dir-contents").append(html);
-				jQuery("time.timeago").timeago();
-			} else {
-				$("#moreDir").addClass("disabled");
-			}
-		});
-}
+    var order = $("[name=sort]:checked").val()
+    if (!order) {
+        order = "active"
+    }
+    var local_only = $("#local_only:checked").val()
+    if (local_only) {
+        local_only = "true"
+    } else {
+        local_only = "false"
+    }
+    var acct_id = $("#dir-acct-sel").val();
+    if (acct_id == "noauth") {
+        var domain = $("#dirNoAuth-url").val();
+        var at = "";
+    } else {
+        var domain = localStorage.getItem("domain_" + acct_id);
+        var at = localStorage.getItem("acct_" + acct_id + "_at");
+    }
+    if (isMore) {
+        var addOffset = $("#dir-contents .cvo").length
+    } else {
+        var addOffset = 0
+        $("#dir-contents").html("");
+    }
+    var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset
+    console.log(start)
+    fetch(start, {
+        method: 'GET',
+        headers: {
+            'content-type': 'application/json',
+            'Authorization': 'Bearer ' + at
+        },
+    }).then(function (response) {
+        return response.json();
+    }).catch(function (error) {
+        //todo(error);
+        console.error(error);
+    }).then(function (json) {
+        if (json) {
+            $("#moreDir").removeClass("disabled")
+            var html = userparse(json, null, acct_id, "dir", null)
+            $("#dir-contents").append(html)
+            jQuery("time.timeago").timeago();
+        } else {
+            $("#moreDir").addClass("disabled")
+        }
+
+    });
+}

app/js/tl/dm.js

@@ -1,38 +1,31 @@
 //DM(Conv) TL
 function dm(acct_id, tlid, type, delc, voice) {
+
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/conversations";
 	fetch(start, {
-		method: "GET",
+		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) {
-			var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>";
-			localStorage.setItem("lastobj_" + tlid, json[0].id);
-			$("#timeline_" + tlid).html(templete);
-			additional(acct_id, tlid);
-			jQuery("time.timeago").timeago();
-			todc();
-			//reload(type, '', acct_id, tlid, data, mute, delc,voice);
-			$(window).scrollTop(0);
-		});
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + '</div>';
+		localStorage.setItem("lastobj_" + tlid, json[0].id)
+		$("#timeline_" + tlid).html(templete);
+		additional(acct_id, tlid);
+		jQuery("time.timeago").timeago();
+		todc();
+		//reload(type, '', acct_id, tlid, data, mute, delc,voice);
+		$(window).scrollTop(0);
+	});
+
 }
 function dmmore(tlid) {
 	var multi = localStorage.getItem("column");
@@ -40,50 +33,39 @@ function dmmore(tlid) {
 	var acct_id = obj[tlid].domain;
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var sid = $("#timeline_" + tlid + " .cvo")
-		.last()
-		.attr("unique-id");
+	var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
 	var start = "https://" + domain + "/api/v1/conversations?max_id=" + sid;
 	var type = "dm";
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + at
-		}
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + '</div>';
+		$("#timeline_" + tlid).append(templete);
+		additional(acct_id, tlid);
+		jQuery("time.timeago").timeago();
+		moreloading = false;
 	})
-		.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) {
-			var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>";
-			$("#timeline_" + tlid).append(templete);
-			additional(acct_id, tlid);
-			jQuery("time.timeago").timeago();
-			moreloading = false;
-		});
 }
 //DMオブジェクトパーサー(トゥート)
 function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
-	var templete = "";
+	var templete = '';
 	if (obj[0]) {
-		localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, "unix"));
+		localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, 'unix'));
 	}
 
 	var actb = localStorage.getItem("action_btns");
-	var actb = "re,rt,fav,qt,del,pin,red";
+	var actb = 're,rt,fav,qt,del,pin,red';
 	if (actb) {
-		var actb = actb.split(",");
+		var actb = actb.split(',');
 		var disp = {};
 		for (var k = 0; k < actb.length; k++) {
 			if (k < 4) {
@@ -216,7 +198,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	}
 	var local = [];
 	var times = [];
-	Object.keys(obj).forEach(function(key) {
+	Object.keys(obj).forEach(function (key) {
 		var conv_id = obj[key].id;
 		var toot = obj[key].last_status;
 		var dis_name = escapeHTML(toot.account.display_name);
@@ -227,12 +209,14 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//絵文字があれば
 		if (actemojick) {
-			Object.keys(toot.account.emojis).forEach(function(key5) {
+			Object.keys(toot.account.emojis).forEach(function (key5) {
 				var emoji = toot.account.emojis[key5];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				dis_name = dis_name.replace(regExp, emoji_url);
+
 			});
 		}
 		var noticeavatar = "";
@@ -248,7 +232,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var fullname = toot.account.acct + "@" + domain;
 		}
 		if (useremp) {
-			Object.keys(useremp).forEach(function(key10) {
+			Object.keys(useremp).forEach(function (key10) {
 				var user = useremp[key10];
 				if (user == fullname) {
 					boostback = "emphasized";
@@ -263,19 +247,19 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var locked = "";
 		}
 		if (!toot.application) {
-			var via = "";
+			var via = '';
 			viashow = "hide";
 		} else {
 			var via = escapeHTML(toot.application.name);
 			//強調チェック
-			Object.keys(emp).forEach(function(key6) {
+			Object.keys(emp).forEach(function (key6) {
 				var cli = emp[key6];
 				if (cli == via) {
 					boostback = "emphasized";
 				}
 			});
 			//ミュートチェック
-			Object.keys(mute).forEach(function(key7) {
+			Object.keys(mute).forEach(function (key7) {
 				var cli = mute[key7];
 				if (cli == via) {
 					boostback = "hide";
@@ -290,20 +274,20 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var spoil = escapeHTML(toot.spoiler_text);
 			var spoiler = "cw cw_hide_" + toot.id;
 			var api_spoil = "gray";
-			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id + '\')" class="nex parsed">' + lang.lang_parse_cwshow + "</a><br>";
+			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+				'\')" class="nex parsed">' + lang.lang_parse_cwshow + '</a><br>';
 		} else {
-			var ct1 = toot.content.split("</p>").length + toot.content.split("<br />").length - 2;
-			var ct2 = toot.content.split("</p>").length + toot.content.split("<br>").length - 2;
-			if (ct1 > ct2) {
-				var ct = ct1;
-			} else {
-				var ct = ct2;
-			}
+			var ct1 = toot.content.split('</p>').length + toot.content.split('<br />').length - 2;
+			var ct2 = toot.content.split('</p>').length + toot.content.split('<br>').length - 2;
+			if (ct1 > ct2) { var ct = ct1; } else { var ct = ct2; }
 			if ((sent < ct && $.mb_strlen($.strip_tags(toot.content)) > 5) || ($.strip_tags(toot.content).length > ltr && $.mb_strlen($.strip_tags(toot.content)) > 5)) {
-				var content = '<span class="gray">' + lang.lang_parse_fulltext + "</span><br>" + toot.content;
-				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(toot.content), 0, 100) + '</span><span class="gray">' + lang.lang_parse_autofold + "</span>";
+				var content = '<span class="gray">' + lang.lang_parse_fulltext + '</span><br>' + toot.content
+				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(
+					toot.content), 0, 100) +
+					'</span><span class="gray">' + lang.lang_parse_autofold + '</span>';
 				var spoiler = "cw cw_hide_" + toot.id;
-				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id + '\')" class="nex parsed">' + lang.lang_parse_more + "</a><br>";
+				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+					'\')" class="nex parsed">' + lang.lang_parse_more + '</a><br>';
 			} else {
 				var content = toot.content;
 				var spoil = escapeHTML(toot.spoiler_text);
@@ -311,13 +295,14 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				var spoiler_show = "";
 			}
 		}
-		var urls = $.strip_tags(content)
-			.replace(/\n/g, " ")
-			.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/);
+		var urls = $.strip_tags(content).replace(/\n/g, " ").match(
+			/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/
+		);
 		if (urls) {
-			var analyze = "<a onclick=\"additionalIndv('" + tlid + "'," + acct_id + ",'" + id + '\')" class="add-show pointer">' + lang.lang_parse_url + "</a><br>";
+			var analyze = '<a onclick="additionalIndv(\'' + tlid + '\',' + acct_id +
+				',\'' + id + '\')" class="add-show pointer">' + lang.lang_parse_url + '</a><br>';
 		} else {
-			var analyze = "";
+			var analyze = '';
 		}
 		var viewer = "";
 		var hasmedia = "";
@@ -329,10 +314,11 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//絵文字があれば
 		if (emojick) {
-			Object.keys(toot.emojis).forEach(function(key5) {
+			Object.keys(toot.emojis).forEach(function (key5) {
 				var emoji = toot.emojis[key5];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
@@ -346,10 +332,11 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//絵文字があれば
 		if (nicoemojick) {
-			Object.keys(toot.profile_emojis).forEach(function(keynico) {
+			Object.keys(toot.profile_emojis).forEach(function (keynico) {
 				var emoji = toot.profile_emojis[keynico];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
@@ -369,17 +356,21 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if (mediack) {
 			hasmedia = "hasmedia";
 			var cwdt = 100 / toot.media_attachments.length;
-			Object.keys(toot.media_attachments).forEach(function(key2) {
+			Object.keys(toot.media_attachments).forEach(function (key2) {
 				var media = toot.media_attachments[key2];
 				var purl = media.preview_url;
 				media_ids = media_ids + media.id + ",";
 				var url = media.url;
 				if (toot.sensitive && nsfw) {
-					var sense = "sensitive";
+					var sense = "sensitive"
 				} else {
-					var sense = "";
+					var sense = ""
 				}
-				viewer = viewer + "<a onclick=\"imgv('" + id + "','" + key2 + "','" + acct_id + '\')" id="' + id + "-image-" + key2 + '" data-url="' + url + '" data-type="' + media.type + '" class="img-parsed"><img src="' + purl + '" class="' + sense + ' toot-img pointer" style="width:' + cwdt + "%; height:" + imh + 'px;"></a></span>';
+				viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
+					acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
+					'" data-type="' + media.type + '" class="img-parsed"><img src="' +
+					purl + '" class="' + sense +
+					' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;"></a></span>';
 			});
 			media_ids = media_ids.slice(0, -1);
 		} else {
@@ -391,21 +382,24 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		//メンションであれば
 		if (menck) {
 			mentions = "";
-			Object.keys(toot.mentions).forEach(function(key3) {
+			Object.keys(toot.mentions).forEach(function (key3) {
 				var mention = toot.mentions[key3];
-				mentions = mentions + "<a onclick=\"udg('" + mention.id + "'," + acct_id + ')" class="pointer">@' + mention.acct + "</a> ";
+				mentions = mentions + '<a onclick="udg(\'' + mention.id + '\',' +
+					acct_id + ')" class="pointer">@' + mention.acct + '</a> ';
 			});
-			mentions = '<div style="float:right">' + mentions + "</div>";
+			mentions = '<div style="float:right">' + mentions + '</div>';
 		}
 		var tagck = toot.tags[0];
 		var tags = "";
 		//タグであれば
 		if (tagck) {
-			Object.keys(toot.tags).forEach(function(key4) {
+			Object.keys(toot.tags).forEach(function (key4) {
 				var tag = toot.tags[key4];
-				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ":<a onclick=\"tl('tag','" + tag.name + "'," + acct_id + ',\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", "#" + tag.name) + '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", "#" + tag.name) + '">Toot</a>　' + "<a onclick=\"tagPin('" + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagpin.replace("{{tag}}", "#" + tag.name) + '">Pin</a></span> ';
+				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ':<a onclick="tl(\'tag\',\'' + tag.name + '\',' + acct_id +
+					',\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag.name) + '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag.name) + '">Toot</a>　' +
+					'<a onclick="tagPin(\'' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag.name) + '">Pin</a></span> ';
 			});
-			tags = '<div style="float:right">' + tags + "</div>";
+			tags = '<div style="float:right">' + tags + '</div>';
 		}
 		//アニメ再生
 		if (gif == "yes") {
@@ -415,13 +409,13 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//ワードミュート
 		if (wordmute) {
-			Object.keys(wordmute).forEach(function(key8) {
+			Object.keys(wordmute).forEach(function (key8) {
 				var worde = wordmute[key8];
 				if (worde) {
 					if (worde.tag) {
 						var word = worde.tag;
 					} else {
-						var word = worde;
+						var word = worde
 					}
 					var regExp = new RegExp(word, "g");
 					if ($.strip_tags(content).match(regExp)) {
@@ -432,7 +426,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//ワード強調
 		if (wordemp) {
-			Object.keys(wordemp).forEach(function(key9) {
+			Object.keys(wordemp).forEach(function (key9) {
 				var word = wordemp[key9];
 				if (word) {
 					var word = word.tag;
@@ -461,21 +455,23 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				if (cards.image) {
 					var twiImg = '<br><img src="' + cards.image + '">';
 				} else {
-					var twiImg = "";
+					var twiImg = '';
 				}
-				analyze = '<blockquote class="twitter-tweet"><b>' + escapeHTML(cards.author_name) + "</b><br>" + escapeHTML(cards.description) + twiImg + "</blockquote>";
+				analyze = '<blockquote class="twitter-tweet"><b>' + escapeHTML(cards.author_name) + '</b><br>' + escapeHTML(cards.description) + twiImg + '</blockquote>';
 			}
 			if (cards.title) {
-				analyze = '<span class="gray">URL' + lang.lang_cards_check + ":<br>Title:" + escapeHTML(cards.title) + "<br>" + escapeHTML(cards.description) + "</span>";
+				analyze = "<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(cards.title) + "<br>" +
+					escapeHTML(cards.description) + "</span>";
 			}
 			if (cards.html) {
 				analyze = cards.html + '<i class="material-icons" onclick="pip(' + id + ')" title="' + lang.lang_cards_pip + '">picture_in_picture_alt</i>';
 			}
+
 		}
 		//Ticker
 		var tickerdom = "";
 		if (ticker) {
-			var tickerdata = localStorage.getItem("ticker");
+			var tickerdata = localStorage.getItem("ticker")
 			if (tickerdata) {
 				var tickerdata = JSON.parse(tickerdata);
 
@@ -486,13 +482,41 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				for (var i = 0; i < tickerdata.length; i++) {
 					var value = tickerdata[i];
 					if (value.domain == thisdomain) {
-						var tickerdom = '<div style="background:linear-gradient(to left,transparent, ' + value.bg + " 96%) !important; color:" + value.text + ';width:100%; height:0.9rem; font-size:0.8rem;"><img src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + "</span></div>";
+						var tickerdom = '<div style="background:linear-gradient(to left,transparent, ' + value.bg + ' 96%) !important; color:' + value.text + ';width:100%; height:0.9rem; font-size:0.8rem;"><img src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + '</span></div>';
 						break;
 					}
 				}
 			}
 		}
-		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' + boostback + " " + fav_app + " " + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[key].created_at, "unix") + '" ' + if_notf + ' onclick="dmStatus()">' + '<div class="area-notice"><span class="gray sharesta">' + notice + home + "</span></div>" + '<div class="area-icon"><a onclick="udg(\'' + toot.account.id + "'," + acct_id + ');" user="' + toot.account.acct + '" class="udg">' + '<img src="' + avatar + '" width="40" class="prof-img" user="' + toot.account.acct + '"></a>' + noticeavatar + "</div>" + '<div class="area-display_name"><div class="flex-name"><span class="user">' + dis_name + '</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' + toot.account.acct + locked + "</span></div>" + '<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-o"></i>' + date(toot.created_at, datetype) + "</span>" + "</div></div>" + '<div class="area-toot">' + tickerdom + '<span class="' + api_spoil + " cw_text_" + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show + '</span><span class="toot ' + spoiler + '">' + content + "</span>" + "" + viewer + "" + "<br><a onclick=\"details('" + toot.id + "'," + acct_id + ",'" + tlid + "','dm')\" class=\"pointer waves-effect\">" + lang.lang_parse_thread + "</a></div>" + '<div class="area-vis"></div>' + "</div></div>";
+		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
+			boostback + ' ' + fav_app +
+			' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[
+				key].created_at, 'unix') + '" ' + if_notf + ' onclick="dmStatus()">' +
+			'<div class="area-notice"><span class="gray sharesta">' + notice + home +
+			'</span></div>' +
+			'<div class="area-icon"><a onclick="udg(\'' + toot.account.id +
+			'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
+			'<img src="' + avatar +
+			'" width="40" class="prof-img" user="' + toot.account.acct +
+			'"></a>' + noticeavatar + '</div>' +
+			'<div class="area-display_name"><div class="flex-name"><span class="user">' +
+			dis_name +
+			'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' +
+			toot.account.acct + locked + '</span></div>' +
+			'<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-o"></i>' +
+			date(toot.created_at, datetype) + '</span>' +
+			'</div></div>' +
+			'<div class="area-toot">' + tickerdom + '<span class="' +
+			api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
+			'</span><span class="toot ' + spoiler + '">' + content +
+			'</span>' +
+			'' + viewer + '' +
+			'<br><a onclick="details(\'' + toot.id + '\',' + acct_id +
+			',\'' + tlid + '\',\'dm\')" class="pointer waves-effect">' + lang.lang_parse_thread + '</a></div>' +
+			'<div class="area-vis"></div>' +
+			'</div></div>';
 	});
 	return templete;
 }

app/js/tl/filter.js

@@ -1,447 +1,381 @@
 /*メディアフィルター機能*/
 //各TL上方のMedia[On/Off]
 function mediaToggle(tlid) {
-	var media = localStorage.getItem('media_' + tlid)
+	var media = localStorage.getItem("media_" + tlid);
 	if (media) {
-		localStorage.removeItem('media_' + tlid)
-		$('#sta-media-' + tlid).text('Off')
-		$('#sta-media-' + tlid).css('color', 'red')
-		$('#timeline_' + tlid).removeClass('media-filter')
+		localStorage.removeItem("media_" + tlid);
+		$("#sta-media-" + tlid).text("Off");
+		$("#sta-media-" + tlid).css("color", 'red');
+		$("#timeline_" + tlid).removeClass("media-filter")
 	} else {
-		localStorage.setItem('media_' + tlid, 'true')
-		$('#sta-media-' + tlid).text('On')
-		$('#sta-media-' + tlid).css('color', '#009688')
-		$('#timeline_' + tlid).addClass('media-filter')
+		localStorage.setItem("media_" + tlid, "true");
+		$("#sta-media-" + tlid).text("On");
+		$("#sta-media-" + tlid).css("color", '#009688');
+		$("#timeline_" + tlid).addClass("media-filter")
 	}
 }
 //各TL上方のBT[BTOnly/BTExc/Off]
 function ebtToggle(tlid) {
-	var ebt = localStorage.getItem('ebt_' + tlid)
-	if (ebt == 'true') {
-		localStorage.setItem('ebt_' + tlid, 'but')
-		$('#sta-bt-' + tlid).text('BT Only')
-		$('#sta-bt-' + tlid).css('color', '#ff9800')
-		$('#timeline_' + tlid).addClass('except-bt-filter')
-		$('#timeline_' + tlid).removeClass('bt-filter')
-	} else if (ebt == 'but') {
-		localStorage.removeItem('ebt_' + tlid)
-		$('#sta-bt-' + tlid).text('Off')
-		$('#sta-bt-' + tlid).css('color', 'red')
-		$('#timeline_' + tlid).removeClass('bt-filter')
-		$('#timeline_' + tlid).removeClass('except-bt-filter')
+	var ebt = localStorage.getItem("ebt_" + tlid);
+	if (ebt == "true") {
+		localStorage.setItem("ebt_" + tlid, "but");
+		$("#sta-bt-" + tlid).text("BT Only");
+		$("#sta-bt-" + tlid).css("color", '#ff9800');
+		$("#timeline_" + tlid).addClass("except-bt-filter")
+		$("#timeline_" + tlid).removeClass("bt-filter")
+	} else if (ebt == "but") {
+		localStorage.removeItem("ebt_" + tlid);
+		$("#sta-bt-" + tlid).text("Off");
+		$("#sta-bt-" + tlid).css("color", 'red');
+		$("#timeline_" + tlid).removeClass("bt-filter")
+		$("#timeline_" + tlid).removeClass("except-bt-filter")
 	} else {
-		localStorage.setItem('ebt_' + tlid, 'true')
-		$('#sta-bt-' + tlid).text('BT Ex')
-		$('#sta-bt-' + tlid).css('color', '#009688')
-		$('#timeline_' + tlid).addClass('bt-filter')
-		$('#timeline_' + tlid).removeClass('except-bt-filter')
+		localStorage.setItem("ebt_" + tlid, "true");
+		$("#sta-bt-" + tlid).text("BT Ex");
+		$("#sta-bt-" + tlid).css("color", '#009688');
+		$("#timeline_" + tlid).addClass("bt-filter")
+		$("#timeline_" + tlid).removeClass("except-bt-filter")
 	}
 }
 //各TL上方のMedia[On/Off]をチェック
 function mediaCheck(tlid) {
-	var media = localStorage.getItem('media_' + tlid)
+	var media = localStorage.getItem("media_" + tlid);
 	if (media) {
-		$('#sta-media-' + tlid).text('On')
-		$('#sta-media-' + tlid).css('color', '#009688')
-		$('#timeline_' + tlid).addClass('media-filter')
+		$("#sta-media-" + tlid).text("On");
+		$("#sta-media-" + tlid).css("color", '#009688');
+		$("#timeline_" + tlid).addClass("media-filter")
 	} else {
-		$('#sta-media-' + tlid).text('Off')
-		$('#sta-media-' + tlid).css('color', 'red')
-		$('#timeline_' + tlid).removeClass('media-filter')
+		$("#sta-media-" + tlid).text("Off");
+		$("#sta-media-" + tlid).css("color", 'red');
+		$("#timeline_" + tlid).removeClass("media-filter")
 	}
 }
 //各TL上方のBT[On/Off]をチェック
 function ebtCheck(tlid) {
-	var ebt = localStorage.getItem('ebt_' + tlid)
-	if (ebt == 'true') {
-		$('#sta-bt-' + tlid).text('BT Ex')
-		$('#sta-bt-' + tlid).css('color', '#009688')
-		$('#timeline_' + tlid).addClass('bt-filter')
-		$('#timeline_' + tlid).removeClass('except-bt-filter')
-	} else if (ebt == 'but') {
-		$('#sta-bt-' + tlid).text('BT Only')
-		$('#sta-bt-' + tlid).css('color', '#ff9800')
-		$('#timeline_' + tlid).addClass('except-bt-filter')
-		$('#timeline_' + tlid).removeClass('bt-filter')
+	var ebt = localStorage.getItem("ebt_" + tlid);
+	if (ebt == "true") {
+		$("#sta-bt-" + tlid).text("BT Ex");
+		$("#sta-bt-" + tlid).css("color", '#009688');
+		$("#timeline_" + tlid).addClass("bt-filter")
+		$("#timeline_" + tlid).removeClass("except-bt-filter")
+	} else if (ebt == "but") {
+		$("#sta-bt-" + tlid).text("BT Only");
+		$("#sta-bt-" + tlid).css("color", '#ff9800');
+		$("#timeline_" + tlid).addClass("except-bt-filter")
+		$("#timeline_" + tlid).removeClass("bt-filter")
 	} else {
-		$('#sta-bt-' + tlid).text('Off')
-		$('#sta-bt-' + tlid).css('color', 'red')
-		$('#timeline_' + tlid).removeClass('bt-filter')
-		$('#timeline_' + tlid).removeClass('except-bt-filter')
+		$("#sta-bt-" + tlid).text("Off");
+		$("#sta-bt-" + tlid).css("color", 'red');
+		$("#timeline_" + tlid).removeClass("bt-filter")
+		$("#timeline_" + tlid).removeClass("except-bt-filter")
 	}
 }
 /* 削除追跡*/
 function catchToggle(tlid) {
-	var catchck = localStorage.getItem('catch_' + tlid)
+	var catchck = localStorage.getItem("catch_" + tlid);
 	if (catchck) {
-		localStorage.removeItem('catch_' + tlid)
-		$('#sta-del-' + tlid).text('Off')
-		$('#sta-del-' + tlid).css('color', 'red')
-		parseColumn(tlid)
+		localStorage.removeItem("catch_" + tlid);
+		$("#sta-del-" + tlid).text("Off");
+		$("#sta-del-" + tlid).css("color", 'red');
+		parseColumn(tlid);
 	} else {
-		localStorage.setItem('catch_' + tlid, 'true')
-		$('#sta-del-' + tlid).text('On')
-		$('#sta-del-' + tlid).css('color', '#009688')
-		parseColumn(tlid)
+		localStorage.setItem("catch_" + tlid, "true");
+		$("#sta-del-" + tlid).text("On");
+		$("#sta-del-" + tlid).css("color", '#009688');
+		parseColumn(tlid);
 	}
 }
 function catchCheck(tlid) {
-	var catchck = localStorage.getItem('catch_' + tlid)
+	var catchck = localStorage.getItem("catch_" + tlid);
 	if (catchck) {
-		$('#sta-del-' + tlid).text('On')
-		$('#sta-del-' + tlid).css('color', '#009688')
+		$("#sta-del-" + tlid).text("On");
+		$("#sta-del-" + tlid).css("color", '#009688');
 	} else {
-		$('#sta-del-' + tlid).text('Off')
-		$('#sta-del-' + tlid).css('color', 'red')
+		$("#sta-del-" + tlid).text("Off");
+		$("#sta-del-" + tlid).css("color", 'red');
 	}
 }
 function delreset(tlid) {
-	$('[tlid=' + tlid + '] .by_delcatch').hide()
-	$('[tlid=' + tlid + '] .by_delcatch').remove()
+	$("[tlid=" + tlid + "] .by_delcatch").hide();
+	$("[tlid=" + tlid + "] .by_delcatch").remove();
+
 }
 /*ワードフィルター機能*/
 function filterMenu() {
-	$('#left-menu div').removeClass('active')
-	$('#filterMenu').addClass('active')
-	$('.menu-content').addClass('hide')
-	$('#filter-box').removeClass('hide')
+	$("#left-menu div").removeClass("active");
+	$("#filterMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+	$("#filter-box").removeClass("hide");
 }
 function filter() {
-	$('#filtered-words').html('')
-	$('#filter-edit-id').val('')
-	var acct_id = $('#filter-acct-sel').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/filters'
+	$("#filtered-words").html("");
+	$("#filter-edit-id").val("")
+	var acct_id = $("#filter-acct-sel").val();
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/filters"
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json) {
+			var filters = "";
+			Object.keys(json).forEach(function (key) {
+				var filterword = json[key];
+				var context = filterword.context.join(',');
+				filters = filters + escapeHTML(filterword.phrase) + '<span class="sml">(for ' + context + ')</span>:<a onclick="filterEdit(\'' + filterword.id + '\',\'' + acct_id +
+					'\')" class="pointer">' + lang.lang_edit + '</a>/<a onclick="filterDel(' + filterword.id + ',' + acct_id +
+					')" class="pointer">' + lang.lang_del + '</a><br> ';
+			});
+			if (filters == "") {
+				filters = lang.lang_filter_nodata + "<br>";
+			}
+			$("#filtered-words").html(filters);
+		} else {
+			$("#filtered-words").html(lang_filter_nodata);
 		}
-	})
-		.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) {
-				var filters = ''
-				Object.keys(json).forEach(function(key) {
-					var filterword = json[key]
-					var context = filterword.context.join(',')
-					filters =
-						filters +
-						escapeHTML(filterword.phrase) +
-						`<span class="sml">(for ${context})</span>:
-						<a onclick="filterEdit('${filterword.id}','${acct_id}')" class="pointer">
-							${lang.lang_edit}
-						</a>/
-						<a onclick="filterDel('${filterword.id}','${acct_id}')" class="pointer">
-							${lang.lang_del}
-						</a><br> `
-				})
-				if (filters == '') {
-					filters = lang.lang_filter_nodata + '<br>'
-				}
-				$('#filtered-words').html(filters)
-			} else {
-				$('#filtered-words').html(lang_filter_nodata)
-			}
-		})
+	});
 }
 function filterTime(day, hour, min) {
-	$('#days_filter').val(day)
-	$('#hours_filter').val(hour)
-	$('#mins_filter').val(min)
+	$("#days_filter").val(day)
+	$("#hours_filter").val(hour)
+	$("#mins_filter").val(min)
 }
 function makeNewFilter() {
-	var acct_id = $('#filter-acct-sel').val()
-	var phr = $('#filter-add-word').val()
-	var cont = []
-	if ($('#home_filter:checked').val()) {
-		cont.push('home')
+	var acct_id = $("#filter-acct-sel").val();
+	var phr = $("#filter-add-word").val();
+	var cont = [];
+	if ($("#home_filter:checked").val()) {
+		cont.push("home");
 	}
-	if ($('#local_filter:checked').val()) {
-		cont.push('public')
+	if ($("#local_filter:checked").val()) {
+		cont.push("public");
 	}
-	if ($('#notf_filter:checked').val()) {
-		cont.push('notifications')
+	if ($("#notf_filter:checked").val()) {
+		cont.push("notifications");
 	}
-	if ($('#conv_filter:checked').val()) {
-		cont.push('thread')
+	if ($("#conv_filter:checked").val()) {
+		cont.push("thread");
 	}
 	if (!cont.length) {
-		$('#filtered-words').html('Error:' + lang.lang_filter_errordegree)
+		$("#filtered-words").html('Error:' + lang.lang_filter_errordegree);
 	}
-	var exc = $('#except_filter:checked').val()
-	var who = $('#wholeword_filter:checked').val()
+	var exc = $("#except_filter:checked").val();
+	var who = $("#wholeword_filter:checked").val();
 	if (!who) {
-		who = false
+		who = false;
 	}
-	var time =
-		$('#days_filter').val() * 24 * 60 * 60 +
-		$('#hours_filter').val() * 60 * 60 +
-		$('#mins_filter').val() * 60
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if ($('#filter-edit-id').val()) {
-		var start = 'https://' + domain + '/api/v1/filters/' + $('#filter-edit-id').val()
-		var method = 'PUT'
+	var time = $("#days_filter").val() * 24 * 60 * 60 + $("#hours_filter").val() * 60 * 60 + $("#mins_filter").val() * 60;
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if ($("#filter-edit-id").val()) {
+		var start = "https://" + domain + "/api/v1/filters/" + $("#filter-edit-id").val();
+		var method = "PUT"
 	} else {
-		var start = 'https://' + domain + '/api/v1/filters'
-		var method = 'POST'
+		var start = "https://" + domain + "/api/v1/filters"
+		var method = "POST"
 	}
 
-	var httpreq = new XMLHttpRequest()
-	httpreq.open(method, start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = 'json'
-	httpreq.send(
-		JSON.stringify({
-			phrase: phr,
-			context: cont,
-			irreversible: exc,
-			whole_word: who,
-			expires_in: time
-		})
-	)
-	httpreq.onreadystatechange = function() {
+	var httpreq = new XMLHttpRequest();
+	httpreq.open(method, start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify({
+		phrase: phr,
+		context: cont,
+		irreversible: exc,
+		whole_word: who,
+		expires_in: time
+	}));
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
-			filter()
+			var json = httpreq.response;
+			filter();
 			filterUpdate(acct_id)
-			$('#filter-add-word').val('')
-			$('#home_filter').prop('checked', false)
-			$('#local_filter').prop('checked', false)
-			$('#notf_filter').prop('checked', false)
-			$('#conv_filter').prop('checked', false)
-			$('#except_filter').prop('checked', false)
-			$('#wholeword_filter').prop('checked', false)
-			$('#days_filter').val('0')
-			$('#hours_filter').val('0')
-			$('#mins_filter').val('0')
-			$('#add-filter-btn').text(lang.lang_add)
-			$('#filter-edit-id').val('')
+			$("#filter-add-word").val("");
+			$("#home_filter").prop("checked", false);
+			$("#local_filter").prop("checked", false);
+			$("#notf_filter").prop("checked", false);
+			$("#conv_filter").prop("checked", false);
+			$("#except_filter").prop("checked", false);
+			$("#wholeword_filter").prop("checked", false);
+			$("#days_filter").val("0");
+			$("#hours_filter").val("0");
+			$("#mins_filter").val("0");
+			$("#add-filter-btn").text(lang.lang_add);
+			$("#filter-edit-id").val("")
 		}
 	}
 }
 function filterEdit(id, acct_id) {
-	$('#filter-add-word').val('')
-	$('#home_filter').prop('checked', false)
-	$('#local_filter').prop('checked', false)
-	$('#notf_filter').prop('checked', false)
-	$('#conv_filter').prop('checked', false)
-	$('#except_filter').prop('checked', false)
-	$('#wholeword_filter').prop('checked', false)
-	$('#days_filter').val('0')
-	$('#hours_filter').val('0')
-	$('#mins_filter').val('0')
-	$('#add-filter-btn').text(lang.lang_edit)
-	$('#filter-edit-id').val(id)
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/filters/' + id
+	$("#filter-add-word").val("");
+	$("#home_filter").prop("checked", false);
+	$("#local_filter").prop("checked", false);
+	$("#notf_filter").prop("checked", false);
+	$("#conv_filter").prop("checked", false);
+	$("#except_filter").prop("checked", false);
+	$("#wholeword_filter").prop("checked", false);
+	$("#days_filter").val("0");
+	$("#hours_filter").val("0");
+	$("#mins_filter").val("0");
+	$("#add-filter-btn").text(lang.lang_edit);
+	$("#filter-edit-id").val(id);
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/filters/" + id
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json) {
+			var now = new Date();
+			now = now.getTime();
+			var now = Math.floor(now / 1000);
+			$("#filter-add-word").val(json.phrase);
+			Object.keys(json.context).forEach(function (key) {
+				var context = json.context[key];
+				$("[value=" + context + "]").prop("checked", true);
+			});
+			if (json.irreversible) {
+				$("#except_filter").prop("checked", true);
+			}
+			if (json.whole_word) {
+				$("#wholeword_filter").prop("checked", true);
+			}
+			var expires = date(json.expires_at, 'unix') - now;
+			var mins = Math.floor(expires / 60) % 60;
+			var hours = Math.floor(expires / 3600) % 24;
+			var days = Math.floor(expires / 3600 / 24);
+			$("#days_filter").val(days);
+			$("#hours_filter").val(hours);
+			$("#mins_filter").val(mins);
 		}
-	})
-		.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) {
-				var now = new Date()
-				now = now.getTime()
-				var now = Math.floor(now / 1000)
-				$('#filter-add-word').val(json.phrase)
-				Object.keys(json.context).forEach(function(key) {
-					var context = json.context[key]
-					$('[value=' + context + ']').prop('checked', true)
-				})
-				if (json.irreversible) {
-					$('#except_filter').prop('checked', true)
-				}
-				if (json.whole_word) {
-					$('#wholeword_filter').prop('checked', true)
-				}
-				var expires = date(json.expires_at, 'unix') - now
-				var mins = Math.floor(expires / 60) % 60
-				var hours = Math.floor(expires / 3600) % 24
-				var days = Math.floor(expires / 3600 / 24)
-				$('#days_filter').val(days)
-				$('#hours_filter').val(hours)
-				$('#mins_filter').val(mins)
-			}
-		})
+	});
 }
 function filterDel(id, acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/filters/' + 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() {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/filters/" + 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) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
-			filter()
+			var json = httpreq.response;
+			filter();
 			filterUpdate(acct_id)
 		}
 	}
 }
 function getFilter(acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
-		var start = 'https://' + domain + '/api/v1/filters'
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if (localStorage.getItem("mode_" + domain) != "misskey") {
+		var start = "https://" + domain + "/api/v1/filters"
 		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) {
-				localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
-			})
+				'Authorization': 'Bearer ' + at
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			localStorage.setItem("filter_" + acct_id, JSON.stringify(json));
+		});
 	} else {
-		localStorage.setItem('filter_' + acct_id, JSON.stringify({}))
+		localStorage.setItem("filter_" + acct_id, JSON.stringify({}));
 	}
 }
 function getFilterType(json, type) {
 	if (!json) {
-		return []
+		return [];
 	}
-	if (type == 'local') {
-		type = 'public'
-	} else if (type == 'list') {
-		type = 'home'
-	} else if (type == 'notf') {
-		type = 'notifi'
+	if (type == "local") {
+		type = "public";
+	} else if (type == "list") {
+		type = "home";
+	} else if (type == "notf") {
+		type = "notifi";
 	}
-	var mutedfilters = []
-	Object.keys(json).forEach(function(key) {
-		var filterword = json[key]
-		var phrases = filterword.phrase
-		var arr = filterword.context
-		if (arr.join(',').indexOf(type) !== -1) {
-			mutedfilters.push(phrases)
-		} else if (type == 'mix'){
-			if (arr.indexOf('home') !== -1 || arr.indexOf('public') !== -1) {
-				mutedfilters.push(phrases)
-			}
+	var mutedfilters = [];
+	Object.keys(json).forEach(function (key) {
+		var filterword = json[key];
+		var phrases = filterword.phrase;
+		if (filterword.context.join(",").indexOf(type) !== -1) {
+			mutedfilters.push(phrases);
 		}
-	})
-	return mutedfilters
-}
-function getFilterTypeByAcct(acct_id, type) {
-	if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
-		var mute = getFilterType(JSON.parse(localStorage.getItem('filter_' + acct_id)), type)
-	} else {
-		var mute = []
-	}
-	return mute
+	});
+	return mutedfilters;
 }
 function filterUpdate(acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/filters'
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/filters"
 	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) {
-			localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
-			filterUpdateInternal(json, 'home')
-			filterUpdateInternal(json, 'local')
-			filterUpdateInternal(json, 'notf')
-			filterUpdateInternal(json, 'pub')
-		})
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		localStorage.setItem("filter_" + acct_id, JSON.stringify(json));
+		filterUpdateInternal(json, "home");
+		filterUpdateInternal(json, "local");
+		filterUpdateInternal(json, "notf");
+		filterUpdateInternal(json, "pub");
+	});
+
+
 }
 function filterUpdateInternal(json, type) {
-	var home = getFilterType(json, type)
-	var wordmute = localStorage.getItem('word_mute')
+	var home = getFilterType(json, type);
+	var wordmute = localStorage.getItem("word_mute");
 	if (wordmute) {
-		var wordmute = JSON.parse(wordmute)
-		home = home.concat(wordmute)
+		var wordmute = JSON.parse(wordmute);
+		home = home.concat(wordmute);
 	}
 	if (home) {
-		$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function(i, elem) {
-			var id = $(elem).attr('toot-id')
-			$('[toot-id=' + id + ']').removeClass('hide')
-			var text = $(elem)
-				.find('.toot')
-				.html()
-			Object.keys(home).forEach(function(key8) {
-				var word = home[key8]
-				var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g')
+		$("[data-acct=" + acct_id + "] [data-type=" + type + "] .cvo").each(function (i, elem) {
+			var id = $(elem).attr("toot-id");
+			$("[toot-id=" + id + "]").removeClass("hide");
+			var text = $(elem).find('.toot').html();
+			Object.keys(home).forEach(function (key8) {
+				var word = home[key8];
+				var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
 				if ($.strip_tags(text).match(regExp)) {
-					$('[toot-id=' + id + ']').addClass('hide')
+					$("[toot-id=" + id + "]").addClass("hide");
 				}
-			})
-		})
+			});
+		});
 	}
 }
 /*
@@ -452,73 +386,73 @@ function filterUpdateInternal(json, type) {
 */
 //通知フィルター
 function exclude(key) {
-	localStorage.setItem('exclude-' + key, '')
-	var excludetxt = localStorage.getItem('exclude-' + key)
+	localStorage.setItem("exclude-" + key, "")
+	var excludetxt = localStorage.getItem("exclude-" + key);
 	if ($('#exc-reply-' + key + ':checked').val()) {
-		excludetxt = '?exclude_types[]=mention'
+		excludetxt = "?exclude_types[]=mention"
 	}
 	if ($('#exc-fav-' + key + ':checked').val()) {
-		if (excludetxt || excludetxt != '') {
-			excludetxt = excludetxt + '&exclude_types[]=favourite'
+		if (excludetxt || excludetxt !="") {
+			excludetxt = excludetxt + "&exclude_types[]=favourite"
 		} else {
-			excludetxt = '?exclude_types[]=favourite'
+			excludetxt = "?exclude_types[]=favourite"
 		}
 	}
 	if ($('#exc-bt-' + key + ':checked').val()) {
-		if (excludetxt || excludetxt != '') {
-			excludetxt = excludetxt + '&exclude_types[]=reblog'
+		if (excludetxt || excludetxt !="") {
+			excludetxt = excludetxt + "&exclude_types[]=reblog"
 		} else {
-			excludetxt = '?exclude_types[]=reblog'
+			excludetxt = "?exclude_types[]=reblog"
 		}
 	}
 	if ($('#exc-follow-' + key + ':checked').val()) {
-		if (excludetxt || excludetxt != '') {
-			excludetxt = excludetxt + '&exclude_types[]=follow'
+		if (excludetxt || excludetxt !="") {
+			excludetxt = excludetxt + "&exclude_types[]=follow"
 		} else {
-			excludetxt = '?exclude_types[]=follow'
+			excludetxt = "?exclude_types[]=follow"
 		}
 	}
 	if ($('#exc-poll-' + key + ':checked').val()) {
-		if (excludetxt || excludetxt != '') {
-			excludetxt = excludetxt + '&exclude_types[]=poll'
+		if (excludetxt || excludetxt !="") {
+			excludetxt = excludetxt + "&exclude_types[]=poll"
 		} else {
-			excludetxt = '?exclude_types[]=poll'
+			excludetxt = "?exclude_types[]=poll"
 		}
 	} else {
 	}
-	localStorage.setItem('exclude-' + key, excludetxt)
-	parseColumn(key)
+	localStorage.setItem("exclude-" + key, excludetxt)
+	parseColumn(key);
 }
 function excludeCk(key, target) {
-	var exc = localStorage.getItem('exclude-' + key)
+	var exc = localStorage.getItem("exclude-" + key);
 	if (!exc) {
-		return ''
+		return "";
 	}
 	if (~exc.indexOf(target)) {
-		return 'checked'
+		return "checked"
 	} else {
-		return ''
+		return "";
 	}
 }
-function checkNotfFilter(tlid) {
-	var excludetxt = localStorage.getItem('exclude-' + tlid)
-	if (!excludetxt || excludetxt != '') {
-		return true
-	} else {
-		return false
+function checkNotfFilter(tlid){
+	var excludetxt = localStorage.getItem("exclude-" + tlid);
+	if(!excludetxt || excludetxt != ""){
+		return true;
+	}else{
+		return false;
 	}
 }
-function resetNotfFilter(tlid) {
-	localStorage.setItem('exclude-' + tlid, '')
-	parseColumn(tlid)
+function resetNotfFilter(tlid){
+	localStorage.setItem("exclude-" + tlid, "")
+	parseColumn(tlid);
 }
-function notfFilter(id, tlid, acct_id) {
-	var excludetxt = localStorage.getItem('exclude-' + tlid)
-	if (excludetxt || excludetxt != '') {
-		excludetxt = excludetxt + '&account_id=' + id
+function notfFilter(id,tlid,acct_id){
+	var excludetxt = localStorage.getItem("exclude-" + tlid);
+	if (excludetxt || excludetxt !="") {
+		excludetxt = excludetxt + "&account_id="+id
 	} else {
-		excludetxt = '?account_id=' + id
+		excludetxt = "?account_id="+id
 	}
-	localStorage.setItem('exclude-' + tlid, excludetxt)
-	parseColumn(tlid)
-}
+	localStorage.setItem("exclude-" + tlid, excludetxt)
+	parseColumn(tlid);
+}

app/js/tl/list.js

@@ -1,358 +1,263 @@
 function listMenu() {
-	$('#left-menu div').removeClass('active')
-	$('#listMenu').addClass('active')
-	$('.menu-content').addClass('hide')
-	$('#list-box').removeClass('hide')
-	$('ul.tabs').tabs('select_tab', 'src-sta')
-	$('#src-contents').html('')
+	$("#left-menu div").removeClass("active");
+	$("#listMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+	$("#list-box").removeClass("hide");
+	$('ul.tabs').tabs('select_tab', 'src-sta');
+	$("#src-contents").html("");
 }
 
+
 function list() {
-	$('#lists-user').html('')
-	var acct_id = $('#list-acct-sel').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		var start = 'https://' + domain + '/api/users/lists/list'
+	$("#lists-user").html("");
+	var acct_id = $("#list-acct-sel").val();
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if (localStorage.getItem("mode_" + domain) == "misskey") {
+		var start = "https://" + domain + "/api/users/lists/list"
 		fetch(start, {
 			method: 'POST',
 			body: JSON.stringify({
 				i: at
-			})
-		})
-			.then(function(response) {
-				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) {
-					var lists = ''
-					Object.keys(json).forEach(function(key) {
-						var list = json[key]
-						lists =
-							lists +
-							escapeHTML(list.title) +
-							`:<a onclick="listShow('${list.id}','${escapeHTML(
-								list.title
-							)}','${acct_id}')" class="pointer">
-								${lang.lang_list_show}
-							</a><br>`
-					})
-					$('#lists').html(lists)
-				} else {
-					$('#lists').html(lang.lang_list_nodata)
-				}
-			})
+			}),
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json) {
+				var lists = "";
+				Object.keys(json).forEach(function (key) {
+					var list = json[key];
+					lists = lists + escapeHTML(list.title) + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
+						'\')" class="pointer">' + lang.lang_list_show + '</a><br>';
+				});
+				$("#lists").html(lists);
+			} else {
+				$("#lists").html(lang.lang_list_nodata);
+			}
+		});
 	} else {
-		var start = 'https://' + domain + '/api/v1/lists'
+		var start = "https://" + domain + "/api/v1/lists"
 		fetch(start, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				'Authorization': 'Bearer ' + at
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json) {
+				var lists = "";
+				Object.keys(json).forEach(function (key) {
+					var list = json[key];
+					lists = lists + escapeHTML(list.title) + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
+						'\')" class="pointer">' + lang.lang_list_show + '</a>/<a onclick="listUser(\'' + list.id + '\',' + acct_id +
+						')" class="pointer">' + lang.lang_list_users + '</a><br>';
+				});
+				$("#lists").html(lists);
+			} else {
+				$("#lists").html(lang.lang_list_nodata);
 			}
-		})
-			.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) {
-					var lists = ''
-					Object.keys(json).forEach(function(key) {
-						var list = json[key]
-						lists =
-							lists +
-							escapeHTML(list.title) +
-							`:<a onclick="listShow('${list.id}','${escapeHTML(
-								list.title
-							)}','${acct_id}')" class="pointer">
-								${lang.lang_list_show}
-							</a>/
-							<a onclick="listUser('${list.id}','${acct_id}')" class="pointer">
-								${lang.lang_list_users}
-							'</a><br>`
-					})
-					$('#lists').html(lists)
-				} else {
-					$('#lists').html(lang.lang_list_nodata)
-				}
-			})
+		});
 	}
 }
 function makeNewList() {
-	var acct_id = $('#list-acct-sel').val()
-	var text = $('#list-add').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
-		var start = 'https://' + domain + '/api/v1/lists'
-		var httpreq = new XMLHttpRequest()
-		httpreq.open('POST', start, true)
-		httpreq.setRequestHeader('Content-Type', 'application/json')
-		httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-		httpreq.responseType = 'json'
-		httpreq.send(
-			JSON.stringify({
-				title: text
-			})
-		)
-		httpreq.onreadystatechange = function() {
+	var acct_id = $("#list-acct-sel").val();
+	var text = $("#list-add").val();
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if (localStorage.getItem("mode_" + domain) != "misskey") {
+		var start = "https://" + domain + "/api/v1/lists"
+		var httpreq = new XMLHttpRequest();
+		httpreq.open('POST', start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		httpreq.responseType = "json";
+		httpreq.send(JSON.stringify({
+			title: text
+		}));
+		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.response
-				if (this.status !== 200) {
-					setLog(start, this.status, this.response)
-				}
-				list()
-				$('#list-add').val('')
+				var json = httpreq.response;
+				list();
+				$("#list-add").val("")
 			}
 		}
 	} else {
-		var start = 'https://' + domain + '/api/users/lists/create'
-		var httpreq = new XMLHttpRequest()
-		httpreq.open('POST', start, true)
-		httpreq.setRequestHeader('Content-Type', 'application/json')
-		httpreq.responseType = 'json'
-		httpreq.send(
-			JSON.stringify({
-				i: at,
-				title: text
-			})
-		)
-		httpreq.onreadystatechange = function() {
+		var start = "https://" + domain + "/api/users/lists/create"
+		var httpreq = new XMLHttpRequest();
+		httpreq.open('POST', start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		httpreq.responseType = "json";
+		httpreq.send(JSON.stringify({
+			i: at,
+			title: text
+		}));
+		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.response
-				if (this.status !== 200) {
-					setLog(start, this.status, this.response)
-				}
-				list()
-				$('#list-add').val('')
+				var json = httpreq.response;
+				list();
+				$("#list-add").val("")
 			}
 		}
 	}
 }
 function listShow(id, title, acct_id) {
-	localStorage.setItem('list_' + id + '_' + acct_id, title)
-	tl('list', id, acct_id, 'add')
+	localStorage.setItem("list_" + id + "_" + acct_id, title);
+	tl('list', id, acct_id, 'add');
 }
 function listUser(id, acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/lists/' + id + '/accounts'
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json) {
+			var lists = "";
+			var templete = userparse(json, '', acct_id);
+			if (!json[0]) {
+				templete = lang.lang_list_nouser;
+			}
+			$("#lists-user").html(templete);
+			jQuery("time.timeago").timeago();
+		} else {
+			$("#lists-user").html(lang.lang_list_nouser);
 		}
-	})
-		.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) {
-				var lists = ''
-				var templete = userparse(json, '', acct_id)
-				if (!json[0]) {
-					templete = lang.lang_list_nouser
-				}
-				$('#lists-user').html(templete)
-				jQuery('time.timeago').timeago()
-			} else {
-				$('#lists-user').html(lang.lang_list_nouser)
-			}
-		})
+	});
 }
 function hisList(user, acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
-		var start = 'https://' + domain + '/api/v1/lists'
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if (localStorage.getItem("mode_" + domain) != "misskey") {
+		var start = "https://" + domain + "/api/v1/lists"
 		fetch(start, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				'Authorization': 'Bearer ' + at
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json) {
+				var lists = lang.lang_list_add + "<br>";
+				Object.keys(json).forEach(function (key) {
+					var list = json[key];
+					lists = lists + '<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
+						'\')" class="pointer">' + escapeHTML(list.title) + '</a><br> ';
+				});
+				$("#his-lists-a").html(lists);
+			} else {
+				$("#his-lists-a").html(lang.lang_list_nodata);
 			}
-		})
-			.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) {
-					var lists = lang.lang_list_add + '<br>'
-					Object.keys(json).forEach(function(key) {
-						var list = json[key]
-						lists =
-							lists +
-							`<a onclick="listAdd('${list.id}','${user}','${acct_id}')" class="pointer">
-								${escapeHTML(list.title)}
-							</a><br> `
-					})
-					$('#his-lists-a').html(lists)
-				} else {
-					$('#his-lists-a').html(lang.lang_list_nodata)
-				}
-			})
-		var start = 'https://' + domain + '/api/v1/accounts/' + user + '/lists'
+		});
+		var start = "https://" + domain + "/api/v1/accounts/" + user + "/lists"
 		fetch(start, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				'Authorization': 'Bearer ' + at
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json) {
+				var lists = lang.lang_list_remove + "<br>";
+				Object.keys(json).forEach(function (key) {
+					var list = json[key];
+					lists = lists + '<a onclick="listRemove(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
+						'\')" class="pointer">' + escapeHTML(list.title) + '</a><br> ';
+				});
+				$("#his-lists-b").html(lists);
+			} else {
+				$("#his-lists-b").html(lang.lang_list_nodata);
 			}
-		})
-			.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) {
-					var lists = lang.lang_list_remove + '<br>'
-					Object.keys(json).forEach(function(key) {
-						var list = json[key]
-						lists =
-							lists +
-							`<a onclick="listRemove('${list.id}','${user}','${acct_id}')" class="pointer">
-								${escapeHTML(list.title)}
-							</a><br> `
-					})
-					$('#his-lists-b').html(lists)
-				} else {
-					$('#his-lists-b').html(lang.lang_list_nodata)
-				}
-			})
+		});
 	} else {
-		var start = 'https://' + domain + '/api/users/lists/list'
+		var start = "https://" + domain + "/api/users/lists/list"
 		fetch(start, {
 			method: 'POST',
 			body: JSON.stringify({
 				i: 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) {
-				if (json) {
-					var lists = ''
-					Object.keys(json).forEach(function(key) {
-						var list = json[key]
-						lists =
-							lists +
-							list.title +
-							`:<a onclick="listShow('${list.id}','${escapeHTML(
-								list.title
-							)}','${acct_id}')" class="pointer">
-								${lang.lang_list_show}
-							</a>/
-							<a onclick="listAdd('${list.id}','${user}','${acct_id}')" class="pointer">
-								${lang.lang_list_add}
-								${lang.lang_list_add_misskey}
-							'</a><br>`
-					})
-					$('#his-lists-a').html(lists)
-				} else {
-					$('#his-lists-a').html(lang.lang_list_nodata)
-				}
-			})
-		$('#his-lists-b').html('')
+			}),
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json) {
+				var lists = "";
+				Object.keys(json).forEach(function (key) {
+					var list = json[key];
+					lists = lists + list.title + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
+						'\')" class="pointer">' + lang.lang_list_show + '</a>/<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
+						'\')" class="pointer">' + lang.lang_list_add + lang.lang_list_add_misskey + '</a><br>';
+				});
+				$("#his-lists-a").html(lists);
+			} else {
+				$("#his-lists-a").html(lang.lang_list_nodata);
+			}
+		});
+		$("#his-lists-b").html("");
 	}
 }
 function listAdd(id, user, acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		var start = 'https://' + domain + '/api/users/lists/push'
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if (localStorage.getItem("mode_" + domain) == "misskey") {
+		var start = "https://" + domain + "/api/users/lists/push"
 		var i = {
 			i: at,
 			listId: id,
 			userId: user
 		}
 	} else {
-		var start = 'https://' + domain + '/api/v1/lists/' + id + '/accounts'
+		var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
 		var i = {
 			account_ids: [user]
 		}
 	}
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('POST', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = 'json'
-	httpreq.send(JSON.stringify(i))
-	httpreq.onreadystatechange = function() {
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify(i));
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
+			var json = httpreq.response;
 			hisList(user, acct_id)
 		}
 	}
 }
 function listRemove(id, user, acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		var start = 'https://' + domain + '/api/users/lists/push'
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if (localStorage.getItem("mode_" + domain) == "misskey") {
+		var start = "https://" + domain + "/api/users/lists/push"
 		var method = 'POST'
 		var i = {
 			i: at,
@@ -360,25 +265,22 @@ function listRemove(id, user, acct_id) {
 			userId: user
 		}
 	} else {
-		var start = 'https://' + domain + '/api/v1/lists/' + id + '/accounts'
+		var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
 		var method = 'DELETE'
 		var i = {
 			account_ids: [user]
 		}
 	}
-	var httpreq = new XMLHttpRequest()
-	httpreq.open(method, start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = 'json'
-	httpreq.send(JSON.stringify(i))
-	httpreq.onreadystatechange = function() {
+	var httpreq = new XMLHttpRequest();
+	httpreq.open(method, start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify(i));
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
+			var json = httpreq.response;
 			hisList(user, acct_id)
 		}
 	}
-}
+}

app/js/tl/misskeyparse.js

@@ -268,7 +268,19 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						body: toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
 						icon: toot.user.avatarUrl
 					};
-					var n = new Notification('TheDesk:' + domain, options);
+					if (os == "darwin") {
+						var n = new Notification('TheDesk:' + domain, options);
+					} else {
+						var nativeNotfOpt = [
+							'TheDesk:' + domain,
+							toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
+							toot.user.avatarUrl,
+							"toot",
+							acct_id,
+							toot.note.id
+						]
+						postMessage(["nativeNotf", nativeNotfOpt], "*")
+					}
 				}
 				if (localStorage.getItem("hasNotfC_" + acct_id) != "true") {
 					$(".notf-icon_" + acct_id).addClass("red-text");
@@ -360,20 +372,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) {
@@ -518,7 +532,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if (tagck) {
 			Object.keys(toot.tags).forEach(function (key4) {
 				var tag = toot.tags[key4];
-				var tags = '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '" data-regTag="'+tag.toLowerCase()+'">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
+				var tags = '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
 					',\'add\')" class="pointer parsed" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a>　' +
 					'<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag) + '">Pin</a></span> ';
 				content = content.replace("#" + tag, tags);
@@ -878,7 +892,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>';
@@ -903,7 +917,19 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 					icon: toot.avatar
 				};
 				var domain = localStorage.getItem("domain_" + acct_id);
-				var n = new Notification('TheDesk:' + domain, options);
+				if (os == "darwin") {
+					var n = new Notification('TheDesk:' + domain, options);
+				} else {
+					var nativeNotfOpt = [
+						'TheDesk:' + domain,
+						toot.display_name + "(" + toot.acct + ")" + ftxt,
+						toot.avatar,
+						"userdata",
+						acct_id,
+						toot.id
+					]
+					postMessage(["nativeNotf", nativeNotfOpt], "*")
+				}
 			}
 		}
 		if (toot.name) {

app/js/tl/mix.js

@@ -1,201 +1,327 @@
 //Integrated TL
-async function mixtl(acct_id, tlid, type, delc, voice) {
-	localStorage.setItem('now', type)
-	todo('Integrated TL Loading...(Local)')
-	const domain = localStorage.getItem('domain_' + acct_id)
-	let startLocal = 'https://' + domain + '/api/v1/timelines/public?local=true'
-	let local = await getTL(startLocal, acct_id)
-	let startHome = 'https://' + domain + '/api/v1/timelines/home'
-	let home = await getTL(startHome, acct_id)
-	let concated = _.concat(local, home)
-	let uniqued = _.uniqBy(concated, 'id')
-	let sorted = _.orderBy(uniqued, ['id'], ['desc'])
-	let integrated = _.slice(sorted, 0, 19)
-	$('#landing_' + tlid).hide()
-	let mute = getFilterTypeByAcct(acct_id, 'mix')
-	let templete = parse(integrated, type, acct_id, tlid, '', mute, type)
-	localStorage.setItem('lastobj_' + tlid, integrated[0].id)
-	$('#timeline_' + tlid).html(templete)
-	additional(acct_id, tlid)
-	jQuery('time.timeago').timeago()
-	todc()
-	mixre(acct_id, tlid, 'mix', mute, voice, '')
-	$(window).scrollTop(0)
-	lastId = integrated[0].id
-	beforeLastId = integrated[1].id
-}
-async function getTL(start, acct_id) {
-	const at = localStorage.getItem('acct_' + acct_id + '_at')
-	let promise = await fetch(start, {
+function mixtl(acct_id, tlid, type, delc, voice) {
+	localStorage.removeItem("morelock")
+	localStorage.setItem("now", type);
+	todo("Integrated TL Loading...(Local)");
+	//まずLocal
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/timelines/public?local=true";
+	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
-		}
-	})
-	if (!promise.ok) {
-		promise.text().then(function(text) {
-			setLog(promise.url, promise.status, text)
-		})
-	}
-	return await promise.json()
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (jsonL) {
+		var start = "https://" + domain + "/api/v1/timelines/home";
+		fetch(start, {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/json',
+				'Authorization': 'Bearer ' + at
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (jsonH) {
+			var homearr = [];
+			var timeline = jsonL.concat(jsonH);
+			timeline.sort(function (a, b) {
+				if (date(a.created_at, "unix") >= date(b.created_at, "unix")) return -1;
+				if (date(a.created_at, "unix") < date(b.created_at, "unix")) return 1;
+				return 0;
+			});
+			if (type == "integrated") {
+				timeline.splice(20);
+			}
+			var templete = "";
+			if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+				var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "mix");
+			} else {
+				var mute = [];
+			}
+			Object.keys(timeline).forEach(function (key) {
+				var pkey = key * 1 + 1;
+				if (pkey < timeline.length) {
+					if (date(timeline[key].created_at, "unix") != date(timeline[pkey].created_at, "unix")) {
+						if (type == "integrated") {
+							templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
+						} else if (type == "plus") {
+							if (timeline[key].account.acct == timeline[key].account.username) {
+								templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "plus");
+							}
+						}
+					}
+				}
+
+			});
+			$("#landing_" + tlid).hide();
+			$("#timeline_" + tlid).html(templete);
+			mixre(acct_id, tlid, type, mute, delc, voice);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			todc();
+		});
+	});
 }
 
+
 //Streamingに接続
-function mixre(acct_id, tlid, TLtype, mute, voice, mode) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if (localStorage.getItem('streaming_' + acct_id)) {
-		var wss = localStorage.getItem('streaming_' + acct_id)
+function mixre(acct_id, tlid, TLtype, mute, delc, voice, mode) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if (localStorage.getItem("streaming_" + acct_id)) {
+		var wss = localStorage.getItem("streaming_" + acct_id)
 	} else {
-		var wss = 'wss://' + domain
+		var wss = "wss://" + domain
 	}
-	var startHome = wss + '/api/v1/streaming/?stream=user&access_token=' + at
-	var startLocal = wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
-	var wshid = wsHome.length
-	var wslid = wsLocal.length
-	wsHome[wshid] = new WebSocket(startHome)
-	wsLocal[wslid] = new WebSocket(startLocal)
-	wsHome[wshid].onopen = function(mess) {
-		localStorage.setItem('wssH_' + tlid, wshid)
-		console.table({
-			tlid: tlid,
-			type: 'Connect Streaming API(Integrated:Home)',
-			domain: domain,
-			message: mess
-		})
-		$('#notice_icon_' + tlid).removeClass('red-text')
+	var startHome = wss +
+		"/api/v1/streaming/?stream=user&access_token=" + at;
+	var startLocal = wss +
+		"/api/v1/streaming/?stream=public:local&access_token=" + at;
+	var wshid = websocketHome.length;
+	var wslid = websocketLocal.length;
+	websocketHome[wshid] = new WebSocket(startHome);
+	websocketLocal[wslid] = new WebSocket(startLocal);
+	websocketHome[wshid].onopen = function (mess) {
+		localStorage.setItem("wssH_" + tlid, wshid);
+		console.table({ "tlid": tlid, "type": "Connect Streaming API(Integrated:Home)", "domain": domain, "message": mess })
+		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
-	wsLocal[wslid].onopen = function(mess) {
-		localStorage.setItem('wssL_' + tlid, wslid)
-		console.table({
-			tlid: tlid,
-			type: 'Connect Streaming API(Integrated:Local)',
-			domain: domain,
-			message: mess
-		})
-		$('#notice_icon_' + tlid).removeClass('red-text')
+	websocketLocal[wslid].onopen = function (mess) {
+		localStorage.setItem("wssL_" + tlid, wslid);
+		console.table({ "tlid": tlid, "type": "Connect Streaming API(Integrated:Local)", "domain": domain, "message": mess })
+		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
-	wsLocal[wslid].onmessage = function(mess) {
-		console.log('Receive Streaming API:(Integrated:Local)', mess)
-		integratedMessage(mess, acct_id, tlid, mute, voice)
-	}
-	wsHome[wshid].onmessage = function(mess) {
-		console.log(['Receive Streaming API:(Integrated:Home)', mess])
-		integratedMessage(mess, acct_id, tlid, mute, voice)
-	}
-	wsLocal[wslid].onerror = function(error) {
-		console.error('WebSocketLocal Error')
-		console.error(error)
-		$('#notice_icon_' + tlid).addClass('red-text')
-		if (mode == 'error') {
-			todo('WebSocket Error ' + error)
-		} else {
-			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
-			localStorage.setItem('wserror_' + tlid, errorct)
-			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, '', 'error')
-			}
-		}
-	}
-	wsLocal[wslid].onclose = function() {
-		console.warn('WebSocketLocal Closing:' + tlid)
-		$('#notice_icon_' + tlid).addClass('red-text')
-		if (mode == 'error') {
-			todo('WebSocket Closed')
-		} else {
-			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
-			localStorage.setItem('wserror_' + tlid, errorct)
-			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, '', 'error')
-			}
-		}
-	}
-	wsHome[wshid].onerror = function(error) {
-		console.error(['WebSocketHome Error', error])
-		$('#notice_icon_' + tlid).addClass('red-text')
-		if (mode == 'error') {
-			todo('WebSocket Error ' + error)
-		} else {
-			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
-			localStorage.setItem('wserror_' + tlid, errorct)
-			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, '', 'error')
-			}
-		}
-	}
-	wsHome[wshid].onclose = function() {
-		console.warn('WebSocketHome Closing:' + tlid)
-		$('#notice_icon_' + tlid).addClass('red-text')
-		if (mode == 'error') {
-			todo('WebSocket Closed')
-		} else {
-			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
-			localStorage.setItem('wserror_' + tlid, errorct)
-			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, '', 'error')
-			}
-		}
-	}
-}
-function integratedMessage(mess, acct_id, tlid, mute, voice) {
-	let data = JSON.parse(mess.data)
-	let type = data.event
-	let payload = data.payload
-	if (type == 'delete') {
-		$('[unique-id=' + payload + ']').hide()
-		$('[unique-id=' + payload + ']').remove()
-	} else if (type == 'update') {
-		let obj = JSON.parse(payload)
-		
-		if (obj.id != lastId && obj.id != beforeLastId) {
-			lastId = obj.id
-			beforeLastId = obj.id
-			let dom = parse([obj], '', acct_id, tlid, '', mute)
-			if (voice) say(obj.content)
-			if ($('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0) {
-				$('#timeline_' + tlid).prepend(dom)
+	websocketLocal[wslid].onmessage = function (mess) {
+		console.log(["Receive Streaming API:(Integrated:Local)", obj]);
+
+		var obj = JSON.parse(JSON.parse(mess.data).payload);
+		var type = JSON.parse(mess.data).event;
+		if (type == "delete") {
+			if (delc == "true") {
+				$("#timeline_" + tlid + " [toot-id=" + JSON.parse(mess.data).payload + "]").addClass("emphasized");
+				$("#timeline_" + tlid + " [toot-id=" + JSON.parse(mess.data).payload + "]").addClass("by_delcatch");
 			} else {
-				let pool = localStorage.getItem('pool_' + tlid)
-				if (pool) {
-					pool = dom + pool
-				} else {
-					pool = dom
-				}
-				localStorage.setItem('pool_' + tlid, pool)
+				$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
+				$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
 			}
-			scrollck()
-			additional(acct_id, tlid)
-			jQuery('time.timeago').timeago()
+
+		} else if (type == "update") {
+			var templete = parse([obj], '', acct_id, tlid, "", mute);
+			if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
+				if (voice) {
+					say(obj.content)
+				}
+				var templete = parse([obj], type, acct_id, tlid, "", mute, "mix");
+				var pool = localStorage.getItem("pool_" + tlid);
+				if (pool) {
+					pool = templete + pool;
+				} else {
+					pool = templete
+				}
+				localStorage.setItem("pool_" + tlid, pool);
+
+				scrollck();
+
+				additional(acct_id, tlid);
+				jQuery("time.timeago").timeago();
+			} else {
+				todo("二重取得発生中");
+			}
+
 		}
 	}
+	websocketHome[wshid].onmessage = function (mess) {
+		console.log(["Receive Streaming API:(Integrated:Home)", obj]);
+		var obj = JSON.parse(JSON.parse(mess.data).payload);
+		var type = JSON.parse(mess.data).event;
+		if (type == "delete") {
+			if (del > 10) {
+				reconnector(tlid, type, acct_id, data)
+			} else {
+				localStorage.setItem("delete", del * 1 + 1)
+			}
+			if (delc == "true") {
+				$("[toot-id=" + JSON.parse(mess.data).payload + "]").addClass("emphasized");
+				$("[toot-id=" + JSON.parse(mess.data).payload + "]").addClass("by_delcatch");
+			} else {
+				$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
+				$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
+			}
+		} else if (type == "update") {
+			localStorage.removeItem("delete");
+			if (TLtype == "integrated") {
+				var templete = parse([obj], '', acct_id, tlid);
+			} else if (TLtype == "plus") {
+				if (obj.account.acct == obj.account.username) {
+					var templete = parse([obj], '', acct_id, tlid, "", mute, "mix");
+				} else {
+					var templete = "";
+				}
+			}
+			if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
+				if (voice) {
+					say(obj.content)
+				}
+				var templete = parse([obj], type, acct_id, tlid, "", mute, "mix");
+				var pool = localStorage.getItem("pool_" + tlid);
+				if (pool) {
+					pool = templete + pool;
+				} else {
+					pool = templete
+				}
+				localStorage.setItem("pool_" + tlid, pool);
+
+				scrollck();
+
+				additional(acct_id, tlid);
+				jQuery("time.timeago").timeago();
+			} else {
+				todo("二重取得発生中");
+			}
+		}
+	}
+	websocketLocal[wslid].onerror = function (error) {
+		console.error('WebSocketLocal Error')
+		console.error(error);
+		if (mode == "error") {
+			$("#notice_icon_" + tlid).addClass("red-text");
+			todo('WebSocket Error ' + error);
+		} else {
+			var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
+			localStorage.setItem("wserror_" + tlid, errorct);
+			if (errorct < 3) {
+				reconnector(tlid, TLtype, acct_id, "", "error");
+			}
+		}
+	};
+	websocketLocal[wslid].onclose = function () {
+		console.warn('WebSocketLocal Closing:' + tlid);
+		if (mode == "error") {
+			$("#notice_icon_" + tlid).addClass("red-text");
+			todo('WebSocket Closed');
+		} else {
+			var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
+			localStorage.setItem("wserror_" + tlid, errorct);
+			if (errorct < 3) {
+				reconnector(tlid, TLtype, acct_id, "", "error");
+			}
+		}
+	};
+	websocketHome[wshid].onerror = function (error) {
+		console.error(['WebSocketHome Error', error])
+		if (mode == "error") {
+			$("#notice_icon_" + tlid).addClass("red-text");
+			todo('WebSocket Error ' + error);
+		} else {
+			var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
+			localStorage.setItem("wserror_" + tlid, errorct);
+			if (errorct < 3) {
+				reconnector(tlid, TLtype, acct_id, "", "error");
+			}
+		}
+	};
+	websocketHome[wshid].onclose = function () {
+		console.warn('WebSocketHome Closing:' + tlid);
+		if (mode == "error") {
+			$("#notice_icon_" + tlid).addClass("red-text");
+			todo('WebSocket Closed');
+		} else {
+			var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
+			localStorage.setItem("wserror_" + tlid, errorct);
+			if (errorct < 3) {
+				reconnector(tlid, TLtype, acct_id, "", "error");
+			}
+		}
+
+	};
+
 }
+
 //ある程度のスクロールで発火
-async function mixmore(tlid, type) {
-	var multi = localStorage.getItem('column')
-	var obj = JSON.parse(multi)
-	var acct_id = obj[tlid].domain
-	moreloading = true
-	todo('Integrated TL MoreLoading...(Local)')
-	const domain = localStorage.getItem('domain_' + acct_id)
-	const sid = $('#timeline_' + tlid + ' .cvo')
-	.last()
-	.attr('unique-id')
-	let startLocal = 'https://' + domain + '/api/v1/timelines/public?local=true&max_id=' + sid
-	let local = await getTL(startLocal, acct_id)
-	let startHome = 'https://' + domain + '/api/v1/timelines/home?max_id=' + sid
-	let home = await getTL(startHome, acct_id)
-	let concated = _.concat(local, home)
-	let uniqued = _.uniqBy(concated, 'id')
-	let sorted = _.orderBy(uniqued, ['id'], ['desc'])
-	let integrated = _.slice(sorted, 0, 19)
-	$('#landing_' + tlid).hide()
-	let mute = getFilterTypeByAcct(acct_id, 'mix')
-	let templete = parse(integrated, type, acct_id, tlid, '', mute, type)
-	localStorage.setItem('lastobj_' + tlid, integrated[0].id)
-	$('#timeline_' + tlid).append(templete)
-	additional(acct_id, tlid)
-	jQuery('time.timeago').timeago()
-	moreloading = false
-	todc()
+function mixmore(tlid, type) {
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	var acct_id = obj[tlid].domain;
+	moreloading = true;
+	todo("Integrated TL MoreLoading...(Local)");
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
+
+
+	var start = "https://" + domain + "/api/v1/timelines/public?local=true&max_id=" + sid;
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (jsonL) {
+		var start = "https://" + domain + "/api/v1/timelines/home?max_id=" + sid;
+		fetch(start, {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/json',
+				'Authorization': 'Bearer ' + at
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (jsonH) {
+			var homearr = [];
+			var timeline = jsonL.concat(jsonH);
+			timeline.sort(function (a, b) {
+				if (date(a.created_at, "unix") > date(b.created_at, "unix")) return -1;
+				if (date(a.created_at, "unix") < date(b.created_at, "unix")) return 1;
+				return 0;
+			});
+			timeline.splice(20);
+			var templete = "";
+			Object.keys(timeline).forEach(function (key) {
+				var pkey = key * 1 + 1;
+				if (pkey < 20) {
+					if (date(timeline[key].created_at, "unix") != date(timeline[pkey].created_at, "unix")) {
+						if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+							var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "mix");
+						} else {
+							var mute = [];
+						}
+						if (type == "integrated") {
+							templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
+						} else if (type == "plus") {
+							if (timeline[key].account.acct == timeline[key].account.username) {
+								templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
+							}
+						}
+					}
+				}
+
+			});
+
+			$("#timeline_" + tlid).append(templete);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			moreloading = false;
+			todc();
+		});
+	});
+
+
 }

app/js/tl/notification.js

@@ -1,359 +1,354 @@
 //通知
 //取得+Streaming接続
 function notf(acct_id, tlid, sys) {
-	if (sys == 'direct') {
+	if (sys == "direct") {
 		notfColumn(acct_id, tlid, sys)
 	} else {
 		notfCommon(acct_id, tlid, sys)
 	}
 }
 function notfColumn(acct_id, tlid, sys) {
-	todo('Notifications Loading...')
-	var native = localStorage.getItem('nativenotf')
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	todo("Notifications Loading...");
+	var native = localStorage.getItem("nativenotf");
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (!native) {
-		native = 'yes'
+		native = "yes";
 	}
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var httpreq = new XMLHttpRequest()
-	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		var misskey = true
-		var start = 'https://' + domain + '/api/i/notifications'
-		httpreq.open('POST', start, true)
-		httpreq.setRequestHeader('Content-Type', 'application/json')
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var httpreq = new XMLHttpRequest();
+	if (localStorage.getItem("mode_" + domain) == "misskey") {
+		var misskey = true;
+		var start = "https://" + domain + "/api/i/notifications";
+		httpreq.open("POST", start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
 		var body = JSON.stringify({
 			i: at
-		})
+		});
 	} else {
-		var misskey = false
-		if (localStorage.getItem('exclude-' + tlid)) {
-			var exc = localStorage.getItem('exclude-' + tlid)
+		var misskey = false;
+		if (localStorage.getItem("exclude-" + tlid)) {
+			var exc = localStorage.getItem("exclude-" + tlid);
 		} else {
-			var exc = ''
+			var exc = "";
 		}
-		var start = 'https://' + domain + '/api/v1/notifications' + exc
-		httpreq.open('GET', start, true)
-		httpreq.setRequestHeader('Content-Type', 'application/json')
-		httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-		var body = ''
+		var start = "https://" + domain + "/api/v1/notifications" + exc;
+		httpreq.open("GET", start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		var body = "";
 	}
 
-	httpreq.responseType = 'json'
-	httpreq.send(body)
-	httpreq.onreadystatechange = function() {
+	httpreq.responseType = "json";
+	httpreq.send(body);
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
-			var max_id = httpreq.getResponseHeader('link')
+			var json = httpreq.response;
+			var max_id = httpreq.getResponseHeader("link");
 			if (max_id) {
 				max_id = max_id.match(/[?&]{1}max_id=([0-9]+)/)[1]
 			}
 			if (json[0]) {
-				var templete = ''
-				var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
-				localStorage.setItem('lastnotf_' + acct_id, json[0].id)
-				Object.keys(json).forEach(function(key) {
-					var obj = json[key]
-					if (lastnotf == obj.id && key > 0 && native == 'yes') {
-						var ct = key
+				var templete = "";
+				var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
+				localStorage.setItem("lastnotf_" + acct_id, json[0].id);
+				Object.keys(json).forEach(function (key) {
+					var obj = json[key];
+					if (lastnotf == obj.id && key > 0 && native == "yes") {
+						var ct = key;
 						if (key > 14) {
-							ct = '15+'
+							ct = "15+";
 						}
-						var os = localStorage.getItem('platform')
+						var os = localStorage.getItem("platform");
 						var options = {
 							body: ct + lang.lang_notf_new,
-							icon: localStorage.getItem('prof_' + acct_id)
-						}
-						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 (misskey) {
-							templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
+							icon: localStorage.getItem("prof_" + acct_id)
+						};
+						if (os == "darwin") {
+							var n = new Notification('TheDesk:' + domain, options);
 						} else {
-							templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute)
+							var nativeNotfOpt = ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
+							postMessage(["nativeNotf", nativeNotfOpt], "*")
+						}
+
+					}
+					if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+						var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "notif");
+					} else {
+						var mute = [];
+					}
+					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)
+							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);
 						}
+
 					}
-				})
-				templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
-				$('#timeline_' + tlid).html(templete)
-				$('#landing_' + tlid).hide()
-				jQuery('time.timeago').timeago()
+				});
+				templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>';
+				$("#timeline_" + tlid).html(templete);
+				$("#landing_" + tlid).hide();
+				jQuery("time.timeago").timeago();
 			}
-			$('#notf-box').addClass('fetched')
-			todc()
+			$("#notf-box").addClass("fetched");
+			todc();
 			//Markers
-			var markers = localStorage.getItem('markers')
-			if (markers == 'yes') {
-				markers = true
+			var markers = localStorage.getItem("markers");
+			if (markers == "no") {
+				markers = false;
 			} else {
-				markers = false
+				markers = true
 			}
 			if (markers) {
-				getMarker(tlid, 'notf', acct_id)
+				getMarker(tlid, "notf", acct_id)
 			}
 		}
 	}
 	if (!misskey) {
-		if (localStorage.getItem('streaming_' + acct_id)) {
-			var wss = localStorage.getItem('streaming_' + acct_id)
+		if (localStorage.getItem("streaming_" + acct_id)) {
+			var wss = localStorage.getItem("streaming_" + acct_id)
 		} else {
-			var wss = 'wss://' + domain
+			var wss = "wss://" + domain
 		}
-		var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
+		var start = wss + "/api/v1/streaming/?stream=user&access_token=" +
+			at;
 	} else {
-		var start = 'wss://' + domain + '/?i=' + at
+		var start = "wss://" + domain + "/?i=" +
+			at;
 	}
+
 }
 function notfCommon(acct_id, tlid, sys) {
-	todo('Notifications Loading...')
-	var native = localStorage.getItem('nativenotf')
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	todo("Notifications Loading...");
+	var native = localStorage.getItem("nativenotf");
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (!native) {
-		native = 'yes'
+		native = "yes";
 	}
-	var domain = localStorage.getItem('domain_' + acct_id)
-	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		var misskey = true
-		var start = 'https://' + domain + '/api/i/notifications'
+	var domain = localStorage.getItem("domain_" + acct_id);
+	if (localStorage.getItem("mode_" + domain) == "misskey") {
+		var misskey = true;
+		var start = "https://" + domain + "/api/i/notifications";
 		var i = {
 			method: 'POST',
 			headers: {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			},
 			body: JSON.stringify({
 				i: at
 			})
 		}
 	} else {
-		var misskey = false
-		var start = 'https://' + domain + '/api/v1/notifications'
+		var misskey = false;
+		var start = "https://" + domain + "/api/v1/notifications";
 		var i = {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
-			}
+				'Authorization': 'Bearer ' + at
+			},
 		}
 	}
-	fetch(start, i)
-		.then(function(response) {
-			console.log('header to get param:' + response.headers.get('link'))
-			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[0]) {
-				var templete = ''
-				var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
-				localStorage.setItem('lastnotf_' + acct_id, json[0].id)
-				Object.keys(json).forEach(function(key) {
-					var obj = json[key]
-					if (lastnotf == obj.id && key > 0 && native == 'yes') {
-						var ct = key
-						if (key > 14) {
-							ct = '15+'
-						}
-						var os = localStorage.getItem('platform')
-						var options = {
-							body: ct + lang.lang_notf_new,
-							icon: localStorage.getItem('prof_' + acct_id)
-						}
-						var n = new Notification('TheDesk:' + domain, options)
+	fetch(start, i).then(function (response) {
+		console.log("header to get param:" + response.headers.get('link'));
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json[0]) {
+			var templete = "";
+			var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
+			localStorage.setItem("lastnotf_" + acct_id, json[0].id);
+			Object.keys(json).forEach(function (key) {
+				var obj = json[key];
+				if (lastnotf == obj.id && key > 0 && native == "yes") {
+					var ct = key;
+					if (key > 14) {
+						ct = "15+";
 					}
-					var mute = getFilterTypeByAcct(acct_id, 'notif')
-					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
-					if (obj.type != 'follow' && obj.type != 'move') {
-						if (misskey) {
-							templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
-						} else {
-							templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
-						}
+					var os = localStorage.getItem("platform");
+					var options = {
+						body: ct + lang.lang_notf_new,
+						icon: localStorage.getItem("prof_" + acct_id)
+					};
+					if (os == "darwin") {
+						var n = new Notification('TheDesk:' + domain, options);
 					} else {
-						if (misskey) {
-							templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
-						} else {
-							templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
-						}
+						var nativeNotfOpt = ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
+						postMessage(["nativeNotf", nativeNotfOpt], "*")
 					}
-				})
-				$('div[data-notf=' + acct_id + ']').html(templete)
-				$('#landing_' + tlid).hide()
-				jQuery('time.timeago').timeago()
-			}
-			$('#notf-box').addClass('fetched')
-			todc()
-			notfWS(misskey, acct_id, tlid, domain, at)
-		})
+
+				}
+				if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+					var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "notif");
+				} else {
+					var mute = [];
+				}
+				if (obj.type != "follow") {
+					if (misskey) {
+						templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
+					} else {
+						templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute);
+					}
+				} else {
+					if (misskey) {
+						templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
+					} else {
+						templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1);
+					}
+
+				}
+			});
+			$("div[data-notf=" + acct_id + "]").html(templete);
+			$("#landing_" + tlid).hide();
+			jQuery("time.timeago").timeago();
+		}
+		$("#notf-box").addClass("fetched");
+		todc();
+		notfWS(misskey, acct_id, tlid, domain, at)
+	});
+
 }
 function notfWS(misskey, acct_id, tlid, domain, at) {
 	if (!misskey) {
-		if (localStorage.getItem('streaming_' + acct_id)) {
-			var wss = localStorage.getItem('streaming_' + acct_id)
+		if (localStorage.getItem("streaming_" + acct_id)) {
+			var wss = localStorage.getItem("streaming_" + acct_id)
 		} else {
-			var wss = 'wss://' + domain
+			var wss = "wss://" + domain
 		}
-		var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
+		var start = wss + "/api/v1/streaming/?stream=user&access_token=" +
+			at;
+
+		var wsid = websocketNotf.length;
+		websocketNotf[acct_id] = new WebSocket(start);
+		websocketNotf[acct_id].onopen = function (mess) {
+			console.table({ "acct_id": acct_id, "type": "Connect Streaming API(Notf)", "domain": domain, "message": [mess] })
+			$("i[data-notf=" + acct_id + "]").removeClass("red-text");
 
-		var wsid = websocketNotf.length
-		websocketNotf[acct_id] = new WebSocket(start)
-		websocketNotf[acct_id].onopen = function(mess) {
-			console.table({
-				acct_id: acct_id,
-				type: 'Connect Streaming API(Notf)',
-				domain: domain,
-				message: [mess]
-			})
-			$('i[data-notf=' + acct_id + ']').removeClass('red-text')
 		}
-		websocketNotf[acct_id].onmessage = function(mess) {
+		websocketNotf[acct_id].onmessage = function (mess) {
 			//console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
-			var popup = localStorage.getItem('popup')
+			var popup = localStorage.getItem("popup");
 			if (!popup) {
-				popup = 0
+				popup = 0;
 			}
-			var obj = JSON.parse(JSON.parse(mess.data).payload)
-			var type = JSON.parse(mess.data).event
-			if (type == 'notification') {
-				var templete = ''
-				localStorage.setItem('lastnotf_' + acct_id, obj.id)
-				if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
+			var obj = JSON.parse(JSON.parse(mess.data).payload);
+			var type = JSON.parse(mess.data).event;
+			if (type == "notification") {
+				var templete = "";
+				localStorage.setItem("lastnotf_" + acct_id, obj.id);
+				if (!$("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
 					//markers show中はダメ
-					if (obj.type != 'follow') {
-						templete = parse([obj], 'notf', acct_id, 'notf', popup)
+					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)
-						$('div[data-const=notf_' + acct_id + ']').prepend(templete)
+					if (!$("div[data-notfIndv=" + acct_id + "_" + obj.id + "]").length) {
+						$("div[data-notf=" + acct_id + "]").prepend(templete);
+						$("div[data-const=notf_" + acct_id + "]").prepend(templete);
 					}
-					jQuery('time.timeago').timeago()
+					jQuery("time.timeago").timeago();
 				}
-			} else if (type == 'delete') {
-				$('[toot-id=' + obj + ']').hide()
-				$('[toot-id=' + obj + ']').remove()
-			}
-		}
-		websocketNotf[acct_id].onerror = function(error) {
-			console.error('WebSocket Error ' + error)
-			errorct++
-			console.log(errorct)
-			if (errorct < 3) {
-				notfWS(misskey, acct_id, tlid, domain, at)
-			}
-		}
-		websocketNotf[acct_id].onclose = function(error) {
-			console.error('WebSocket Close ' + error)
-			errorct++
-			console.log(errorct)
-			if (errorct < 3) {
-				notfWS(misskey, acct_id, tlid, domain, at)
+			} else if (type == "delete") {
+				$("[toot-id=" + obj + "]").hide();
+				$("[toot-id=" + obj + "]").remove();
 			}
 		}
+		websocketNotf[acct_id].onerror = function (error) {
+			console.error('WebSocket Error ' + error);
+			notfWS(misskey, acct_id, tlid, domain, at)
+		};
 	}
 }
 //一定のスクロールで発火
 function notfmore(tlid) {
-	console.log({ status: 'kicked', status: moreloading })
-	var multi = localStorage.getItem('column')
-	var obj = JSON.parse(multi)
-	var acct_id = obj[tlid].domain
+	console.log({ "status": "kicked", "status": moreloading });
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	var acct_id = obj[tlid].domain;
 	if (!type) {
-		var type = obj[tlid].type
+		var type = obj[tlid].type;
 	} else {
-		var data
+		var data;
 	}
-	var sid = $('#timeline_' + tlid + ' .notif-marker')
-		.last()
-		.attr('data-maxid')
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var domain = localStorage.getItem('domain_' + acct_id)
+	var sid = $("#timeline_" + tlid + " .notif-marker").last().attr("data-maxid");
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var domain = localStorage.getItem("domain_" + acct_id);
 	if (sid && !moreloading) {
-		moreloading = true
-		var httpreq = new XMLHttpRequest()
-		if (localStorage.getItem('mode_' + domain) == 'misskey') {
-			var misskey = true
-			var start = 'https://' + domain + '/api/i/notifications'
-			httpreq.open(POST, start, true)
-			httpreq.setRequestHeader('Content-Type', 'application/json')
+		moreloading = true;
+		var httpreq = new XMLHttpRequest();
+		if (localStorage.getItem("mode_" + domain) == "misskey") {
+			var misskey = true;
+			var start = "https://" + domain + "/api/i/notifications";
+			httpreq.open(POST, start, true);
+			httpreq.setRequestHeader('Content-Type', 'application/json');
 			var body = JSON.stringify({
 				i: at,
 				untilID: sid
-			})
+			});
 		} else {
-			var misskey = false
-			if (localStorage.getItem('exclude-' + tlid)) {
-				var exc = localStorage.getItem('exclude-' + tlid) + '&max_id=' + sid
+			var misskey = false;
+			if (localStorage.getItem("exclude-" + tlid)) {
+				var exc = localStorage.getItem("exclude-" + tlid) + "&max_id=" + sid;
 			} else {
-				var exc = '?max_id=' + sid
+				var exc = "?max_id=" + sid;
 			}
-			var start = 'https://' + domain + '/api/v1/notifications' + exc
-			httpreq.open('GET', start, true)
-			httpreq.setRequestHeader('Content-Type', 'application/json')
-			httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-			var body = ''
+			var start = "https://" + domain + "/api/v1/notifications" + exc;
+			httpreq.open("GET", start, true);
+			httpreq.setRequestHeader('Content-Type', 'application/json');
+			httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+			var body = "";
 		}
 
-		httpreq.responseType = 'json'
-		httpreq.send(body)
-		httpreq.onreadystatechange = function() {
+		httpreq.responseType = "json";
+		httpreq.send(body);
+		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.response
-				if (this.status !== 200) {
-					setLog(start, this.status, this.response)
-				}
-				console.log(['More notifications on ' + tlid, json])
-				var max_id = httpreq.getResponseHeader('link').match(/[?&]{1}max_id=([0-9]+)/)[1]
+				var json = httpreq.response;
+				console.log(["More notifications on " + tlid, json]);
+				var max_id = httpreq.getResponseHeader("link").match(/[?&]{1}max_id=([0-9]+)/)[1];
 				if (json[0]) {
-					var templete = ''
-					var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
-					localStorage.setItem('lastnotf_' + acct_id, json[0].id)
-					Object.keys(json).forEach(function(key) {
-						var obj = json[key]
-						var mute = getFilterTypeByAcct(acct_id, 'notif')
-						if (obj.type != 'follow') {
+					var templete = "";
+					var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
+					localStorage.setItem("lastnotf_" + acct_id, json[0].id);
+					Object.keys(json).forEach(function (key) {
+						var obj = json[key];
+						if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+							var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "notif");
+						} else {
+							var mute = [];
+						}
+						if (obj.type != "follow") {
 							if (misskey) {
-								templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
+								templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
 							} else {
-								templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
+								templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute);
 							}
 						} else {
 							if (misskey) {
-								templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
+								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);
 							}
+
 						}
-					})
-					moreloading = false
-					templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
-					$('#timeline_' + tlid).append(templete)
-					$('#landing_' + tlid).hide()
-					jQuery('time.timeago').timeago()
+					});
+					moreloading = false;
+					templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>';
+					$("#timeline_" + tlid).append(templete);
+					$("#landing_" + tlid).hide();
+					jQuery("time.timeago").timeago();
 				}
-				$('#notf-box').addClass('fetched')
-				todc()
+				$("#notf-box").addClass("fetched");
+				todc();
 			}
 		}
 	}
@@ -361,64 +356,53 @@ function notfmore(tlid) {
 
 //通知トグルボタン
 function notfToggle(acct, tlid) {
-	if ($('#notf-box_' + tlid).hasClass('column-hide')) {
-		$('#notf-box_' + tlid).css('display', 'block')
-		$('#notf-box_' + tlid).animate(
-			{
-				height: '400px'
-			},
-			{
-				duration: 300,
-				complete: function() {
-					$('#notf-box_' + tlid).css('overflow-y', 'scroll')
-					$('#notf-box_' + tlid).removeClass('column-hide')
+	if ($("#notf-box_" + tlid).hasClass("column-hide")) {
+		$("#notf-box_" + tlid).css("display", "block")
+		$("#notf-box_" + tlid).animate({
+			'height': '400px'
+		}, {
+				'duration': 300,
+				'complete': function () {
+					$("#notf-box_" + tlid).css("overflow-y", "scroll")
+					$("#notf-box_" + tlid).removeClass("column-hide")
 				}
-			}
-		)
+			});
 	} else {
-		$('#notf-box_' + tlid).css('overflow-y', 'hidden')
-		$('#notf-box_' + tlid).animate(
-			{
-				height: '0'
-			},
-			{
-				duration: 300,
-				complete: function() {
-					$('#notf-box_' + tlid).addClass('column-hide')
-					$('#notf-box_' + tlid).css('display', 'none')
+		$("#notf-box_" + tlid).css("overflow-y", "hidden")
+		$("#notf-box_" + tlid).animate({
+			'height': '0'
+		}, {
+				'duration': 300,
+				'complete': function () {
+					$("#notf-box_" + tlid).addClass("column-hide")
+					$("#notf-box_" + tlid).css("display", "none")
 				}
-			}
-		)
+			});
 	}
 	notfCanceler(acct)
 }
 function notfCanceler(acct) {
-	$('.notf-reply_' + acct).text(0)
-	localStorage.removeItem('notf-reply_' + acct)
-	$('.notf-reply_' + acct).addClass('hide')
-	$('.notf-fav_' + acct).text(0)
-	localStorage.removeItem('notf-fav_' + acct)
-	$('.notf-fav_' + acct).addClass('hide')
-	$('.notf-bt_' + acct).text(0)
-	localStorage.removeItem('notf-bt_' + acct)
-	$('.notf-bt_' + acct).addClass('hide')
-	$('.notf-follow_' + acct).text(0)
-	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)
-	}
+	$(".notf-reply_" + acct).text(0);
+	localStorage.removeItem("notf-reply_" + acct)
+	$(".notf-reply_" + acct).addClass("hide");
+	$(".notf-fav_" + acct).text(0);
+	localStorage.removeItem("notf-fav_" + acct)
+	$(".notf-fav_" + acct).addClass("hide");
+	$(".notf-bt_" + acct).text(0);
+	localStorage.removeItem("notf-bt_" + acct)
+	$(".notf-bt_" + acct).addClass("hide");
+	$(".notf-follow_" + acct).text(0);
+	localStorage.removeItem("notf-follow_" + acct)
+	$(".notf-follow_" + acct).addClass("hide");
+	$(".notf-icon_" + acct).removeClass("red-text");
 }
 function allNotfRead() {
-	var multi = localStorage.getItem('multi')
+	var multi = localStorage.getItem("multi");
 	if (multi) {
-		var obj = JSON.parse(multi)
-		Object.keys(obj).forEach(function(key) {
+		var obj = JSON.parse(multi);
+		Object.keys(obj).forEach(function (key) {
 			notfCanceler(key)
-		})
+		});
 	}
 }
-allNotfRead()
+allNotfRead()

app/js/tl/old-mix.js

@@ -1,375 +1,249 @@
 //Integrated TL
-function mixtl(acct_id, tlid, type, delc, voice) {
-	localStorage.removeItem('morelock')
-	localStorage.setItem('now', type)
-	todo('Integrated TL Loading...(Local)')
+function mixtl(acct_id, tlid) {
+	var type = "mix";
+	localStorage.removeItem("morelock")
+	localStorage.setItem("now", type);
+	todo("Integrated TL Loading...(Local)");
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
 	//まずLocal
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/timelines/public?local=true'
+	var start = "https://" + domain + "/api/v1/timelines/public?local=true";
 	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)
-				})
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(json) {
+		//パースして描画
+		var templete = parse(json, 'mix', acct_id, tlid);
+		$("#timeline_" + tlid).html(templete[0]);
+
+		jQuery("time.timeago").timeago();
+		$(window).scrollTop(0);
+		var locals = templete[1];
+		var times = templete[2];
+		todo("Integrated TL Loading...(Home)");
+		//Home
+		var start = "https://" + domain + "/api/v1/timelines/home";
+		fetch(start, {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/json',
+				'Authorization': 'Bearer ' + at
+			},
+		}).then(function(response) {
+			return response.json();
+		}).catch(function(error) {
+			todo(error);
+			console.error(error);
+		}).then(function(obj) {
+			//ホームのオブジェクトをUnix時間で走査
+			if (!$("[toot-id=" + obj[0].id + "]").length) {
+				$("#timeline_" + tlid + " .cvo").first().before(parse([obj[0]], 'home',
+					acct_id));
+					//delete obj[0];
 			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(jsonL) {
-			var start = 'https://' + domain + '/api/v1/timelines/home'
-			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(jsonH) {
-					var homearr = []
-					var timeline = jsonL.concat(jsonH)
-					timeline.sort(function(a, b) {
-						if (date(a.created_at, 'unix') >= date(b.created_at, 'unix')) return -1
-						if (date(a.created_at, 'unix') < date(b.created_at, 'unix')) return 1
-						return 0
-					})
-					if (type == 'integrated') {
-						timeline.splice(20)
-					}
-					var templete = ''
-					if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
-						var mute = getFilterType(JSON.parse(localStorage.getItem('filter_' + acct_id)), 'mix')
-					} else {
-						var mute = []
-					}
-					Object.keys(timeline).forEach(function(key) {
-						var pkey = key * 1 + 1
-						if (pkey < timeline.length) {
-							if (
-								date(timeline[key].created_at, 'unix') != date(timeline[pkey].created_at, 'unix')
-							) {
-								if (type == 'integrated') {
-									templete = templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'mix')
-								} else if (type == 'plus') {
-									if (timeline[key].account.acct == timeline[key].account.username) {
-										templete =
-											templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'plus')
-									}
-								}
-							}
+			//Localが遅すぎてHomeの全てより過去の場合
+			var unixL=date(json[0].created_at,"unix");
+			var unixH=date(obj[obj.length-1].created_at,"unix");
+			//console.log(unixH+"vs"+unixL)
+		if(unixH < unixL){
+			Object.keys(obj).forEach(function(key) {
+				var skey = obj.length - key - 1;
+				var toot = obj[key];
+				console.log(toot);
+				var id = toot.id;
+				if ($("#timeline_" + tlid + " [toot-id=" + toot.id + "]").length < 1) {
+				//console.log(toot.id);
+				var tarunix = date(toot.created_at, 'unix');
+				var beforekey2;
+				var key2;
+				//console.log(locals)
+				//ホームのオブジェクトに対してLocalのオブジェクトを時間走査
+				Object.keys(times).forEach(function(key2) {
+						if (times[key2] < tarunix) {
+							var local = json[key2].id;
+							//console.log($.strip_tags(toot.content));
+							html = parse(
+								[toot], 'home', acct_id, tlid);
+							$("#timeline_" + tlid + " [toot-id=" + local + "]").before(html);
+							//console.log("#timeline_" + tlid + " [toot-id=" + local + "]");
+								tarunix = 0;
 						}
-					})
-					$('#landing_' + tlid).hide()
-					$('#timeline_' + tlid).html(templete)
-					mixre(acct_id, tlid, type, mute, delc, voice)
-					additional(acct_id, tlid)
-					jQuery('time.timeago').timeago()
-					todc()
-				})
-		})
+
+				});
+			}
+			});
+		}else{
+			html = parse(
+				obj, 'home', acct_id, tlid);
+			$("#timeline_" + tlid).html(html);
+		}
+			todc();
+			mixre(acct_id, tlid);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+		});
+	});
 }
 
 //Streamingに接続
-function mixre(acct_id, tlid, TLtype, mute, delc, voice, mode) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	if (localStorage.getItem('streaming_' + acct_id)) {
-		var wss = localStorage.getItem('streaming_' + acct_id)
-	} else {
-		var wss = 'wss://' + domain
-	}
-	var startHome = wss + '/api/v1/streaming/?stream=user&access_token=' + at
-	var startLocal = wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
-	var wshid = websocketHome.length
-	var wslid = websocketLocal.length
-	websocketHome[wshid] = new WebSocket(startHome)
-	websocketLocal[wslid] = new WebSocket(startLocal)
+function mixre(acct_id, tlid) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var type = "mix";
+	localStorage.setItem("now", type);
+	var startHome = "wss://" + domain +
+		"/api/v1/streaming/?stream=user&access_token=" + at;
+
+	var startLocal = "wss://" + domain +
+		"/api/v1/streaming/?stream=public:local&access_token=" + at;
+	var wshid = websocketHome.length;
+	var wslid = websocketLocal.length;
+	websocketHome[wshid] = new WebSocket(startHome);
+	websocketLocal[wslid] = new WebSocket(startLocal);
 	websocketHome[wshid].onopen = function(mess) {
-		localStorage.setItem('wssH_' + tlid, wshid)
-		console.table({
-			tlid: tlid,
-			type: 'Connect Streaming API(Integrated:Home)',
-			domain: domain,
-			message: mess
-		})
-		$('#notice_icon_' + tlid).removeClass('red-text')
+		console.log("Connect Streaming API(Home)");
+		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onopen = function(mess) {
-		localStorage.setItem('wssL_' + tlid, wslid)
-		console.table({
-			tlid: tlid,
-			type: 'Connect Streaming API(Integrated:Local)',
-			domain: domain,
-			message: mess
-		})
-		$('#notice_icon_' + tlid).removeClass('red-text')
+		console.log("Connect Streaming API(Local)");
+		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onmessage = function(mess) {
-		console.log(['Receive Streaming API:(Integrated:Local)', obj])
+		console.log("Receive Streaming API:");
 
-		var obj = JSON.parse(JSON.parse(mess.data).payload)
-		var type = JSON.parse(mess.data).event
-		if (type == 'delete') {
-			if (delc == 'true') {
-				$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
-					'emphasized'
-				)
-				$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
-					'by_delcatch'
-				)
-			} else {
-				$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
-				$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
-			}
-		} else if (type == 'update') {
-			var templete = parse([obj], '', acct_id, tlid, '', mute)
-			if ($('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1) {
-				if (voice) {
-					say(obj.content)
-				}
-				var templete = parse([obj], type, acct_id, tlid, '', mute, 'mix')
-				var pool = localStorage.getItem('pool_' + tlid)
+		var obj = JSON.parse(JSON.parse(mess.data).payload);
+		console.log(obj);
+		var type = JSON.parse(mess.data).event;
+		if (type == "delete") {
+			$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
+			$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
+		} else if (type == "update") {
+			var templete = parse([obj], '', acct_id, tlid);
+				var pool = localStorage.getItem("pool_" + tlid);
 				if (pool) {
-					pool = templete + pool
+					pool = templete + pool;
 				} else {
 					pool = templete
 				}
-				localStorage.setItem('pool_' + tlid, pool)
-
-				scrollck()
-
-				additional(acct_id, tlid)
-				jQuery('time.timeago').timeago()
-			} else {
-				todo('二重取得発生中')
-			}
+				localStorage.setItem("pool_" + tlid, pool);
+				scrollck();
+				additional(acct_id, tlid);
+				jQuery("time.timeago").timeago();
+				todc();
 		}
 	}
 	websocketHome[wshid].onmessage = function(mess) {
-		console.log(['Receive Streaming API:(Integrated:Home)', obj])
-		var obj = JSON.parse(JSON.parse(mess.data).payload)
-		var type = JSON.parse(mess.data).event
-		if (type == 'delete') {
-			if (del > 10) {
-				reconnector(tlid, type, acct_id, data)
-			} else {
-				localStorage.setItem('delete', del * 1 + 1)
-			}
-			if (delc == 'true') {
-				$('[toot-id=' + JSON.parse(mess.data).payload + ']').addClass('emphasized')
-				$('[toot-id=' + JSON.parse(mess.data).payload + ']').addClass('by_delcatch')
-			} else {
-				$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
-				$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
-			}
-		} else if (type == 'update') {
-			localStorage.removeItem('delete')
-			if (TLtype == 'integrated') {
-				var templete = parse([obj], '', acct_id, tlid)
-			} else if (TLtype == 'plus') {
-				if (obj.account.acct == obj.account.username) {
-					var templete = parse([obj], '', acct_id, tlid, '', mute, 'mix')
-				} else {
-					var templete = ''
-				}
-			}
-			if ($('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1) {
-				if (voice) {
-					say(obj.content)
-				}
-				var templete = parse([obj], type, acct_id, tlid, '', mute, 'mix')
-				var pool = localStorage.getItem('pool_' + tlid)
+		console.log("Receive Streaming API:(Home)");
+
+		var obj = JSON.parse(JSON.parse(mess.data).payload);
+		console.log(obj);
+		var type = JSON.parse(mess.data).event;
+		if (type == "delete") {
+			$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
+			$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
+		} else if (type == "update") {
+			var templete = parse([obj], '', acct_id, tlid);
+				if (obj.visibility != "public" || obj.account.acct != obj.account.username) {
+				var pool = localStorage.getItem("pool_" + tlid);
 				if (pool) {
-					pool = templete + pool
+					pool = templete + pool;
 				} else {
 					pool = templete
 				}
-				localStorage.setItem('pool_' + tlid, pool)
-
-				scrollck()
-
-				additional(acct_id, tlid)
-				jQuery('time.timeago').timeago()
-			} else {
-				todo('二重取得発生中')
+				localStorage.setItem("pool_" + tlid, pool);
+				scrollck();
+				additional(acct_id, tlid);
+				jQuery("time.timeago").timeago();
 			}
 		}
 	}
 	websocketLocal[wslid].onerror = function(error) {
-		console.error('WebSocketLocal Error')
-		console.error(error)
-		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
-			todo('WebSocket Error ' + error)
-		} else {
-			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
-			localStorage.setItem('wserror_' + tlid, errorct)
-			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, '', 'error')
-			}
-		}
-	}
-	websocketLocal[wslid].onclose = function() {
-		console.warn('WebSocketLocal Closing:' + tlid)
-		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
-			todo('WebSocket Closed')
-		} else {
-			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
-			localStorage.setItem('wserror_' + tlid, errorct)
-			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, '', 'error')
-			}
-		}
-	}
+		console.error('WebSocket Error ' + error);
+	};
 	websocketHome[wshid].onerror = function(error) {
-		console.error(['WebSocketHome Error', error])
-		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
-			todo('WebSocket Error ' + error)
-		} else {
-			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
-			localStorage.setItem('wserror_' + tlid, errorct)
-			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, '', 'error')
-			}
-		}
-	}
-	websocketHome[wshid].onclose = function() {
-		console.warn('WebSocketHome Closing:' + tlid)
-		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
-			todo('WebSocket Closed')
-		} else {
-			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
-			localStorage.setItem('wserror_' + tlid, errorct)
-			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, '', 'error')
-			}
-		}
-	}
+		console.error('WebSocket Error ' + error);
+	};
 }
 
 //ある程度のスクロールで発火
-function mixmore(tlid, type) {
-	var multi = localStorage.getItem('column')
-	var obj = JSON.parse(multi)
-	var acct_id = obj[tlid].domain
-	moreloading = true
-	todo('Integrated TL MoreLoading...(Local)')
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var sid = $('#timeline_' + tlid + ' .cvo')
-		.last()
-		.attr('unique-id')
-
-	var start = 'https://' + domain + '/api/v1/timelines/public?local=true&max_id=' + sid
+function mixmore(tlid) {
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	var acct_id = obj[tlid].domain;
+	todo("Integrated TL MoreLoading...(Local)");
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");
+	var len = $("#timeline_" + tlid + " .cvo").length
+	var start = "https://" + domain +
+		"/api/v1/timelines/public?local=true&max_id=" + sid;
+		console.log(start);
 	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)
-				})
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(json) {
+		var templete = parse(json, 'mix', acct_id, tlid);
+		$("#timeline_" + tlid).append(templete[0]);
+		var locals = templete[1];
+		todo("Integrated TL MoreLoading...(Home)");
+		console.log(sid);
+		var start = "https://" + domain + "/api/v1/timelines/home?max_id=" + sid;
+		fetch(start, {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/json',
+				'Authorization': 'Bearer ' + at
+			},
+		}).then(function(response) {
+			return response.json();
+		}).catch(function(error) {
+			todo(error);
+			console.error(error);
+		}).then(function(obj) {
+			if ($("[toot-id=" + obj[0].id + "]").length < 1) {
+				$("#timeline_" + tlid + " .cvo").eq(len).before(parse([obj[0]], 'home',
+					acct_id)+'<div class="divider"></div>');
+					//delete obj[0];
 			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(jsonL) {
-			var start = 'https://' + domain + '/api/v1/timelines/home?max_id=' + sid
-			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(jsonH) {
-					var homearr = []
-					var timeline = jsonL.concat(jsonH)
-					timeline.sort(function(a, b) {
-						if (date(a.created_at, 'unix') > date(b.created_at, 'unix')) return -1
-						if (date(a.created_at, 'unix') < date(b.created_at, 'unix')) return 1
-						return 0
-					})
-					timeline.splice(20)
-					var templete = ''
-					Object.keys(timeline).forEach(function(key) {
-						var pkey = key * 1 + 1
-						if (pkey < 20) {
-							if (
-								date(timeline[key].created_at, 'unix') != date(timeline[pkey].created_at, 'unix')
-							) {
-								if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
-									var mute = getFilterType(
-										JSON.parse(localStorage.getItem('filter_' + acct_id)),
-										'mix'
-									)
-								} else {
-									var mute = []
-								}
-								if (type == 'integrated') {
-									templete = templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'mix')
-								} else if (type == 'plus') {
-									if (timeline[key].account.acct == timeline[key].account.username) {
-										templete = templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'mix')
-									}
-								}
-							}
+			Object.keys(obj).forEach(function(key) {
+				var skey = obj.length - key - 1;
+				var toot = obj[skey];
+				var id = toot.id;
+				var tarunix = date(toot.created_at, 'unix');
+				var beforekey2;
+				var key2;
+				Object.keys(locals).forEach(function(key2) {
+					if ($("[toot-id=" + toot.id + "]").length <1) {
+						if (key2 > tarunix) {
+							var local = locals[key2];
+							$("#timeline_" + tlid + " [toot-id=" + local + "]").after(parse([toot], 'home',
+								acct_id, tlid));
+							tarunix = 2147483647;
 						}
-					})
 
-					$('#timeline_' + tlid).append(templete)
-					additional(acct_id, tlid)
-					jQuery('time.timeago').timeago()
-					moreloading = false
-					todc()
-				})
-		})
-}
+					}
+				});
+			});
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			todc();
+		});
+	});
+
+}

app/js/tl/poll.js

@@ -1,37 +1,37 @@
 //アンケートのトグル
 function pollToggle() {
-	if ($('#poll').hasClass('hide')) {
-		$('#right-side').show()
-		$('#right-side').css('width', '300px')
-		$('#left-side').css('width', 'calc(100% - 300px)')
-		var width = localStorage.getItem('postbox-width')
-		if (width) {
-			width = width.replace('px', '') * 1 + 300
-		} else {
-			width = 600
-		}
-		$('#post-box').css('width', width + 'px')
-		$('#poll').removeClass('hide')
-		$('#pollsta').text(lang.lang_yesno)
-	} else {
-		$('#right-side').hide()
-		$('#left-side').css('width', '100%')
-		$('#right-side').css('width', '300px')
-		var width = localStorage.getItem('postbox-width')
-		if (width) {
-			width = width.replace('px', '') * 1
-		} else {
-			width = 300
-		}
-		$('#post-box').css('width', width + 'px')
-		$('#emoji').addClass('hide')
-		$('#poll').addClass('hide')
-		$('#pollsta').text(lang.lang_no)
-	}
+    if ($("#poll").hasClass("hide")) {
+        $("#right-side").show()
+        $("#right-side").css("width", "300px")
+        $("#left-side").css("width", "calc(100% - 300px)")
+        var width = localStorage.getItem("postbox-width");
+        if (width) {
+            width = width.replace("px", "") * 1 + 300
+        } else {
+            width = 600
+        }
+        $("#post-box").css("width", width + "px")
+        $("#poll").removeClass("hide")
+        $("#pollsta").text(lang.lang_yesno)
+    } else {
+        $("#right-side").hide()
+        $("#left-side").css("width", "100%")
+        $("#right-side").css("width", "300px")
+        var width = localStorage.getItem("postbox-width");
+        if (width) {
+            width = width.replace("px", "") * 1
+        } else {
+            width = 300
+        }
+        $("#post-box").css("width", width + "px")
+        $("#emoji").addClass("hide")
+        $("#poll").addClass("hide")
+        $("#pollsta").text(lang.lang_no)
+    }
 }
 function pollProviderCk() {
-	$('.poll-provider').addClass('hide')
-	$('#' + $('#poll-sel').val()).removeClass('hide')
+    $(".poll-provider").addClass("hide");
+    $("#" + $("#poll-sel").val()).removeClass("hide");
 }
 /*
 function pollAddtime(num){
@@ -42,81 +42,98 @@ function pollAddtime(num){
 }
 */
 function pollCalc() {
-	var days = $('#days_poll').val()
-	var hrs = $('#hours_poll').val()
-	var mins = $('#mins_poll').val()
-	console.log('Poll calc:' + days * 86400 + hrs * 3600 + mins * 60)
-	return days * 86400 + hrs * 3600 + mins * 60
+    var days = $("#days_poll").val();
+    var hrs = $("#hours_poll").val();
+    var mins = $("#mins_poll").val();
+    console.log("Poll calc:" + days * 86400 + hrs * 3600 + mins * 60)
+    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')
-	} 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')
-		} else {
-			$(elem).css('background-color', 'var(--emphasized)')
-			$(elem).addClass('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').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 {
+            $('.vote_' + acct_id + '_' + id + '_' + to).css("background-color", "var(--emphasized)")
+            $('.vote_' + acct_id + '_' + id + '_' + to).addClass("sel");
+        }
+    }
+
 }
-function voteMastodon(acct_id, id, target) {
-	var choice = []
-	$(`#vote${target} div`).each(function(i, elem) {
-		if ($(this).hasClass('sel')) {
-			choice.push(i + '')
-		}
-	})
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/polls/' + id + '/votes'
-	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		return false
-	}
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('POST', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = 'json'
-	httpreq.send(JSON.stringify({ choices: choice }))
-	httpreq.onreadystatechange = function() {
-		voteMastodonrefresh(acct_id, id, target)
-	}
+function voteMastodon(acct_id, id) {
+    var choice = [];
+    $('.vote_' + acct_id + '_' + id + ' div').each(function (i, elem) {
+        if ($(this).hasClass("sel")) {
+            choice.push(i + "");
+        }
+    });
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/polls/" + id + "/votes";
+    if (localStorage.getItem("mode_" + domain) == "misskey") {
+        return false;
+    }
+    var httpreq = new XMLHttpRequest();
+    httpreq.open('POST', start, true);
+    httpreq.setRequestHeader('Content-Type', 'application/json');
+    httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+    httpreq.responseType = "json";
+    httpreq.send(JSON.stringify({ choices: choice }));
+    httpreq.onreadystatechange = function () {
+        voteMastodonrefresh(acct_id, id)
+    }
 }
 function showResult(acct_id, id) {
-	$('.vote_' + acct_id + '_' + id + '_result').toggleClass('hide')
-}
-function voteMastodonrefresh(acct_id, id, target) {
-	var datetype = localStorage.getItem('datetype')
-	if (!datetype) {
-		datetype = 'absolute'
-	}
-	var httpreqd = new XMLHttpRequest()
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/polls/' + id
-	httpreqd.open('GET', start, true)
-	httpreqd.setRequestHeader('Content-Type', 'application/json')
-	httpreqd.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreqd.responseType = 'json'
-	httpreqd.send()
-	httpreqd.onreadystatechange = function() {
-		if (httpreqd.readyState == 4) {
-			if (this.status !== 200) {
-				setLog(start, this.status, this.response)
-			}
-			var json = httpreqd.response
-			console.log(['Refresh vote', json])
-			if (!json) {
-				return false
-			}
-			var poll = pollParse(json, acct_id, json.emojis)
-			$(`#vote${target}`).html(poll)
-		}
-	}
+    $('.vote_' + acct_id + '_' + id + '_result').toggleClass("hide")
 }
+function voteMastodonrefresh(acct_id, id) {
+    var datetype = localStorage.getItem("datetype");
+    if (!datetype) {
+        datetype = "absolute";
+    }
+    var httpreqd = new XMLHttpRequest();
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/polls/" + id;
+    httpreqd.open('GET', start, true);
+    httpreqd.setRequestHeader('Content-Type', 'application/json');
+    httpreqd.setRequestHeader('Authorization', 'Bearer ' + at);
+    httpreqd.responseType = 'json';
+    httpreqd.send();
+    httpreqd.onreadystatechange = function () {
+        if (httpreqd.readyState == 4) {
+            var json = httpreqd.response;
+            console.log(["Refresh vote", json]);
+            if (!json) {
+                return false;
+            }
+            var poll = "";
+            var choices = json.options;
+            var myvote = lang.lang_parse_voted;
+            var result_hide = "";
+            Object.keys(choices).forEach(function (keyc) {
+                var choice = choices[keyc];
+                if (!json.voted) {
+                    votesel = 'voteSelMastodon(\'' + acct_id + '\',\'' + json.id + '\',' + keyc + ',' + json.multiple + ')';
+                }
+                poll = poll + '<div class="pointer vote vote_' + acct_id + '_' + json.id + '_' + keyc + '" onclick="' + votesel + '">' + escapeHTML(choice.title) + '<span class="vote_' + acct_id + '_' + json.id + '_result ' + result_hide + '">(' + choice.votes_count + ')</span></div>';
+            });
+            poll = poll + myvote + '<a onclick="voteMastodonrefresh(\'' + acct_id + '\',\'' + json.id + '\')" class="pointer">' + lang.lang_manager_refresh + '</a><span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
+                '"><i class="far fa-calendar-times"></i>' +
+                date(json.expires_at, datetype) + '</span>';
+            $('.vote_' + acct_id + '_' + json.id).html(poll)
+        }
+    }
+}

app/js/tl/speech.js

@@ -1,183 +1,108 @@
-$voise = null
-isBouyomi = localStorage.getItem('voice_bouyomi')
-$voiseName = lang.lang_speech
-$voices = speechSynthesis.getVoices()
-$synthes = new SpeechSynthesisUtterance()
-$voise = $.grep($voices, function(n, i) {
-	return n.name == $voiseName
-})[0]
-$synthes.voice = $voise // 音声の設定
-localStorage.removeItem('voicebank')
+$voise = null;
+$voiseName = lang.lang_speech;
+$voices = speechSynthesis.getVoices();
+$synthes = new SpeechSynthesisUtterance();
+$voise = $.grep($voices, function (n, i) { return n.name == $voiseName })[0];
+$synthes.voice = $voise;                  // 音声の設定
+localStorage.removeItem("voicebank");
 speechSynthesis.cancel()
-if (!localStorage.getItem('voice_vol')) {
-	localStorage.setItem('voice_vol', 1)
+if (!localStorage.getItem("voice_vol")) {
+    localStorage.setItem("voice_vol", 1)
 }
-voiceRate = localStorage.getItem('voice_speed')
-$synthes.rate = voiceRate
-voicePitch = localStorage.getItem('voice_pitch')
-$synthes.pitch = voicePitch
-voiceVol = localStorage.getItem('voice_vol')
-$synthes.volume = voiceVol
+$synthes.rate = localStorage.getItem("voice_speed");
+$synthes.pitch = localStorage.getItem("voice_pitch");
+$synthes.volume = localStorage.getItem("voice_vol");
 function say(msgr) {
-	msg = voiceParse(msgr)
-	var voice = localStorage.getItem('voicebank')
-	var obj = JSON.parse(voice)
-	if (!obj) {
-		var json = JSON.stringify([msg])
-		localStorage.setItem('voicebank', json)
-	} else {
-		obj.push([msg])
-		var json = JSON.stringify(obj)
-		localStorage.setItem('voicebank', json)
-	}
-}
-$repeat = setInterval(function() {
-	if (!speechSynthesis.speaking) {
-		var voice = localStorage.getItem('voicebank')
-		if (voice) {
-			var obj = JSON.parse(voice)
-			if (obj[0]) {
-				if (localStorage.getItem('voice_bouyomi')) {
-					var delim = '<bouyomi>'
-					var thisVoiceRate = voiceRate * 10 + 70
-					var thisVoicePitch = voicePitch * 50 + 70
-					var thisVoiceVol = voiceVol * 100
-					console.log(thisVoiceRate, thisVoicePitch, thisVoiceVol)
-					var command = 0x0001
-					var type = 0
-					var sends =
-						'' +
-						command +
-						delim +
-						thisVoiceRate +
-						delim +
-						thisVoicePitch +
-						delim +
-						thisVoiceVol +
-						delim +
-						type +
-						delim +
-						obj[0]
-					bouyomiConnect(sends)
-				} else {
-					$synthes.text = obj[0]
-					speechSynthesis.speak($synthes)
-				}
+    msg = voiceParse(msgr);
+    var voice = localStorage.getItem("voicebank");
+    var obj = JSON.parse(voice);
+    if (!obj) {
+        var json = JSON.stringify([msg]);
+        localStorage.setItem("voicebank", json);
+    } else {
+        obj.push([msg]);
+        var json = JSON.stringify(obj);
+        localStorage.setItem("voicebank", json);
+    }
 
-				obj.splice(0, 1)
-				var json = JSON.stringify(obj)
-				localStorage.setItem('voicebank', json)
-			}
-		}
-	}
-}, 300)
+}
+$repeat = setInterval(function () {
+    if (!speechSynthesis.speaking) {
+        var voice = localStorage.getItem("voicebank");
+        if (voice) {
+            var obj = JSON.parse(voice);
+            if (obj[0]) {
+                $synthes.text = obj[0];
+                speechSynthesis.speak($synthes);
+                obj.splice(0, 1);
+                var json = JSON.stringify(obj);
+                localStorage.setItem("voicebank", json);
+            }
+        }
+    }
+}, 300);
 function voiceParse(msg) {
-	msg = $.strip_tags(msg)
-	msg = msg.replace(/#/g, '')
-	msg = msg.replace(/'/g, '')
-	msg = msg.replace(/"/g, '')
-	msg = msg.replace(/https?:\/\/[a-zA-Z0-9./-@_=?%&-]+/g, '')
-	return msg
+    msg = $.strip_tags(msg);
+    msg = msg.replace(/#/g, "");
+    msg = msg.replace(/'/g, "");
+    msg = msg.replace(/"/g, "");
+    msg = msg.replace(/https?:\/\/[a-zA-Z0-9./-@_=?%&-]+/g, "");
+    return msg;
 }
 function voiceToggle(tlid) {
-	var voiceck = localStorage.getItem('voice_' + tlid)
-	if (voiceck) {
-		localStorage.removeItem('voice_' + tlid)
-		speechSynthesis.cancel()
-		if (localStorage.getItem('voice_bouyomi')) {
-			var command = 0x0010
-			var sends = '' + command
-			bouyomiConnect(sends)
-		}
-		$('#sta-voice-' + tlid).text('Off')
-		$('#sta-voice-' + tlid).css('color', 'red')
-		parseColumn(tlid)
-	} else {
-		localStorage.setItem('voice_' + tlid, 'true')
-		$('#sta-voice-' + tlid).text('On')
-		$('#sta-voice-' + tlid).css('color', '#009688')
-		parseColumn(tlid)
-	}
+    var voiceck = localStorage.getItem("voice_" + tlid);
+    if (voiceck) {
+        localStorage.removeItem("voice_" + tlid);
+        speechSynthesis.cancel()
+        $("#sta-voice-" + tlid).text("Off");
+        $("#sta-voice-" + tlid).css("color", 'red');
+        parseColumn(tlid);
+    } else {
+        localStorage.setItem("voice_" + tlid, "true");
+        $("#sta-voice-" + tlid).text("On");
+        $("#sta-voice-" + tlid).css("color", '#009688');
+        parseColumn(tlid);
+    }
 }
 function voiceCheck(tlid) {
-	var voiceck = localStorage.getItem('voice_' + tlid)
-	if (voiceck) {
-		$('#sta-voice-' + tlid).text('On')
-		$('#sta-voice-' + tlid).css('color', '#009688')
-	} else {
-		$('#sta-voice-' + tlid).text('Off')
-		$('#sta-voice-' + tlid).css('color', 'red')
-	}
+    var voiceck = localStorage.getItem("voice_" + tlid);
+    if (voiceck) {
+        $("#sta-voice-" + tlid).text("On");
+        $("#sta-voice-" + tlid).css("color", '#009688');
+    } else {
+        $("#sta-voice-" + tlid).text("Off");
+        $("#sta-voice-" + tlid).css("color", 'red');
+    }
 }
 function voicePlay() {
-	if (speechSynthesis.speaking) {
-		speechSynthesis.cancel()
-	} else {
-		var text = $('#voicetxt').val()
-		var rate = $('#voicespeed').val()
-		var pitch = $('#voicepitch').val()
-		var vol = $('#voicevol').val()
-		if (localStorage.getItem('voice_bouyomi')) {
-			var delim = '<bouyomi>'
-			rate = rate * 1 + 70
-			pitch = pitch * 1 + 70
-			var command = 0x0001 // コマンドです。0x0001.読み上げ/0x0010.ポーズ/0x0020.再開/0x0030.スキップ
-			/*var speed = 100; // 速度50-200。-1を指定すると本体設定
-            var pitch = 100; // ピッチ50-200。-1を指定すると本体設定
-            var volume = 100; // ボリューム0-100。-1を指定すると本体設定*/
-			var type = 0 // 声質(0.本体設定/1.女性1/2.女性2/3.男性1/4.男性2/5.中性/6.ロボット/7.機械1/8.機械2)
-			var sends =
-				'' + command + delim + rate + delim + pitch + delim + vol + delim + type + delim + text
-			bouyomiConnect(sends)
-		} else {
-			$synthes.text = text
-			$synthes.rate = rate / 10
-			$synthes.pitch = pitch / 50
-			$synthes.volume = vol / 100
-			speechSynthesis.speak($synthes)
-		}
-	}
+    if (speechSynthesis.speaking) {
+        speechSynthesis.cancel()
+    } else {
+        $synthes.text = $("#voicetxt").val();
+        $synthes.rate = $("#voicespeed").val() / 10;
+        $synthes.pitch = $("#voicepitch").val() / 50;
+        $synthes.volume = $("#voicevol").val() / 100;
+        speechSynthesis.speak($synthes);
+    }
 }
 
 function voiceSettings() {
-	var awk = $('[name=bym]:checked').val()
-	if (awk == 'yes') {
-		localStorage.setItem('voice_bouyomi', 'yes')
-		M.toast({ html: 'Bouyomi Chan connection requires WebSocket Plugin', displayLength: 3000 })
-	} else {
-		localStorage.removeItem('voice_bouyomi')
-	}
-	localStorage.setItem('voice_speed', $('#voicespeed').val() / 10)
-	localStorage.setItem('voice_pitch', $('#voicepitch').val() / 50)
-	localStorage.setItem('voice_vol', $('#voicevol').val() / 100)
-	M.toast({ html: lang.lang_speech_refresh, displayLength: 3000 })
+    localStorage.setItem("voice_speed", $("#voicespeed").val() / 10);
+    localStorage.setItem("voice_pitch", $("#voicepitch").val() / 50);
+    localStorage.setItem("voice_vol", $("#voicevol").val() / 100);
+    M.toast({ html: lang.lang_speech_refresh, displayLength: 3000 })
 }
 function voiceSettingLoad() {
-	var flag = localStorage.getItem('voice_bouyomi')
-	if (flag) {
-		$('#bym_yes').prop('checked', true)
-	} else {
-		$('#bym_no').prop('checked', true)
-	}
-	var speed = localStorage.getItem('voice_speed')
-	var pitch = localStorage.getItem('voice_pitch')
-	var vol = localStorage.getItem('voice_vol')
-	if (speed) {
-		$('#voicespeed').val(speed * 10)
-		$('#voicespeedVal').text(speed * 10)
-	}
-	if (pitch) {
-		$('#voicepitch').val(pitch * 50)
-		$('#voicepitchVal').text(pitch * 50)
-	}
-	if (vol) {
-		$('#voicevol').val(vol * 100)
-		$('#voicevolVal').text(vol * 100)
-	}
-}
-function bouyomiConnect(sends) {
-	var socket = new WebSocket('ws://localhost:50002/')
-	socket.onopen = function() {
-		socket.send(sends)
-	}
-}
+    var speed = localStorage.getItem("voice_speed");
+    var pitch = localStorage.getItem("voice_pitch");
+    var vol = localStorage.getItem("voice_vol");
+    if (speed) {
+        $("#voicespeed").val(speed * 10);
+    }
+    if (pitch) {
+        $("#voicepitch").val(pitch * 50);
+    }
+    if (vol) {
+        $("#voicevol").val(vol * 100);
+    }
+}

app/js/tl/src.js

@@ -1,357 +1,252 @@
 //検索
 //検索ボックストグル
 function searchMenu() {
-	$('#src-contents').html('')
-	trend()
-	$('#left-menu div').removeClass('active')
-	$('#searchMenu').addClass('active')
-	$('.menu-content').addClass('hide')
-	$('#src-box').removeClass('hide')
+	$("#src-contents").html("");
+	trend();
+	$("#left-menu div").removeClass("active");
+	$("#searchMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+	$("#src-box").removeClass("hide");
 	//$('ul.tabs').tabs('select_tab', 'src-sta');
 }
 
 //検索取得
 function src(mode, offset) {
-	if (!offset) {
-		$('#src-contents').html('')
-		var add = ''
-	} else {
-		var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
+	if(!offset){
+		$("#src-contents").html("");
+		var add = ""
+	}else{
+		var add = "&type=accounts&offset=" + $("#src-accts .cvo").length
 	}
-
-	var q = $('#src').val()
-	var acct_id = $('#src-acct-sel').val()
-	if (acct_id == 'tootsearch') {
+	
+	var q = $("#src").val();
+	var acct_id = $("#src-acct-sel").val();
+	if (acct_id == "tootsearch") {
 		tsAdd(q)
-		return false
+		return false;
 	}
-	localStorage.setItem('last-use', acct_id)
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var m = q.match(/^#(.+)$/)
-	if (m) {
-		q = m[1]
-	}
-	if (user == '--now') {
-		var user = $('#his-data').attr('user-id')
+	localStorage.setItem("last-use", acct_id);
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var m = q.match(/^#(.+)$/);
+	if (m) { q = m[1]; }
+	if (user == "--now") {
+		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
+		var start = "https://" + domain + "/api/v1/search?q=" + q
 	}
-	console.log('Try to search at ' + start)
+	console.log("Try to search at " + start)
 	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) {
-			src('v1')
-			return false
-		})
-		.then(function(json) {
-			console.log(['Search', json])
-			//ハッシュタグ
-			if (json.hashtags[0]) {
-				var tags = ''
-				Object.keys(json.hashtags).forEach(function(key4) {
-					var tag = json.hashtags[key4]
-					if (mode) {
-						tags =
-							tags +
-							`<a onclick="tl('tag','${tag}','${acct_id}','add')" class="pointer">
-								#${escapeHTML(tag)}
-							</a>
-							<br> `
-					} else {
-						tags = tags + graphDraw(tag, acct_id)
-					}
-				})
-				$('#src-contents').append('Tags<br>' + tags)
-			}
-			//トゥート
-			if (json.statuses[0]) {
-				var templete = parse(json.statuses, '', acct_id)
-				$('#src-contents').append('<br>Mentions<br>' + templete)
-			}
-			//アカウント
-			if (json.accounts[0]) {
-				var templete = userparse(json.accounts, '', acct_id)
-				if (!offset) {
-					$('#src-contents').append(
-						`<br>Accounts<div id="src-accts">
-							${templete}
-							</div><a onclick="src(false,'more')" class="pointer">more...</a>`
-					)
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		src("v1")
+		return false;
+	}).then(function (json) {
+		console.log(["Search", json]);
+		//ハッシュタグ
+		if (json.hashtags[0]) {
+			var tags = "";
+			Object.keys(json.hashtags).forEach(function (key4) {
+				var tag = json.hashtags[key4];
+				if (mode) {
+					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
+						'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
 				} else {
-					$('#src-accts').append(templete)
+					tags = tags + graphDraw(tag, acct_id);
 				}
+
+			});
+			$("#src-contents").append("Tags<br>" + tags);
+		}
+		//トゥート
+		if (json.statuses[0]) {
+			var templete = parse(json.statuses, '', acct_id);
+			$("#src-contents").append("<br>Mentions<br>" + templete);
+		}
+		//アカウント
+		if (json.accounts[0]) {
+			var templete = userparse(json.accounts, '', acct_id);
+			if(!offset){
+				$("#src-contents").append("<br>Accounts<div id=\"src-accts\">" + templete + '</div><a onclick="src(false,\'more\')" class="pointer">more...</a>');
+			}else{
+				$("#src-accts").append(templete)
 			}
-			jQuery('time.timeago').timeago()
-		})
+			
+		}
+		jQuery("time.timeago").timeago();
+	});
 }
 function tsAdd(q) {
 	var add = {
 		domain: acct_id,
-		type: 'tootsearch',
+		type: "tootsearch",
 		data: q
-	}
-	var multi = localStorage.getItem('column')
-	var obj = JSON.parse(multi)
-	localStorage.setItem('card_' + obj.length, 'true')
-	obj.push(add)
-	var json = JSON.stringify(obj)
-	localStorage.setItem('column', json)
-	parseColumn('add')
+	};
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	localStorage.setItem("card_" + obj.length, "true");
+	obj.push(add);
+	var json = JSON.stringify(obj);
+	localStorage.setItem("column", json);
+	parseColumn('add');
 }
 function tootsearch(tlid, q) {
-	var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
-	console.log('Toot srrach at ' + start)
-	$('#notice_' + tlid).text('tootsearch(' + q + ')')
-	$('#notice_icon_' + tlid).text('search')
+	var start = "https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=" + q
+	console.log("Toot srrach at " + start)
+	$("#notice_" + tlid).text("tootsearch(" + q + ")");
+	$("#notice_icon_" + tlid).text("search");
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json'
-		}
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(raw) {
-			var templete = ''
-			var json = raw.hits.hits
-			var max_id = raw['hits'].length
-			for (var i = 0; i < json.length; i++) {
-				var toot = json[i]['_source']
-				if (lastid != toot.uri) {
-					if (toot && toot.account) {
-						templete = templete + parse([toot], 'noauth', null, tlid, 0, [], 'tootsearch')
-					}
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (raw) {
+		var templete = "";
+		var json = raw.hits.hits;
+		var max_id = raw["hits"].length;
+		for (var i = 0; i < json.length; i++) {
+			var toot = json[i]["_source"];
+			if (lastid != toot.uri) {
+				if (toot && toot.account) {
+					templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
 				}
-				var lastid = toot.uri
 			}
-			if (!templete) {
-				templete = lang.lang_details_nodata
-			} else {
-				templete = templete + `<div class="hide ts-marker" data-maxid="${max_id}"></div>`
-			}
-			$('#timeline_' + tlid).html(templete)
+			var lastid = toot.uri;
+		}
+		if (!templete) {
+			templete = lang.lang_details_nodata;
+		} else {
+			templete = templete + '<div class="hide ts-marker" data-maxid="' + max_id + '"></div>';
+		}
+		$("#timeline_" + tlid).html(templete);
 
-			jQuery('time.timeago').timeago()
-		})
+		jQuery("time.timeago").timeago();
+	});
 }
 function moreTs(tlid, q) {
-	var sid = $('#timeline_' + tlid + ' .ts-marker')
-		.last()
-		.attr('data-maxid')
-	moreloading = true
-	var start =
-		'https://tootsearch.chotto.moe/api/v1/search?from=' + sid + '&sort=created_at%3Adesc&q=' + q
-	$('#notice_' + tlid).text('tootsearch(' + q + ')')
-	$('#notice_icon_' + tlid).text('search')
+	var sid = $("#timeline_" + tlid + " .ts-marker").last().attr("data-maxid");
+	moreloading = true;
+	var start = "https://tootsearch.chotto.moe/api/v1/search?from=" + sid + "&sort=created_at%3Adesc&q=" + q
+	$("#notice_" + tlid).text("tootsearch(" + q + ")");
+	$("#notice_icon_" + tlid).text("search");
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json'
-		}
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(raw) {
-			var templete = ''
-			var json = raw.hits.hits
-			var max_id = raw['hits'].length
-			for (var i = 0; i < json.length; i++) {
-				var toot = json[i]['_source']
-				if (lastid != toot.uri) {
-					if (toot && toot.account) {
-						templete = templete + parse([toot], 'noauth', null, tlid, 0, [], 'tootsearch')
-					}
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (raw) {
+		var templete = "";
+		var json = raw.hits.hits;
+		var max_id = raw["hits"].length;
+		for (var i = 0; i < json.length; i++) {
+			var toot = json[i]["_source"];
+			if (lastid != toot.uri) {
+				if (toot && toot.account) {
+					templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
 				}
-				var lastid = toot.uri
 			}
-			if (!templete) {
-				templete = lang.lang_details_nodata
-			} else {
-				templete = templete + `<div class="hide ts-marker" data-maxid="${max_id}"></div>`
-			}
-			$('#timeline_' + tlid).append(templete)
+			var lastid = toot.uri;
+		}
+		if (!templete) {
+			templete = lang.lang_details_nodata;
+		} else {
+			templete = templete + '<div class="hide ts-marker" data-maxid="' + max_id + '"></div>';
+		}
+		$("#timeline_" + tlid).append(templete);
 
-			jQuery('time.timeago').timeago()
-		})
+		jQuery("time.timeago").timeago();
+	});
 }
 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,
-		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
-	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>`
+	var tags = "";
+	var his = tag.history;
+	var max = Math.max.apply(null, [his[0].uses, his[1].uses, his[2].uses, his[3].uses, his[4].uses, his[5].uses, his[6].uses]);
+	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);
+	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: #9e9e9e; stroke-width: 1;fill: none;"></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">
 	<path d="M0,0 L10,0 20,10 20,50" fill="#3F51B5"></path>
 </svg>
 */
-function trend() {
-	console.log('get trend')
-	$('#src-contents').html('')
-	var acct_id = $('#src-acct-sel').val()
-	if (acct_id == 'tootsearch') {
-		return false
+function trend(){
+	console.log("get trend")
+	$("#src-contents").html("");
+	var acct_id = $("#src-acct-sel").val();
+	if(acct_id=="tootsearch"){
+		return false;
 	}
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/trends'
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/trends"
 	console.log(start)
 	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) {
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			var tags = ''
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		//todo(error);
+		console.error(error);
+	}).then(function(json) {
+		var tags = "";
 			Object.keys(json).forEach(function(keye) {
-				var tag = json[keye]
-				var his = tag.history
-				tags = graphDrawCore(his, tag)
+				var tag = json[keye];
+				var his=tag.history;
+				var max=Math.max.apply(null, [his[0].uses,his[1].uses,his[2].uses,his[3].uses,his[4].uses,his[5].uses,his[6].uses]);
+				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: #9e9e9e; stroke-width: 1;fill: none;"></path></g>'+
+			'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
+					'\',\'add\')" class="pointer">#' + 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)
-	}
+					$("#src-contents").append(tags);
+			});
+
+	});
 }

app/js/tl/tag.js

@@ -1,200 +1,153 @@
 //タグ表示
 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 == 'tag') {
-		var acct_id = localStorage.getItem('main')
-		tl('tag', decodeURI(codex), acct_id, 'add')
-	}
+    var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+    var mode = m[1];
+    var codex = m[2];
+    if (mode == "tag") {
+        var acct_id = localStorage.getItem("main");
+        tl('tag', decodeURI(codex), acct_id, 'add');
+    }
 }
 //よく使うタグ
 function tagShow(tag) {
-	console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']')
-	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
+    $("[data-tag=" + decodeURI(tag).toLowerCase() + "]").toggleClass("hide");
 }
 //タグ追加
 function tagPin(tag) {
-	var tags = localStorage.getItem('tag')
-	if (!tags) {
-		var obj = []
-	} else {
-		var obj = JSON.parse(tags)
-	}
-	var can
-	Object.keys(obj).forEach(function(key) {
-		var tagT = obj[key]
-		if (tagT == tag) {
-			can = true
-		} else {
-			can = false
-		}
-	})
-	if (!can) {
-		obj.push(tag)
-	}
-	var json = JSON.stringify(obj)
-	localStorage.setItem('tag', json)
-	favTag()
+    var tags = localStorage.getItem("tag");
+    if (!tags) {
+        var obj = [];
+    } else {
+        var obj = JSON.parse(tags);
+    }
+    var can;
+    Object.keys(obj).forEach(function (key) {
+        var tagT = obj[key];
+        if (tagT == tag) {
+            can = true;
+        } else {
+            can = false;
+        }
+    });
+    if (!can) {
+        obj.push(tag);
+    }
+    var json = JSON.stringify(obj);
+    localStorage.setItem("tag", json);
+    favTag();
 }
 //タグ削除
 function tagRemove(key) {
-	var tags = localStorage.getItem('tag')
-	var obj = JSON.parse(tags)
-	obj.splice(key, 1)
-	var json = JSON.stringify(obj)
-	localStorage.setItem('tag', json)
-	favTag()
+    var tags = localStorage.getItem("tag");
+    var obj = JSON.parse(tags);
+    obj.splice(key, 1);
+    var json = JSON.stringify(obj);
+    localStorage.setItem("tag", json);
+    favTag();
 }
 function favTag() {
-	$('#taglist').html('')
-	var tagarr = localStorage.getItem('tag')
-	if (!tagarr) {
-		var obj = []
-	} else {
-		var obj = JSON.parse(tagarr)
-	}
-	var tags = ''
-	var nowPT = localStorage.getItem('stable')
-	Object.keys(obj).forEach(function(key) {
-		var tag = obj[key]
-		if (nowPT != tag) {
-			console.log('stable tags:' + nowPT + '/' + tag)
-			var ptt = lang.lang_tags_realtime
-			var nowon = ''
-		} else {
-			var ptt = lang.lang_tags_unrealtime
-			var nowon = '(' + lang.lang_tags_realtime + ')'
-		}
-		tag = escapeHTML(tag)
-		tags =
-			tags +
-			`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
-			${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
-			<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}">
-				TL
-			</a>　
-			<a onclick="brInsert('#${tag}')" class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
-				Toot
-			</a>　
-			<a onclick="autoToot('${tag}');" class="pointer" title="${lang.lang_tags_always}${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
-				${ptt}
-			</a>　
-			<a onclick="tagRemove('${key}')" class="pointer" title="${lang.lang_tags_tagunpin.replace('{{tag}}', '#' + tag)}">
-				${lang.lang_del}
-			</a>
-			</span> `
-	})
-	if (obj.length > 0) {
-		$('#taglist').append('My Tags:' + tags)
-	} else {
-		$('#taglist').append('')
-	}
+    $("#taglist").html("");
+    var tagarr = localStorage.getItem("tag");
+    if (!tagarr) {
+        var obj = [];
+    } else {
+        var obj = JSON.parse(tagarr);
+    }
+    var tags = "";
+    var nowPT = localStorage.getItem("stable")
+    Object.keys(obj).forEach(function (key) {
+        var tag = obj[key];
+        if (nowPT != tag) {
+            console.log("stable tags:" + nowPT + "/" + tag);
+            var ptt = lang.lang_tags_realtime;
+            var nowon = "";
+        } else {
+            var ptt = lang.lang_tags_unrealtime;
+            var nowon = "(" + lang.lang_tags_realtime + ")";
+        }
+        tag = escapeHTML(tag);
+        tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a>' + nowon + '<span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a>　' +
+            '<a onclick="autoToot(\'' + tag + '\');" class="pointer" title="' + lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">' + ptt + '</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' + lang.lang_tags_tagunpin.replace("{{tag}}", '#' + tag) + '">' + lang.lang_del + '</a></span> ';
+    });
+    if (obj.length > 0) {
+        $("#taglist").append("My Tags:" + tags);
+    } else {
+        $("#taglist").append("");
+    }
 }
 function trendTag() {
-	$('.trendtag').remove()
-	var domain = 'imastodon.net'
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/trend_tags'
-	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) {
-			if (json) {
-				var tags = ''
-				json = json.score
-				Object.keys(json).forEach(function(tag) {
-					tag = escapeHTML(tag)
-					tags =
-						tags +
-						`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
-						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
-						<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
-						<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">
-							Toot
-						</a>
-						</span> `
-				})
-				$('#taglist').append(
-					'<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' +
-						tags +
-						'</div>'
-				)
-				trendintervalset()
-			} else {
-				$('#taglist').html('')
-			}
-		})
+    $(".trendtag").remove();
+    var domain = "imastodon.net"
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/trend_tags"
+    fetch(start, {
+        method: 'GET',
+        headers: {
+            'content-type': 'application/json',
+            'Authorization': 'Bearer ' + at
+        },
+    }).then(function (response) {
+        return response.json();
+    }).catch(function (error) {
+        todo(error);
+        console.error(error);
+    }).then(function (json) {
+        if (json) {
+            var tags = "";
+            json = json.score;
+            Object.keys(json).forEach(function (tag) {
+                tag = escapeHTML(tag);
+                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span> ';
+            });
+            $("#taglist").append('<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags + '</div>');
+            trendintervalset()
+        } else {
+            $("#taglist").html("");
+        }
+    });
+
 }
 
 function trendintervalset() {
-	setTimeout(trendTag, 6000000)
+    setTimeout(trendTag, 6000000);
 }
 function tagTL(a, b, c, d) {
-	var acct_id = $('#post-acct-sel').val()
-	tl(a, b, acct_id, d)
+    var acct_id = $("#post-acct-sel").val();
+    tl(a, b, acct_id, d);
 }
 function autoToot(tag) {
-	tag = escapeHTML(tag)
-	var nowPT = localStorage.getItem('stable')
-	if (nowPT == tag) {
-		localStorage.removeItem('stable')
-		M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
-	} else {
-		localStorage.setItem('stable', tag)
-		M.toast({
-			html: lang.lang_tags_tagwarn.replace('{{tag}}', tag).replace('{{tag}}', tag),
-			displayLength: 3000
-		})
-		brInsert('#' + tag + ' ')
-	}
-	favTag()
+    tag = escapeHTML(tag)
+    var nowPT = localStorage.getItem("stable")
+    if (nowPT == tag) {
+        localStorage.removeItem("stable");
+        M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
+    } else {
+        localStorage.setItem("stable", tag);
+        M.toast({ html: lang.lang_tags_tagwarn.replace("{{tag}}", tag).replace("{{tag}}", tag), displayLength: 3000 })
+        brInsert('#' + tag + " ")
+    }
+    favTag();
 }
 //タグをフィーチャー
-function tagFeature(name, acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/featured_tags'
+function tagFeature(name, acct_id){
+    var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/featured_tags"
 	fetch(start, {
 		method: 'POST',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
-		},
-		body: JSON.stringify({
-			name: name
-		})
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			return false
-		})
-		.then(function(json) {
-			console.log(json)
-			M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
-		})
-}
+			'Authorization': 'Bearer ' + at
+        },
+        body: JSON.stringify({
+            name: name
+        })
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		return false;
+	}).then(function (json) {
+        console.log(json)
+		M.toast({ html: "Complete: " + escapeHTML(name), displayLength: 3000 })
+	});
+}

app/js/ui/img.js

@@ -1,259 +1,259 @@
 /*イメージビューワー*/
 //postのimg.jsとは異なります。
 function imgv(id, key, acct_id) {
-	$('#imgprog').text(0)
-	$('#imgsec').text(0)
-	$('#imgmodal').hide()
-	$('#imgmodal').attr('src', '../../img/loading.svg')
-	var murl = $('#' + id + '-image-' + key).attr('data-url')
-	var ourl = $('#' + id + '-image-' + key).attr('data-original')
-	if (!ourl || ourl == 'null') {
-		ourl = murl
-	}
-	var type = $('#' + id + '-image-' + key).attr('data-type')
-	$('#imagemodal').attr('data-id', id)
-	$('#imagemodal').attr('data-acct', acct_id)
-	$('#imagemodal').attr('data-original', ourl)
-	$('#imagemodal').attr('data-image', murl)
-	//表示はリモートを使うか(どちらにしろコピーはオリジナル)
-	var remote_img = localStorage.getItem('remote_img')
-	if (remote_img == 'yes') {
-		murl = ourl
-	}
-	$(document).ready(function() {
-		if (type == 'image') {
-			$('#imagemodal').modal('open')
-			imageXhr(id, key, murl)
-			$('#imagewrap').dragScroll() // ドラッグスクロール設定
-			$('#imgmodal').show()
-			$('#imagemodal').attr('data-key', key)
-			$('#imagemodal').attr('data-id', id)
-		} else if (type == 'video' || type == 'gifv') {
-			$('#video').attr('src', murl)
-			$('#videomodal').modal('open')
-			$('#imgmodal').show()
+	$("#imgprog").text(0);
+	$('#imgmodal').hide();
+	$('#imgmodal').attr('src', '../../img/loading.svg');
+	var murl = $("#" + id + "-image-" + key).attr("data-url");
+	var type = $("#" + id + "-image-" + key).attr("data-type");
+	$("#imagemodal").attr("data-id", id);
+	$("#imagemodal").attr("data-acct", acct_id);
+	$(document).ready(function () {
+		if (type == "image") {
+			$('#imagemodal').modal('open');
+			xhr = new XMLHttpRequest;
+			xhr.open('GET', murl, true);
+			xhr.addEventListener('progress', function (event) {
+				if (event.lengthComputable) {
+					var total = event.total;
+					var now = event.loaded;
+					var per = now / total * 100;
+					$("#imgprog").text(Math.floor(per));
+				}
+			}, false);
+			xhr.addEventListener('loadend', function (event) {
+				var total = event.total;
+				var now = event.loaded;
+				var per = now / total * 100;
+				$("#imgprog").text(Math.floor(per));
+			}, false);
+			xhr.send();
+			$('#imgmodal').attr('src', murl);
+			$('#imagewrap').dragScroll(); // ドラッグスクロール設定
+			$('#imgmodal').show();
+			$('#imagemodal').attr('data-key', key);
+			$('#imagemodal').attr('data-id', id);
+		} else if (type == "video" || type == "gifv") {
+			$('#video').attr('src', murl);
+			$('#videomodal').modal('open');
+			$('#imgmodal').show();
 		}
-	})
+		var element = new Image();
+		var width;
+		element.onload = function () {
+			var width = element.naturalWidth;
+			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 + 60 + "px")
+				$("#imagemodal img").css("height", "100%")
+				if (width > windowW * 0.8) {
+					$("#imagemodal").css("width", "80vw")
+					$("#imagemodal img").css("width", "100%")
+					var heightS = windowW * 0.8 / width * height;
+					$("#imagemodal").css("height", heightS + 60 + "px")
+				} else {
+					$("#imagemodal").css("width", width + "px")
+				}
+			} else {
+				$("#imagemodal img").css("width", "auto")
+				var widthS = windowH / height * width;
+				if (widthS < windowW) {
+					$("#imagemodal").css("width", widthS + "px")
+				} else {
+					$("#imagemodal").css("width", "100vw")
+				}
+
+				$("#imagemodal").css("height", "100vh")
+				$("#imagemodal img").css("height", "calc(100vh - 60px)")
+			}
+
+		}
+		if ($("#" + id + "-image-" + (key * 1 + 1)).length == 0) {
+			$("#image-next").prop("disabled", true);
+		} else {
+			$("#image-next").prop("disabled", false);
+		}
+		if ($("#" + id + "-image-" + (key * 1 - 1)).length == 0) {
+			$("#image-prev").prop("disabled", true);
+		} else {
+			$("#image-prev").prop("disabled", false);
+		}
+		element.src = murl;
+	});
 }
 //イメージビューワーの送り
 function imgCont(type) {
-	var key = $('#imagemodal').attr('data-key')
-	var id = $('#imagemodal').attr('data-id')
-	if (type == 'next') {
-		key++
-	} else if (type == 'prev') {
-		key = key * 1 - 1
-	}
-	var murl = $('#' + id + '-image-' + key).attr('data-url')
-	var ourl = $('#' + id + '-image-' + key).attr('data-original')
-	var type = $('#' + id + '-image-' + key).attr('data-type')
-	$('#imagemodal').attr('data-id', id)
-	$('#imagemodal').attr('data-acct', acct_id)
-	$('#imagemodal').attr('data-original', ourl)
-	$('#imagemodal').attr('data-image', murl)
-	//表示はリモートを使うか(どちらにしろコピーはオリジナル)
-	var remote_img = localStorage.getItem('remote_img')
-	if (remote_img == 'yes' && ourl != 'null') {
-		murl = ourl
+	$("#imgprog").text(0);
+	var key = $('#imagemodal').attr('data-key');
+	var id = $('#imagemodal').attr('data-id');
+	if (type == "next") {
+		key++;
+	} else if (type == "prev") {
+		key = key * 1 - 1;
 	}
+	var murl = $("#" + id + "-image-" + key).attr("data-url");
 	if (murl) {
-		$('#imgprog').text(0)
-		$('#imgsec').text(0)
-		$('#imgmodal').attr('src', '../../img/loading.svg')
-		var type = $('#' + id + '-image-' + key).attr('data-type')
-		$(document).ready(function() {
-			if (type == 'image') {
-				imageXhr(id, key, murl)
-				$('#imagewrap').dragScroll() // ドラッグスクロール設定
-				$('#imagemodal').attr('data-key', key)
-				$('#imagemodal').attr('data-id', id)
-			} else if (type == 'video' || type == 'gifv') {
-				$('#video').attr('src', murl)
-				$('#videomodal').modal('open')
-			}
-		})
-	}
-}
-function imageXhr(id, key, murl) {
-	var startTime = new Date()
-	xhr = new XMLHttpRequest()
-	xhr.open('GET', murl, true)
-	xhr.responseType = 'arraybuffer'
-	xhr.addEventListener(
-		'progress',
-		function(event) {
-			if (event.lengthComputable) {
-				var total = event.total
-				var now = event.loaded
-				var per = (now / total) * 100
-				$('#imgprog').text(Math.floor(per))
-			}
-		},
-		false
-	)
-	xhr.addEventListener(
-		'loadend',
-		function(event) {
-			var total = event.total
-			$('#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()
-			r.readAsDataURL(this.response)
-			r.onload = function() {
-				var b64 = r.result
-				var element = new Image()
-				var width
-				element.onload = function() {
-					var width = element.naturalWidth
-					if(width < 650) {
-						width = 650;
+		$('#imgmodal').attr('src', '../../img/loading.svg');
+		var type = $("#" + id + "-image-" + key).attr("data-type");
+		$(document).ready(function () {
+			if (type == "image") {
+				xhr = new XMLHttpRequest;
+				xhr.open('GET', murl, true);
+				xhr.responseType = "arraybuffer";
+				xhr.addEventListener('progress', function (event) {
+					if (event.lengthComputable) {
+						var total = event.total;
+						var now = event.loaded;
+						var per = now / total * 100;
+						$("#imgprog").text(Math.floor(per));
 					}
-					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')
-						if (width > windowW * 0.8) {
-							$('#imagemodal').css('width', '80vw')
-							$('#imagemodal img').css('width', 'auto')
-							var heightS = ((windowW * 0.8) / width) * height
-							$('#imagemodal').css('height', heightS + 100 + 'px')
-						} else {
-							$('#imagemodal').css('width', width + 'px')
-						}
+				}, false);
+				xhr.addEventListener('loadend', function (event) {
+					var total = event.total;
+					var now = event.loaded;
+					var per = now / total * 100;
+					$("#imgprog").text(Math.floor(per));
+				}, false);
+				xhr.send();
+				$('#imgmodal').attr('src', murl);
+				$('#imagewrap').dragScroll(); // ドラッグスクロール設定
+				$('#imagemodal').attr('data-key', key);
+				$('#imagemodal').attr('data-id', id);
+			} else if (type == "video" || type == "gifv") {
+				$('#video').attr('src', murl);
+				$('#videomodal').modal('open');
+			}
+			var element = new Image();
+			var width;
+			element.onload = function () {
+				var width = element.naturalWidth;
+				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 + 60 + "px")
+					$("#imagemodal img").css("height", "100%")
+					if (width > windowW * 0.8) {
+						$("#imagemodal").css("width", "80vw")
+						$("#imagemodal img").css("width", "100%")
+						var heightS = windowW * 0.8 / width * height;
+						$("#imagemodal").css("height", heightS + 60 + "px")
 					} else {
-						$('#imagemodal img').css('width', 'auto')
-						var widthS = (windowH / height) * width
-						if (widthS < windowW) {
-							$('#imagemodal').css('width', widthS + 'px')
-						} else {
-							$('#imagemodal').css('width', '100vw')
-						}
-
-						$('#imagemodal').css('height', '100vh')
-						$('#imagemodal img').css('height', 'calc(100vh - 60px)')
+						$("#imagemodal").css("width", width + "px")
 					}
-				}
-				if ($('#' + id + '-image-' + (key * 1 + 1)).length == 0) {
-					$('#image-next').prop('disabled', true)
 				} else {
-					$('#image-next').prop('disabled', false)
+					$("#imagemodal img").css("width", "auto")
+					var widthS = windowH / height * width;
+					if (widthS < windowW) {
+						$("#imagemodal").css("width", widthS + "px")
+					} else {
+						$("#imagemodal").css("width", "100vw")
+					}
+
+					$("#imagemodal").css("height", "100vh")
+					$("#imagemodal img").css("height", "calc(100vh - 60px)")
 				}
-				if ($('#' + id + '-image-' + (key * 1 - 1)).length == 0) {
-					$('#image-prev').prop('disabled', true)
-				} else {
-					$('#image-prev').prop('disabled', false)
-				}
-				element.src = b64
-				var endTime = new Date()
-				var proctime = endTime.getTime() - startTime.getTime()
-				$('#imgsec').text(proctime)
-				$('#imgmodal').attr('src', b64)
 			}
-		}
+			if ($("#" + id + "-image-" + (key * 1 + 1)).length === 0) {
+				$("#image-next").prop("disabled", true);
+			} else {
+				$("#image-next").prop("disabled", false);
+			}
+			if ($("#" + id + "-image-" + (key * 1 - 1)).length === 0) {
+				$("#image-prev").prop("disabled", true);
+			} else {
+				$("#image-prev").prop("disabled", false);
+			}
+			element.src = murl;
+
+		});
 	}
-	xhr.responseType = 'blob'
-	xhr.send()
 }
 //ズームボタン(z:倍率)
 function zoom(z) {
-	var wdth = $('#imagewrap img').width()
-	var wdth = wdth * z
-	$('#imagewrap img').css('width', wdth + 'px')
-	var hgt = $('#imagewrap img').height()
-	var hgt = hgt * z
-	$('#imagewrap img').css('height', hgt + 'px')
+	var wdth = $('#imagewrap img').width();
+	var wdth = wdth * z;
+	$('#imagewrap img').css("width", wdth + "px");
+	var hgt = $('#imagewrap img').height();
+	var hgt = hgt * z;
+	$('#imagewrap img').css("height", hgt + "px");
 }
 //スマホ対応ドラッグ移動システム
-;(function() {
-	$.fn.dragScroll = function() {
-		var target = this
-		$(this)
-			.mousedown(function(event) {
-				$(this)
-					.data('down', true)
-					.data('x', event.clientX)
-					.data('y', event.clientY)
-					.data('scrollLeft', this.scrollLeft)
-					.data('scrollTop', this.scrollTop)
-				return false
-			})
-			.css({
-				overflow: 'hidden', // スクロールバー非表示
-				cursor: 'move'
-			})
+(function () {
+	$.fn.dragScroll = function () {
+		var target = this;
+		$(this).mousedown(function (event) {
+			$(this)
+				.data('down', true)
+				.data('x', event.clientX)
+				.data('y', event.clientY)
+				.data('scrollLeft', this.scrollLeft)
+				.data('scrollTop', this.scrollTop);
+			return false;
+		}).css({
+			'overflow': 'hidden', // スクロールバー非表示
+			'cursor': 'move'
+		});
 		// ウィンドウから外れてもイベント実行
-		$(document)
-			.mousemove(function(event) {
-				if ($(target).data('down') == true) {
-					// スクロール
-					target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - event.clientX)
-					target.scrollTop($(target).data('scrollTop') + $(target).data('y') - event.clientY)
-					return false // 文字列選択を抑止
-				}
-			})
-			.mouseup(function(event) {
-				$(target).data('down', false)
-			})
-		$(this)
-			.on('touchstart', function(event) {
-				$(this)
-					.data('down', true)
-					.data('x', getX(event))
-					.data('y', getY(event))
-					.data('scrollLeft', this.scrollLeft)
-					.data('scrollTop', this.scrollTop)
-				return false
-			})
-			.css({
-				overflow: 'hidden', // スクロールバー非表示
-				cursor: 'move'
-			}) //指が触れたか検知
-		$(this).on('touchmove', function(event) {
+		$(document).mousemove(function (event) {
+			if ($(target).data('down') == true) {
+				// スクロール
+				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') -
+					event.clientX);
+				target.scrollTop($(target).data('scrollTop') + $(target).data('y') -
+					event.clientY);
+				return false; // 文字列選択を抑止
+			}
+		}).mouseup(function (event) {
+			$(target).data('down', false);
+		});
+		$(this).on('touchstart', function (event) {
+			$(this)
+				.data('down', true)
+				.data('x', getX(event))
+				.data('y', getY(event))
+				.data('scrollLeft', this.scrollLeft)
+				.data('scrollTop', this.scrollTop);
+			return false;
+		}).css({
+			'overflow': 'hidden', // スクロールバー非表示
+			'cursor': 'move'
+		}); //指が触れたか検知
+		$(this).on('touchmove', function (event) {
 			if ($(target).data('down') === true) {
 				// スクロール
-				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - getX(event))
-				target.scrollTop($(target).data('scrollTop') + $(target).data('y') - getY(event))
-				return false // 文字列選択を抑止
-			} else {
-			}
-		}) //指が動いたか検知
-		$(this).on('touchend', function(event) {
-			$(target).data('down', false)
-		})
+				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') -
+					getX(event));
+				target.scrollTop($(target).data('scrollTop') + $(target).data('y') -
+					getY(event));
+				return false; // 文字列選択を抑止
+			} else { }
+		}); //指が動いたか検知
+		$(this).on('touchend', function (event) {
+			$(target).data('down', false);
+		});
 
-		return this
+		return this;
 	}
-})(jQuery)
+})(jQuery);
 
 function getX(event) {
-	return event.originalEvent.touches[0].pageX
+	return event.originalEvent.touches[0].pageX;
 }
 
 function getY(event) {
-	return event.originalEvent.touches[0].pageY
+	return event.originalEvent.touches[0].pageY;
 }
 //マウスホイールで拡大
-var element = document.getElementById('imagemodal')
-element.onmousewheel = function(e) {
-	var delta = e.wheelDelta
+var element = document.getElementById("imagemodal");
+element.onmousewheel = function (e) {
+	var delta = e.wheelDelta;
 	if (delta > 0) {
 		zoom(1.1)
 	} else {
@@ -263,33 +263,22 @@ element.onmousewheel = function(e) {
 
 //当該トゥート
 function detFromImg() {
-	var id = $('#imagemodal').attr('data-id')
-	var acct_id = $('#imagemodal').attr('data-acct')
-	$('#imagemodal').modal('close')
-	details(id, acct_id)
+	var id = $("#imagemodal").attr("data-id");
+	var acct_id = $("#imagemodal").attr("data-acct");
+	$('#imagemodal').modal('close');
+	details(id, acct_id);
 }
 //画像保存
 function dlImg() {
-	var ourl = $('#imagemodal').attr('data-original')
-	var murl = $('#imagemodal').attr('data-image')
-	var remote_img = localStorage.getItem('remote_img')
-	if (remote_img == 'yes') {
-		murl = ourl
+	var url = $("#imgmodal").attr("src");
+	if (localStorage.getItem("savefolder")) {
+		var save = localStorage.getItem("savefolder");
+	} else {
+		var save = "";
 	}
-	var save = localStorage.getItem('savefolder')
-	if (!save || save == 'null') {
-		var save = ''
-	}
-	postMessage(['generalDL', [murl, save, false]], '*')
+	postMessage(["generalDL", [url, save, false]], "*")
+
 }
 function openFinder(dir) {
-	postMessage(['openFinder', dir], '*')
-}
-function stopVideo() {
-	document.getElementById('video').pause()
-}
-function copyImgUrl() {
-	var murl = $('#imagemodal').attr('data-original')
-	execCopy(murl)
-	M.toast({ html: lang.lang_img_copyDone, displayLength: 1500 })
-}
+	postMessage(["openFinder", dir], "*")
+}

app/js/ui/menu.js

@@ -69,9 +69,5 @@ $(function () {
   });
 });
 function help() {
-  $("#left-menu div").removeClass("active");
-	$("#helpMenu").addClass("active");
-	$(".menu-content").addClass("hide");
-	$("#help-box").removeClass("hide");
-  postMessage(["sendSinmpleIpc", "getLogs"], "*")
+  postMessage(["openUrl", "https://docs.thedesk.top"], "*")
 }

app/js/ui/post-box.js

@@ -1,141 +1,134 @@
 /*ささやきボックス(Cr民並感)*/
 //✕隠す
 function hide() {
-	$('#right-side').hide()
-	$('#right-side').css('width', '300px')
-	$('#left-side').css('width', '100%')
-	var width = localStorage.getItem('postbox-width')
-	if (width) {
-		width = width.replace('px', '') * 1
+	$("#right-side").hide()
+	$("#right-side").css("width", "300px")
+	$("#left-side").css("width", "100%")
+	var width = localStorage.getItem("postbox-width");
+	if(width){
+		width = width.replace("px", "") * 1
 	} else {
 		width = 300
 	}
-	$('#post-box').css('width', width)
+	$("#post-box").css("width", width)
 	$('#post-box').fadeOut()
-	$('#post-box').removeClass('appear')
-	$('#emoji').addClass('hide')
-	$('#left-side').show()
-	$('#default-emoji').show()
-	$('#unreact').show()
-	$('#addreact').addClass('hide')
+	$("#post-box").removeClass("appear")
+	$("#emoji").addClass("hide")
+	$("#left-side").show();
+	$("#default-emoji").show();
+	$("#unreact").show();
+	$("#addreact").addClass("hide");
 }
 //最小化
 function mini() {
-	$('body').toggleClass('mini-post')
-	if ($('body').hasClass('mini-post')) {
-		$('.mini-btn').text('expand_less')
+	$("body").toggleClass("mini-post");
+	if ($("body").hasClass("mini-post")) {
+		$(".mini-btn").text("expand_less");
 	} else {
-		$('.mini-btn').text('expand_more')
+		$(".mini-btn").text("expand_more");
 	}
 }
 //最小化時に展開
 function show() {
-	$('#post-box').addClass('appear')
-	$('#textarea').focus()
-	console.log('show' + localStorage.getItem('postbox-left'))
-	var left = localStorage.getItem('postbox-left')
+	$("#post-box").addClass("appear")
+	$("#textarea").focus();
+	console.log("show" + localStorage.getItem("postbox-left"));
+	var left = localStorage.getItem("postbox-left");
 	if (left > $('body').width() - $('#post-box').width()) {
-		left = $('body').width() - $('#post-box').width()
+		left = $('body').width() - $('#post-box').width();
 	} else if (left < 0) {
-		left = 0
+		left = 0;
 	}
-	var top = localStorage.getItem('postbox-top')
+	var top = localStorage.getItem("postbox-top");
 	if (top > $('body').height() - $('#post-box').height()) {
-		top = $('body').height() - $('#post-box').height()
+		top = $('body').height() - $('#post-box').height();
 	} else if (top < 0) {
-		top = 0
+		top = 0;
 	}
-	$('#post-box').css('left', left + 'px')
-	$('#post-box').css('top', top + 'px')
-	var width = localStorage.getItem('postbox-width')
+	$('#post-box').css("left", left + "px")
+	$('#post-box').css("top", top + "px")
+	var width = localStorage.getItem("postbox-width");
 	if (width) {
-		$('#post-box').css('width', width + 'px')
+		$('#post-box').css("width", width + "px")
 	} else {
-		$('#post-box').css('width', '300px')
+		$('#post-box').css("width", "300px")
 	}
-	$('#post-box').fadeIn()
-	$('#textarea').characterCounter()
-	mdCheck()
+	$('#post-box').fadeIn();
+	$('#textarea').characterCounter();
 }
 
-$(function() {
-	$('#post-box').draggable({
-		handle: '#post-bar',
-		stop: function() {
-			var left = $('#post-box').offset().left
+$(function () {
+	$("#post-box").draggable({
+		handle: "#post-bar",
+		stop: function () {
+			var left = $('#post-box').offset().left;
 			if (left > $('body').width() - $('#post-box').width()) {
-				left = $('body').width() - $('#post-box').width()
+				left = $('body').width() - $('#post-box').width();
 			} else if (left < 0) {
-				left = 0
+				left = 0;
 			}
-			var top = $('#post-box').offset().top
+			var top = $('#post-box').offset().top;
 			if (top > $('body').height() - $('#post-box').height()) {
-				top = $('body').height() - $('#post-box').height()
+				top = $('body').height() - $('#post-box').height();
 			} else if (top < 0) {
-				top = 0
+				top = 0;
 			}
-			localStorage.setItem('postbox-left', left)
-			localStorage.setItem('postbox-top', top)
+			localStorage.setItem("postbox-left", left);
+			localStorage.setItem("postbox-top", top);
 		}
-	})
-	$('#post-box').resizable({
+	});
+	$("#post-box").resizable({
 		minHeight: 150,
 		minWidth: 100,
-		stop: function(event, ui) {
-			$('#textarea').blur()
-			localStorage.setItem('postbox-width', ui.size.width)
+		stop: function (event, ui) {
+			$("#textarea").blur()
+			localStorage.setItem("postbox-width", ui.size.width);
 		}
-	})
-})
+	});
+});
 
 //コード受信
 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 == 'share') {
-		$('textarea').focus()
-		$('#textarea').val(decodeURI(codex))
-		show()
-		$('body').removeClass('mini-post')
-		$('.mini-btn').text('expand_less')
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+	var mode = m[1];
+	var codex = m[2];
+	if (mode == "share") {
+		$('textarea').focus();
+		$("#textarea").val(decodeURI(codex));
+		show();
+		$("body").removeClass("mini-post");
+		$(".mini-btn").text("expand_less");
 	}
 }
-$('#posttgl').click(function(e) {
-	if (!$('#post-box').hasClass('appear')) {
-		show()
+$('#posttgl').click(function (e) {
+	if (!$('#post-box').hasClass("appear")) {
+		show();
 	} else {
-		hide()
+		hide();
 	}
-	$('.cvo').removeClass('selectedToot')
+	$('.cvo').removeClass("selectedToot")
 	selectedColumn = 0
 	selectedToot = 0
-})
+});
 
-$('#timeline-container,#group').click(function(e) {
-	if (localStorage.getItem('box') != 'absolute') {
-		if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
-			hide()
+$("#timeline-container,#group").click(function (e) {
+	if (localStorage.getItem("box") != "absolute") {
+		if ($('#post-box').hasClass("appear") && !localStorage.getItem("nohide")) {
+			hide();
 		}
 	}
-	$('.cvo').removeClass('selectedToot')
+	$('.cvo').removeClass("selectedToot")
 	selectedColumn = 0
 	selectedToot = 0
-	localStorage.removeItem('nohide')
-	srcBox('close')
-})
-$('#contextWrap').click(function(e) {
-	$('#contextWrap').addClass('hide')
-	$('.contextMenu').addClass('hide')
-	$('.act-icon').text('expand_more')
-})
-$('#textarea,#cw-text').focusout(function(e) {
-	localStorage.setItem('nohide', true)
-	var countup = function() {
-		localStorage.removeItem('nohide')
+	localStorage.removeItem("nohide")
+});
+$('#textarea,#cw-text').focusout(function (e) {
+	localStorage.setItem("nohide", true)
+	var countup = function () {
+		localStorage.removeItem("nohide")
 	}
 	//setTimeout(remove, 100);
-	$('.cvo').removeClass('selectedToot')
+	$('.cvo').removeClass("selectedToot")
 	selectedColumn = 0
 	selectedToot = 0
-})
+});

app/js/ui/scroll.js

@@ -1,70 +1,62 @@
 //スクロールで続きを読む
 function scrollevent() {
-	$('.tl-box').scroll(function() {
-		scrollck()
-	})
+	$(".tl-box").scroll(function () {
+		scrollck();
+	});
 }
-scrollevent()
+scrollevent();
 
 function scrollck() {
-	$('.tl-box').each(function(i, elem) {
-		var tlid = $(this).attr('tlid')
-		var len = $('#timeline_' + tlid + ' .cvo').length
+	$(".tl-box").each(function (i, elem) {
+		var tlid = $(this).attr('tlid');
 		//一番上ならためていた新しいトゥートを表示ないしtealなら未読管理モード
 		if ($(this).scrollTop() === 0) {
-			if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
-				var pool = localStorage.getItem('pool_' + tlid)
+			if (!$("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+				var pool = localStorage.getItem("pool_" + tlid);
 				if (pool) {
-					$('#timeline_' + tlid).prepend(pool)
-					jQuery('time.timeago').timeago()
-					localStorage.removeItem('pool_' + tlid)
+					$("#timeline_" + tlid).prepend(pool);
+					jQuery("time.timeago").timeago();
+					localStorage.removeItem("pool_" + tlid);
 				}
 			} else {
 				ueload(tlid)
 			}
 			//自動リフレッシュ
-			if (len > 30) {
-				for (var i = 30; i < $('#timeline_' + tlid + ' .cvo').length; i++) {
-					$('#timeline_' + tlid + ' .cvo')
-						.eq(i)
-						.remove()
+			if ($("#timeline_" + tlid + " .cvo").length > 30) {
+				for (var i = 30; i < $("#timeline_" + tlid + " .cvo").length; i++) {
+					$("#timeline_" + tlid + " .cvo").eq(i).remove();
 				}
 			}
 		}
 		//続きを読むトリガー
-		var scrt =
-			$(this)
-				.find('.tl')
-				.height() - $(window).height()
-		var scr = $(this).scrollTop()
-		if (scr > scrt && scrt > 0) {
-			console.log('kicked more loading:' + tlid)
-			moreload('', tlid)
+		var scrt = $(this).find(".tl").height() - $(window).height();
+		var scr = $(this).scrollTop();
+		if (scr > scrt) {
+			console.log("kicked more loading:" + tlid);
+			moreload('', tlid);
 		}
-	})
+	});
 }
 
 function goTop(id) {
-	if ($('#unread_' + id + ' .material-icons').hasClass('teal-text')) {
-		$('#unread_' + id + ' .material-icons').removeClass('teal-text')
-		var multi = localStorage.getItem('column')
+	if ($("#unread_" + id + " .material-icons").hasClass("teal-text")) {
+		$("#unread_" + id + " .material-icons").removeClass("teal-text")
+		var multi = localStorage.getItem("column")
 		var obj = JSON.parse(multi)
 		var acct_id = obj[id * 1].domain
 		var type = obj[id * 1].type
 		console.log(id, type)
 		columnReload(id, type)
 	}
-	if ($('#timeline_box_' + id + '_box .tl-box').scrollTop() > 500) {
-		$('#timeline_box_' + id + '_box .tl-box').scrollTop(500)
+	if ($("#timeline_box_" + id + "_box .tl-box").scrollTop() > 500) {
+		$("#timeline_box_" + id + "_box .tl-box").scrollTop(500)
 	}
-	$('#timeline_box_' + id + '_box .tl-box').animate({ scrollTop: 0 })
+	$("#timeline_box_" + id + "_box .tl-box").animate({ scrollTop: 0 });
 }
 function goColumn(key) {
-	$('#sort-box').addClass('hide')
-	$('#sort-box').removeClass('show')
+	$("#sort-box").addClass("hide");
+	$("#sort-box").removeClass("show");
 	if ($('[tlid=' + key + ']').length) {
-		$('#timeline-container').animate({
-			scrollLeft: $('#timeline-container').scrollLeft() + $('[tlid=' + key + ']').offset().left
-		})
+		$("#timeline-container").animate({ scrollLeft: $("#timeline-container").scrollLeft() + $('[tlid=' + key + ']').offset().left });
 	}
-}
+}

app/js/ui/spotify.js

@@ -1,210 +1,180 @@
 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"], "*");
-	} else {
-		auth = auth + "&state=code";
-		$("#spotify-code-show").removeClass("hide");
-		postMessage(["openUrl", auth], "*");
-	}
+    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], "*")
+    }
+
+
 }
 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");
-	} else {
-		$("#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";
-	}
-	$("#np-temp").val(content);
-	var flag = localStorage.getItem("artwork");
-	if (flag) {
-		$("#awk_yes").prop("checked", true);
-	} else {
-		$("#awk_no").prop("checked", true);
-	}
+    if (localStorage.getItem("spotify")) {
+        $("#spotify-enable").addClass("disabled");
+        $("#spotify-disable").removeClass("disabled");
+    } else {
+        $("#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";
+    }
+    $("#np-temp").val(content);
+    var flag = localStorage.getItem("artwork");
+    if (flag) {
+        $("#awk_yes").prop("checked", true);
+    } else {
+        $("#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 });
-	} 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 });
-	}
+    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 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 (at) {
-			fetch(start, {
-				method: "GET",
-				headers: {
-					"content-type": "application/json"
-				}
-			})
-				.then(function(response) {
-					if (!response.ok) {
-						response.text().then(function(text) {
-							setLog(response.url, response.status, text);
-						});
-					}
-					return response.json();
-				})
-				.catch(function(error) {
-					todo(error);
-					setLog(start, "JSON", error);
-					console.error(error);
-				})
-				.then(function(json) {
-					console.table(json);
-					if (json.length < 1) {
-						return false;
-					}
-					var item = json.item;
-					var img = item.album.images[0].url;
-					var flag = localStorage.getItem("artwork");
-					if (flag) {
-						postMessage(["bmpImage", [img, 0]], "*");
-					}
-					var content = localStorage.getItem("np-temp");
-					if (!content || content == "" || content == "null") {
-						var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
-					}
-					var regExp = new RegExp("{song}", "g");
-					content = content.replace(regExp, item.name);
-					var regExp = new RegExp("{album}", "g");
-					content = content.replace(regExp, item.album.name);
-					var regExp = new RegExp("{artist}", "g");
-					content = content.replace(regExp, item.artists[0].name);
-					var regExp = new RegExp("{url}", "g");
-					content = content.replace(regExp, item.external_urls.spotify);
-					var regExp = new RegExp("{composer}", "g");
-					content = content.replace(regExp, "");
-					var regExp = new RegExp("{hz}", "g");
-					content = content.replace(regExp, "");
-					var regExp = new RegExp("{bitRate}", "g");
-					content = content.replace(regExp, "");
-					var regExp = new RegExp("{lyricist}", "g");
-					content = content.replace(regExp, "");
-					var regExp = new RegExp("{bpm}", "g");
-					content = content.replace(regExp, "");
-					var regExp = new RegExp("{genre}", "g");
-					content = content.replace(regExp, "");
-					$("#textarea").val(content);
-				});
-		} else {
-			Swal.fire({
-				type: "info",
-				title: lang.lang_spotify_acct
-			});
-		}
-	} else if (mode == "itunes") {
-		postMessage(["itunes", ""], "*");
-	}
+    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',
+                headers: {
+                    'content-type': 'application/json'
+                }
+            }).then(function (response) {
+                return response.json();
+            }).catch(function (error) {
+                todo(error);
+                console.error(error);
+            }).then(function (json) {
+                console.table(json);
+                if (json.length < 1) {
+                    return false;
+                }
+                var item = json.item;
+                var img = item.album.images[0].url;
+                var flag = localStorage.getItem("artwork");
+                if (flag) {
+                    postMessage(["bmpImage", [img, 0]], "*")
+                }
+                var content = localStorage.getItem("np-temp");
+                if (!content || content == "" || content == "null") {
+                    var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
+                }
+                var regExp = new RegExp("{song}", "g");
+                content = content.replace(regExp, item.name);
+                var regExp = new RegExp("{album}", "g");
+                content = content.replace(regExp, item.album.name);
+                var regExp = new RegExp("{artist}", "g");
+                content = content.replace(regExp, item.artists[0].name);
+                var regExp = new RegExp("{url}", "g");
+                content = content.replace(regExp, item.external_urls.spotify);
+                var regExp = new RegExp("{composer}", "g");
+                content = content.replace(regExp, "");
+                var regExp = new RegExp("{hz}", "g");
+                content = content.replace(regExp, "");
+                var regExp = new RegExp("{bitRate}", "g");
+                content = content.replace(regExp, "");
+                var regExp = new RegExp("{lyricist}", "g");
+                content = content.replace(regExp, "");
+                var regExp = new RegExp("{bpm}", "g");
+                content = content.replace(regExp, "");
+                var regExp = new RegExp("{genre}", "g");
+                content = content.replace(regExp, "");
+                $("#textarea").val(content);
+            });
+        } else {
+            Swal.fire({
+                type: 'info',
+                title: lang.lang_spotify_acct
+            })
+        }
+    } else if (mode == "itunes") {
+        postMessage(["itunes", ""], "*")
+    }
 }
-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}";
-	}
-	var flag = localStorage.getItem("artwork");
-	var platform = localStorage.getItem("platform");
-	if (platform == "win32") {
-		if (flag && arg.path) {
-			media(arg.path, "image/png", "new");
-		}
-	} 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
-			postMessage(["bmpImage", [await getUnknownAA(q), 0]], "*");
-		}
-	}
-	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);
-		}
-	}
-	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 npCore(arg) {
+    if (arg.cmd) {
+        console.error(arg);
+        return;
+    }
+    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");
+        }
+    } else if (platform == "darwin") {
+        if (flag && arg.existsArtwork) {
+            media(arg.artworks[0].data, "image/png", "new");
+        }
+    }
+    var regExp = new RegExp("{song}", "g");
+    content = content.replace(regExp, arg.name);
+    var regExp = new RegExp("{album}", "g");
+    content = content.replace(regExp, arg.album);
+    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]);
-	} 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
-	return data[0].artworkUrl100
+    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 {
+
+    }
+
 }

app/js/ui/theme.js

@@ -1,35 +1,32 @@
 //テーマ適用
 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,218 +1,137 @@
 //左下のメッセージ
-var todcTrigger = null
+var todcTrigger = null;
 function todo(mes) {
-	clearInterval(todcTrigger)
-	$('#message').text(mes)
-	$('#message').fadeIn()
-	todcTrigger = setTimeout(todc, 4000)
+	clearInterval(todcTrigger);
+	$('#message').text(mes);
+	$('#message').fadeIn();
+	todcTrigger = setTimeout(todc, 4000);
 }
 function todc() {
-	$('#message').fadeOut()
+	$('#message').fadeOut();
 }
 //reverse
 function bottomReverse() {
-	$('#bottom').toggleClass('reverse')
-	$('.leftside').toggleClass('reverse')
-	if ($('#bottom').hasClass('reverse')) {
-		localStorage.removeItem('reverse')
+	$("#bottom").toggleClass("reverse");
+	$(".leftside").toggleClass("reverse");
+	if ($("#bottom").hasClass("reverse")) {
+		localStorage.removeItem("reverse")
 	} else {
-		localStorage.setItem('reverse', 'true')
+		localStorage.setItem("reverse", "true")
 	}
 }
 function tips(mode) {
-	postMessage(['sendSinmpleIpc', 'endmem'], '*')
-	clearInterval(clockint)
-	clearInterval(spotStart)
-	if (mode == 'ver') {
+	postMessage(["sendSinmpleIpc", "endmem"], "*")
+	clearInterval(clockint);
+	clearInterval(spotStart);
+	if (mode == "ver") {
 		tipsToggle()
-		$('#tips-text').html(
-			'<img src="../../img/desk.png" width="20" onclick="todo(\'TheDesk is a nice client!: TheDesk ' +
-				localStorage.getItem('ver') +
-				' git: ' +
-				gitHash +
-				'\')">TheDesk ' +
-				localStorage.getItem('ver') +
-				' {' +
-				gitHash.slice(0, 7) +
-				'} [<i class="material-icons" style="font-size:1.2rem;top: 3px;position: relative;">supervisor_account</i><span id="persons">1+</span>]'
-		)
-		localStorage.setItem('tips', 'ver')
-	} else if (mode == 'clock') {
+		$("#tips-text").html('<img src="../../img/desk.png" width="20" onclick="todo(\'TheDesk is a nice client!: TheDesk ' + localStorage.getItem("ver") + ' git: '+ gitHash +'\')">TheDesk ' + localStorage.getItem("ver") + ' {'+ gitHash.slice(0, 7) +'} [<i class="material-icons" style="font-size:1.2rem;top: 3px;position: relative;">supervisor_account</i><span id="persons">1+</span>]')
+		localStorage.setItem("tips", "ver")
+	} else if (mode == "clock") {
 		tipsToggle()
-		localStorage.setItem('tips', 'clock')
+		localStorage.setItem("tips", "clock")
 		clock()
-	} else if (mode == 'memory') {
+	} else if (mode == "memory") {
 		tipsToggle()
-		localStorage.setItem('tips', 'memory')
-		startmem()
-	} else if (mode == 'trend') {
+		localStorage.setItem("tips", "memory")
+		startmem();
+	} else if (mode == "trend") {
 		tipsToggle()
-		localStorage.setItem('tips', 'trend')
+		localStorage.setItem("tips", "trend")
 		trendTagonTip()
-	} else if (mode == 'spotify') {
+	} else if (mode == "spotify") {
 		tipsToggle()
-		localStorage.setItem('tips', 'spotify')
-		spotifytips()
-	} else if (mode == 'itunes') {
-		tipsToggle()
-		localStorage.setItem('tips', 'itunes')
-		itunestips()
+		localStorage.setItem("tips", "spotify")
+		var json = nowplaying("spotifytips")
+		spotifytips(json)
 	}
 }
 //メモリ
 function startmem() {
-	postMessage(['sendSinmpleIpc', 'startmem'], '*')
+	postMessage(["sendSinmpleIpc", "startmem"], "*")
 }
-function renderMem(use, cpu, total) {
-	$('#tips-text').html(
-		escapeHTML(cpu) +
-			'<br>Memory:' +
-			Math.floor(use / 1024 / 1024 / 102.4) / 10 +
-			'/' +
-			Math.floor(total / 1024 / 1024 / 102.4) / 10 +
-			'GB(' +
-			Math.floor((use / total) * 100) +
-			'%)'
-	)
+function renderMem(use, cpu, total){
+	$("#tips-text").html(escapeHTML(cpu) + "<br>Memory:" + Math.floor(use / 1024 / 1024 / 102.4) / 10 + "/" + Math.floor(total / 1024 / 1024 / 102.4) / 10 + "GB(" + Math.floor(use / total * 100) + "%)")
 }
 //トレンドタグ
 function trendTagonTip() {
-	$('.trendtag').remove()
-	var domain = 'imastodon.net'
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/trend_tags'
+	$(".trendtag").remove();
+	var domain = "imastodon.net"
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/trend_tags"
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json) {
+			var tags = "";
+			json = json.score;
+			Object.keys(json).forEach(function (tag) {
+				tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + escapeHTML(tag) + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
+			});
+			$("#tips-text").html('<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTagonTip()" style="font-size:12px">refresh</i>:<br>' + tags + '</div>');
+			trendTagonTipInterval()
+		} else {
+			$("#tips-text").html("");
 		}
-	})
-		.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) {
-				var tags = ''
-				json = json.score
-				Object.keys(json).forEach(function(tag) {
-					tags =
-						tags +
-						`<a onclick="tagShow('${tag}')" class="pointer">
-							#${escapeHTML(tag)}
-						</a>
-						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
-							<a onclick="tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
-							<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">Toot</a>
-						</span><br>`
-				})
-				$('#tips-text').html(
-					'<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTagonTip()" style="font-size:12px">refresh</i>:<br>' +
-						tags +
-						'</div>'
-				)
-				trendTagonTipInterval()
-			} else {
-				$('#tips-text').html('')
-			}
-		})
+	});
+
 }
 //Spotify
-spotint = null
 function spotifytips() {
-	if (spotint) clearInterval(spotint)
-	var start =
-		'https://thedesk.top/now-playing?at=' +
-		localStorage.getItem('spotify') +
-		'&rt=' +
-		localStorage.getItem('spotify-refresh')
-	var at = localStorage.getItem('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',
 			headers: {
 				'content-type': 'application/json'
 			}
-		})
-			.then(function(response) {
-				if (!response.ok) {
-					response.text().then(function(text) {
-						setLog(response.url, response.status, text)
-					})
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			var ms = json.progress_ms;
+			var last = 1000 - ms % 1000;
+			var item = json.item;
+			var img = item.album.images[0].url;
+			var artisttxt = "";
+			for (i = 0; i < item.artists.length; i++) {
+				if (i > 0) {
+					artisttxt = artisttxt + "," + item.artists[i].name;
+				} else {
+					artisttxt = item.artists[0].name;
 				}
-				return response.json()
-			})
-			.catch(function(error) {
-				todo(error)
-				setLog(start, 'JSON', error)
-				console.error(error)
-			})
-			.then(function(json) {
-				var ms = json.progress_ms
-				var last = 1000 - (ms % 1000)
-				var item = json.item
-				var img = item.album.images[0].url
-				var artisttxt = ''
-				for (i = 0; i < item.artists.length; i++) {
-					if (i > 0) {
-						artisttxt = artisttxt + ',' + item.artists[i].name
-					} else {
-						artisttxt = item.artists[0].name
-					}
-				}
-				artisttxt = escapeHTML(artisttxt)
-				sleep(last)
-				var tms = item.duration_ms
-				var per = (ms / item.duration_ms) * 100
-				ms = ms / 1000
-				tms = tms / 1000
-				var s = Math.round(ms) % 60
-				if (s < 10) {
-					s = '0' + s
-				}
-				var m = (Math.round(ms) - (Math.round(ms) % 60)) / 60
-				var ts = Math.round(tms) % 60
-				if (ts < 10) {
-					ts = '0' + ts
-				}
-				var tm = (Math.round(tms) - (Math.round(tms) % 60)) / 60
-				var html = `
-				<div id="spot-box">
-					<div id="spot-refresh">
-						<i class="material-icons pointer" onclick="spotifytips()" style="font-size:20px">refresh</i>
-						<i class="material-icons pointer" onclick="nowplaying('spotify');show()" style="font-size:20px">send</i>
-					</div>
-					<div id="spot-cover">
-						<img src="${img}" id="spot-img">
-					</div>
-					<div id="spot-name">
-						${escapeHTML(item.name)}
-					</div>
-					<div id="spot-artist">
-						<span class="gray sml" id="spot-art">${artisttxt}</span>
-					</div>
-					<div id="spot-time">
-						<span id="spot-m">${m}</span>:<span id="spot-s">${s}</span>/${tm}:${ts}</span>
-					</div>
-					<div class="progress grey">
-					<div class="determinate spotify-prog grey lighten-2"
-					 style="width:${per}%" data-s="${Math.round(ms)}" data-total="${item.duration_ms}">
-					</div>
-				</div>
-				</div>`
-				$('#tips-text').html(html)
-				spotint = setInterval(spotStart, 1000)
-			})
+			}
+			artisttxt = escapeHTML(artisttxt);
+			sleep(last);
+			var tms = item.duration_ms;
+			var per = ms / item.duration_ms * 100;
+			ms = ms / 1000;
+			tms = tms / 1000;
+			var s = Math.round(ms) % 60;
+			if (s < 10) {
+				s = "0" + s;
+			}
+			var m = (Math.round(ms) - Math.round(ms) % 60) / 60;
+			var ts = Math.round(tms) % 60;
+			if (ts < 10) {
+				ts = "0" + ts;
+			}
+			var tm = (Math.round(tms) - Math.round(tms) % 60) / 60;
+			$("#tips-text").html('<div id="spot-box"><i class="material-icons pointer" onclick="spotifytips()" style="font-size:12px">refresh</i><img src="' + img + '" width="20" id="spot-img">' + escapeHTML(item.name) + '<span class="gray sml" id="spot-art">' + artisttxt + '</span><span id="spot-m">' + m + '</span>:<span id="spot-s">' + s + '</span>/' + tm + ":" + ts + '</span></div><div class="progress grey"><div class="determinate spotify-prog grey lighten-2" style="width: ' + per + '%" data-s="' + Math.round(ms) + '" data-total="' + item.duration_ms + '"></div></div>');
+			spotint = setInterval(spotStart, 1000);
+		});
 	} else {
 		Swal.fire({
 			type: 'info',
@@ -221,73 +140,57 @@ function spotifytips() {
 	}
 }
 function spotStart() {
-	var total = $('.spotify-prog').attr('data-total')
-	var s = $('.spotify-prog').attr('data-s')
-	var news = s * 1 + 1
-	var per = (news * 100000) / total
-	var ns = news % 60
-	var nm = (news - ns) / 60
+	var total = $(".spotify-prog").attr("data-total");
+	var s = $(".spotify-prog").attr("data-s");
+	var news = s * 1 + 1;
+	var per = news * 100000 / total;
+	var ns = news % 60;
+	var nm = (news - ns) / 60;
 	if (ns < 10) {
-		ns = '0' + ns
+		ns = "0" + ns;
 	}
 	if (per >= 100) {
-		clearInterval(spotStart)
+		clearInterval(spotStart);
 		spotifytips()
 	} else {
-		$('#spot-m').text(nm)
-		$('#spot-s').text(ns)
+		$("#spot-m").text(nm);
+		$("#spot-s").text(ns);
 	}
-	$('.spotify-prog').attr('data-s', news)
-	$('.spotify-prog').css('width', per + '%')
+	$(".spotify-prog").attr("data-s", news);
+	$(".spotify-prog").css("width", per + "%");
 }
+
+
 function trendTagonTipInterval() {
-	setTimeout(trendTagonTip, 6000000)
+	setTimeout(trendTagonTip, 6000000);
 }
 //時計
-var clockint
+var clockint;
 function clock() {
-	var now = new Date()
-	var last = 1000 - (now.getTime() % 1000)
-	sleep(last)
-	clockint = setInterval(clockStart, 1000)
+	var now = new Date();
+	var last = 1000 - now.getTime() % 1000;
+	sleep(last);
+	clockint = setInterval(clockStart, 1000);
 }
 function clockStart() {
-	var nowTime = new Date() //  現在日時を得る
-	var nowHour = nowTime.getHours() // 時を抜き出す
-	if (nowHour < 10) {
-		nowHour = '0' + nowHour
-	}
-	var nowMin = nowTime.getMinutes() // 分を抜き出す
-	if (nowMin < 10) {
-		nowMin = '0' + nowMin
-	}
-	var nowSec = nowTime.getSeconds() // 秒を抜き出す
-	if (nowSec < 10) {
-		nowSec = '0' + nowSec
-	}
-	var msg =
-		nowTime.getFullYear() +
-		'/' +
-		(nowTime.getMonth() + 1) +
-		'/' +
-		nowTime.getDate() +
-		'<span style="font-size:20px; font-family:Open Sans">' +
-		nowHour +
-		':' +
-		nowMin +
-		':' +
-		nowSec +
-		'</span>'
-	$('#tips-text').html(msg)
+	var nowTime = new Date(); //  現在日時を得る
+	var nowHour = nowTime.getHours(); // 時を抜き出す
+	if (nowHour < 10) { nowHour = "0" + nowHour }
+	var nowMin = nowTime.getMinutes(); // 分を抜き出す
+	if (nowMin < 10) { nowMin = "0" + nowMin }
+	var nowSec = nowTime.getSeconds(); // 秒を抜き出す
+	if (nowSec < 10) { nowSec = "0" + nowSec }
+	var msg = nowTime.getFullYear() + "/" + (nowTime.getMonth() + 1) + "/" + nowTime.getDate() + '<span style="font-size:20px; font-family:Open Sans">' + nowHour + ":" + nowMin + ":" + nowSec + "</span>";
+	$("#tips-text").html(msg);
 }
 function sleep(waitMsec) {
-	var startMsec = new Date()
+	var startMsec = new Date();
 	while (new Date() - startMsec < waitMsec);
 }
 function tipsToggle() {
-	$('#tips').toggleClass('hide')
-	$('#tips-menu').toggleClass('hide')
+	$("#tips").toggleClass("hide");
+	$("#tips-menu").toggleClass("hide");
 }
-if (localStorage.getItem('tips')) {
-	tips(localStorage.getItem('tips'))
+if (localStorage.getItem("tips")) {
+	tips(localStorage.getItem("tips"));
 }

app/js/userdata/prof-edit.js

@@ -52,7 +52,6 @@ function imgChange(imgfile, target) {
 		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
-				if(this.status!==200){ setLog(start, this.status, this.response); }
 				$('#his-data').modal('close');
 				todc();
 				localStorage.removeItem("image");

app/js/userdata/showOnTL.js

@@ -6,12 +6,12 @@ if (location.search) {
 	var mode = m[1];
 	var codex = m[2];
 	if (mode == "user") {
-		udgEx(codex, "main");
+		udgEx(codex, 'main');
 	}
 }
 function udgEx(user, acct_id) {
 	if (user == "selector") {
-		user = $("#his-acct").attr("fullname");
+		user = $("#his-acct").attr('fullname');
 	}
 	if (acct_id == "selector") {
 		acct_id = $("#user-acct-sel").val();
@@ -21,39 +21,28 @@ function udgEx(user, acct_id) {
 	}
 	console.log("Get user data of " + user);
 	var domain = localStorage.getItem("domain_" + acct_id);
-	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		return false;
-	}
+	if (localStorage.getItem("mode_" + domain) == "misskey") { return false; }
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user);
+	var start = "https://" + domain + "/api/v1/search?resolve=true&q=" + user
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + at
+			'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) {
-			if (json.accounts[0]) {
-				var id = json.accounts[0].id;
-				udg(id, acct_id);
-			} else {
-				postMessage(["openUrl", user], "*");
-			}
-		});
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json.accounts) {
+			var id = json.accounts[0].id;
+			udg(id, acct_id);
+		} else {
+			postMessage(["openUrl", url], "*")
+		}
+	});
 	return true;
 }
 function udg(user, acct_id) {
@@ -64,184 +53,160 @@ function udg(user, acct_id) {
 	todo("User Data Loading...");
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		misskeyUdg(user, acct_id);
+		misskeyUdg(user, acct_id)
 		return;
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/accounts/" + user;
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + at
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		//一つ前のユーザーデータ
+		if (!localStorage.getItem("history")) {
+			$("#his-history-btn").prop("disabled", true);
+		} else {
+			$("#his-history-btn").prop("disabled", false);
+			$('#his-data').attr("history", localStorage.getItem("history"));
 		}
-	})
-		.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 (!localStorage.getItem("history")) {
-				$("#his-history-btn").prop("disabled", true);
-			} else {
-				$("#his-history-btn").prop("disabled", false);
-				$("#his-data").attr("history", localStorage.getItem("history"));
-			}
-			//moved設定時
-			if (json.moved) {
-				M.toast({
-					html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + "')\">" + lang.lang_showontl_movebtn + "</button>",
-					displayLength: 4000
-				});
-			}
-			$("#his-data").modal("open");
-			$("#his-data").attr("user-id", user);
-			$("#his-data").attr("use-acct", acct_id);
-			if (json.username != json.acct) {
-				//Remote
-				$("#his-data").attr("remote", "true");
-				var fullname = json.acct;
-			} else {
-				$("#his-data").attr("remote", "false");
-				var fullname = json.acct + "@" + domain;
-			}
-			utl(json.id, "", acct_id);
-			flw(json.id, "", acct_id);
-			fer(json.id, "", acct_id);
-			var dis_name = escapeHTML(json.display_name);
-			dis_name = twemoji.parse(dis_name);
+		//moved設定時
+		if (json.moved) {
+			M.toast({
+				html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' +
+					json.moved.id + '\',\'' + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>', displayLength: 4000
+			})
+		}
+		$('#his-data').modal('open');
+		$('#his-data').attr("user-id", user);
+		$('#his-data').attr("use-acct", acct_id);
+		if (json.username != json.acct) {
+			//Remote
+			$('#his-data').attr("remote", "true");
+			var fullname = json.acct;
+		} else {
+			$('#his-data').attr("remote", "false");
+			var fullname = json.acct + "@" + domain;
+		}
+		utl(json.id, '', acct_id);
+		flw(json.id, '', acct_id);
+		fer(json.id, '', acct_id);
+		var dis_name = escapeHTML(json.display_name);
+		dis_name = twemoji.parse(dis_name);
 
-			var note = json.note;
-			if (json.emojis) {
-				var actemojick = json.emojis[0];
-			} else {
-				var actemojick = false;
-			}
-			//絵文字があれば
-			if (actemojick) {
-				Object.keys(json.emojis).forEach(function(key5) {
-					var emoji = json.emojis[key5];
-					var shortcode = emoji.shortcode;
-					var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">';
-					var regExp = new RegExp(":" + shortcode + ":", "g");
-					dis_name = dis_name.replace(regExp, emoji_url);
-					note = note.replace(regExp, emoji_url);
-				});
-			}
-			//noteの解析
-			//var tags =  '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
-			//var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
-			//note=note.replace(/#(\S+)/gi, tags)
-			//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
-			$("#his-name").html(dis_name);
-			$("#his-acct").text(json.acct);
-			$("#his-acct").attr("fullname", fullname);
-			$("#his-prof").attr("src", json.avatar);
-			$("#his-data").css("background-image", "url(" + json.header + ")");
-			$("#his-sta").text(json.statuses_count);
-			$("#his-follow").text(json.following_count);
-			var flerc = json.followers_count;
-			if (flerc < 0) {
-				flerc = "-";
-			}
-			$("#his-follower").text(flerc);
-			$("#his-since").text(crat(json.created_at));
-			$("#his-openin").attr("data-href", json.url);
-			if (json.fields) {
-				var table = "";
-				if (json.fields.length > 0) {
-					$("#his-des").css("max-height", "250px");
-					table = '<table id="his-field">';
-					for (var i = 0; i < json.fields.length; i++) {
-						var fname = json.fields[i].name;
-						var fval = json.fields[i].value;
-						if (json.fields[i].verified_at) {
-							var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at);
-							var color = "rgba(121,189,154,.25);";
-						} else {
-							var when = "";
-							var color = "inherit";
-						}
-						table = table + '<tr><td class="his-field-title">' + escapeHTML(fname) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + fval + "</td></tr>";
+		var note = json.note;
+		if (json.emojis) {
+			var actemojick = json.emojis[0];
+		} else {
+			var actemojick = false;
+		}
+		//絵文字があれば
+		if (actemojick) {
+			Object.keys(json.emojis).forEach(function (key5) {
+				var emoji = json.emojis[key5];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				dis_name = dis_name.replace(regExp, emoji_url);
+				note = note.replace(regExp, emoji_url);
+			});
+		}
+		//noteの解析
+		//var tags =  '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
+		//var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
+		//note=note.replace(/#(\S+)/gi, tags)
+		//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
+		$("#his-name").html(dis_name);
+		$("#his-acct").text(json.acct);
+		$("#his-acct").attr("fullname", fullname);
+		$("#his-prof").attr("src", json.avatar);
+		$('#his-data').css('background-image', 'url(' + json.header + ')');
+		$("#his-sta").text(json.statuses_count);
+		$("#his-follow").text(json.following_count);
+		var flerc = json.followers_count;
+		if (flerc < 0) {
+			flerc = "-";
+		}
+		$("#his-follower").text(flerc);
+		$("#his-since").text(crat(json.created_at));
+		$("#his-openin").attr("data-href", json.url);
+		if (json.fields) {
+			if (json.fields.length > 0) {
+				note = note + '<table id="his-field">'
+				for (var i = 0; i < json.fields.length; i++) {
+					var fname = json.fields[i].name;
+					var fval = json.fields[i].value;
+					if (json.fields[i].verified_at) {
+						var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at);
+						var color = "rgba(121,189,154,.25);"
+					} else {
+						var when = "";
+						var color = "inherit"
 					}
-					table = table + "</table>";
-					$("#his-des").html(twemoji.parse(note));
-				} else {
-					$("#his-des").css("max-height", "400px");
+					note = note + '<tr><td class="his-field-title">' + twemoji.parse(escapeHTML(fname)) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + twemoji.parse(fval) + '</td></tr>';
 				}
-				$("#his-table").html(twemoji.parse(table));
+				note = note + '</table>'
+				$("#his-des").html(twemoji.parse(note));
 			} else {
-				$("#his-des").css("max-height", "400px");
+				$("#his-des").html(twemoji.parse(note));
 			}
+		} else {
 			$("#his-des").html(twemoji.parse(note));
-			if (json.bot) {
-				$("#his-bot").html(lang.lang_showontl_botacct);
+		}
+		if (json.bot) {
+			$("#his-bot").html(lang.lang_showontl_botacct);
+		}
+		$("#his-des").attr("data-acct", acct_id);
+		$('#his-data').css('background-size', 'cover');
+		$("#his-float-timeline").css("height", $("#his-data-show").height() + "px")
+		localStorage.setItem("history", user);
+		//自分の時
+		if (json.acct == localStorage.getItem("user_" + acct_id)) {
+			showFav('', acct_id);
+			showBlo('', acct_id);
+			showMut('', acct_id);
+			showDom('', acct_id);
+			showReq('', acct_id);
+			showFrl('', acct_id);
+			$("#his-name-val").val(json.display_name);
+			if (json.fields.length > 0) {
+				if (json.fields[0]) { $("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value)); }
+				if (json.fields[1]) { $("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value)); }
+				if (json.fields[2]) { $("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value)); }
+				if (json.fields[3]) { $("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value)); }
 			}
-			$("#his-des").attr("data-acct", acct_id);
-			$("#his-data").css("background-size", "cover");
-			$("#his-float-timeline").css("height", $("#his-data-show").height() + "px");
-			localStorage.setItem("history", user);
-			//自分の時
-			if (json.acct == localStorage.getItem("user_" + acct_id)) {
-				showFav("", acct_id);
-				showBlo("", acct_id);
-				showMut("", acct_id);
-				showDom("", acct_id);
-				showReq("", acct_id);
-				showFrl("", acct_id);
-				$("#his-name-val").val(json.display_name);
-				if (json.fields.length > 0) {
-					if (json.fields[0]) {
-						$("#his-f1-name").val(json.fields[0].name);
-						$("#his-f1-val").val($.strip_tags(json.fields[0].value));
-					}
-					if (json.fields[1]) {
-						$("#his-f2-name").val(json.fields[1].name);
-						$("#his-f2-val").val($.strip_tags(json.fields[1].value));
-					}
-					if (json.fields[2]) {
-						$("#his-f3-name").val(json.fields[2].name);
-						$("#his-f3-val").val($.strip_tags(json.fields[2].value));
-					}
-					if (json.fields[3]) {
-						$("#his-f4-name").val(json.fields[3].name);
-						$("#his-f4-val").val($.strip_tags(json.fields[3].value));
-					}
-				}
-				var des = json.note;
-				des = des.replace(/<br \/>/g, "\n");
-				des = $.strip_tags(des);
-				$("#his-des-val").val(des);
-				$("#his-follow-btn").hide();
-				$("#his-block-btn").hide();
-				$("#his-mute-btn").hide();
-				$("#his-notf-btn").hide();
-				$("#his-domain-btn").hide();
-				$("#his-emp-btn").hide();
-				$(".only-my-data").show();
-				$(".only-his-data").hide();
-				if (localStorage.getItem("main") == acct_id) {
-					$("#his-main-acct").hide();
-				}
-			} else {
-				relations(user, acct_id);
-				$(".only-my-data").hide();
-				$(".only-his-data").show();
+			var des = json.note;
+			des = des.replace(/<br \/>/g, "\n")
+			des = $.strip_tags(des);
+			$("#his-des-val").val(des);
+			$("#his-follow-btn").hide();
+			$("#his-block-btn").hide();
+			$("#his-mute-btn").hide();
+			$("#his-notf-btn").hide();
+			$("#his-domain-btn").hide();
+			$("#his-emp-btn").hide();
+			$(".only-my-data").show();
+			$(".only-his-data").hide();
+			if (localStorage.getItem("main") == acct_id) {
+				$("#his-main-acct").hide();
 			}
-			todc();
-			//外部データ取得(死かもしれないので)
-			udAdd(acct_id, user, json.url);
-		});
+		} else {
+			relations(user, acct_id);
+			$(".only-my-data").hide();
+			$(".only-his-data").show();
+		}
+		todc();
+		//外部データ取得(死かもしれないので)
+		udAdd(acct_id, user, json.url);
+	});
 }
 function misskeyUdg(user, acct_id) {
 	reset();
@@ -251,137 +216,128 @@ function misskeyUdg(user, acct_id) {
 	todo("User Data Loading...");
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
-		udg(user, acct_id);
+		udg(user, acct_id)
 		return;
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/users/show";
 	fetch(start, {
-		method: "POST",
+		method: 'POST',
 		headers: {
-			"content-type": "application/json"
+			'content-type': 'application/json',
 		},
 		body: JSON.stringify({
 			i: at,
 			userId: user
 		})
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text);
-				});
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		//一つ前のユーザーデータ
+		if (!localStorage.getItem("history")) {
+			$("#his-history-btn").prop("disabled", true);
+		} else {
+			$("#his-history-btn").prop("disabled", false);
+			$('#his-data').attr("history", localStorage.getItem("history"));
+		}
+		$('#his-data').modal('open');
+		$('#his-data').attr("user-id", user);
+		$('#his-data').attr("use-acct", acct_id);
+		if (json.host) {
+			//Remote
+			$('#his-data').attr("remote", "false");
+			var fullname = json.username + "@" + json.host;
+		} else {
+			$('#his-data').attr("remote", "false");
+			var fullname = json.acct + "@" + domain;
+		}
+		utl(json.id, '', acct_id);
+		flw(json.id, '', acct_id);
+		fer(json.id, '', acct_id);
+		if (json.name) {
+			var dis_name = escapeHTML(json.name);
+			dis_name = twemoji.parse(dis_name);
+		} else {
+			var dis_name = json.name
+		}
+		$("#his-name").html(dis_name);
+		$("#his-acct").text(json.username);
+		$("#his-acct").attr("fullname", fullname);
+		$("#his-prof").attr("src", json.avatarUrl);
+		$('#his-data').css('background-image', 'url(' + json.bannerUrl + ')');
+		$("#his-sta").text(json.notesCount);
+		$("#his-follow").text(json.followingCount);
+		$("#his-follower").text(json.followersCount);
+		$("#his-since").text(crat(json.createdAt));
+		var note = escapeHTML(json.description);
+		$("#his-des").html(twemoji.parse(note));
+		if (json.isCat) {
+			$("#his-bot").html("Cat" + twemoji.parse("😺"));
+		}
+		$('#his-data').css('background-size', 'cover');
+		localStorage.setItem("history", user);
+		//自分の時
+		if (json.username == localStorage.getItem("user_" + acct_id) && !json.host) {
+			//showFav('', acct_id);
+			//showMut('', acct_id);
+			//showReq('', acct_id);
+			showFrl('', acct_id);
+			$("#his-name-val").val(json.name);
+			var des = json.note;
+			des = nl2br(des)
+			des = $.strip_tags(des);
+			$("#his-des-val").val(des);
+			$("#his-follow-btn").hide();
+			$("#his-block-btn").hide();
+			$("#his-mute-btn").hide();
+			$("#his-notf-btn").hide();
+			$("#his-domain-btn").hide();
+			$("#his-emp-btn").hide();
+			$(".only-my-data").show();
+			$(".only-his-data").hide();
+			if (localStorage.getItem("main") == acct_id) {
+				$("#his-main-acct").hide();
 			}
-			return response.json();
-		})
-		.catch(function(error) {
-			todo(error);
-			setLog(start, "JSON", error);
-			console.error(error);
-		})
-		.then(function(json) {
-			//一つ前のユーザーデータ
-			if (!localStorage.getItem("history")) {
-				$("#his-history-btn").prop("disabled", true);
+		} else {
+			if (json.isFollowing) {
+				//自分がフォローしている
+				$("#his-data").addClass("following");
+				$("#his-follow-btn").text(lang.lang_status_unfollow);
+				hisList(user, acct_id);
 			} else {
-				$("#his-history-btn").prop("disabled", false);
-				$("#his-data").attr("history", localStorage.getItem("history"));
+				$("#his-follow-btn").text(lang.lang_status_follow);
 			}
-			$("#his-data").modal("open");
-			$("#his-data").attr("user-id", user);
-			$("#his-data").attr("use-acct", acct_id);
-			if (json.host) {
-				//Remote
-				$("#his-data").attr("remote", "false");
-				var fullname = json.username + "@" + json.host;
+			if (json.isFollowed) {
+				//フォローされてる
+				$("#his-relation").text(lang.lang_showontl_followed);
+			}
+			$("#his-block-btn").hide();
+			if (json.isMuted) {
+				$("#his-data").addClass("muting");
+				$("#his-mute-btn").text(lang.lang_status_unmute);
 			} else {
-				$("#his-data").attr("remote", "false");
-				var fullname = json.acct + "@" + domain;
+				$("#his-mute-btn").text(lang.lang_status_mute);
 			}
-			utl(json.id, "", acct_id);
-			flw(json.id, "", acct_id);
-			fer(json.id, "", acct_id);
-			if (json.name) {
-				var dis_name = escapeHTML(json.name);
-				dis_name = twemoji.parse(dis_name);
-			} else {
-				var dis_name = json.name;
-			}
-			$("#his-name").html(dis_name);
-			$("#his-acct").text(json.username);
-			$("#his-acct").attr("fullname", fullname);
-			$("#his-prof").attr("src", json.avatarUrl);
-			$("#his-data").css("background-image", "url(" + json.bannerUrl + ")");
-			$("#his-sta").text(json.notesCount);
-			$("#his-follow").text(json.followingCount);
-			$("#his-follower").text(json.followersCount);
-			$("#his-since").text(crat(json.createdAt));
-			var note = escapeHTML(json.description);
-			$("#his-des").html(twemoji.parse(note));
-			if (json.isCat) {
-				$("#his-bot").html("Cat" + twemoji.parse("😺"));
-			}
-			$("#his-data").css("background-size", "cover");
-			localStorage.setItem("history", user);
-			//自分の時
-			if (json.username == localStorage.getItem("user_" + acct_id) && !json.host) {
-				//showFav('', acct_id);
-				//showMut('', acct_id);
-				//showReq('', acct_id);
-				showFrl("", acct_id);
-				$("#his-name-val").val(json.name);
-				var des = json.note;
-				des = nl2br(des);
-				des = $.strip_tags(des);
-				$("#his-des-val").val(des);
-				$("#his-follow-btn").hide();
-				$("#his-block-btn").hide();
-				$("#his-mute-btn").hide();
-				$("#his-notf-btn").hide();
-				$("#his-domain-btn").hide();
-				$("#his-emp-btn").hide();
-				$(".only-my-data").show();
-				$(".only-his-data").hide();
-				if (localStorage.getItem("main") == acct_id) {
-					$("#his-main-acct").hide();
-				}
-			} else {
-				if (json.isFollowing) {
-					//自分がフォローしている
-					$("#his-data").addClass("following");
-					$("#his-follow-btn-text").text(lang.lang_status_unfollow);
-					hisList(user, acct_id);
-				} else {
-					$("#his-follow-btn-text").text(lang.lang_status_follow);
-				}
-				if (json.isFollowed) {
-					//フォローされてる
-					$("#his-relation").text(lang.lang_showontl_followed);
-				}
-				$("#his-block-btn").hide();
-				if (json.isMuted) {
-					$("#his-data").addClass("muting");
-					$("#his-mute-btn-text").text(lang.lang_status_unmute);
-				} else {
-					$("#his-mute-btn-text").text(lang.lang_status_mute);
-				}
-				$(".only-my-data").hide();
-				$(".only-his-data").show();
-			}
-			todc();
-		});
+			$(".only-my-data").hide();
+			$(".only-his-data").show();
+		}
+		todc();
+	});
 }
 //一つ前のユーザーデータ表示
 function historyShow() {
-	var acct_id = $("#his-data").attr("use-acct");
-	var user = $("#his-data").attr("history");
-	udg(user, acct_id, "true");
+	var acct_id = $('#his-data').attr("use-acct");
+	var user = $('#his-data').attr("history");
+	udg(user, acct_id, "true")
 }
 //選択アカウントのプロフ
 function profShow() {
 	var acct_id = $("#post-acct-sel").val();
 	var user = localStorage.getItem("user-id_" + acct_id);
-	udg(user, acct_id);
+	udg(user, acct_id)
 	hide();
 }
 
@@ -391,112 +347,104 @@ function relations(user, acct_id) {
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/accounts/relationships?id=" + user;
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + at
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var json = json[0];
+		if (json.following) {
+			//自分がフォローしている
+			$("#his-data").addClass("following");
+			$("#his-follow-btn").text(lang.lang_status_unfollow);
+			hisList(user, acct_id);
+		} else {
+			$("#his-follow-btn").text(lang.lang_status_follow);
 		}
-	})
-		.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) {
-			var json = json[0];
-			if (json.following) {
-				//自分がフォローしている
-				$("#his-data").addClass("following");
-				$("#his-follow-btn-text").text(lang.lang_status_unfollow);
-				hisList(user, acct_id);
-			} else {
-				$("#his-follow-btn-text").text(lang.lang_status_follow);
-			}
-			if (json.followed_by) {
-				//フォローされてる
-				$("#his-relation").text(lang.lang_showontl_followed);
-			}
-			if (json.blocking) {
-				$("#his-data").addClass("blocking");
-				$("#his-block-btn-text").text(lang.lang_status_unblock);
-			} else {
-				$("#his-block-btn-text").text(lang.lang_status_block);
-			}
-			if (json.muting) {
-				$("#his-data").addClass("muting");
-				$("#his-mute-btn-text").text(lang.lang_status_unmute);
-			} else {
-				$("#his-mute-btn-text").text(lang.lang_status_mute);
-			}
-			if (json.muting_notifications) {
-				$("#his-data").addClass("mutingNotf");
-				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute);
-			} else {
-				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_mute);
-			}
-			if (json.domain_blocking) {
-				$("#his-data").addClass("blockingDom");
-				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock);
-			} else {
-				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_block);
-			}
-			//Endorsed
-			if (json.endorsed) {
-				$("#his-end-btn").addClass("endorsed");
-				$("#his-end-btn-text").text(lang.lang_status_unendorse);
-			} else {
-				$("#his-end-btn").removeClass("endorsed");
-				$("#his-end-btn-text").text(lang.lang_status_endorse);
-			}
-			//Blocked
-			if (json.blocked_by) {
-				$("#my-data-nav .btn").addClass("disabled");
-				$(".his-var-content").hide();
-				$("#his-float-blocked").show();
-				$("#his-follow-btn").hide();
-			}
-		});
+		if (json.followed_by) {
+			//フォローされてる
+			$("#his-relation").text(lang.lang_showontl_followed);
+		}
+		if (json.blocking) {
+			$("#his-data").addClass("blocking");
+			$("#his-block-btn").text(lang.lang_status_unblock);
+		} else {
+			$("#his-block-btn").text(lang.lang_status_block);
+		}
+		if (json.muting) {
+			$("#his-data").addClass("muting");
+			$("#his-mute-btn").text(lang.lang_status_unmute);
+		} else {
+			$("#his-mute-btn").text(lang.lang_status_mute);
+		}
+		if (json.muting_notifications) {
+			$("#his-data").addClass("mutingNotf");
+			$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_unmute);
+		} else {
+			$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
+		}
+		if (json.domain_blocking) {
+			$("#his-data").addClass("blockingDom");
+			$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_unblock);
+		} else {
+			$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
+		}
+		//Endorsed
+		if (json.endorsed) {
+			$("#his-end-btn").addClass("endorsed");
+			$("#his-end-btn").text(lang.lang_status_unendorse)
+		} else {
+			$("#his-end-btn").removeClass("endorsed");
+			$("#his-end-btn").text(lang.lang_status_endorse)
+		}
+		//Blocked
+		if (json.blocked_by) {
+			$("#my-data-nav .btn").addClass("disabled")
+			$(".his-var-content").hide();
+			$("#his-float-blocked").show()
+			$("#his-follow-btn").hide()
+		}
+
+	});
 }
 function profbrws() {
-	var url = $("#his-openin").attr("data-href");
-	postMessage(["openUrl", url], "*");
+	var url = $("#his-openin").attr("data-href")
+	postMessage(["openUrl", url], "*")
 }
 function setMain() {
-	var acct_id = $("#his-data").attr("use-acct");
+	var acct_id = $("#his-data").attr("use-acct")
 	localStorage.setItem("main", acct_id);
-	multiSelector(true);
-	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 });
+	multiSelector(true)
+	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
 }
 //オールリセット
 function hisclose() {
-	$("#his-data").modal("close");
+	$('#his-data').modal('close');
 	reset();
-	$("#his-data").attr("history", "");
+	$('#his-data').attr("history", "");
 	localStorage.removeItem("history");
 }
 function reset() {
 	$(".his-var-content:eq(0)").show();
 	$(".his-var-content:gt(0)").hide();
-	$("#my-data-nav .btn").removeClass("disabled");
+	$("#my-data-nav .btn").removeClass("disabled")
 	$(".active-back").removeClass("active-back");
 	$(".column-first").addClass("active-back");
 	$("#his-name").text("Loading");
 	$("#his-acct").text("");
 	$("#his-prof").attr("src", "../../img/loading.svg");
-	$("#his-data").css("background-image", "url(../../img/loading.svg)");
+	$('#his-data').css('background-image', 'url(../../img/loading.svg)');
 	$("#his-sta").text("");
 	$("#his-follow").text("");
 	$("#his-follower").text("");
 	$("#his-des").html("");
-	$("#his-data").css("background-size", "cover");
+	$('#his-data').css('background-size', 'cover');
 	$("#his-since").text("");
 	$("#his-data").removeClass("following");
 	$("#his-data").removeClass("muting");
@@ -504,7 +452,6 @@ function reset() {
 	$("#his-data").removeClass("mutingNotf");
 	$("#his-data").removeClass("blockingDom");
 	$("#his-end-btn").removeClass("endorsed");
-	$("#his-des").css("max-height", "250px");
 	$("#his-bot").html("");
 	$("#his-follow-btn").show();
 	$("#his-block-btn").show();
@@ -512,34 +459,30 @@ function reset() {
 	$("#his-notf-btn").show();
 	$("#his-domain-btn").show();
 	$("#his-emp-btn").show();
-	$("#his-follow-btn-text").text(lang.lang_status_follow);
-	$("#his-mute-btn-text").text(lang.lang_status_mute);
-	$("#his-block-btn-text").text(lang.lang_status_block);
+	$("#his-follow-btn").text(lang.lang_status_follow);
+	$("#his-mute-btn").text(lang.lang_status_mute);
+	$("#his-block-btn").text(lang.lang_status_block);
 	$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
 	$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
 	$("#his-relation").text("");
 	$(".cont-series").html("");
 	$("#domainblock").val("");
 	$("#his-lists-a").html(lang.lang_showontl_listwarn);
-	$("#his-lists-b").html("");
+	$("#his-lists-b").html('');
 	$("#his-name-val").val("");
 	$("#his-des-val").val("");
-	$("#his-f1-name").val("");
-	$("#his-f1-val").val("");
-	$("#his-f2-name").val("");
-	$("#his-f2-val").val("");
-	$("#his-f3-name").val("");
-	$("#his-f3-val").val("");
-	$("#his-f4-name").val("");
-	$("#his-f4-val").val("");
+	$("#his-f1-name").val(""); $("#his-f1-val").val("");
+	$("#his-f2-name").val(""); $("#his-f2-val").val("");
+	$("#his-f3-name").val(""); $("#his-f3-val").val("");
+	$("#his-f4-name").val(""); $("#his-f4-val").val("");
 	$("#his-endorse").html("");
 	$("#his-openin").attr("data-href", "");
 	$("#his-float-timeline").show();
 	$("#his-float-blocked").hide();
 	$("#his-main-acct").show();
-	$("#his-proof-prof").html("");
+	$("#his-proof-prof").html("")
 }
-$("#my-data-nav .anc-link").on("click", function() {
+$('#my-data-nav .anc-link').on('click', function () {
 	var target = $(this).attr("go");
 	if (target) {
 		$("#my-data-nav .anc-link").removeClass("active-back");
@@ -547,4 +490,5 @@ $("#my-data-nav .anc-link").on("click", function() {
 		$(target).show();
 		$(".his-var-content:not(" + target + ")").hide();
 	}
-});
+
+});

app/main.js

@@ -1,24 +1,23 @@
-var dirname = __dirname
-var dir = 'file://' + __dirname
-var base = dir + '/view/'
+var dirname = __dirname;
+var dir = 'file://' + __dirname;
+var base = dir + '/view/';
 // Electronのモジュール
-const electron = require('electron')
-const fs = require('fs')
-const language = require('./main/language.js')
-const css = require('./main/css.js')
-const dl = require('./main/dl.js')
-const img = require('./main/img.js')
-const np = require('./main/np.js')
-const systemFunc = require('./main/system.js')
+const electron = require("electron");
+const fs = require("fs");
+const language = require('./main/language.js');
+const css = require('./main/css.js');
+const dl = require('./main/dl.js');
+const img = require('./main/img.js');
+const np = require('./main/np.js');
+const systemFunc = require('./main/system.js');
 const Menu = electron.Menu
-const join = require('path').join
-
+const join = require('path').join;
 // アプリケーションをコントロールするモジュール
-const app = electron.app
+const app = electron.app;
 // ウィンドウを作成するモジュール
-const BrowserWindow = electron.BrowserWindow
+const BrowserWindow = electron.BrowserWindow;
 // メインウィンドウはGCされないようにグローバル宣言
-let mainWindow
+let mainWindow;
 
 // アプリが多重起動しないようにする
 const gotTheLock = app.requestSingleInstanceLock()
@@ -30,319 +29,212 @@ if (!gotTheLock) {
 		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
 		// Someone tried to run a second instance, we should focus our window.
 		if (mainWindow) {
-			if (mainWindow.isMinimized()) mainWindow.restore()
-			mainWindow.focus()
+		if (mainWindow.isMinimized()) mainWindow.restore()
+		mainWindow.focus()
 		}
 	})
 }
 
-if (process.argv.indexOf('--dev') === -1) {
-	var packaged = true
+if (process.argv.indexOf("--dev") === -1) {
+	var packaged = true;
 } else {
-	var packaged = false
+	var packaged = false;
 	console.log(
-		'||\\\\\\ \n' +
-			'||||  \\\\\\\\ \n' +
-			'||||     \\\\\\\\ \n' +
-			'|||| Am I a \\\\\\\\ \n' +
-			'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
-			'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
-			"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
-			'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
-			'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
-			'||||          /////         \n' +
-			'||||       /////\n' +
-			'||||     /////\n' +
-			'||||//////'
+		"||\\\\\\ \n"+
+		"||||  \\\\\\\\ \n"+
+		"||||     \\\\\\\\ \n"+
+		"|||| Am I a \\\\\\\\ \n"+
+		"|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n"+
+		"||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n"+
+		"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n"+
+		"|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/\__ \\   < \n"+
+		"||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n"+
+		"||||          /////         \n"+
+		"||||       /////\n"+
+		"||||     /////\n"+
+		"||||//////"
 	)
-	console.log('If it does not show the window, you might forget `npm run construct`.')
+	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')
+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");
 try {
-	fs.readFileSync(ha_path, 'utf8')
+	fs.readFileSync(ha_path, 'utf8');
 	app.disableHardwareAcceleration()
-	if (!packaged) console.log('disabled: Hardware Acceleration')
-} catch {
-	if (!packaged) console.log('enabled: Hardware Acceleration')
+	if(!packaged) console.log("disabled: Hardware Acceleration");
+} catch{
+	if(!packaged) console.log("enabled: Hardware Acceleration");
 }
-var window_size
+var window_size;
 try {
-	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
+	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'));
 } catch (e) {
 	window_size = {
 		width: 1000,
 		height: 750
-	} // デフォルトバリュー
+	}; // デフォルトバリュー
 }
-var max_window_size
+var max_window_size;
 try {
-	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
+	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'));
 } catch (e) {
 	max_window_size = {
-		width: 'string',
-		height: 'string',
-		x: 'string',
-		y: 'string'
-	} // デフォルトバリュー
+		width: "string",
+		height: "string",
+		x: "string",
+		y: "string"
+
+	}; // デフォルトバリュー
 }
 function isFile(file) {
 	try {
-		fs.statSync(file)
+		fs.statSync(file);
 		return true
 	} catch (err) {
 		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(() => {})
-	app.quit()
-})
+app.on('window-all-closed', function () {
+	if (process.platform != 'darwin') {
+		electron.session.defaultSession.clearCache(() => { })
+		app.quit();
+	}
+});
+// macOSでウィンドウを閉じた後に再度開けるようにする
+app.on('activate', function () {
+	if (mainWindow == null) {
+		createWindow();
+	}
+});
+
 function createWindow() {
 	if (isFile(lang_path)) {
-		var lang = fs.readFileSync(lang_path, 'utf8')
+		var lang = fs.readFileSync(lang_path, 'utf8');
 	} else {
-		var langs = app.getLocale()
-		console.log(langs)
-		if (~langs.indexOf('ja')) {
-			lang = 'ja'
-		} else if (~langs.indexOf('de')) {
-			lang = 'de'
-		} else if (~langs.indexOf('cs')) {
-			lang = 'cs'
-		} else if (~langs.indexOf('bg')) {
-			lang = 'bg'
+		var langs = app.getLocale();
+		console.log(langs);
+		if (~langs.indexOf("ja")) {
+			lang = "ja";
+		} else if (~langs.indexOf("de")) {
+			lang = "de";
+		} else if (~langs.indexOf("cs")) {
+			lang = "cs";
+		} else if (~langs.indexOf("bg")) {
+			lang = "bg";
 		} else {
-			lang = 'en'
+			lang = "en";
 		}
-		fs.mkdir(app.getPath('userData'), function(err) {
-			fs.writeFileSync(lang_path, lang)
-		})
+		fs.mkdir(app.getPath("userData"), function (err) {
+			fs.writeFileSync(lang_path, lang);
+		});
 	}
-	if (!packaged) console.log('your lang:' + app.getLocale())
-	if (!packaged) console.log('launch:' + lang)
+	if(!packaged) console.log("your lang:" + app.getLocale());
+	if(!packaged) console.log("launch:" + lang);
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
-	var platform = process.platform
-	var bit = process.arch
-	if (platform == 'linux') {
+	var platform = process.platform;
+	var bit = process.arch;
+	if (platform == "linux") {
 		var arg = {
 			webPreferences: {
 				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(__dirname, 'js', 'platform', 'preload.js')
+				preload: join(__dirname, "js", "platform", "preload.js")
 			},
-			width: window_size.width,
-			height: window_size.height,
-			x: window_size.x,
-			y: window_size.y,
-			icon: __dirname + '/desk.png',
-			show: false,
-			frame: frame,
-			resizable: true
+			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png', show: false
 		}
-	} else if (platform == 'win32') {
+	} else if (platform == "win32") {
 		var arg = {
 			webPreferences: {
 				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(__dirname, 'js', 'platform', 'preload.js')
+				preload: join(__dirname, "js", "platform", "preload.js")
 			},
-			width: window_size.width,
-			height: window_size.height,
-			x: window_size.x,
-			y: window_size.y,
-			simpleFullscreen: true,
-			show: false,
-			frame: frame
+			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false
 		}
-	} else if (platform == 'darwin') {
+	} else if (platform == "darwin") {
 		var arg = {
 			webPreferences: {
 				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(__dirname, 'js', 'platform', 'preload.js')
+				preload: join(__dirname, "js", "platform", "preload.js")
 			},
-			width: window_size.width,
-			height: window_size.height,
-			x: window_size.x,
-			y: window_size.y,
-			simpleFullscreen: true,
-			show: false,
-			titleBarStyle: frameTitle,
-			frame: frame,
+			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false
 		}
 	}
-	mainWindow = new BrowserWindow(arg)
+	mainWindow = new BrowserWindow(arg);
 	mainWindow.once('page-title-updated', () => {
 		mainWindow.show()
 		if (window_size.max) {
-			mainWindow.maximize()
+			mainWindow.maximize();
 		}
-	})
-	if (!packaged) mainWindow.toggleDevTools()
-	electron.session.defaultSession.clearCache(() => {})
+	  })
+	electron.session.defaultSession.clearCache(() => { })
 	if (process.argv) {
 		if (process.argv[1]) {
-			var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
+			var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/);
 			if (m) {
-				var mode = m[1]
-				var code = m[2]
-				var plus = '?mode=' + mode + '&code=' + code
+				var mode = m[1];
+				var code = m[2];
+				var plus = '?mode=' + mode + '&code=' + code;
 			} else {
-				var plus = ''
+				var plus = "";
 			}
 		} else {
-			var plus = ''
+			var plus = "";
 		}
 	} else {
-		var plus = ''
+		var plus = "";
 	}
-	var ua
-	try {
-		ua = fs.readFileSync(ua_path, 'utf8')
-	} catch (e) {
-		//default UA Example:
-		// Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36
-		const crypto = require('crypto')
-		const N = 100
-		var ua =
-			'Mastodon client: ' +
-			crypto
-				.randomBytes(N)
-				.toString('base64')
-				.substring(0, N)
-	}
-	mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua })
+	mainWindow.loadURL(base + lang + '/index.html' + plus);
 	if (!window_size.x && !window_size.y) {
-		mainWindow.center()
+		mainWindow.center();
 	}
 	// ウィンドウが閉じられたらアプリも終了
-	mainWindow.on('closed', function() {
-		electron.ipcMain.removeAllListeners()
-		mainWindow = null
-	})
-	closeArg = false
-	mainWindow.on('close', function(e, arg) {
-		writePos(mainWindow)
-		if (!closeArg) {
-			e.preventDefault()
-		}
-		const promise = new Promise(function(resolve) {
-			mainWindow.webContents.send('asReadEnd', '')
-			setTimeout(function() {
-				resolve()
-			}, 3000)
-		})
-		promise.then(function(response) {
-			closeArg = true
-			mainWindow.close()
-		})
-	})
-	electron.ipcMain.on('sendMarkersComplete', function(e, arg) {
-		closeArg = true
-		mainWindow.close()
-	})
-	function writePos(mainWindow) {
+	mainWindow.on('closed', function () {
+		electron.ipcMain.removeAllListeners();
+		mainWindow = null;
+	});
+	mainWindow.on('close', function () {
 		if (
 			max_window_size.width == mainWindow.getBounds().width &&
 			max_window_size.height == mainWindow.getBounds().height &&
 			max_window_size.x == mainWindow.getBounds().x &&
 			max_window_size.y == mainWindow.getBounds().y
 		) {
-			var size = {
-				width: mainWindow.getBounds().width,
-				height: mainWindow.getBounds().height,
-				x: mainWindow.getBounds().x,
-				y: mainWindow.getBounds().y,
-				max: true
-			}
+			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y, max: true }
 		} else {
-			var size = {
-				width: mainWindow.getBounds().width,
-				height: mainWindow.getBounds().height,
-				x: mainWindow.getBounds().x,
-				y: mainWindow.getBounds().y
-			}
+			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y }
 		}
-		fs.writeFileSync(info_path, JSON.stringify(size))
-	}
-	mainWindow.on('maximize', function() {
-		writePos(mainWindow)
-		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()))
-	})
-	mainWindow.on('minimize', function() {
-		writePos(mainWindow)
-		mainWindow.webContents.send('asRead', '')
-	})
+		fs.writeFileSync(info_path, JSON.stringify(size));
+	});
+	mainWindow.on('maximize', function () {
+		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
+	});
 
-	var platform = process.platform
-	var bit = process.arch
-	Menu.setApplicationMenu(
-		Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame))
-	)
-	if(!frame) {
-		mainWindow.setMenu(null)
-	}
+	var platform = process.platform;
+	var bit = process.arch;
+	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname)));
 	//CSS
-	css.css(mainWindow)
+	css.css(mainWindow);
 	//アップデータとダウンロード
-	dl.dl(mainWindow, lang_path, base, dirname)
+	dl.dl(mainWindow, lang_path, base, dirname);
 	//画像選択と画像処理
-	img.img(mainWindow, dir)
+	img.img(mainWindow, dir);
 	//NowPlaying
-	np.TheDeskNowPlaying(mainWindow)
+	np.TheDeskNowPlaying(mainWindow);
 	//その他system
-	systemFunc.system(mainWindow, dir, lang, dirname)
-	setInterval(function() {
-		mouseTrack(mainWindow)
-	}, 1000)
-}
-var x = 0
-var y = 0
-var unchanged = 0
-var locked = false
-function mouseTrack(mainWindow) {
-	let mousePos = electron.screen.getCursorScreenPoint()
-	let xNow = mousePos.x
-	let yNow = mousePos.x
-	if (x != xNow || y != yNow) {
-		unchanged = 0
-		locked = false
-	} else {
-		unchanged++
-		if (unchanged > 60 && !locked) {
-			unchanged = 0
-			locked = true
-			mainWindow.webContents.send('asRead', '')
-		}
-	}
-	x = xNow
-	y = yNow
+	systemFunc.system(mainWindow, dir, lang, dirname);
 }
 // Electronの初期化完了後に実行
-app.on('ready', createWindow)
-var onError = function(err, response) {
-	console.error(err, response)
-}
+app.on('ready', createWindow);
+var onError = function (err, response) {
+	console.error(err, response);
+};
 
 app.setAsDefaultProtocolClient('thedesk')

app/main/css.js

@@ -23,7 +23,7 @@ function css(mainWindow) {
 	ipc.on('theme-json-create', function (e, arg) {
 		var themecss = join(app.getPath("userData"), JSON5.parse(arg)["id"] +
 			".thedesktheme");
-		fs.writeFileSync(themecss, JSON5.stringify(JSON5.parse(arg)));
+		fs.writeFileSync(themecss, JSON.stringify(JSON5.parse(arg)));
 		if (JSON5.parse(arg)["id"]) {
 			e.sender.webContents.send('theme-json-create-complete', "");
 		} else {
@@ -39,14 +39,13 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-json-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
-		var raw = fs.readFileSync(themecss, 'utf8')
-		var json = JSON5.parse(raw);
-		e.sender.webContents.send('theme-json-response', [json, raw]);
+		var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+		e.sender.webContents.send('theme-json-response', json);
 	})
 	ipc.on('theme-css-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
 		try {
-			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
+			var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
 
 			var primary = json.vars.primary;
 			var secondary = json.vars.secondary;
@@ -68,52 +67,21 @@ function css(mainWindow) {
 				if (json.props.TheDeskAccent) {
 					var emphasized = json.props.TheDeskAccent
 				} else {
-					var emphasized = secondary
-				}
-				if (json.props.TheDeskActive) {
-					var active = json.props.TheDeskActive
-				} else {
-					var active = primary
-				}
-				if (json.props.TheDeskModal) {
-					var modal = json.props.TheDeskModal
-				} else {
-					var modal = secondary
-				}
-				if (json.props.TheDeskBottom) {
-					var bottom = json.props.TheDeskBottom
-				} else {
-					var bottom = primary
-				}
-				if (json.props.TheDeskPostbox) {
-					var postbox = json.props.TheDeskPostbox
-				} else {
-					var postbox = primary
-				}
-				if (json.props.TheDeskSubcolor) {
-					var subcolor = json.props.TheDeskSubcolor
-				} else {
-					var subcolor = primary
+					var emphasized = secondary;
 				}
 			} else {
-				var emphasized = primary
-				var acs = secondary
-				var active = primary
-				var modal = secondary
-				var bottom = primary
-				var postbox = primary
-				var subcolor = primary
+				var emphasized = primary;
 			}
 
 			var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
 				"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
-				modal + ";--subcolor:" + subcolor + ";--box:" + subcolor +
-				";--sidebar:" + bottom + ";--shared:" + emphasized + ";" +
-				"--notfbox:" + secondary + ";--emphasized:" + active + ";--his-data:" +
+				secondary + ";--subcolor:" + primary + ";--box:" + primary +
+				";--sidebar:" + primary + ";--shared:" + emphasized + ";" +
+				"--notfbox:" + secondary + ";--emphasized:" + primary + ";--his-data:" +
 				secondary +
-				";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
+				";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
 				primary +
-				";--accentbtn:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
+				";--accentbtn:" + primary + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
 				"--gray:" + gray + ";"+
 				".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
 			e.sender.webContents.send('theme-css-response', css);
@@ -124,19 +92,15 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-json-list', function (e, arg) {
 		fs.readdir(app.getPath("userData"), function (err, files) {
-			if (err || !files) throw err;
+			if (err) throw err;
 			var fileList = files.filter(function (file) {
-				if(file.match(/\.thedesktheme$/)){
-					var tfile = join(app.getPath("userData"), file)
-					return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
-				}else{
-					return null
-				}
+				var tfile = join(app.getPath("userData"), file);
+				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile); //絞り込み
 			})
 			var themes = [];
 			for (var i = 0; i < fileList.length; i++) {
 				var themecss = join(app.getPath("userData"), fileList[i]);
-				var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
+				var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
 				themes.push({
 					name: json.name,
 					id: json.id

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)
+				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,35 +1,32 @@
 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)
-				}
-			} 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");
+                    const value = await nowplaying.getRawData();
+                    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

@@ -1,146 +1,133 @@
 function system(mainWindow, dir, lang, dirname) {
 	const electron = require("electron");
 	const app = electron.app;
-	const join = require("path").join;
+	const join = require('path').join;
 	var Jimp = require("jimp");
 	const fs = require("fs");
-	var JSON5 = require("json5");
+	var JSON5 = require('json5');
 	var ipc = electron.ipcMain;
-	const clipboard = electron.clipboard;
 	var tmp_img = join(app.getPath("userData"), "tmp.png");
 	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
-	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();
-	//今日のやつ
-	var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
-	//昨日のやつ
-	today.setDate(today.getDate() - 1);
-	var yestStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
-	//一昨日のやつ
-	today.setDate(today.getDate() - 1);
-	var yest2Str = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
-
 	const BrowserWindow = electron.BrowserWindow;
 	const dialog = electron.dialog;
-	const os = require("os");
+	const os = require('os')
 	const language = require("../main/language.js");
-	//プラットフォーム
-	ipc.on("getPlatform", function(e, arg) {
-		try {
-			var gitHash = fs.readFileSync("git", "utf8");
-		} catch {
-			var gitHash = null;
+	ipc.on('native-notf', function (e, args) {
+
+		var platform = process.platform;
+		var bit = process.arch;
+		if (platform == "win32") {
+			const notifier = require('node-notifier')
+			var tmp_imge = tmp_img;
+			Jimp.read(args[2], function (err, lenna) {
+				if (!err && lenna) {
+					lenna.write(tmp_img);
+					var tmp_imge = tmp_img;
+				} else {
+					var tmp_imge = "";
+				}
+				notifier.notify({
+					appID: "top.thedesk",
+					message: args[1],
+					title: args[0],
+					icon: tmp_imge,
+					sound: false,
+					wait: true,
+				},
+					function (err, response) {
+						console.log(err, response)
+					});
+			});
 		}
-		e.sender.webContents.send("platform", [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash]);
 	});
+	//プラットフォーム
+	ipc.on('getPlatform', function (e, arg) {
+		try {
+			var gitHash = fs.readFileSync("git", 'utf8')
+		} catch{
+			var gitHash = null
+		}
+		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash]);
+	})
 	//言語
-	ipc.on("lang", function(e, arg) {
+	ipc.on('lang', function (e, arg) {
+
 		console.log("set:" + arg);
 		fs.writeFileSync(lang_path, arg);
-		e.sender.webContents.send("langres", arg);
-	});
+		e.sender.webContents.send('langres', arg);
+	})
 	//エクスポートのダイアログ
-	ipc.on("exportSettings", function(e, args) {
-		dialog.showSaveDialog(
-			mainWindow,
-			{
-				title: "Export",
-				properties: ["openFile", "createDirectory"],
-				defaultPath: "export.thedeskconfig.json5"
-			},
-			savedFiles => {
-				if (!savedFiles) {
-					return false;
-				}
-				e.sender.webContents.send("exportSettingsFile", savedFiles);
+	ipc.on('exportSettings', function (e, args) {
+		dialog.showSaveDialog(null, {
+			title: 'Export',
+			properties: ['openFile', 'createDirectory'],
+			defaultPath: "export.thedeskconfig.json5"
+		}, (savedFiles) => {
+			if (!savedFiles) {
+				return false;
 			}
-		);
-	});
+			e.sender.webContents.send('exportSettingsFile', savedFiles);
+		})
+	})
 	//インポートのダイアログ
-	ipc.on("importSettings", function(e, args) {
-		dialog.showOpenDialog(
-			mainWindow,
-			{
-				title: "Import",
-				properties: ["openFile"],
-				filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
-			},
-			fileNames => {
-				console.log("imported from: ", fileNames)
-				if (!fileNames) {
-					return false;
-				}
-				e.sender.webContents.send("config", JSON5.parse(fs.readFileSync(fileNames[0], "utf8")));
+	ipc.on('importSettings', function (e, args) {
+		dialog.showOpenDialog(null, {
+			title: 'Import',
+			properties: ['openFile'],
+			filters: [
+				{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2', 'json5'] },
+			]
+		}, (fileNames) => {
+			if (!fileNames) {
+				return false;
 			}
-		);
-	});
+			e.sender.webContents.send('config', JSON5.parse(fs.readFileSync(fileNames[0], 'utf8')));
+		})
+	})
 	//保存フォルダのダイアログ
-	ipc.on("savefolder", function(e, args) {
-		dialog.showOpenDialog(
-			mainWindow,
-			{
-				title: "Save folder",
-				properties: ["openDirectory"]
-			},
-			fileNames => {
-				e.sender.webContents.send("savefolder", fileNames[0]);
-			}
-		);
-	});
+	ipc.on('savefolder', function (e, args) {
+		dialog.showOpenDialog(null, {
+			title: 'Save folder',
+			properties: ['openDirectory'],
+		}, (fileNames) => {
+			e.sender.webContents.send('savefolder', fileNames[0]);
+		});
+	})
 	//カスタムサウンドのダイアログ
-	ipc.on("customSound", function(e, arg) {
-		dialog.showOpenDialog(
-			mainWindow,
-			{
-				title: "Custom sound",
-				properties: ["openFile"],
-				filters: [{ name: "Audio", extensions: ["mp3", "aac", "wav", "flac", "m4a"] }, { name: "All", extensions: ["*"] }]
-			},
-			fileNames => {
-				e.sender.webContents.send("customSoundRender", [arg, fileNames[0]]);
-			}
-		);
-	});
+	ipc.on('customSound', function (e, arg) {
+		dialog.showOpenDialog(null, {
+			title: 'Custom sound',
+			properties: ['openFile'],
+			filters: [
+				{ name: 'Audio', extensions: ['mp3', 'aac', 'wav', 'flac', 'm4a'] },
+				{ name: 'All', extensions: ['*'] },
+			]
+		}, (fileNames) => {
+			e.sender.webContents.send('customSoundRender', [arg, fileNames[0]]);
+		});
+	})
 
 	//ハードウェアアクセラレーションの無効化
-	ipc.on("ha", function(e, arg) {
+	ipc.on('ha', function (e, arg) {
+
 		if (arg == "true") {
 			fs.writeFileSync(ha_path, arg);
 		} else {
-			fs.unlink(ha_path, function(err) {});
+			fs.unlink(ha_path, function (err) { });
 		}
-		app.relaunch();
-		app.exit();
-	});
-	//ユーザーエージェント
-	ipc.on("ua", function(e, arg) {
-		if (arg == "") {
-			fs.unlink(ua_path, function(err) {});
-		} else {
-			fs.writeFileSync(ua_path, arg);
-		}
-		app.relaunch();
-		app.exit();
-	});
-	//フレームのありなし
-	ipc.on("frameSet", function(e, arg) {
-		fs.writeFileSync(frame_path, arg);
-		app.relaunch();
-		app.exit();
-	});
+		app.relaunch()
+		app.exit()
+	})
 
-	ipc.on("quit", (e, args) => {
+	ipc.on('quit', (e, args) => {
 		app.quit();
 	});
-	ipc.on("about", (e, args) => {
+	ipc.on('about', (e, args) => {
 		about();
 	});
 	function about() {
-		var ver = app.getVersion();
+		var ver = app.getVersion()
 		var window = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
@@ -150,18 +137,20 @@ function system(mainWindow, dir, lang, dirname) {
 			},
 			width: 300,
 			height: 500,
-			transparent: false, // ウィンドウの背景を透過
-			frame: false, // 枠の無いウィンドウ
-			resizable: false
+			"transparent": false, // ウィンドウの背景を透過
+			"frame": false, // 枠の無いウィンドウ
+			"resizable": false
 		});
-		window.loadURL(dir + "/about.html?ver=" + ver);
-		return "true";
+		window.loadURL(dir + '/about.html?ver=' + ver);
+		return "true"
 	}
-	ipc.on("nano", function(e, x, y) {
-		var nano_info_path = join(app.getPath("userData"), "nano-window-position.json");
+	ipc.on('nano', function (e, x, y) {
+
+		var nano_info_path = join(app.getPath("userData"),
+			"nano-window-position.json");
 		var window_pos;
 		try {
-			window_pos = JSON.parse(fs.readFileSync(nano_info_path, "utf8"));
+			window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'));
 		} catch (e) {
 			window_pos = [0, 0]; // デフォルトバリュー
 		}
@@ -173,40 +162,41 @@ function system(mainWindow, dir, lang, dirname) {
 				preload: join(dirname, "js", "platform", "preload.js")
 			},
 			width: 350,
-			height: 140,
-			transparent: false, // ウィンドウの背景を透過
-			frame: false, // 枠の無いウィンドウ
-			resizable: false
+			height: 200,
+			"transparent": false, // ウィンドウの背景を透過
+			"frame": false, // 枠の無いウィンドウ
+			"resizable": false
 		});
-		nanowindow.loadURL(dir + "/nano.html");
+		nanowindow.loadURL(dir + '/nano.html');
 		nanowindow.setAlwaysOnTop(true);
-		//nanowindow.toggleDevTools()
+
 		nanowindow.setPosition(window_pos[0], window_pos[1]);
-		nanowindow.on("close", function() {
+		nanowindow.on('close', function () {
 			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
 		});
 		return true;
-	});
+	})
 	var cbTimer1;
-	ipc.on("startmem", (e, arg) => {
-		event = e.sender;
+	ipc.on('startmem', (e, arg) => {
+		event = e.sender
 		cbTimer1 = setInterval(mems, 1000);
 	});
 	function mems() {
 		var mem = os.totalmem() - os.freemem();
 		if (mainWindow) {
-			event.webContents.send("memory", [mem, os.cpus()[0].model, os.totalmem()]);
+			event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()]);
 		}
 	}
-	ipc.on("endmem", (e, arg) => {
+	ipc.on('endmem', (e, arg) => {
 		if (cbTimer1) {
 			clearInterval(cbTimer1);
 		}
 	});
 
-	ipc.on("export", (e, args) => {
+
+	ipc.on('export', (e, args) => {
 		fs.writeFileSync(args[0], JSON5.stringify(args[1]));
-		e.sender.webContents.send("exportAllComplete", "");
+		e.sender.webContents.send('exportAllComplete', "");
 	});
 	//フォント
 	function object_array_sort(data, key, order, fn) {
@@ -214,13 +204,12 @@ function system(mainWindow, dir, lang, dirname) {
 		var num_a = -1;
 		var num_b = 1;
 
-		if (order === "asc") {
-			//指定があれば昇順(ASC)
+		if (order === 'asc') { //指定があれば昇順(ASC)
 			num_a = 1;
 			num_b = -1;
 		}
 
-		data = data.sort(function(a, b) {
+		data = data.sort(function (a, b) {
 			var x = a[key];
 			var y = b[key];
 			if (x > y) return num_a;
@@ -231,7 +220,7 @@ function system(mainWindow, dir, lang, dirname) {
 		//重複排除
 		var arrObj = {};
 		for (var i = 0; i < data.length; i++) {
-			arrObj[data[i]["family"]] = data[i];
+			arrObj[data[i]['family']] = data[i];
 		}
 
 		data = [];
@@ -241,69 +230,12 @@ 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);
-	});
-	//コピー
-	ipc.on("copy", (e, arg) => {
-		clipboard.writeText(arg);
-	});
-	//ログ
-	ipc.on("log", (e, arg) => {
-		var today = new Date();
-		var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate();
-		var log_path = join(log_dir_path, todayStr + ".log");
-		fs.appendFile(log_path, "\n" + arg, function(err) {
-			if (err) {
-				throw err;
-			}
+	ipc.on('fonts', (e, arg) => {
+		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("getLogs", (e, arg) => {
-		var logs=""
-		var todayLog=""
-		var yestLog=""
-		var yest2Log=""
-		fs.readdir(log_dir_path, function(err, files) {
-			if (err) throw err;
-			files.filter(function(file) {
-				if (file == todayStr) {
-					todayLog=fs.readFileSync(join(log_dir_path, file), "utf8")
-				}
-				if (file == yestStr) {
-					yestLog=logs+fs.readFileSync(join(log_dir_path, file), "utf8")
-				}
-				if (file == yest2Str) {
-					yest2Log=fs.readFileSync(join(log_dir_path, file), "utf8")
-				}
-				logs = todayLog + yestLog + yest2Log;
-			});
-			logs = yest2Log + yestLog + todayLog;
-			e.sender.webContents.send("logData", logs);
-		});
-	});
-	
-	//起動時ログディレクトリ存在確認と作成、古ログ削除
-	fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, error => {
-		if (error) {
-			if (error.code === "ENOENT") {
-				fs.mkdirSync(log_dir_path);
-			} else {
-				return;
-			}
-		} else {
-			fs.readdir(log_dir_path, function(err, files) {
-				if (err) throw err;
-				files.filter(function(file) {
-					if (file != todayStr && file != yestStr && file != yest2Str) {
-						fs.unlinkSync(join(log_dir_path, file));
-					}
-				});
-			});
-		}
-	});
 }
-exports.system = system;
+exports.system = system;

app/manifest.json

@@ -1,52 +1,21 @@
 {
   "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"
+      "src": "./img/desk.png",
+      "type": "image/png",
+      "sizes": "512x512"
     }
   ],
-  "splash_pages": null
-}
+  "start_url": "/",
+  "display": "standalone",
+  "orientation": "portrait-primary",
+  "background_color": "#212121",
+  "theme_color": "#212121",
+  "description": "TheDesk",
+  "dir": "ltr",
+  "lang": "ja-jp",
+  "related_applications": [],
+  "prefer_related_applications": false
+}

app/nano.html

@@ -1,155 +1,240 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="utf-8" />
-		<link href="./css/themes.css" type="text/css" rel="stylesheet" />
-		<link href="./css/tl.css" type="text/css" rel="stylesheet" />
-		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
-		<link href="./node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
-		<title>TheDesk Nano</title>
-		<style>
-			html {
-				-webkit-app-region: drag !important;
-				cursor: move !important;
-				width: 100vw;
-				height: 100vh;
-				overflow: hidden;
-				font-family: sans-serif;
-				color: var(--color) !important;
-			}
 
-			body {
-				background-color: rgba(0, 0, 0, 0.1);
-				font-size: 11px;
-			}
+<head>
+	<meta charset="utf-8">
+	<link href="./css/themes.css" type="text/css" rel="stylesheet">
+	<link href="./css/tl.css" type="text/css" rel="stylesheet">
+	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+	<title>TheDesk Nano</title>
+	<style>
+		html {
+			-webkit-app-region: drag !important;
+			cursor: move !important;
+			width: 100vw;
+			height: 100vh;
+			overflow: hidden;
+			font-family: sans-serif;
+		}
 
-			#timeline_nano {
-				overflow-y: scroll;
-				overflow-x: hidden;
-				-webkit-app-region: no-drag;
-				max-height: 100px;
-			}
+		body {
+			background-color: rgba(0, 0, 0, 0.1);
+			font-size: 11px;
+		}
 
-			.user {
-				font-size: 12px;
-			}
+		#timeline_nano {
+			overflow-y: scroll;
+			overflow-x: hidden;
+			-webkit-app-region: no-drag;
+			max-height: 100px;
+		}
 
-			select {
-				-webkit-app-region: no-drag;
-			}
+		.user {
+			font-size: 12px;
+		}
 
-			button {
-				-webkit-app-region: no-drag;
-			}
+		select {
+			-webkit-app-region: no-drag;
+		}
 
-			textarea {
-				-webkit-app-region: no-drag;
-				color: var(--color) !important;
-			}
+		button {
+			-webkit-app-region: no-drag;
+		}
 
-			::-webkit-scrollbar {
-				width: 5px;
-				height: 10px;
-				background: rgba(0, 0, 0, 0.05);
-			}
+		textarea {
+			-webkit-app-region: no-drag;
+		}
 
-			::-webkit-scrollbar-track {
-				-webkit-border-radius: 5px;
-				border-radius: 5px;
-			}
+		::-webkit-scrollbar {
+			width: 5px;
+			height: 10px;
+			background: rgba(0, 0, 0, 0.05);
+		}
 
-			.area-date_via {
-				display: none !important;
-			}
+		::-webkit-scrollbar-track {
+			-webkit-border-radius: 5px;
+			border-radius: 5px;
+		}
 
-			.area-side {
-				display: none !important;
-			}
+		.area-actions {
+			display: none !important;
+		}
 
-			/* Handle */
-			::-webkit-scrollbar-thumb {
-				-webkit-border-radius: 5px;
-				border-radius: 5px;
-				background: rgba(0, 0, 0, 0.8);
-				-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
-			}
-			.hide, .pin, .rep-btn, .tickers{
-				display: none;
-			}
-			.fas {
-				font-size: 1rem !important;
-			}
-			.cvo {
-				grid-template-rows: auto 1rem 1fr auto 2rem;
-			}
-		</style>
-	</head>
+		.area-date_via {
+			display: none !important;
+		}
 
-	<body>
-		<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
-		<script>
-			$.strip_tags = function(str, allowed) {
-				if (!str) {
-					return "";
-				}
-				allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join("");
-				var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
-					commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
-				return str.replace(commentsAndPhpTags, "").replace(tags, function($0, $1) {
-					return allowed.indexOf("<" + $1.toLowerCase() + ">") > -1 ? $0 : "";
-				});
-			};
-			function escapeHTML(str) {
-				if (!str) {
-					return "";
-				}
-				return str
-					.replace(/&/g, "&amp;")
-					.replace(/</g, "&lt;")
-					.replace(/>/g, "&gt;")
-					.replace(/"/g, "&quot;")
-					.replace(/'/g, "&#039;");
+		.area-side {
+			display: none !important;
+		}
+
+		/* Handle */
+		::-webkit-scrollbar-thumb {
+			-webkit-border-radius: 5px;
+			border-radius: 5px;
+			background: rgba(0, 0, 0, 0.8);
+			-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+		}
+
+		.blacktheme body {
+			color: white;
+			background-color: #212121;
+		}
+
+		.blacktheme button {
+			background-color: black;
+			color: white;
+		}
+
+		.blacktheme textarea,
+		.blacktheme select {
+			color: white;
+		}
+
+		.blacktheme select,
+		.blacktheme option {
+			background-color: black;
+		}
+	</style>
+</head>
+
+<body>
+	<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
+	<script>
+		$.strip_tags = function (str, allowed) {
+			if (!str) {
+				return "";
 			}
-		</script>
-		<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-		<div id="menu" class="hide">
-			TL and posting account<br>
-			<select id="post-acct-sel" style="max-width:150px"> </select><br>
-			TL type<br>
-			<select id="type-sel" style="max-width:60px" onchange="loader()">
-				<option value="local">Local</option>
-				<option value="home">Home</option> </select
-			><button onclick="tl()">Show</button><br>
-			Visibility<br>
-			<select id="vis-sel" style="max-width:60px">
-					<option value="public">Public</option>
-					<option value="unlisted">Unlisted</option>
-					<option value="private">Private</option>
-			</select>
-		</div>
-		<button onclick="set()" id="setting">Setting</button>
-		<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post someyhing new"></textarea>
-		<button class="btn" onclick="post()">Post</button>
-		<button onclick="window.close()">x</button><br />
-		<div id="timeline_nano">Click "settings" to show TL</div>
-		<br />
-		<script>
-			if (localStorage.getItem("lang")) {
-				var lang = localStorage.getItem("lang");
+			allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
+				.join('');
+			var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
+				commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
+			return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
+				return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
+			});
+		};
+		function escapeHTML(str) {
+			if (!str) {
+				return "";
+			}
+			return str.replace(/&/g, '&amp;')
+				.replace(/</g, '&lt;')
+				.replace(/>/g, '&gt;')
+				.replace(/"/g, '&quot;')
+				.replace(/'/g, '&#039;');
+		}
+	</script>
+	<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
+	<select id="post-acct-sel" style="max-width:150px">
+	</select>
+	<select id="type-sel" style="max-width:60px">
+		<option value="local">Local</option>
+		<option value="home">Home</option>
+	</select><button onclick="tl()">Show</button><button onclick="window.close()">x</button><br>
+	<div id="timeline_nano">
+
+	</div>
+	<br>
+	<textarea id="textarea" style="width:80%; background-color:transparent"></textarea>
+	<button class="btn" onclick="post()">Post</button>
+	<script>
+		if (localStorage.getItem("lang")) {
+			var lang = localStorage.getItem("lang");
+		} else {
+			var lang = "ja";
+		}
+	</script>
+	<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
+	<script type="text/javascript" src="./js/post/post.js"></script>
+	<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
+	<script type="text/javascript" src="./js/tl/parse.js"></script>
+	<script type="text/javascript" src="./js/ui/theme.js"></script>
+	<script type="text/javascript" src="./js/tl/date.js"></script>
+	<script type="text/javascript" src="./js/common/time.js"></script>
+	<script type="text/javascript" src="./js/platform/nano.js"></script>
+	<script type="text/javascript" src="./js/platform/end.js"></script>
+	<script>
+		var multi = localStorage.getItem("multi");
+		if (!multi) {
+			var obj = [{
+				at: localStorage.getItem(localStorage.getItem("domain_" + acct_id) + "_at"),
+				name: localStorage.getItem("name_" + acct_id),
+				domain: localStorage.getItem("domain_" + acct_id),
+				user: localStorage.getItem("user_" + acct_id),
+				prof: localStorage.getItem("prof_" + acct_id)
+			}];
+			var json = JSON.stringify(obj);
+			localStorage.setItem("multi", json);
+		} else {
+			var obj = JSON.parse(multi);
+		}
+		var templete;
+		var last = localStorage.getItem("last-use");
+		var sel;
+		Object.keys(obj).forEach(function (key) {
+			var acct = obj[key];
+			var list = key * 1 + 1;
+			if (key == last) {
+				sel = "selected";
 			} else {
-				var lang = "ja";
+				sel = "";
 			}
-		</script>
-		<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
-		<script type="text/javascript" src="view/en/main.js"></script>
-		<script type="text/javascript" src="./js/post/status.js"></script>
-		<script type="text/javascript" src="./js/post/post.js"></script>
-		<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
-		<script type="text/javascript" src="./js/tl/parse.js"></script>
-		<script type="text/javascript" src="./js/ui/theme.js"></script>
-		<script type="text/javascript" src="./js/tl/date.js"></script>
-		<script type="text/javascript" src="./js/common/time.js"></script>
-		<script type="text/javascript" src="./js/platform/nano.js"></script>
-		<script type="text/javascript" src="./js/platform/end.js"></script>
-	</body>
-</html>
+			templete = '<option value="' + key + '" ' + sel + '>' + acct.user + '@' + acct.domain +
+				'</option>';
+			$("#post-acct-sel").append(templete);
+		});
+		function mov() {
+			return false;
+		}
+		function resetmv() {
+			return false;
+		}
+		function post() {
+			var acct_id = $("#post-acct-sel").val();
+			var domain = localStorage.getItem("domain_" + acct_id);
+			var at = localStorage.getItem("acct_" + acct_id + "_at");
+			var start = "https://" + domain + "/api/v1/statuses";
+			var str = $("#textarea").val();
+			var toot = {
+				status: str
+			}
+			var vis = loadVis(acct_id)
+			toot.visibility = vis;
+			var httpreq = new XMLHttpRequest();
+			httpreq.open('POST', start, true);
+			httpreq.setRequestHeader('Content-Type', 'application/json');
+			httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+			httpreq.responseType = "json";
+			httpreq.send(JSON.stringify(toot));
+			httpreq.onreadystatechange = function () {
+				if (httpreq.readyState === 4) {
+					$("#textarea").val("");
+				}
+			}
+		}
+		function loadVis(acct_id) {
+			var vist = localStorage.getItem("vis");
+			console.log(vist);
+			if (!vist) {
+				return "public";
+			} else {
+				if (vist == "memory") {
+					var memory = localStorage.getItem("vis-memory-" + acct_id);
+					if (!memory) {
+						memory = "public";
+					}
+					return memory;
+				} else if (vist == "server") {
+					var multi = localStorage.getItem("multi");
+					var obj = JSON.parse(multi);
+					var memory = obj[acct_id]["vis"];
+					if (!memory) {
+						memory = "public";
+					}
+					return memory;
+				} else {
+					return vist;
+				}
+			}
+		}
+	</script>

app/node_modules/.bin/electron

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/electron-builder

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron-builder/out/cli/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron-builder/out/cli/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/electron-builder.cmd

@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\electron-builder\out\cli\cli.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\electron-builder\out\cli\cli.js" %*
+)

app/node_modules/.bin/electron-download

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron-download/lib/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron-download/lib/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/electron-download.cmd

@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\electron-download\lib\cli.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\electron-download\lib\cli.js" %*
+)

app/node_modules/.bin/electron.cmd

@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\electron\cli.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\electron\cli.js" %*
+)

app/node_modules/.bin/esparse

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../esprima/bin/esparse.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../esprima/bin/esparse.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/esparse.cmd

@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\esprima\bin\esparse.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\esprima\bin\esparse.js" %*
+)

app/node_modules/.bin/esvalidate

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../esprima/bin/esvalidate.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../esprima/bin/esvalidate.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/esvalidate.cmd

@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\esprima\bin\esvalidate.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\esprima\bin\esvalidate.js" %*
+)

app/node_modules/.bin/extract-zip

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../extract-zip/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../extract-zip/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/extract-zip.cmd

@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\extract-zip\cli.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\extract-zip\cli.js" %*
+)

app/node_modules/.bin/install-app-deps

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron-builder/out/cli/install-app-deps.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron-builder/out/cli/install-app-deps.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/install-app-deps.cmd

@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\electron-builder\out\cli\install-app-deps.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\electron-builder\out\cli\install-app-deps.js" %*
+)