today shinchoku

Bump chokidar from 3.3.1 to 3.4.0 in /app

.github/ISSUE_TEMPLATE/bug-report-english.md

@@ -0,0 +1,27 @@
+---
+name: Bug report English
+about: Create a report to help us improve
+title: ''
+labels: "\U0001F41Bbug"
+assignees: ''
+
+---
+
+Describe the bug: a clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Click on '....'
+2. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Environment**
+ - OS: [e.g. macOS High Sierra , Windows 10 Pro 1903, Ubuntu 19.04]
+ - Version: [e.g. Usamin (18.0.0)]  
+Check at 'Application,' 'About TheDesk' at top of the window.
+- Your instance: [e.g. mastodon.social]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug-report-japanese----------.md

@@ -0,0 +1,27 @@
+---
+name: Bug report Japanese(日本語のバグ報告)
+about: 迅速なバグ撲滅のために
+title: ''
+labels: "\U0001F41Bbug"
+assignees: ''
+
+---
+
+バグの簡単な説明を最初に入れます。
+
+**再現方法**
+このようにするとバグが発生しました。
+1. '....'をクリックすると
+2. エラーが出ます
+
+**本来の挙動**
+本来どのように動くのが望ましいかを記入
+
+**環境**
+ - OS: [例 macOS High Sierra , Windows 10 Pro 1903, Ubuntu 19.04]
+ - バージョン: [例 Usamin (18.0.0)]  
+TheDesk画面上部の「アプリケーション」から「TheDeskについて」で確認
+- インスタンス: [例. mastodon.social]
+
+**追記**
+追記

.gitignore

@@ -12,4 +12,15 @@ 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
+app/yarn-error.log

.travis.yml

@@ -3,20 +3,26 @@ os:
  - linux
  - osx
 language: node_js
+env:
+  - YARN_GPG=no
 node_js:
 - '10.15.2'
+cache:
+  yarn: true
 script: node -v
 before_deploy:
-  - npm install electron-builder -g
+  - yarn global add electron-builder
   - cd app
   - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
-  - npm install
+  - yarn install --no-lockfile --prod
+  - yarn 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
@@ -44,4 +50,5 @@ deploy:
   on:
     repo: cutls/TheDesk
     tags: true
-    all_branches: true
+branches:
+  only: "/^v?[0-9\\.]+/"

LATEST.md

@@ -1,22 +0,0 @@
-## 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

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

README.md

@@ -1,3 +1,18 @@
+# rewrite-overallブランチへようこそ🎃
+
+このブランチはコードを最初から全部読み直して書き直そうという途方もなく壮大なプロジェクトです。
+
+1周目では、
+
+* 脱jQuery
+* 脱onclick
+* 脱コールバック地獄
+* 重複してるやつや使ってないやつを消す
+
+という極めて当たり前のやつをやっていきます。
+
+# 以下いつものREADME
+
 <img src="https://thedesk.top/img/top.png" width="300" align="left">
 <img src="https://thedesk.top/img/desk.png" width="150" align="right">
 
@@ -28,7 +43,6 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
 * [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
 * [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
 * [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
-* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
 
 The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
 
@@ -41,24 +55,12 @@ The default sounds of notifications is provided [Creative Commons BY](https://cr
 
 * 日本語(Japanese)
 * English
+* de, cs, bg(from Crowdin)
 
 ### Translation
 
 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.
@@ -79,15 +81,37 @@ 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
 npm install
 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 npm scripts.  
+Use scripts(they can work well with npm, **yarn**).  
+
+#### npm
 
 ```sh
 # Build for current platform
@@ -101,6 +125,21 @@ 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
@@ -121,8 +160,23 @@ 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?  
 Pleroma **does not** follow Mastodon API rules completely although Pleroma developers say so.  
 Please write issues to improve TheDesk affinity with Pleroma.
+
+## Vulnerabilities when `npm i`???
+
+No, if your npm says materialize-css has vulnerabilities(CVE-2019-11002/3/4), look at [here](https://github.com/Dogfalo/materialize/issues/6286) under discussion.

README_ja.md

@@ -40,24 +40,12 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
 
 * 日本語
 * English(英語)
+* ドイツ語, チェコ語, ブルガリア語(from Crowdin)
 
 ### 翻訳
   
 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`フォルダ内で実行
@@ -72,22 +60,42 @@ Linuxビルダー
 
 * [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
 
-iTunes NowPlayingにアルバムアートワークを付けてくれた人
+コーダー
 
 * [kPherox](https://pl.kpherox.dev/kPherox)
 
 ## ビルド
 
+npmでもyarnでも好きな方を選んでください。
+
+### npm
 
 ```sh
 git clone https://github.com/cutls/TheDesk
 cd TheDesk/app
 npm install
 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(推奨)
-npm scriptsを利用します
+
+scriptsを利用します
+
+#### npm
 
 ```sh
 # 実行している環境向けにビルド
@@ -101,6 +109,20 @@ 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(非推奨)
@@ -123,6 +145,17 @@ 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で不具合が発生することがあります。  
@@ -131,3 +164,8 @@ Issuesに書いてある問題についてはなるべく対処しますので
 ## 詳しく
 
 [TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
+
+## `npm i`したら脆弱性あるって言われた
+
+materialize-cssの脆弱性(CVE-2019-11002/3/4)については[こちら](https://github.com/Dogfalo/materialize/issues/6286)で本当に脆弱性かどうか議論しています。  
+実際には害が無いものと思われます。

app/about.html

@@ -1,20 +1,21 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="ja">
-
 	<head>
 		<title>TheDesk</title>
-    <meta content="width=device-width,initial-scale=1.0" name="viewport">
-    <link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
-    <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
-    <link href="./css/themes.css" type="text/css" rel="stylesheet">
-    <link href="./css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
-    <meta charset="utf-8">
+		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
+		<link href="./css/font-awesome.css" rel="stylesheet" type="text/css" />
+		<link href="./css/themes.css" type="text/css" rel="stylesheet" />
+		<link href="./css/master.css" type="text/css" rel="stylesheet" />
+		<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet" />
+		<meta charset="utf-8" />
 		<style>
 			body {
 				font-family: 'Open Sans';
 				-webkit-app-region: drag;
 				cursor: move;
+				padding: 5px;
+				padding-top: 15px;
 			}
 
 			a,
@@ -27,7 +28,7 @@
 				display: grid;
 				grid-template-columns: 1fr 1fr;
 				grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5';
+				grid-template-areas: 'name1 data1' 'name2 data2' 'name3 data3' 'name4 data4' 'name5 data5' 'name6 data6';
 				text-align: left;
 				margin: 5px;
 			}
@@ -71,52 +72,68 @@
 			.area-data5 {
 				grid-area: data5;
 			}
+
+			.area-name6 {
+				grid-area: name6;
+			}
+
+			.area-data6 {
+				grid-area: data6;
+			}
 		</style>
 	</head>
 
-<body class="center " style="overflow:hidden">
+	<body class="center" style="overflow: hidden;">
 		<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
 		<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
 		<script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
-    <img src="./img/desk.svg" style="max-width:62%;">
+		<img src="./img/desk.svg" style="max-width: 62%;" />
 		<h5>TheDesk</h5>
 		<div class="container">
 			<div class="area-name1">Display version</div>
 			<div class="area-data1" id="now"></div>
 			<div class="area-name2">Internal version</div>
 			<div class="area-data2" id="ver"></div>
-        <div class="area-name3">Chromium</div>
-        <div class="area-data3" id="chrome"></div>
-        <div class="area-name4">Electron</div>
-        <div class="area-data4" id="electron"></div>
-        <div class="area-name5">Node.js</div>
-        <div class="area-data5" id="node"></div>
+			<div class="area-name3">Commit(7chars)</div>
+			<div class="area-data3" id="hash"></div>
+			<div class="area-name4">Chromium</div>
+			<div class="area-data4" id="chrome"></div>
+			<div class="area-name5">Electron</div>
+			<div class="area-data5" id="electron"></div>
+			<div class="area-name6">Node.js</div>
+			<div class="area-data6" id="node"></div>
 		</div>
-    <div class="cp">Copyright &copy; TheDesk 2018<br>
-        Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
-        Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a
-            href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pl.kpherox.dev/kPherox"
-            target="_blank">kPherox</a> and all users
-        <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️"
-            title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
-        <br><a href="https://thedesk.top" target="_blank">Web site</a></div>
-    <button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i
-            class="material-icons left">close</i>Close</button>
+		<div class="cp">
+			Copyright &copy; TheDesk 2018<br />
+			Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br />
+			Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a
+				href="https://pl.kpherox.dev/kPherox"
+				target="_blank"
+				>kPherox</a
+			>
+			and all users
+			<img draggable="false" style="width: 0.8rem; top: 1px; margin-left: 1px; position: relative;" alt="❤️" title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png" />
+			<br /><a href="https://thedesk.top" target="_blank">Web site</a>
+		</div>
+		<button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
 		<script type="text/javascript" src="./js/ui/theme.js"></script>
 		<script>
-        var about = JSON.parse(localStorage.getItem("about"));
-        $("#now").text(localStorage.getItem("ver"));
-        $("#node").text(about[0]);
-        $("#chrome").text(about[1]);
-        $("#electron").text(about[2]);
+			var about = JSON.parse(localStorage.getItem('about'))
+			$('#now').text(localStorage.getItem('ver'))
+			$('#node').text(about[0])
+			$('#chrome').text(about[1])
+			$('#electron').text(about[2])
 			if (location.search) {
-            var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/);
-            var ver = m[1];
-            $("#ver").text(ver);
+				var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/)
+				var ver = m[1]
+				$('#ver').text(ver)
 			}
-        $(document).on('click', 'a', e => {
-            var url = $(e.target).attr('href');
-            postMessage(["openUrl", url], "*")
-            return false;
-        });
+			$('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
+			$(document).on('click', 'a', (e) => {
+				var url = $(e.target).attr('href')
+				postMessage(['openUrl', url], '*')
+				return false
+			})
 		</script>
+	</body>
+</html>

app/css/acct.css

@@ -0,0 +1,82 @@
+.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;
+}
+.hide-second {
+	display: none;
+}
+.first .hide-second {
+	display: inline;
+}
+
+#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

@@ -5,19 +5,43 @@ body {
 	overflow: hidden;
 	user-select: none;
 	cursor: default;
-  font-size: 13px;
 	height: 100vh;
 	color: var(--color);
 }
-.btn {
-  margin: 5px;
+html {
+	font-size: 13px;
+}
+.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;
+}
+.btn, .btn-flat {
+	font-size: 1.1rem;
+	margin: 0.4rem;
 	text-transform: none;
+	height: 2.76rem;
+	line-height: 2.76rem;
 }
 .markdown {
 	display: none;
 }
-help {
-  display: none;
+.accessMark {
+	font-size: 12px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	background-color: var(--emphasized);
+	padding-left: 5px;
+	padding-right: 5px;
+}
+.accessibility .scr {
+	display: none !important;
 }
 .show-help {
 	display: inline;
@@ -57,7 +81,7 @@ option {
 	padding: 0;
 }
 #imagemodal .modal-footer {
-  overflow-x: scroll;
+	overflow-x: hidden;
 	overflow-y: hidden;
 }
 
@@ -70,7 +94,7 @@ option {
 }
 .badge {
 	min-width: 0 !important;
-  margin-left: 5px !important;
+	margin-left: 0.4rem !important;
 }
 .unvisible {
 	opacity: 0;
@@ -129,7 +153,7 @@ option {
 }
 code:before,
 .pre:before {
-  content: "Code";
+	content: 'Code';
 	font-size: 1.8rem;
 	line-height: 1em;
 	font-family: monospace, monospace;
@@ -144,16 +168,17 @@ pre {
 	display: block;
 	border-left: 5px solid;
 	border-color: #079903;
-  padding-left: 10px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  margin-left: 5px;
+	padding-left: 0.75rem;
+	margin-top: 0.75rem;
+	margin-bottom: 0.75rem;
+	margin-left: 0.75rem;
 	background-color: #000;
 	padding: 1em 1em 1em;
 	position: relative;
-  border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
+	border-top-left-radius: 0.75rem;
+	border-bottom-right-radius: 0.75rem;
+	border-bottom-left-radius: 0.75rem;
+	white-space: normal;
 }
 blockquote,
 .quote p {
@@ -165,13 +190,13 @@ blockquote,
 	background-color: #ddd;
 	padding: 1em 1em 1em;
 	position: relative;
-  border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
+	border-top-left-radius: 0.75rem;
+	border-bottom-right-radius: 0.75rem;
+	border-bottom-left-radius: 0.5rem;
 }
 blockquote:before,
 .quote:before {
-  content: "Quote";
+	content: 'Quote';
 	font-size: 1.8rem;
 	line-height: 1em;
 	font-family: Open Sans, cursive;
@@ -180,38 +205,18 @@ blockquote:before,
 	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-top-left-radius: 0.75rem;
+	border-bottom-right-radius: 0.75rem;
+	border-bottom-left-radius: 0.75rem;
 	border-left: 5px solid #0096fa;
 }
 .pixiv-post :before {
-  content: "From Pixiv";
+	content: 'From Pixiv';
 	font-size: 1.8rem;
 	line-height: 1em;
 	font-family: Open Sans;
@@ -220,6 +225,17 @@ blockquote:before,
 	right: 0;
 	top: 0;
 }
+#start {
+	display: none;
+	position: fixed;
+	width: 100vw;
+	height: calc(100vh - 3rem);
+	background-color: var(--bg);
+	color: var(--color);
+	z-index: 99999;
+	justify-content: center;
+	align-items: center;
+}
 #drag {
 	display: none;
 	position: fixed;
@@ -308,7 +324,7 @@ blockquote:before,
 }
 .font {
 	font-size: 1.5rem;
-  margin-bottom: 5px;
+	margin-bottom: 0.4rem;
 }
 .font:hover {
 	background-color: #999;
@@ -325,44 +341,47 @@ blockquote:before,
 #menu {
 	position: fixed;
 	z-index: 9999;
-  background-color: var(--box);
+	background-color: var(--postbox);
 	width: 540px;
 	top: calc(50% - 150px);
 	left: calc(50% - 250px);
-  padding: 5px;
+	padding: 0.4rem;
 	border: thin solid gray;
-  border-radius: 5px;
+	border-radius: 0.4rem;
+	overflow: hidden;
 }
 #menu-wrapper {
 	margin-left: -5px;
 	display: flex;
+	height: calc(100% - 3.5rem);
+	overflow: hidden;
 }
 #left-menu {
-  width: 170px;
+	width: 17.7rem;
 }
-#left-menu div {
-  padding-left: 5px;
+#left-menu a {
+	padding-left: 0.4rem;
 	width: 100%;
-  height: 50px;
+	height: 3rem;
 	display: flex;
 	align-items: center;
 	cursor: pointer;
+	color: var(--color);
 }
-#left-menu div:hover {
+#left-menu a:hover {
 	background-color: var(--beforehover);
 }
 #left-menu span {
-  margin-left: 5px;
+	margin-left: 0.4rem;
 }
-#left-menu div.active {
+#left-menu a.active {
 	background-color: var(--emphasized);
 }
 #right-menu {
-  width: 380px;
-  max-height: 375px;
+	width: 100%;
 	overflow-y: scroll;
 	overflow-x: hidden;
-  padding: 5px;
+	padding: 0.4rem;
 }
 #tltype {
 	display: flex;
@@ -372,9 +391,13 @@ blockquote:before,
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
-  width: 170px;
-  height: 40px;
+	width: 13rem;
+	height: 3.1rem;
 	cursor: pointer;
+	color: var(--color);
+}
+#tltype .type span {
+	width: calc(100% - 2.3rem);
 }
 #tltype .type:hover {
 	background-color: var(--beforehover);
@@ -383,26 +406,28 @@ blockquote:before,
 	background-color: var(--emphasized);
 }
 #tltype i {
-  font-size: 30px;
+	font-size: 2.3rem;
 }
 #tltype i.sub-icon {
-  font-size: 20px;
-  position: relative;
+	font-size: 1.53rem;
+	position: absolute;
 	color: var(--beforehover);
-  left: -15px;
+	left: 0.9rem;
+	bottom: 0.4rem;
+	background-color: #fff;
 }
 .drag-bar {
 	cursor: move;
 	text-align: center;
-  width: calc(100% + 10px);
+	width: calc(100% + 0.8rem);
 	border-radius: 5px;
 	background-color: var(--box);
 	filter: brightness(80%);
-  margin-left: -5px;
-  margin-right: -5px;
-  margin-top: -5px;
-  font-size: 16px;
-  padding: 4px;
+	margin-left: -0.4rem;
+	margin-right: -0.4rem;
+	margin-top: -0.4rem;
+	font-size: 1.3rem;
+	padding: 0.3rem;
 }
 #something-wrong {
 	flex-direction: column;
@@ -419,11 +444,11 @@ blockquote:before,
 	width: 100vw;
 	background-color: var(--box);
 	z-index: 9999;
-  padding: 10px;
+	padding: 0.8rem;
 	display: grid;
 	grid-template-columns: 3fr 1fr 1fr;
-  grid-template-rows: 1fr 36px;
-  grid-template-areas: "note middle right" "note close close";
+	grid-template-rows: 1fr 2.7rem;
+	grid-template-areas: 'note middle right' 'note close close';
 }
 #support-btm-en,
 #support-btm-ja {
@@ -439,9 +464,10 @@ blockquote:before,
 	grid-area: close;
 }
 .select-wrapper .dropdown-content {
-  width: 250px !important;
+	width: 19.2rem !important;
 }
-input, textarea {
+input,
+textarea {
 	color: var(--color);
 	font-size: 1rem !important;
 	font-family: inherit;
@@ -449,9 +475,77 @@ input, textarea {
 .swal2-popup {
 	background-color: var(--notfbox) !important;
 }
-.swal2-title, .swal2-content{
+.swal2-title,
+.swal2-content {
 	color: var(--color) !important;
 }
+#src-contents svg {
+	margin-right: 0.4rem;
+}
+.contributor {
+	cursor: pointer;
+}
+.contributor img {
+	width: 1rem;
+}
+.tagComp {
+	display: grid;
+	grid-template-columns: 4.6rem 6.15rem 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: 0.4rem;
+}
+.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: 0.4rem;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+#sabakanMark {
+	background-color: var(--emphasized);
+}
+#pageSrc {
+	position: absolute;
+	top: 0;
+	left: calc(50vw - 11.53rem);
+	width: 23rem;
+	max-width: 100%;
+	background-color: var(--box);
+	z-index: 501;
+	padding: 0.4rem;
+}
+#pageSrcInput {
+	width: 12.3rem;
+}
+.voice {
+	clip: rect(1px, 1px, 1px, 1px);
+	position: absolute !important;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+
+@media (max-width: 500px) {
+	#pageSrc {
+		left: 0;
+	}
+}
 
 /*スクロールバー*/
 ::-webkit-scrollbar {
@@ -475,7 +569,7 @@ input, textarea {
 	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');
+	src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.ttf') format('truetype');
 	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 @font-face {
@@ -488,7 +582,7 @@ input, textarea {
 	font-family: 'Material Icons';
 	font-weight: normal;
 	font-style: normal;
-  font-size: 24px;
+	font-size: 1.84rem;
 	line-height: 1;
 	letter-spacing: normal;
 	text-transform: none;
@@ -499,3 +593,16 @@ input, textarea {
 	-webkit-font-feature-settings: 'liga';
 	-webkit-font-smoothing: antialiased;
 }
+.pwaView .pwa,
+.pwaView .mac,
+.pwaView .win {
+	display: none;
+}
+.win32 .mac,
+.linux .mac {
+	display: none;
+}
+.linux .win,
+.darwin .win {
+	display: none;
+}

app/css/post.css

@@ -7,15 +7,19 @@
 	background-color: var(--postbox);
 	border: thin solid gray;
 	z-index: 501;
-  min-width: 300px;
 	max-width: 100%;
-  padding: 5px;
-  border-radius: 5px;
+	padding: 0.4rem;
+	border-radius: 0.4rem;
+	overflow: hidden;
 }
 textarea {
-  min-height: 100px !important;
+	min-height: 7.7rem !important;
 	font-family: inherit;
 }
+#post-box .ui-resizable-s,
+#post-box .ui-resizable-se {
+	display: none !important;
+}
 
 .cancel {
 	font-size: 0.5rem;
@@ -61,71 +65,69 @@ textarea {
 #emoji {
 }
 #suggest {
-  max-height: 300px;
+	max-height: 23rem;
 	overflow-y: scroll;
 }
 #emoji-list {
 	width: 100%;
-  height: 200px;
+	height: 15.4rem;
 	overflow-y: scroll;
 }
 #preview-field {
 	display: none;
 }
 .preview-img {
-  width: 50px;
-  max-height: 100px;
+	width: 4rem;
+	max-height: 7.6rem;
 }
 .pi-wrap {
 	display: inline-block;
-  width: 50px;
-  max-height: 100px;
+	width: 3.8rem;
+	max-height: 7.7rem;
 }
 #default-emoji a {
 	color: var(--color);
-  margin-right: 2px;
+	margin-right: 0.15rem;
 }
 .character-counter {
 	position: relative;
-  top: -25px;
+	top: -1.9rem;
 }
 .trendtag {
 	overflow-y: scroll;
-  max-height: 100px;
+	max-height: 7.7rem;
 }
 #toot-btn-field {
 	display: flex;
 }
 #toot-post-btn {
-  width: calc(100% - 10px);
+	width: calc(100% - 0.7rem);
 	padding: 0;
-  margin-top: 10px;
+	margin-top: 0.7rem;
+	height: 2.7rem;
 }
 #toot-sec-btn {
-  width: 30px;
+	width: 2.3rem;
 	padding: 0;
-  margin-top: 10px;
+	margin-top: 0.7rem;
 }
 #left-side {
 	float: left;
-  width: 300px;
+	overflow-x: hidden;
+	height: calc(100% - 2.5rem);
 }
 #right-side {
 	display: none;
 	float: left;
-  width: 300px;
-  padding: 5px;
+	width: 23rem;
+	padding: 0.4rem;
+	overflow-x: hidden;
+	height: calc(100% - 2.5rem);
 }
-#poll {
-}
-.poll-provider {
-  position: absolute;
-  height: calc(100% - 90px);
-  overflow-y: scroll;
-  top: 90px;
-}
-#posttgl,#toot-post-btn {
+#posttgl,
+#toot-post-btn {
 	background-color: var(--accentbtn);
+	color: var(--color);
 }
 /*mini*/
 .mini-post .mize {
@@ -135,8 +137,8 @@ textarea {
 	padding: 0;
 }
 .mini-post #post-box {
-  width: 200px;
-  min-width: 100px;
+	width: 15.4rem;
+	min-width: 7.7rem;
 }
 .mini-post #toot-field {
 	padding: 0;

app/css/sort.css

@@ -3,29 +3,29 @@
   cursor: move;
   user-select: none;
   background-color: var(--modalfooter);
-  margin: 5px;
-  border-radius: 5px;
+  margin: 0.4rem;
+  border-radius: 0.4rem;
   color: var(--color);
   padding: 3px;
   display: grid;
-  grid-template-columns: 43px 1fr 60px;
+  grid-template-columns: 3.3rem 1fr 4.6rem;
   grid-template-areas: "sorticon sorttitle sorttitle" "sorticon sortacct sortaction";
 }
 .sorticon {
   grid-area: sorticon;
 }
 .sorticon i {
-  font-size: 43px;
+  font-size: 3.3rem;
 }
 .sorttitle {
-  margin-left: 5px;
+  margin-left: 0.4rem;
   grid-area: sorttitle;
 }
 .sortacct {
-  margin-left: 5px;
+  margin-left: 0.4rem;
   grid-area: sortacct;
 }
 .sortaction {
-  margin-left: 5px;
+  margin-left: 0.4rem;
   grid-area: sortaction;
 }

app/css/themes.css

@@ -142,3 +142,51 @@
 .bluetheme #imagemodal {
   background: url("../img/pixel.white.svg");
 }
+.polartheme {
+  --bg: #2e3440;
+  --drag: rgba(0, 0, 0, 0.8);
+  --color: white;
+  --beforehover: #8d94a0;
+  --modal: #3b4252;
+  --subcolor: #434c5e;
+  --box: #4c566a;
+  --sidebar: #3b4252;
+  --shared: #2d3b58;
+  --notfbox: #2a3857;
+  --emphasized: #2f4b86;
+  --his-data: rgba(0, 0, 0, 0.8);
+  --active: #2a3857;
+  --postbox: #434c5e;
+  --modalfooter: #485166;
+  --accentbtn: #2f4b86;
+  --selected: #464f61;
+  --selectedWithShare: #3e527e;
+  --gray: #cccccc;
+}
+.polartheme #imagemodal {
+  background: url("../img/pixel.svg");
+}
+.snowtheme {
+  --bg: #eceff4;
+  --drag: rgba(255, 255, 255, 0.8);
+  --color: #36425a;
+  --beforehover: #344058;
+  --modal: #e5e9f0;
+  --subcolor: #d8dee9;
+  --box: #c0c8d6;
+  --sidebar: #eeeeee;
+  --shared: #c3d4e6;
+  --notfbox: #d8dee9;
+  --emphasized: #88c0d0;
+  --his-data: rgba(255, 255, 255, 0.9);
+  --active: #8fbcbb;
+  --postbox: #d8dee9;
+  --modalfooter: #b2bed4;
+  --accentbtn: #81a1c1;
+  --selected: #b4bdd0;
+  --selectedWithShare: #a3afbb;
+  --gray: #5c6c8c;
+}
+.snowtheme #imagemodal {
+  background: url("../img/pixel.white.svg");
+}

app/css/tl.css

@@ -1,7 +1,7 @@
 /*TL CSS(ただしBBCode pulse:master.css/spin:font-awesome*/
 #main {
 	width: 100vw;
-  height: calc(100vh - 40px);
+	height: calc(100% - 3rem);
 }
 #timeline-container {
 	overflow-x: scroll;
@@ -11,79 +11,123 @@
 }
 #bottom {
 	position: absolute;
+	overflow: hidden;
 	bottom: 0;
 	width: 100vw;
-  height: 40px;
-  padding: 3px;
+	height: 3rem;
+	padding: 0.23rem;
 	padding-right: 0;
-  padding-left: 40px;
+	padding-left: 3rem;
 	background-color: var(--sidebar);
 	display: flex;
 	justify-content: space-between;
 	flex-wrap: wrap;
 	z-index: 500;
-  box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2);
+	box-shadow: 0.77rem 0 0.77rem, 0.77rem rgba(0, 0, 0, 0.2);
+}
+#demobottom {
+	width: 500px;
+	display: flex;
 }
 #bottom.reverse {
 	padding-left: 0;
-  padding-right: 40px;
+	padding-right: 3rem;
 }
 .reverse {
 	flex-direction: row-reverse;
 }
 #bottom #dambox {
-  width: 300px;
-  margin-right: 10px;
+	width: 23rem;
+	margin-right: 0.76rem;
 }
 #bottom.reverse #dambox {
 	margin-right: 0;
 }
 #bottom .trendtag {
-  height: 40px;
+	height: 3rem;
 }
-#bottom #group {
-  margin-right: 40px;
+#bottom #group,
+#demogroup {
+	margin-right: 3rem;
 }
 #bottom .leftside {
 	display: flex;
 }
-#bottom #tips img {
-  vertical-align: -3px;
+#tips {
+	display: flex;
+	align-items: center;
 }
-#bottom a {
+#bottom #tips img {
+	vertical-align: -0.23rem;
+}
+#bottom a,
+#demogroup a {
 	color: var(--color);
 }
 #bottom i {
-  font-size: 30px;
+	font-size: 2.3rem;
 }
 .exc-icons {
-  font-size: 20px;
+	font-size: 1.53rem;
 }
 .exc-chb {
-  padding-left: 24px !important;
+	padding-left: 1.84rem !important;
 }
-#bottom .btnsgroup {
+.btnsgroup {
 	border: 1px solid;
-  padding: 1px;
-  padding-left: 5px;
-  padding-right: 5px;
-  margin-right: 15px;
-  border-radius: 5px;
+	padding-top: 1px;
+	padding-left: 0.4rem;
+	padding-right: 0.4rem;
+	margin-right: 1.15rem;
+	border-radius: 0.4rem;
+	height: 2.7rem;
+}
+.bgReport {
+	height: 2.61rem;
+	padding-top: 0.45rem;
+	text-decoration: underline;
+	padding-left: 0.4rem;
+	padding-right: 0.4rem;
 }
 #spot-box {
+	display: grid;
+	grid-template-columns: 3rem 2.3rem 2.5fr 1fr 4.6rem;
+	grid-template-rows: 1.7rem 1.5rem;
+	grid-template-areas: 'cover name name artist refresh' 'cover progress progress progress time';
+}
+#spot-refresh {
+	grid-area: refresh;
+}
+#spot-cover {
+	grid-area: cover;
+}
+#spot-name {
+	grid-area: name;
 	white-space: nowrap;
 	text-overflow: ellipsis;
+	overflow: hidden;
+	line-height: 1.92rem;
+}
+#spot-artist {
+	grid-area: artist;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	line-height: 1.92rem;
 }
 #spot-img {
-  margin-right: 2px;
+	width: 90%;
 }
-#spot-art {
-  margin-right: 2px;
-  margin-left: 2px;
+#spot-time {
+	grid-area: time;
+}
+.progress {
+	grid-area: progress;
+	width: 100%;
 }
 .btnsgroup .grouptitle {
 	font-family: Open Sans;
-  font-size: 15px;
+	font-size: 1.1rem;
 }
 @media screen and (max-width: 890px) {
 	.btnsgroup .grouptitle {
@@ -97,7 +141,7 @@
 iframe,
 .cvo video {
 	max-width: 100%;
-  max-height: 300px;
+	max-height: 23rem;
 }
 @media screen and (max-width: 600px) {
 	.mobile #timeline-container {
@@ -113,12 +157,12 @@ iframe,
 }
 .box {
 	overflow: hidden;
-  min-width: 300px;
+	min-width: 23rem;
 	flex: 1;
 	border-top: none;
 	display: flex;
 	flex-direction: column;
-  margin-bottom: -10px;
+	margin-bottom: -0.75rem;
 }
 .img_FTL {
 	display: none;
@@ -172,14 +216,20 @@ iframe,
 }
 .emoji,
 .emoji-img {
-  width: 15px;
+	width: 1.153rem;
 }
 .area-toot .emoji,
 .area-toot .emoji-img {
-  width: 20px;
+	width: 1.538rem;
 	vertical-align: middle;
 	margin: -1px 0;
 }
+.bigemoji {
+	width: 7.7rem !important;
+	height: auto !important;
+	position: relative;
+	z-index: 9999;
+}
 .faicon_FTL {
 	display: none;
 }
@@ -204,15 +254,27 @@ iframe,
 }
 .cvo {
 	user-select: text;
-  padding-left: 5px;
+	padding-left: 0.4rem;
 	border-bottom: 0.5px solid;
-  padding-right: 2px;
+	padding-right: 0.15rem;
 	word-break: break-word;
 	width: 100%;
 	display: grid;
-  grid-template-columns: 43px 2fr 1fr;
+	grid-template-columns: 3.3rem 2fr 1fr;
 	grid-template-rows: auto 1.6rem 1fr auto 2.5rem;
-  grid-template-areas: "notice notice notice" "icon display_name display_name" "space toot toot" "space additional additional" "vis actions side";
+	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space toot toot' 'space additional additional' 'vis actions side';
+}
+.hide-actions {
+	grid-template-rows: auto 1.6rem 1fr auto 0;
+}
+.hide-actions .area-actions {
+	display: none;
+}
+.hide-actions .area-vis {
+	display: none;
+}
+.hide-actions .area-side {
+	display: none;
 }
 .cvo h1,
 .cvo h2,
@@ -224,21 +286,21 @@ iframe,
 }
 
 .area-notice {
-  margin: 2px;
+	margin: 0.15rem;
 	grid-area: notice;
 }
 
 .area-icon {
-  width: 40px;
-  margin: 2px;
+	width: 3rem;
+	margin: 0.15rem;
 	grid-area: icon;
 }
 
 .area-display_name {
 	user-select: text;
 	height: 1.5em;
-  margin: 2px;
-  margin-left: 5px;
+	margin: 0.15rem;
+	margin-left: 0.4rem;
 	overflow: hidden;
 	grid-area: display_name;
 	white-space: nowrap;
@@ -249,7 +311,7 @@ iframe,
 	flex-wrap: nowrap;
 }
 .flex-name {
-  max-width: calc(100% - 60px);
+	max-width: calc(100% - 4.6rem);
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
@@ -257,9 +319,9 @@ iframe,
 .area-toot {
 	cursor: text;
 	user-select: auto;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  margin-left: 5px;
+	margin-top: 0.4rem;
+	margin-bottom: 0.4rem;
+	margin-left: 0.4rem;
 	grid-area: toot;
 }
 
@@ -276,11 +338,23 @@ iframe,
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
+.acct-note p {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+.area-toot.acct-note p:not(:first-child) {
+	display: none;
+}
+.area-toot.acct-note p:first-child:after {
+	content: '...';
+	color: var(--gray);
+}
 
 .area-actions {
 	padding: 0;
 	margin: 0;
-  top: -5px;
+	top: -0.4rem;
 	position: relative;
 	display: flex;
 	justify-content: space-around;
@@ -288,33 +362,65 @@ iframe,
 	grid-area: actions;
 }
 .area-vis {
-  margin: 2px;
+	margin: 0.4rem;
 	grid-area: vis;
 	text-align: center;
 }
 .area-side {
 	display: flex;
-  top: -5px;
+	top: -0.4rem;
 	position: relative;
 	justify-content: flex-end;
-  margin: 2px;
+	margin: 0.15rem;
 	grid-area: side;
 }
 
+.cusr {
+	user-select: text;
+	padding-left: 0.4rem;
+	border-bottom: 0.5px solid;
+	padding-right: 0.15rem;
+	word-break: break-word;
+	width: 100%;
+	display: grid;
+	grid-template-columns: 3.3rem 2fr 1fr;
+	grid-template-rows: auto 1.6rem 2fr auto;
+	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions';
+}
+
+.area-status {
+	grid-area: status;
+	display: flex;
+	flex-wrap: wrap;
+	margin-bottom: 0.75rem;
+}
+
+.cusr .cbadge {
+	margin-top: 0.46rem;
+	margin-left: 0.46rem;
+}
+
+.quote-inline {
+	display: none;
+}
 .quote-renote {
 	display: grid;
-  grid-template-columns: 43px 2fr 1fr;
-  grid-template-areas: "ricon ruser" "ricon rtext";
+	grid-template-columns: 3.3rem 2fr 1.92rem;
+	grid-template-areas: 'ricon ruser rdet' 'ricon rtext rdet';
 	border: 1px solid;
-  margin-top: 3px;
+	margin-top: 0.23rem;
 	padding: 1px;
-  border-radius: 3px;
+	border-radius: 0.23rem;
 }
 .renote-icon {
 	grid-area: ricon;
+	padding: 0.4rem;
+}
+.renote-details {
+	grid-area: rdet;
 }
 .renote-icon img {
-  width: 43px;
+	width: 100%;
 }
 .renote-user {
 	grid-area: ruser;
@@ -327,17 +433,17 @@ iframe,
 	color: var(--color);
 }
 .area-side i {
-  margin-left: 10px;
+	margin-left: 0.75rem;
 }
 .viabadge {
-  margin-top: 10px;
+	margin-top: 0.75rem;
 }
 .action i {
 	font-size: 1.2rem;
-  margin-right: 2px;
+	margin-right: 0.15rem;
 }
 .action .fa-quote-right {
-  margin-top: 2px;
+	margin-top: 0.15rem;
 }
 .actct {
 	color: var(--beforehover);
@@ -346,6 +452,40 @@ iframe,
 	color: var(--color);
 	transition: 0.5s;
 }
+#contextWrap {
+	position: fixed;
+	width: 199vw;
+	height: 100vh;
+	z-index: 100;
+}
+.contextMenu {
+	position: fixed;
+	background-color: var(--box);
+	z-index: 9999;
+	border-radius: 0.4rem;
+	padding: 0.4rem;
+}
+.contextMenu.bottom:before {
+	content: '';
+	position: absolute;
+	top: 100%;
+	right: 2rem;
+	border: 1.2rem solid transparent;
+	border-top: 1.2rem solid var(--box);
+}
+.contextMenu.top:before {
+	content: '';
+	position: absolute;
+	top: -2.3rem;
+	right: 2rem;
+	border: 1.5rem solid transparent;
+	border-bottom: 1.5rem solid var(--box);
+}
+.contextMenu .btn-flat {
+	text-transform: none !important;
+	width: 100%;
+	text-align: left;
+}
 
 .gray {
 	color: var(--gray);
@@ -362,26 +502,27 @@ iframe,
 }
 .toot img:not(.emoji-img) {
 	max-width: 100%;
-  max-height: 300px;
+	max-height: 23rem;
 }
 .cbadge {
 	display: inline-block;
-  min-width: 10px;
-  max-width: 100px;
-  padding: 3px 7px;
+	min-width: 0.76rem;
+	max-width: 7.7rem;
+	padding: 0.23rem 0.5rem;
 	font-size: 0.8em;
-  margin-right: 5px;
+	margin-right: 0.4rem;
 	line-height: 1;
 	color: #fff;
 	text-align: center;
 	white-space: nowrap;
 	vertical-align: middle;
 	background-color: #777;
-  border-radius: 10px;
+	border-radius: 0.75rem;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-  height: calc(0.8em + 8px);
+	height: calc(0.8em + 0.6rem);
+	user-select: none;
 }
 .cbadge-hover {
 	color: var(--color);
@@ -394,10 +535,10 @@ iframe,
 p {
 	margin: 0;
 	margin-bottom: 0px;
-  line-height: 20px;
+	line-height: 1.53rem;
 }
 p:not(:last-child) {
-  margin-bottom: 10px;
+	margin-bottom: 0.76rem;
 }
 .shared {
 	background-color: var(--shared);
@@ -413,15 +554,15 @@ p:not(:last-child) {
 	background-color: var(--notfbox);
 	filter: brightness(110%);
 	position: relative;
-  margin-right: 10px;
+	margin-right: 0.7rem;
 	width: 100%;
-  min-height: 60px;
+	min-height: 4.6rem;
 	z-index: 500;
-  padding: 5px;
+	padding: 0.4rem;
 	display: grid;
-  grid-template-columns: 40px 48px 1fr 24px;
-  grid-template-rows: 30px 30px;
-  grid-template-areas: "notice notice_name notice_name a2" "notice a1 sta a3" "notf-box notf-box notf-box notf-box";
+	grid-template-columns: 3rem 5rem 1fr 1.8rem;
+	grid-template-rows: 2.3rem 2.3rem;
+	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }
 .emp {
 	font-weight: bold;
@@ -444,7 +585,6 @@ p:not(:last-child) {
 }
 
 .area-a1 {
-  text-align: center;
 	grid-area: a1;
 }
 .area-sta {
@@ -465,8 +605,8 @@ p:not(:last-child) {
 }
 #tools {
 	position: fixed;
-  top: 10px;
-  right: 10px;
+	top: 0.76rem;
+	right: 0.76rem;
 	float: right;
 }
 .setting {
@@ -479,14 +619,14 @@ p:not(:last-child) {
 }
 .notf-box {
 	position: fixed;
-  right: 70px;
+	right: 5.4rem;
 	background-color: var(--box);
 	border: thin solid gray;
 	z-index: 501;
-  width: 400px;
-  padding: 5px;
-  min-height: 100px;
-  max-height: 500px;
+	width: 30rem;
+	padding: 0.4rem;
+	min-height: 7.7rem;
+	max-height: 38.4rem;
 }
 .column-hide {
 	display: none;
@@ -494,30 +634,28 @@ p:not(:last-child) {
 	height: 0;
 }
 .prof-img {
-  border-radius: 3px;
+	border-radius: 0.23rem;
+	width: 3rem;
+}
+.prof-img-sml {
+	width: 1.5rem;
 }
 .notf-icon {
 	position: relative;
-  top: -20px;
-  width: 20px;
-  left: 20px;
+	top: -1.53rem;
+	width: 1.5rem;
+	left: 1.5rem;
 }
 .notf-indv-box {
 	width: 100%;
-  max-height: 400px;
+	max-height: 30.7rem;
 	overflow-y: scroll;
 	overflow-x: hidden;
 	border: thin solid gray;
 	border-bottom: 2px solid white;
 	grid-area: notf-box;
-  box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14),
-    0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.3),
-    0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset;
-}
-#src-contents {
-  min-height: 100px;
-  max-height: 190px;
-  overflow-y: scroll;
+	box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12),
+		0 5px 5px -3px rgba(0, 0, 0, 0.3), 0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset;
 }
 .type-b {
 	display: none;
@@ -532,7 +670,7 @@ p:not(:last-child) {
 	right: 0px;
 }
 .toot a span.ellipsis:after {
-  content: "...";
+	content: '...';
 }
 .toot a:not(.mention) span:last-of-type {
 	/*display: none;*/
@@ -543,47 +681,72 @@ p:not(:last-child) {
 .vote {
 	width: 100%;
 	border: 1px solid;
-  margin-top: 3px;
+	margin-top: 0.23rem;
 	padding: 1px;
-  border-radius: 3px;
+	border-radius: 0.23rem;
+	overflow: hidden;
+	position: relative;
 }
 .fa-2x > .emoji-img {
-  width: 36px !important;
-  height: 36px !important;
+	width: 2.3rem !important;
+	height: 2.3rem !important;
 }
 .fa-3x > .emoji-img {
-  width: 54px !important;
-  height: 54px !important;
+	width: 4.15rem !important;
+	height: 4.15rem !important;
 }
 .fa-4x > .emoji-img {
-  width: 72px !important;
-  height: 72px !important;
+	width: 4.6rem !important;
+	height: 4.6rem !important;
 }
 .fa-5x > .emoji-img {
-  width: 90px !important;
-  height: 90px !important;
+	width: 6.9rem !important;
+	height: 6.9rem !important;
 }
 #lists-user {
 	overflow-y: scroll;
 	overflow-x: hidden;
-  max-height: 200px;
+	max-height: 15.4rem;
 }
 .votebtn {
 	border: 1px solid;
 	color: var(--bg);
 	background-color: var(--beforehover);
 	cursor: pointer;
-  width: 50px;
-  padding: 2px;
+	width: 3.8rem;
+	height: 1.7rem;
 	display: inline-block;
 	text-align: center;
-  margin-top: 5px;
-  border-radius: 10px;
+	margin-top: 0.38rem;
+	border-radius: 0.75rem;
 	transition-duration: 0.5s;
 }
 .votebtn:hover {
 	background-color: var(--color);
 }
+.leadPoll {
+	position: absolute;
+	background-color: var(--box);
+	height: 1.5rem;
+	border-radius: 0.23rem;
+}
+.lpAnime {
+	animation-duration: 1s;
+	animation-name: fadeInLeft;
+}
+.onPoll {
+	position: relative;
+}
+.maxVoter {
+	background-color: var(--emphasized);
+	filter: brightness(120%);
+}
+.ownMark img {
+	width: 1.2rem !important;
+	position: relative;
+	top: -1px;
+	margin-left: 0.38rem !important;
+}
 .jump {
 	display: inline-block;
 	animation: jump 0.75s linear infinite;
@@ -607,6 +770,9 @@ p:not(:last-child) {
 	width: 100%;
 	height: 100%;
 }
+.fav_ct, .rt_ct, .rep_ct {
+	font-size: 1.1rem;
+}
 .shared.selectedToot {
 	background-color: var(--selectedWithShare);
 }
@@ -620,17 +786,19 @@ audio {
 	white-space: normal;
 }
 .cw_btn {
-  margin: 3px;
+	margin: 0.23rem;
 	background-color: var(--emphasized);
 	color: var(--color);
-  padding-left: 3px;
-  padding-right: 3px;
-  border-radius: 3px;
+	padding-left: 0.23rem;
+	padding-right: 0.23rem;
+	border-radius: 0.23rem;
 	border: 1px solid var(--color);
+	user-select: none;
 }
 .vis-data {
 	font-size: 1rem !important;
-  margin: 5px;
+	margin: 0.4rem;
+	user-select: none;
 }
 @keyframes jump {
 	0% {
@@ -676,11 +844,57 @@ audio {
 	}
 }
 .box-anime {
-  animation-duration: 1s;
-  animation-name: fadeInLeft;
+	/*animation-duration: 1s;
+  animation-name: fadeInLeft;*/
 }
 
 .cvo-anime {
 	animation-duration: 0.1s;
 	animation-name: fadeInDown;
 }
+.urbadge {
+	line-height: normal;
+	height: 2rem;
+	font-size: 1rem;
+	background-color: #009688;
+}
+.box .ui-resizable-s {
+	display: none !important;
+}
+.boxIn .ui-resizable-e {
+	display: none !important;
+}
+.boxIn .ui-resizable-s {
+	display: block !important;
+}
+.box .ui-resizable-se {
+	display: none !important;
+}
+.announcement {
+	padding: 0.38rem;
+	border-bottom: 1px solid;
+}
+.announReaction {
+	width: 2.7rem;
+	height: 1.7rem;
+	font-size: 1.1rem;
+	margin: 0.23rem;
+	cursor: pointer;
+	border: solid 1px;
+	padding-left: 0.15rem;
+	background-color: var(--notfbox);
+	border-radius: 0.15rem;
+}
+.announReaction img {
+	position: relative;
+	top: 0.23rem;
+}
+.announReaction.reactioned {
+	background-color: var(--emphasized);
+}
+.announReaction.add {
+	width: 1.46rem;
+}
+.reactionsPack {
+	display: flex;
+}

app/css/userdata.css

@@ -1,37 +1,42 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
 #his-data {
   background-repeat: no-repeat;
-  background-image: url("../../loading.svg");
+  background-image: url("../img/loading.svg");
   overflow-y: hidden;
 }
+#his-data .btn .material-icons{
+  float:left;
+}
+#his-data-content {
+  display: flex;
+  justify-content: center;
+}
 #his-name {
   font-size: 1.5rem;
 }
 #his-prof {
   float: left;
-  width: 100px;
-  margin-right: 5px;
+  width: 7.7rem;
+  margin-right: 0.4rem;
 }
 .his-float {
-  float: left;
   overflow-y: scroll;
-  padding: 5px;
+  padding: 0.4rem;
 }
 #his-float-data {
-  width: 400px;
   height: 100%;
+  overflow-y: hidden;
+}
+#his-leftside {
+  width: 38.4rem;
 }
 #his-float-timeline {
-  width: calc(100% - 400px);
+  max-width: 59.6rem;
   height: 100%;
   overflow-y: hidden;
 }
 #his-basic-prof {
-  min-height: 130px;
-}
-#his-matching-list {
-  overflow-y: scroll;
-  overflow-x: hidden;
+  min-height: 10rem;
 }
 #his-field {
   vertical-align: baseline;
@@ -46,63 +51,97 @@
   padding: 0;
   background-color: #757575;
   text-align: center;
-  padding: 5px;
+  padding: 0.4rem;
   margin-bottom: 1px;
   width: 30%;
 }
 .his-field-content {
   height: 1.5rem;
   padding: 0;
-  padding-left: 5px;
+  padding-left: 0.4rem;
 }
-#his-data a span.ellipsis:after {
+.his-var-content a span.ellipsis:after {
   content: "...";
 }
-#his-data a:not(.mention) span:last-of-type {
+.his-var-content a:not(.mention) span:last-of-type {
   display: none;
 }
-#his-data-show {
-  margin: 20px;
-  background-color: var(--his-data);
-  width: calc(100% - 20px);
-  height: calc(100% - 20px);
-  margin-bottom: 0;
-  padding: 5px;
+#his-data a .rep_ct,
+#his-data a .rt_ct,
+#his-data a .fav_ct {
+  display: inline !important;
 }
-.tab-content {
+#his-data-show {
+  margin: 1.5rem;
+  margin-left: 3.8rem;
+  margin-right: 3.8rem;
+  background-color: var(--his-data);
+  height: calc(100% - 1.5rem);
+  margin-bottom: 0;
+  padding: 0.4rem;
+}
+#his-data-wrap {
+  display: flex;
+}
+.his-var-content {
   overflow-y: scroll;
   overflow-x: hidden;
-  height: calc(100% - 240px);
+  height: calc(100% - 3.4rem);
 }
-.my-data-width {
-  width: 10%;
+#my-data-nav .btn {
+  width: 10.7rem;
 }
 .active-back {
   background-color: var(--active);
 }
 #his-name .emojione,
 #his-name .emoji-img {
-  width: 20px;
+  width: 1.538rem;
 }
 #his-plus-action .btn {
-  width: 170px;
+  padding-right: 0.4rem;
+  padding-left: 0.4rem;
 }
 .tabs {
   display: flex;
 }
 .tabs .tab a {
-  padding: 8px 12px;
+  padding: 0.6rem 0.9rem;
+}
+#his-des {
+  max-height: 17.7rem;
+  overflow-y: scroll;
+}
+#his-sign-action {
+  border: 1px solid;
+  border-radius: 0.4rem;
+  display: flex;
+  align-items: center;
+  padding-left: 0.75rem;
+  padding-right: 0.75rem;
+  flex-wrap: wrap;
+}
+#his-sign-action .btn {
+  flex-basis: 31.2%;
 }
 #his-des .mention {
   color: #039be5;
   cursor: pointer;
 }
+#his-table{
+  max-height: 11.538rem;
+  overflow-y: scroll;
+}
 #his-float-blocked {
   display: flex;
   justify-content: center;
   align-items: center;
   font-size: 2rem;
-  width: 90%;
   height: 100%;
-  position: absolute;
+}
+#hisdropdown{
+  background-color: var(--bg);
+}
+#hisdropdown li:hover{
+  background-color: var(--active);
 }

app/img/desk-animation.svg

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="TheDesk">
+        <g id="back">
+            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
+                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:rgba(255,255,255,0);">
+                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
+                </rect>
+            </g>
+            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:rgba(255,255,255,0);">
+                <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
+            </rect>
+            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
+                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:rgba(255,255,255,0);">
+                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
+                </rect>
+            </g>
+        </g>
+        <g transform="matrix(1,0,0,0.998821,0,4.65666)" id="gray">
+            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
+        </g>
+        <g transform="matrix(0.999978,-5.55112e-17,-2.20005e-08,0.996112,-1237.17,972.039)" id="orange">
+            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);" r="3117.62">
+                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,-583.55" to="-60,1915.71,-583.55" dur="0.5s" repeatCount="1" fill="freeze" />
+            </rect>
+        </g>
+        <g transform="matrix(0.999978,5.55112e-17,-5.55112e-17,0.999978,-1236.96,-1164.58)" id="blue">
+            <rect x="1915.5" y="1775.41" width="450" height="3105.58" style="fill:rgb(54,76,159);" r="3117.62">
+                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,4881" to="60,1915.71,4881" dur="0.5s" repeatCount="1" fill="freeze" />
+            </rect>
+        </g>
+        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgba(0,0,0,0);">
+            <animate attributeName="fill" begin="0.6s" dur="0.5s" fill="freeze" values="rgba(0,0,0,0);rgba(0,0,0,1)" repeatCount="1" />
+        </path>
+    </g>
+</svg>

app/img/desk.svg

@@ -1,35 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{fill:#FFFFFF;}
-	.st2{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
-	.st3{fill:#F0842E;}
-	.st4{fill:#364C9F;}
-	.st5{fill:#FFFFFF;stroke:#040000;stroke-miterlimit:10;}
-	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#040000;}
-	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
-</style>
-<g id="レイヤー_1" class="st0">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="TheDesk">
+        <g>
+            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
+                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:white;"/>
             </g>
-<g id="レイヤー_2">
-	<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
-	<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
-	
-		<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
-	
-		<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
-	<path class="st5" d="M714.5,2953.5"/>
-	<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
-		c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
-		c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
-		c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
-		c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
-		c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
-		c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
-	<rect class="st7" width="4096" height="4096"/>
-	<path class="st1" d="M-58,1122"/>
+            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:white;"/>
+            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
+                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:white;"/>
+            </g>
+        </g>
+        <g transform="matrix(1,0,0,0.998821,0,4.65666)">
+            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
+        </g>
+        <g transform="matrix(0.5,-0.866,0.862652,0.498067,224.046,2340.41)">
+            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);"/>
+        </g>
+        <g transform="matrix(0.5,0.866,-0.866,0.5,3757.17,-299.625)">
+            <rect x="1915.5" y="1555.41" width="450" height="3105.58" style="fill:rgb(54,76,159);"/>
+        </g>
+        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgb(4,0,0);"/>
+        <rect x="0" y="0" width="4096" height="4096" style="fill:none;"/>
     </g>
 </svg>

app/img/desk_full.svg

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!--
+	TheDesk icon, Cutls P.
+	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+-->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
 <style type="text/css">

app/img/picture.svg

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

app/img/thinking.svg

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ThinkingDesk: Cutls P's icon, Cutls P.
+	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+-->
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">

app/index.html

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

app/js/common/about.js

@@ -2,3 +2,4 @@
 function about() {
 	postMessage(["sendSinmpleIpc", "about"], "*")
 }
+document.getElementById('onClickAbout').addEventListener('click', about)

app/js/common/api.js

@@ -0,0 +1,38 @@
+async function getApi(start, at) {
+    let json = {}
+    let response = null
+    response = await fetch(start, {
+        method: 'GET',
+        headers: {
+            'content-type': 'application/json',
+            'Authorization': `Bearer ${at}`
+        }
+    })
+    if (!response.ok) {
+        response.text().then(function (text) {
+            setLog(response.url, response.status, text)
+        })
+    }
+    json = await response.json()
+    return json
+}
+async function postApi(url, body, at, ideKey) {
+    let json = {}
+    let response = null
+    response = await fetch(url, {
+        method: 'POST',
+        headers: {
+            'content-type': 'application/json',
+            'Authorization': `Bearer ${at}`,
+            'Idempotency-Key': ideKey
+        },
+        body: JSON.stringify(body)
+    })
+    if (!response.ok) {
+        response.text().then(function (text) {
+            setLog(response.url, response.status, text)
+        })
+    }
+    json = await response.json()
+    return json
+}

app/js/common/blurhash.js

@@ -1,4 +1,4 @@
-var digitCharacters = [
+const digitCharacters = [
     "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
     "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
     "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
@@ -10,16 +10,16 @@ var digitCharacters = [
     "|", "}", "~",
 ];
 function decode83(str) {
-    var value = 0;
-    for (var i = 0; i < str.length; i++) {
-        var c = str[i];
-        var digit = digitCharacters.indexOf(c);
+    let value = 0;
+    for (let i = 0; i < str.length; i++) {
+        const c = str[i];
+        const digit = digitCharacters.indexOf(c);
         value = value * 83 + digit;
     }
     return value;
 }
 function linearTosRGB(value) {
-    var v = Math.max(0, Math.min(1, value));
+    const v = Math.max(0, Math.min(1, value));
     if (v <= 0.0031308) {
         return Math.round(v * 12.92 * 255 + 0.5);
     }
@@ -28,7 +28,7 @@ function linearTosRGB(value) {
     }
 }
 function sRGBToLinear(value) {
-    var v = value / 255;
+    const v = value / 255;
     if (v <= 0.04045) {
         return v / 12.92;
     }
@@ -37,18 +37,18 @@ function sRGBToLinear(value) {
     }
 }
 function decodeDC(value) {
-    var intR = value >> 16;
-    var intG = (value >> 8) & 255;
-    var intB = value & 255;
+    const intR = value >> 16;
+    const intG = (value >> 8) & 255;
+    const intB = value & 255;
     return [sRGBToLinear(intR), sRGBToLinear(intG), sRGBToLinear(intB)];
 };
 function sign(n) { return (n < 0 ? -1 : 1); }
 function signPow(val, exp) { return sign(val) * Math.pow(Math.abs(val), exp); }
 function decodeDC2(value, maximumValue) {
-    var quantR = Math.floor(value / (19 * 19));
-    var quantG = Math.floor(value / 19) % 19;
-    var quantB = value % 19;
-    var rgb = [
+    const quantR = Math.floor(value / (19 * 19));
+    const quantG = Math.floor(value / 19) % 19;
+    const quantB = value % 19;
+    const rgb = [
         signPow((quantR - 9) / 9, 2.0) * maximumValue,
         signPow((quantG - 9) / 9, 2.0) * maximumValue,
         signPow((quantB - 9) / 9, 2.0) * maximumValue,
@@ -61,45 +61,45 @@ function decodeblur(blurhash, width, height, punch) {
         console.error('too short blurhash');
         return null;
     }
-    var sizeFlag = decode83(blurhash[0]);
-    var numY = Math.floor(sizeFlag / 9) + 1;
-    var numX = (sizeFlag % 9) + 1;
-    var quantisedMaximumValue = decode83(blurhash[1]);
-    var maximumValue = (quantisedMaximumValue + 1) / 166;
+    const sizeFlag = decode83(blurhash[0]);
+    const numY = Math.floor(sizeFlag / 9) + 1;
+    const numX = (sizeFlag % 9) + 1;
+    const quantisedMaximumValue = decode83(blurhash[1]);
+    const maximumValue = (quantisedMaximumValue + 1) / 166;
     if (blurhash.length !== 4 + 2 * numX * numY) {
         console.error('blurhash length mismatch', blurhash.length, 4 + 2 * numX * numY);
         return null;
     }
-    var colors = new Array(numX * numY);
-    for (var i = 0; i < colors.length; i++) {
+    let colors = new Array(numX * numY);
+    for (let i = 0; i < colors.length; i++) {
         if (i === 0) {
-            var value = decode83(blurhash.substring(2, 6));
+            const value = decode83(blurhash.substring(2, 6));
             colors[i] = decodeDC(value);
         }
         else {
-            var value = decode83(blurhash.substring(4 + i * 2, 6 + i * 2));
+            const value = decode83(blurhash.substring(4 + i * 2, 6 + i * 2));
             colors[i] = decodeDC2(value, maximumValue * punch);
         }
     }
-    var bytesPerRow = width * 4;
-    var pixels = new Uint8ClampedArray(bytesPerRow * height);
+    const bytesPerRow = width * 4;
+    let pixels = new Uint8ClampedArray(bytesPerRow * height);
     for (var y = 0; y < height; y++) {
         for (var x = 0; x < width; x++) {
             var r = 0;
             var g = 0;
             var b = 0;
-            for (var j = 0; j < numY; j++) {
-                for (var i = 0; i < numX; i++) {
-                    var basis = Math.cos(Math.PI * x * i / width) * Math.cos(Math.PI * y * j / height);
-                    var color = colors[i + j * numX];
+            for (let j = 0; j < numY; j++) {
+                for (let i = 0; i < numX; i++) {
+                    let basis = Math.cos(Math.PI * x * i / width) * Math.cos(Math.PI * y * j / height);
+                    let color = colors[i + j * numX];
                     r += color[0] * basis;
                     g += color[1] * basis;
                     b += color[2] * basis;
                 }
             }
-            var intR = linearTosRGB(r);
-            var intG = linearTosRGB(g);
-            var intB = linearTosRGB(b);
+            const intR = linearTosRGB(r);
+            const intG = linearTosRGB(g);
+            const intB = linearTosRGB(b);
             pixels[4 * x + 0 + y * bytesPerRow] = intR;
             pixels[4 * x + 1 + y * bytesPerRow] = intG;
             pixels[4 * x + 2 + y * bytesPerRow] = intB;
@@ -109,9 +109,9 @@ function decodeblur(blurhash, width, height, punch) {
     return pixels;
 }
 function parseBlur(blur) {
-    var canvas = document.getElementById('canvas');
-    var ctx = canvas.getContext('2d');
-    var pixels = decodeblur(blur, 32, 32)
+    const canvas = document.getElementById('canvas');
+    const ctx = canvas.getContext('2d');
+    const pixels = decodeblur(blur, 32, 32)
     const imageData = new ImageData(pixels, 32, 32);
 
     ctx.putImageData(imageData, 0, 0);

app/js/common/keyshortcut.js

@@ -1,180 +1,197 @@
-selectedColumn = 0
-selectedToot = 0
+let selectedColumn = 0
+let selectedToot = 0
 $(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;
-			} else {
-				var wv = true;
+		const hasFocus = isFocused('input')
+		const hasFocus2 = isFocused('textarea')
+		const postBox = document.querySelector('#textarea')
+		let wv = false
+		//Enter
+		if (e.keyCode === 13) {
+			if (isFocused('#src')) {
+				src()
+				return false
+			}
+			if (isFocused('#list-add')) {
+				makeNewList()
+				return false
 			}
-		} else {
-			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();
+					show()
+				}
+			}
+			//Ctrl+F:検索
+			if (event.metaKey || event.ctrlKey) {
+				if (e.keyCode === 70) {
+					srcBox()
 				}
 			}
 			//X:開閉
 			if (e.keyCode === 88) {
-				if (!$("#post-box").hasClass("appear")) {
-					show();
-					$('textarea').focus();
+				if (!document.querySelector('#post-box').classList.contains('appear')) {
+					show()
+					$('textarea').focus()
 				} else {
-					hide();
+					hide()
 				}
-				return false;
+				return false
 			}
 			//N:新トゥート
 			if (e.keyCode === 78) {
-				if (!$("#post-box").hasClass("appear")) {
-					show();
+				if (!document.querySelector('#post-box').classList.contains('appear')) {
+					show()
 				}
-				$('textarea').focus();
-				return false;
+				postBox.focus()
+				return false
 			}
 			//Ctrl+E:全ての通知未読を既読にする
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 69) {
-					allNotfRead();
-					return false;
+					allNotfRead()
+					return false
+				}
+			}
+			//Ctrl+K:メニュー開閉
+			if (event.metaKey || event.ctrlKey) {
+				if (e.keyCode === 75) {
+					menu()
+					return false
 				}
 			}
 			//Ctrl+Space:読み込み
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 32) {
-					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;
+					const 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 (document.querySelector('#imagemodal').classList.contains('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 (document.querySelector('#imagemodal').classList.contains('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 (document.querySelector('#imagemodal').classList.contains('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 (document.querySelector('#imagemodal').classList.contains('open')) {
+					return false
 				}
 				selectedToot++
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
 			}
 			//Ctrl+U:0,0選択
 			if (event.ctrlKey || event.metaKey) {
@@ -182,29 +199,26 @@ $(function ($) {
 					selectedToot = 0
 					selectedColumn = 0
 					tootSelector(0, 0)
-					return false;
+					return false
 				}
 			}
 			//選択時
+			const selectedId = document.querySelector('.selectedToot').getAttribute('unique-id')
+			const selectedAcctIds = document.querySelector(`#timeline_${selectedColumn}`).getAttribute('data-acct')
 			if (e.keyCode == 70) {
-				var id = $(".selectedToot").attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
-				fav(id, acct_id, false)
-				return false;
+				fav(selectedId, selectedAcctIds, false)
+				return false
 			}
 			if (e.keyCode == 66) {
-				var id = $(".selectedToot").attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
-				rt(id, acct_id, false)
-				return false;
+				rt(selectedId, selectedAcctIds, 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")
-				re(id, ats_cm, acct_id, mode)
-				return false;
+				const target = document.querySelector('.selectedToot .rep-btn')
+				const ats_cm = target.getAttribute('data-men')
+				const mode = target.getAttribute('data-visen')
+				re(selectedId, ats_cm, selectedAcctIds, mode)
+				return false
 			}
 		}
 		//textareaフォーカス時
@@ -213,35 +227,41 @@ $(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;
+						const no = e.keyCode - 48
+						const oks = localStorage.getItem('oks-' + no)
+						if (oks) {
+							postBox.value = postBox.value + oks
+						}
+						return false
 					}
 				}
 			}
 		}
-	});
+	})
 	//クリアボタン
-	$("#clear").click(function () {
-		clear();
-	});
-});
+	document.getElementById('clear').addEventListener('click', clear)
+})
 //選択する
 function tootSelector(column, toot) {
-	$('.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
+	const selectedToot = document.querySelector('.selectedToot')
+	let rect = {top: 0}
+	if (selectedToot) {
+		selectedToot.classList.remove('selectedToot')
+		rect = selectedToot.getBoundingClientRect()
+	}
+	document.querySelectorAll(`#timeline_${column} .cvo`)[toot].classList.add('selectedToot')
+	const scr = document.querySelector(`#tlBox${column}`).scrollTop
+	const elem = rect.top + document.body.scrollTop
+	let top = elem - getHeight('.tl-box') + scr
 	if (top > 0) {
-		top = top + $('.selectedToot').height()
+		top = top + getHeight('.selectedToot')
 		if (top > scr) {
-			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: top })
+			$(`#tlBox${column}`).animate({ scrollTop: top })
 		}
 	} else if (elem < 0) {
-		var to = scr + elem - $('.selectedToot').height()
+		const to = scr + elem - getHeight('.selectedToot')
 		if (to < scr) {
-			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
+			$(`#tlBox${column}`).animate({ scrollTop: to })
 		}
 	}
 }

app/js/common/modal.js

@@ -1,7 +1,8 @@
 //モーダル・ドロップダウンの各種設定
 $(document).ready(function () {
   // the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered
-  $('.modal').modal({
+  const modals = document.querySelectorAll('.modal')
+  M.Modal.init(modals, {
     inDuration: 300,
     outDuration: 225,
     constrainWidth: false, // Does not change width of dropdown to that of the activator
@@ -10,8 +11,9 @@ $(document).ready(function () {
     belowOrigin: false, // Displays dropdown below the button
     alignment: 'left', // Displays dropdown with edge aligned to the left of button
     stopPropagation: false
-  });
-  $('.dropdown-trigger').dropdown({
+  })
+  const dropdown = document.querySelectorAll('.modal')
+  M.Dropdown.init(dropdown, {
     inDuration: 300,
     outDuration: 225,
     constrainWidth: false, // Does not change width of dropdown to that of the activator
@@ -20,7 +22,10 @@ $(document).ready(function () {
     belowOrigin: false, // Displays dropdown below the button
     alignment: 'left', // Displays dropdown with edge aligned to the left of button
     stopPropagation: false // Stops event propagation
-  }
-  );
-  $('.collapsible').collapsible();
-});
+  })
+  M.Collapsible.init(document.querySelectorAll('.collapsible'));
+  const videoModal = document.querySelectorAll('#videomodal')
+  M.Modal.init(videoModal, {
+    onCloseEnd: stopVideo
+  })
+})

app/js/common/sha256.js

@@ -1,31 +1,31 @@
-var sha256 = function sha256(ascii) {
+const sha256 = function sha256(ascii) {
 	function rightRotate(value, amount) {
 		return (value >>> amount) | (value << (32 - amount));
 	};
 
-	var mathPow = Math.pow;
-	var maxWord = mathPow(2, 32);
-	var lengthProperty = 'length'
-	var i, j; // Used as a counter across the whole file
-	var result = ''
+	const mathPow = Math.pow;
+	const maxWord = mathPow(2, 32);
+	const lengthProperty = 'length'
+	let i, j; // Used as a counter across the whole file
+	let result = ''
 
-	var words = [];
-	var asciiBitLength = ascii[lengthProperty] * 8;
+	let words = [];
+	const asciiBitLength = ascii[lengthProperty] * 8;
 
 	//* caching results is optional - remove/add slash from front of this line to toggle
 	// Initial hash value: first 32 bits of the fractional parts of the square roots of the first 8 primes
 	// (we actually calculate the first 64, but extra values are just ignored)
-	var hash = sha256.h = sha256.h || [];
+	let hash = sha256.h = sha256.h || [];
 	// Round constants: first 32 bits of the fractional parts of the cube roots of the first 64 primes
-	var k = sha256.k = sha256.k || [];
-	var primeCounter = k[lengthProperty];
+	let k = sha256.k = sha256.k || [];
+	let primeCounter = k[lengthProperty];
 	/*/
 	var hash = [], k = [];
 	var primeCounter = 0;
 	//*/
 
-	var isComposite = {};
-	for (var candidate = 2; primeCounter < 64; candidate++) {
+	let isComposite = {};
+	for (let candidate = 2; primeCounter < 64; candidate++) {
 		if (!isComposite[candidate]) {
 			for (i = 0; i < 313; i += candidate) {
 				isComposite[i] = candidate;
@@ -47,21 +47,21 @@ var sha256 = function sha256(ascii) {
 
 	// process each chunk
 	for (j = 0; j < words[lengthProperty];) {
-		var w = words.slice(j, j += 16); // The message is expanded into 64 words as part of the iteration
-		var oldHash = hash;
+		let w = words.slice(j, j += 16); // The message is expanded into 64 words as part of the iteration
+		const oldHash = hash;
 		// This is now the undefinedworking hash", often labelled as variables a...g
 		// (we have to truncate as well, otherwise extra entries at the end accumulate
 		hash = hash.slice(0, 8);
 
 		for (i = 0; i < 64; i++) {
-			var i2 = i + j;
+			const i2 = i + j;
 			// Expand the message into 64 words
 			// Used below if 
-			var w15 = w[i - 15], w2 = w[i - 2];
+			const w15 = w[i - 15], w2 = w[i - 2];
 
 			// Iterate
-			var a = hash[0], e = hash[4];
-			var temp1 = hash[7]
+			const a = hash[0], e = hash[4];
+			const temp1 = hash[7]
 				+ (rightRotate(e, 6) ^ rightRotate(e, 11) ^ rightRotate(e, 25)) // S1
 				+ ((e & hash[5]) ^ ((~e) & hash[6])) // ch
 				+ k[i]
@@ -74,7 +74,7 @@ var sha256 = function sha256(ascii) {
 				) | 0
 				);
 			// This is only used once, so *could* be moved below, but it only saves 4 bytes and makes things unreadble
-			var temp2 = (rightRotate(a, 2) ^ rightRotate(a, 13) ^ rightRotate(a, 22)) // S0
+			const temp2 = (rightRotate(a, 2) ^ rightRotate(a, 13) ^ rightRotate(a, 22)) // S0
 				+ ((a & hash[1]) ^ (a & hash[2]) ^ (hash[1] & hash[2])); // maj
 
 			hash = [(temp1 + temp2) | 0].concat(hash); // We don't bother trimming off the extra ones, they're harmless as long as we're truncating when we do the slice()
@@ -88,7 +88,7 @@ var sha256 = function sha256(ascii) {
 
 	for (i = 0; i < 8; i++) {
 		for (j = 3; j + 1; j--) {
-			var b = (hash[i] >> (j * 8)) & 255;
+			const b = (hash[i] >> (j * 8)) & 255;
 			result += ((b < 16) ? 0 : '') + b.toString(16);
 		}
 	}

app/js/common/time.js

@@ -36,8 +36,7 @@
       return inWords($.timeago.datetime(timestamp));
     }
   };
-  var $t = $.timeago;
-
+  const $t = $.timeago;
   $.extend($.timeago, {
     settings: {
       refreshMillis: 60000,
@@ -47,22 +46,22 @@
       cutoff: 0,
       autoDispose: true,
       strings: {
-        prefixAgo: null,
-        prefixFromNow: "今から",
-        suffixAgo: "",
-        suffixFromNow: "",
-        inPast: '',
-        seconds: "%d秒前",
-        minute: "1分前",
-        minutes: "%d分前",
-        hour: "1時間前",
-        hours: "%d時間前",
-        day: "昨日",
-        days: "%d日前",
-        month: "昨月",
-        months: "%dヶ月前",
-        year: "去年",
-        years: "%d年前",
+        prefixAgo: lang.lang_time_prefixAgo,
+        prefixFromNow: lang.lang_time_prefixFromNow,
+        suffixAgo: lang.lang_time_suffixAgo,
+        suffixFromNow: lang.lang_time_suffixFromNow,
+        inPast: lang.lang_time_inPast,
+        seconds: lang.lang_time_seconds,
+        minute: lang.lang_time_minute,
+        minutes: lang.lang_time_minutes,
+        hour: lang.lang_time_hour,
+        hours: lang.lang_time_hours,
+        day: lang.lang_time_day,
+        days: lang.lang_time_days,
+        month: lang.lang_time_month,
+        months: lang.lang_time_months,
+        year: lang.lang_time_year,
+        years: lang.lang_time_years,
         wordSeparator: " ",
         numbers: []
       }
@@ -73,9 +72,9 @@
         throw 'timeago allowPast and allowFuture settings can not both be set to false.';
       }
 
-      var $l = this.settings.strings;
-      var prefix = $l.prefixAgo;
-      var suffix = $l.suffixAgo;
+      const $l = this.settings.strings;
+      let prefix = $l.prefixAgo;
+      let suffix = $l.suffixAgo;
       if (this.settings.allowFuture) {
         if (distanceMillis < 0) {
           prefix = $l.prefixFromNow;
@@ -87,19 +86,19 @@
         return this.settings.strings.inPast;
       }
 
-      var seconds = Math.abs(distanceMillis) / 1000;
-      var minutes = seconds / 60;
-      var hours = minutes / 60;
-      var days = hours / 24;
-      var years = days / 365;
+      const seconds = Math.abs(distanceMillis) / 1000;
+      const minutes = seconds / 60;
+      const hours = minutes / 60;
+      const days = hours / 24;
+      const years = days / 365;
 
       function substitute(stringOrFunction, number) {
-        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
-        var value = ($l.numbers && $l.numbers[number]) || number;
+        const string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        const value = ($l.numbers && $l.numbers[number]) || number;
         return string.replace(/%d/i, value);
       }
 
-      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+      const words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
         seconds < 90 && substitute($l.minute, 1) ||
         minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
         minutes < 90 && substitute($l.hour, 1) ||
@@ -111,13 +110,13 @@
         years < 1.5 && substitute($l.year, 1) ||
         substitute($l.years, Math.round(years));
 
-      var separator = $l.wordSeparator || "";
+        const separator = $l.wordSeparator || "";
       if ($l.wordSeparator === undefined) { separator = " "; }
       return $.trim([prefix, words, suffix].join(separator));
     },
 
     parse: function (iso8601) {
-      var s = $.trim(iso8601);
+      let s = $.trim(iso8601);
       s = s.replace(/\.\d+/, ""); // remove milliseconds
       s = s.replace(/-/, "/").replace(/-/, "/");
       s = s.replace(/T/, " ").replace(/Z/, " UTC");
@@ -126,7 +125,7 @@
       return new Date(s);
     },
     datetime: function (elem) {
-      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+      const iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
       return $t.parse(iso8601);
     },
     isTime: function (elem) {
@@ -138,18 +137,18 @@
   // functions that can be called via $(el).timeago('action')
   // init is default when no action is given
   // functions are called with context of a single element
-  var functions = {
+  const functions = {
     init: function () {
       functions.dispose.call(this);
-      var refresh_el = $.proxy(refresh, this);
+      const refresh_el = $.proxy(refresh, this);
       refresh_el();
-      var $s = $t.settings;
+      const $s = $t.settings;
       if ($s.refreshMillis > 0) {
         this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
       }
     },
     update: function (timestamp) {
-      var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp);
+      const date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp);
       $(this).data('timeago', { datetime: date });
       if ($t.settings.localeTitle) {
         $(this).attr("title", date.toLocaleString());
@@ -169,7 +168,7 @@
   };
 
   $.fn.timeago = function (action, options) {
-    var fn = action ? functions[action] : functions.init;
+    const fn = action ? functions[action] : functions.init;
     if (!fn) {
       throw new Error("Unknown function name '" + action + "' for timeago");
     }
@@ -181,7 +180,7 @@
   };
 
   function refresh() {
-    var $s = $t.settings;
+    const $s = $t.settings;
 
     //check if it's still visible
     if ($s.autoDispose && !$.contains(document.documentElement, this)) {
@@ -190,7 +189,7 @@
       return this;
     }
 
-    var data = prepareData(this);
+    const data = prepareData(this);
 
     if (!isNaN(data.datetime)) {
       if ($s.cutoff === 0 || Math.abs(distance(data.datetime)) < $s.cutoff) {
@@ -208,7 +207,7 @@
     element = $(element);
     if (!element.data("timeago")) {
       element.data("timeago", { datetime: $t.datetime(element) });
-      var text = $.trim(element.text());
+      const text = $.trim(element.text());
       if ($t.settings.localeTitle) {
         element.attr("title", element.data('timeago').datetime.toLocaleString());
       } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {

app/js/common/version.js

@@ -1,280 +1,246 @@
 //バージョンチェッカー
-function verck(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")) {
-		//ちょっと削除とリンク解析の都合上アレ(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);
-			for (var i = 0; i < obj.length; i++) {
-				localStorage.removeItem("card_" + i);
+async function verck(ver) {
+	console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
+	document.querySelector('body').classList.add(localStorage.getItem('platform'))
+	const date = new Date()
+	let showVer = false
+	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
+		showVer = true
+		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
+		if (localStorage.getItem('winstore') && !pwa) {
+			openRN()
 		}
 	}
-		//ちょっと削除とリンク解析の都合上アレ(e)
-		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();
-			}
-		});
-	}
-	if (!show) {
-		console.log(show)
-		if (date.getMonth() + 1 >= localStorage.getItem("showSupportMe") || !localStorage.getItem("showSupportMe")) {
+	localStorage.setItem('ver', ver)
+	if (!showVer) {
+		console.log(showVer)
+		if (
+			date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
+			!localStorage.getItem('showSupportMe')
+		) {
 			if (date.getMonth() == 11) {
-				var nextmonth = 1
+				yrs = date.getFullYear() + 1
+				nextmonth = yrs * 100 + 1
 			} else {
-				var nextmonth = date.getMonth() + 2
+				yrs = date.getFullYear()
+				nextmonth = yrs * 100 + date.getMonth() + 2
 			}
-			if (lang.language != "ja") {
-				$("#support-btm-ja").addClass("hide");
-				$("#support-btm-en").removeClass("hide");
+			if (lang.language != 'ja') {
+				document.querySelector('#support-btm-ja').classList.add('hide')
+				document.querySelector('#support-btm-en').classList.remove('hide')
 			}
-			localStorage.setItem("showSupportMe", nextmonth)
-			$("#support-btm").removeClass("hide")
-			$("#support-btm").animate({
-				'bottom': '0'
-			}, {
-					'duration': 300
-				});
+			localStorage.setItem('showSupportMe', nextmonth)
+			document.querySelector('#support-btm').classList.remove('hide')
+			document.querySelector('#support-btm').animate([
+				{
+					bottom: '-500px'
+				},
+				{
+					bottom: '0'
+				}
+			], 300);
 		}
 	}
-	var platform = localStorage.getItem("platform");
-	console.log("Your platform:" + platform)
-	if (!localStorage.getItem("winstore")) {
-		storeDialog(platform, ver)
+	const platform = localStorage.getItem('platform')
+	console.log('Your platform:' + platform)
+	if (!localStorage.getItem('winstore') && !pwa) {
+		document.querySelector('#start').style.display = 'flex'
 	}
-	if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
-		var winstore = true;
+	let winstore = false
+	if (
+		localStorage.getItem('winstore') == 'brewcask' ||
+		localStorage.getItem('winstore') == 'snapcraft' ||
+		localStorage.getItem('winstore') == 'winstore'
+	) {
+		winstore = true
 	} else {
-		var winstore = false;
+		winstore = false
 	}
-	var l = 5;
+	const l = 5
 	// 生成する文字列に含める文字セット
-	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
-	var cl = c.length;
-	var r = "";
+	const c = 'abcdefghijklmnopqrstuvwxyz0123456789'
+	const cl = c.length
+	let 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";
-	fetch(start, {
-		method: 'GET'
-	}).then(function (response) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (mess) {
-		console.table(mess);
+	const start = 'https://thedesk.top/ver.json'
+	let mess
+	try {
+		mess = await getApi(start, null)
+	} catch {
+		return false
+	}
+	console.table(mess)
 	if (mess) {
-			var platform = localStorage.getItem("platform");
-			if (platform == "darwin") {
-				var newest = mess.desk_mac;
+		let newest = null
+		if (platform == 'darwin') {
+			newest = mess.desk_mac
 		} else {
-				var newest = mess.desk;
+			newest = mess.desk
 		}
 		if (newest == ver) {
-				todo(lang.lang_version_usever.replace("{{ver}}", mess.desk));
+			todo(lang.lang_version_usever.replace('{{ver}}', mess.desk))
 			//betaかWinstoreならアプデチェックしない
-			} else if (ver.indexOf("beta") != -1 || winstore) {
-
+		} else if (ver.indexOf('beta') != -1 || winstore) {
+			//skipped
 		} else {
-				localStorage.removeItem("instance")
-				if (localStorage.getItem("new-ver-skip")) {
-					if (localStorage.getItem("next-ver") != newest) {
-						postMessage(["sendSinmpleIpc", "update"], "*")
+			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);
+					console.warn(lang.lang_version_skipver)
+					todo(lang.lang_version_skipver)
 				}
 			} else {
-					postMessage(["sendSinmpleIpc", "update"], "*")
+				postMessage(['sendSinmpleIpc', 'update'], '*')
 			}
 		}
 	}
-	});
-	if (!localStorage.getItem("last-notice-id")) {
-		localStorage.setItem("last-notice-id", 0)
+	let lni = localStorage.getItem('last-notice-id')
+	if (!lni) {
+		localStorage.setItem('last-notice-id', 0)
+		lni = 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;
+	const getNotice = 'https://thedesk.top/notice/index.php?since_id=' + lni
+	let notices
+	try {
+		notices = await getApi(getNotice, null)
+	} catch {
+		return false
+	}
+	if (notices.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;
+		localStorage.setItem('last-notice-id', notices[0].ID)
+		for (i = 0; i < notices.length; i++) {
+			var obj = notices[i]
+			if (obj.ID * 1 <= lni) {
+				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 {
-									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 })
+				toastInterpret(obj)
 			}
 		}
 	}
 }
-
-			}
-		}
-	});
-}
-var infostreaming = false;
+let infostreaming = false
 function infowebsocket() {
-	infows = new WebSocket("wss://thedesk.top/ws/");
+	infows = new WebSocket('wss://thedesk.top/ws/')
 	infows.onopen = function (mess) {
-		console.log([tlid, ":Connect Streaming Info:", mess]);
-		infostreaming = true;
+		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") {
-				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>';
+		console.log([tlid, ':Receive Streaming:', JSON.parse(mess.data)])
+		const obj = JSON.parse(mess.data)
+		localStorage.setItem('last-notice-id', obj.id)
+		if (obj.type != 'counter') {
+			toastInterpret(obj)
 		} else {
-						var toot = "";
+			const people = document.querySelector('#persons')
+			if(people) {
+				people.innerText = obj.text
 			}
-					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) {
-						console.log(obj.text)
-						console.log(escapeHTML(obj.text))
-						M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
-					}
-				}
-			}
-		} else {
-			$("#persons").text(obj.text);
 		}
 	}
 	infows.onerror = function (error) {
-		infostreaming = false;
-		console.error("Error closing:info");
-		console.error(error);
-		return false;
-	};
+		infostreaming = false
+		console.error('Error closing:info')
+		console.error(error)
+		return false
+	}
 	infows.onclose = function () {
-		infostreaming = false;
-		console.error("Closing:info");
-	};
+		infostreaming = false
+		console.error('Closing:info')
+	}
 }
 setInterval(function () {
 	if (!infostreaming) {
-		console.log("try to connect to base-streaming")
-		infowebsocket();
+		console.log('try to connect to base-streaming')
+		infowebsocket()
 	}
-}, 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();
+}, 10000)
+async function toastInterpret(obj) {
+	if (obj.type == 'textv2') {
+		if (~obj.languages.indexOf(lang.language)) {
+			let showVer = true
+			let toot = null
+			if (obj.toot != '') {
+				toot = `<button class="btn-flat toast-action" data-toot="${obj.toot}">Show</button>`
+			}
+			if (obj.ver == ver) {
+				showVer = true
 			} else {
-		$("#release-en").show();
+				showVer = false
+			}
+			if (obj.domain != '') {
+				const multi = localStorage.getItem('multi')
+				if (multi) {
+					showVer = false
+					const accts = JSON.parse(multi)
+					const keys = Object.keys(accts)
+					for (let i = 0; i < accts.length; i++) {
+						const key = keys[i]
+						const acct = accts[key]
+						if (acct.domain == obj.domain) {
+							showVer = true
+							break
 						}
 					}
-function closeSupport() {
-	$("#support-btm").animate({
-		'bottom': '-300px'
-	}, {
-			'duration': 300,
-			'complete': function () {
-				$("#support-btm").addClass("hide")
 				}
-		});
+			}
+			if (showVer) {
+				M.toast({
+					html: `${escapeHTML(obj.text)} ${toot} <span class="sml grey-text">(スライドして消去)</span>`,
+					displayLength: 86400
+				})
+				await sleep(500)
+				const targets = document.querySelectorAll('.toast-action')
+				for (let j = 0; j < targets.length; j++) {
+					const target = targets[j]
+					const toot = target.getAttribute('data-toot')
+					target.addEventListener('click', () => detEx(toot, 'main'))
+				}
+
+			}
+		}
+	}
+}
+function openRN() {
+	console.log(kirishima)
+	M.Modal.getInstance(document.querySelector('#releasenote')).open()
+	if (lang.language == 'ja') {
+		verp = ver.replace('(', '').replace('.', '-').replace('.', '-').replace('[', '-').replace(']', '').replace(')', '').replace(' ', '_')
+		showElm(`#release-${verp}`)
+	} else {
+		showElm('#release-en')
+	}
+}
+async function closeSupport() {
+	document.querySelector('#support-btm').animate([
+		{
+			bottom: '0'
+		},
+		{
+			bottom: '-300px'
+		}
+	], 300);
+	await sleep(300)
+	document.querySelector('#support-btm').classList.add('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;
+	if (document.querySelector('body').classList.contain('accessibility')) return false
+	let mes = false
+	if (platform == 'win32') {
+		mes = lang.lang_version_platform
+	} else if (platform == 'linux') {
+		mes = lang.lang_version_platform_linux
+	} else if (platform == 'darwin') {
+		mes = lang.lang_version_platform_mac
 	}
+	if (mes) {
 		Swal.fire({
-		title: "Select your platform",
+			title: 'Select your platform',
 			text: mes,
 			type: 'info',
 			showCancelButton: true,
@@ -282,31 +248,31 @@ function storeDialog(platform, ver) {
 			cancelButtonColor: '#3085d6',
 			confirmButtonText: lang.lang_no,
 			cancelButtonText: lang.lang_yesno
-	}).then((result) => {
+		}).then(result => {
 			//逆にしてる
 			if (!result.value) {
-			localStorage.setItem("winstore", "winstore")
+				localStorage.setItem('winstore', 'winstore')
 			} else {
-			localStorage.setItem("winstore", "localinstall")
+				localStorage.setItem('winstore', 'localinstall')
 			}
-		localStorage.setItem("ver", ver);
-		show = true
-		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
-		$(document).ready(function () {
-			$('#releasenote').modal('open');
-			verp = ver.replace('(', '');
-			verp = verp.replace('.', '-');
-			verp = verp.replace('.', '-');
-			verp = verp.replace('[', '-');
-			verp = verp.replace(']', '');
-			verp = verp.replace(')', '');
-			verp = verp.replace(' ', '_');
-			console.log("%c " + verp, "color: red;font-size:200%;");
-			if (lang.language == "ja") {
-				$("#release-" + verp).show();
-			} else {
-				$("#release-en").show();
-			}
-		});
+			localStorage.setItem('ver', ver)
+			showVer = true
+			if (pwa) return false
+			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
+			openRN()
 		})
+	} else {
+		localStorage.setItem('ver', ver)
+		showVer = true
+		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
+		openRN()
+	}
+
+}
+function closeStart() {
+	$('#start').css('display', 'none')
+	document.querySelector('#start').style.display = 'none'
+	const platform = localStorage.getItem('platform')
+	const ver = localStorage.getItem('ver')
+	storeDialog(platform, ver)
 }

app/js/emoji/default-emoji.js

@@ -1,5 +1,5 @@
-var defaultemojiList = ["activity", "flag", "food", "nature", "object", "people", "place", "symbol"];
-var defaultemoji = {
+const defaultemojiList = ['activity', 'flag', 'food', 'nature', 'object', 'people', 'place', 'symbol']
+const defaultemoji = {
 	activity: activity,
 	flag: flag,
 	food: food,
@@ -8,77 +8,85 @@ var defaultemoji = {
 	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"
-    };
+}
+let defaultemojiname = {
+	activity: 'Activities',
+	flag: 'Flags',
+	food: 'Foods',
+	nature: 'Nature',
+	object: 'Tools',
+	people: 'People',
+	place: 'Places',
+	symbol: 'Symbols'
+}
+if (lang == 'ja') {
+	defaultemojiname = {
+		activity: '活動',
+		flag: '国旗',
+		food: '食べ物',
+		nature: '自然',
+		object: 'もの',
+		people: 'ひと',
+		place: '場所',
+		symbol: '記号'
+	}
 }
 
 function defaultEmoji(target) {
-    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");
+	let announcement = false
+	if (document.querySelector('#media').value == 'announcement') {
+		announcement = true
 	}
+	const json = defaultemoji[target]
+	const keymap = Object.keys(json)
+	let emojis = ''
+	for (let i = 0; i < json.length; i++) {
+		const key = keymap[i]
+		const emoji = json[key]
+		let def = `<a data-shortcode="${emoji['shortcode']}" class="pointer defEmoji">`
+		if (announcement) {
+			def = `<a data-shortcode="${emoji['shortcode']}" class="pointer defEmoji">`
+		}
+		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>`
+	}
+	document.querySelector('#emoji-list').innerHTML = emojis
+	document.querySelector('#now-emoji').innerText = lang.lang_defaultemojis_text.replace('{{cat}}', defaultemojiname[target])
+	document.querySelector('.emoji-control').classList.add('hide')
+	const targets = document.querySelectorAll('.defEmoji')
+	for (let j = 0; j < targets.length; j++) {
+		const target = targets[j]
+		const sc = target.getAttribute('data-shortcode')
+		target.addEventListener('click', () => defEmoji(sc))
+	}
+}
+
 function customEmoji() {
-    $("#emoji-suggest").val("");
-    $(".emoji-control").removeClass("hide");
+	document.querySelector('#emoji-suggest').value = ''
+	document.querySelector('.emoji-control').classList.remove('hide')
 	emojiList('home')
 }
+
 function defEmoji(target) {
-    var selin = $("#textarea").prop('selectionStart');
+	const textarea = document.querySelector('#textarea')
+	let selin = textarea.selectionStart
 	if (!selin) {
-        selin = 0;
+		selin = 0
 	}
-    var emojiraw = newpack.filter(function (item, index) {
-        if (item.short_name == target) return true;
-    });
-    var hex = emojiraw[0].unified.split("-");
+	const hex = emojipack[target].unified.split('-')
+	let emoji = twemoji.convert.fromCodePoint(hex[0])
 	if (hex.length === 2) {
-        emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1]);
-    } else {
-        emoji = twemoji.convert.fromCodePoint(hex[0]);
+		emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1])
 	}
-    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");
+	const now = textarea.value
+	const before = now.substr(0, selin)
+	const after = now.substr(selin, now.length)
+	const newt = before + emoji + after
+	textarea.value = newt
+	textarea.focus()
 }

app/js/login/instance.js

@@ -1,5 +1,5 @@
 //インスタンスリスト
-var idata = {
+const idata = {
 	"kirishima.cloud": "instance",
 	"kirishima.cloud_name": "アスタルテ",
 	"kirishima.cloud_letters": "6229",
@@ -9,16 +9,11 @@ var idata = {
 	"kirishima.cloud_public": "パブリックタイムライン",
 	"minohdon.jp": "instance",
 	"minohdon.jp_name": "箕面どん",
-	"minohdon.jp_letters": "500",
-	"minohdon.jp_bbcode": "disabled",
-	"minohdon.jp_markdown": "disabled",
-	"minohdon.jp_glitch": "disabled",
+	"fedibird.com":"instance",
+	"fedibird.com_name":"Fedibird",
+	"fedibird.com_quote":"enabled",
 	"mastodos.com": "instance",
 	"mastodos.com_name": "マストどす",
-	"mastodos.com_letters": "500",
-	"mastodos.com_bbcode": "disabled",
-	"mastodos.com_markdown": "disabled",
-	"mastodos.com_glitch": "disabled",
 	"dev.kirishima.cloud": "hidden",
 	"dev.kirishima.cloud_name": "アスタルテ(Dev)",
 	"dev.kirishima.cloud_letters": "6229",
@@ -27,15 +22,8 @@ var idata = {
 	"dev.kirishima.cloud_glitch": "enabled",
 	"mstdn.y-zu.org": "instance",
 	"mstdn.y-zu.org_name": "Yづドン(Y-zuDon)",
-	"mstdn.y-zu.org_letters": "500",
-	"mstdn.y-zu.org_bbcode": "disabled",
-	"mstdn.y-zu.org_markdown": "enabled",
-	"mstdn.y-zu.org_glitch": "disabled",
 	"imastodon.net": "instance",
 	"imastodon.net_name": "im@stodon",
-	"imastodon.net_letters": "500",
-	"imastodon.net_bbcode": "disabled",
-	"imastodon.net_markdown": "disabled",
 	"imastodon.net_home": "オフィス",
 	"imastodon.net_local": "楽屋",
 	"imastodon.net_notification": "ホワイトボード",
@@ -44,12 +32,6 @@ var idata = {
 	"imastodon.net_fav": "の頭にティンときたようです",
 	"imastodon.net_bt": ":「わかるわ」",
 	"imastodon.net_follow": "名刺をいただきました",
-	"imastodon.net_glitch": "disabled",
-	"mstdn.osaka": "instance",
-	"mstdn.osaka_name": "大阪丼",
-	"mstdn.osaka_letters": "500",
-	"mstdn.osaka_bbcode": "disabled",
-	"mstdn.osaka_markdown": "disabled",
 	"mstdn.osaka_home": "ウチ",
 	"mstdn.osaka_local": "近所",
 	"mstdn.osaka_notification": "あめちゃん",
@@ -58,12 +40,9 @@ var idata = {
 	"mstdn.osaka_fav": "がええやん言いました",
 	"mstdn.osaka_bt": "がしばいた",
 	"mstdn.osaka_follow": "ツルまれました",
-	"mstdn.osaka_glitch": "disabled",
 	"mstdn.kemono-friends.info": "instance",
 	"mstdn.kemono-friends.info_name": "ますとどんちほー",
 	"mstdn.kemono-friends.info_letters": "1024",
-	"mstdn.kemono-friends.info_bbcode": "disabled",
-	"mstdn.kemono-friends.info_markdown": "disabled",
 	"mstdn.kemono-friends.info_home": "なわばり",
 	"mstdn.kemono-friends.info_local": "ますとどんちほー",
 	"mstdn.kemono-friends.info_notification": "ねえねえ!",
@@ -71,19 +50,13 @@ var idata = {
 	"mstdn.kemono-friends.info_post": "がおー！",
 	"mstdn.kemono-friends.info_fav": ":「すごーい」",
 	"mstdn.kemono-friends.info_bt": ":「たーのしー」",
-	"mstdn.kemono-friends.info_glitch": "disabled",
 	"itabashi.0j0.jp": "instance",
 	"itabashi.0j0.jp_name": "板橋丼",
 	"itabashi.0j0.jp_letters": "1024",
-	"itabashi.0j0.jp_bbcode": "disabled",
-	"itabashi.0j0.jp_markdown": "disabled",
-	"itabashi.0j0.jp_glitch": "disabled",
+	"itabashi.0j0.jp_quote":"enabled",
 	"dtp-mstdn.jp": "instance",
-	"dtp-mstdn.jp_name": "DTP鯖",
-	"dtp-mstdn.jp_letters": "500",
-	"dtp-mstdn.jp_bbcode": "disabled",
-	"dtp-mstdn.jp_markdown": "disabled",
-	"dtp-mstdn.jp_glitch": "disabled",
+	"dtp-mstdn.jp_name": "dtp-mstdn.jp",
+	"dtp-mstdn.jp_quote":"enabled",
 	"misskey.io": "misskey",
 	"misskey.io_name": "misskey.io",
 	"misskey.io_letters": "1000",
@@ -93,7 +66,7 @@ var idata = {
 	"misskey.io_post": "Post",
 	"misskey.io_fav": " reacted your post.",
 	"misskey.io_bt": " reposted your post.",
-	"misskey.dev": "misskey.dev",
+	"misskey.dev": "misskey",
 	"misskey.dev_name": "misskey.dev",
 	"misskey.dev_letters": "1024",
 	"misskey.dev_bbcode": "disabled",
@@ -105,10 +78,9 @@ var idata = {
 	"precure.ml": "instance",
 	"precure.ml_name": "キュアスタ！",
 	"precure.ml_letters": "1024",
-	"precure.ml_bbcode": "disabled",
-	"precure.ml_markdown": "disabled",
 	"precure.ml_post": "キュア！",
-	"precure.ml_glitch": "disabled"
+	"odakyu.app_quote":"enabled",
+	"nitiasa.com_quote":"enabled",
+	"biwakodon.com_quote":"enabled",
+	"comm.cx_quote":"enabled"
 };
-
-localStorage.setItem("instance", JSON.stringify(idata));

app/js/login/login.js

@@ -1,528 +1,276 @@
 /*ログイン処理・認証までのJS*/
 //最初に読むやつ
-//アスタルテ判定初期化
 
-localStorage.removeItem("kirishima")
-localStorage.removeItem("imas")
-localStorage.removeItem("image");
-localStorage.removeItem("stable")
-localStorage.setItem("mode_misskey.xyz", "misskey")
-function ck() {
-	var main = localStorage.getItem("main");
+localStorage.removeItem('kirishima')
+localStorage.removeItem('quoters')
+localStorage.removeItem('imas')
+//stable, 固定タグのことらしい。ふざけるな。
+localStorage.removeItem('stable')
+const acctList = JSON.parse(localStorage.getItem('multi'))
+
+async function ck() {
+	const 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);
+		const m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
+		const mode = m[1]
+		const 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"
+	const multi = localStorage.getItem('multi')
+	if (!multi || multi == '[]') {
+		const date = new Date()
+		localStorage.setItem('showSupportMe', date.getMonth() + 2)
+		location.href = 'acct.html?mode=first&code=true'
 	} else {
-		var obj = JSON.parse(multi);
-		Object.keys(obj).forEach(function (key) {
-			var acct = obj[key];
+		const obj = JSON.parse(multi)
+		const keymap = Object.keys(obj)
+		let req = false
+		for (let i = 0; i < keymap.length; i++) {
+			const key = keymap[i]
+			const acct = obj[key]
 			if (acct.domain) {
-				refresh(key, true)
-			}
-		});
-		if (obj[0].domain) {
-			$("#tl").show();
-			ticker();
-			multiSelector(false);
-			verck(ver);
-			$(".stw").show()
-			$("#something-wrong img").attr("src", "../../img/thinking.svg")
+				let refreshed = await refresh(key, true)
+				if (refreshed) req = true
 			}
 		}
-}
-ck();
-
-
-//ログインポップアップ
-function login(url) {
-	if ($('#linux:checked').val() == "on") {
-		var red = "urn:ietf:wg:oauth:2.0:oob"
-	} else {
-		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 () {
-		if (httpreq.readyState === 4) {
-			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") {
-			} else {
-				postMessage(["sendSinmpleIpc", "quit"], "*")
-			}
-		}
-	}
-}
-
-//テキストボックスにURL入れた
-function instance() {
-	var url = $("#url").val();
-	login(url);
-}
-
-
-//コードを入れた後認証
-function code(code, mode) {
-	var red = localStorage.getItem("redirect");
-	localStorage.removeItem("redirect")
-	if (!code) {
-		var code = $("#code").val();
-	}
-	if (localStorage.getItem("domain_tmp")) {
-		var url = localStorage.getItem("domain_tmp");
-	} else {
-		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");
-	fetch(start, {
-		method: 'POST',
-		headers: {
-			'content-type': 'application/json'
-		},
-		body: JSON.stringify({
-			grant_type: "authorization_code",
-			redirect_uri: red,
-			client_id: id,
-			client_secret: secret,
-			code: code
+		if (req) {
+			Swal.fire({
+				title: 'Reload required',
+				text: lang.lang_login_changedData,
+				type: 'info',
+				showCancelButton: true,
+				confirmButtonText: lang.lang_no,
+				cancelButtonText: lang.lang_yesno
+			}).then(result => {
+				if (result) location.reload()
 			})
-	}).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();
 		}
-
-		}
-	});
-}
-
-//ユーザーデータ取得(最初)
-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";
-	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.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();
+		if (obj[0].domain) {
+			showElm('#tl')
+			ticker()
 			parseColumn()
-		ckdb();
-	});
+			verck(ver)
+			showElm('.stw')
+			const tipsType = localStorage.getItem('tips')
+			if (tipsType) {
+				tips(tipsType)
 			}
-//ユーザーデータ取得(追加)
-function getdataAdv(domain, at) {
-	var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
-	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.error) {
-			console.error("Error:" + json.error);
-			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
-			return;
+			document.querySelector('#something-wrong img').setAttribute('src', '../../img/thinking.svg')
 		}
-		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";
-	});
 }
+ck()
 //ユーザーデータ更新
-function refresh(target, loadskip) {
-	var multi = localStorage.getItem("multi");
-	var obj = JSON.parse(multi);
-	if (obj[target].mode == "misskey") {
+async function refresh(target, loadskip) {
+	let obj = acctList
+	let requireReload = false
+	const { mode, domain, at, background, text, name, prof, vis } = obj[target]
+	if (mode == 'misskey') {
 		return
 	}
-	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
-		},
-	}).then(function (response) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (json) {
+	const start = `https://${domain}/api/v1/accounts/verify_credentials`
+	let json
+	try {
+		json = await getApi(start, at)
+	} catch {
+		return false
+	}
 	if (json.error) {
-			console.error("Error:" + json.error);
-			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
-			return;
+		console.error('Error:' + json.error)
+		M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+		return
 	}
-		var avatar = json["avatar"];
+	if (!json) return false
+	let avatar = json['avatar']
 	//missingがmissingなやつ
-		if (avatar == "/avatars/original/missing.png" || !avatar) {
-			avatar = "./img/missing.svg";
+	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"],
+	const newName = json.display_name
+	const newProf = avatar
+	const newVis = json.source.privacy
+	if (newName != name || newProf != prof || newVis != vis) {
+		let ref = {
+			at: at,
+			name: newName,
+			domain: 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();
+			id: json['id'],
+			vis: newVis
+		}
+		if (background) {
+			ref.background = background
+		}
+		if (text) {
+			ref.text = text
+		}
+		if (json['source']['sensitive']) {
+			localStorage.setItem('nsfw_' + target, true)
+		} else {
+			localStorage.removeItem('nsfw_' + target)
+		}
+		obj[target] = ref
+		const save = JSON.stringify(obj)
+		localStorage.setItem('multi', save)
+		requireReload = true
+	}
+	if (!loadskip) {
+		load()
+	} else {
+		return requireReload
 	}
-	});
 }
 //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");
-		$("#ranking-btn").show();
-	} 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";
-	if (localStorage.getItem("instance")) {
-		var json = JSON.parse(localStorage.getItem("instance"));
-		if (json[bbcode]) {
-			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);
-			}
-		} else {
-			localStorage.removeItem("bb_" + acct_id);
-			$("[data-activates='bbcode']").addClass("disabled");
-			$("[data-activates='bbcode']").addClass("disabled", true);
+async function ckdb(acct_id) {
+	const domain = localStorage.getItem(`domain_${acct_id}`)
+	if (domain == 'kirishima.cloud') {
+		localStorage.setItem('kirishima', true)
+	} else if (domain == 'imastodon.net') {
+		localStorage.setItem('imas', true)
+		showElm('.imasonly')
 	}
+	const at = localStorage.getItem(`acct_${acct_id}_at`)
+	const letters = `${domain}_letters`
+	const quoteMarker = `${domain}_quote`
 
-		if (json[domain + "_markdown"] == "enabled") {
-			localStorage.setItem("md_" + acct_id, "true");
-			$(".markdown").show();
-		} else {
-			$(".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 + "_local"]) {
-			localStorage.setItem("local_" + acct_id, json[domain + "_local"]);
-		}
-		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 + "_post"]) {
-			localStorage.setItem("post_" + acct_id, json[domain + "_post"]);
-		}
-		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 + "_follow"]) {
-			localStorage.setItem("followlocale_" + acct_id, json[domain + "_follow"]);
+	if (idata) {
+		//check and replace json to idata
+		const json = idata
+		if (json[quoteMarker] == 'enabled') {
+			localStorage.setItem('quoters', true)
+			localStorage.setItem(quoteMarker, true)
 		}
 	}
-	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;
+	if (!isMisskey(domain)) {
+		const start = `https://${domain}/api/v1/instance`
+		let json
+		try {
+			json = await getApi(start, null)
+		} catch {
+			return null
 		}
-			if (json) {
-				if (json["max_toot_chars"]) {
-					localStorage.setItem("letters_" + acct_id, json["max_toot_chars"]);
+		if (!json || json.error) {
+			return
 		}
-				if (json["urls"]["streaming_api"]) {
-					localStorage.setItem("streaming_" + acct_id, json["urls"]["streaming_api"]);
+		const mtc = json['max_toot_chars']
+		if (mtc) {
+			localStorage.setItem(letters, mtc)
+		}
+		if (json['feature_quote']) {
+			localStorage.setItem(quoteMarker, true)
+		}
+		const str = json['urls']['streaming_api']
+		if (str) {
+			localStorage.setItem(`streaming_${domain}`, str)
 		}
 	}
-		});
-
-	} else {
-	}
-
-
 }
 
 //アカウントを選択…を実装
-function multiSelector(parseC) {
-	var multi = localStorage.getItem("multi");
-	if (!multi) {
-		var obj = [];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
-		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";
+function multiSelector() {
+	let obj = acctList
+	//if (!obj) obj = JSON.parse(localStorage.getItem('multi'))
+	let template = ''
+	//StringなのはlocalStorageがStringしか返さないから
+	let lastUsed = '0'
+	if (localStorage.getItem('mainuse') == 'main') {
+		lastUsed = localStorage.getItem('main')
+	} else if (localStorage.getItem('last-use')) {
+		lastUsed = localStorage.getItem('last-use')
+		if (lastUsed == 'webview' || lastUsed == 'noauth') {
+			lastUsed = '0'
 		}
 	} else {
-		var last = "0";
+		lastUsed = '0'
 	}
-	last = last + "";
-	var sel;
+	let 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>');
+		document.querySelector('#src-acct-sel').innerHTML = '<option value="tootsearch">Tootsearch</option>'
+		document.querySelector('#add-acct-sel').innerHTML = `<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"])
+		for (let i = 0; i < obj.length; i++) {
+			const acct = obj[i]
+			const strKey = i.toString()
+			if (strKey == lastUsed) {
+				sel = 'selected'
+				const domain = acct.domain
+				const letters = idata[`${domain}_letters`]
+				const textarea = document.querySelector('#textarea')
+				if (letters) {
+					textarea.setAttribute('data-length', letters)
 				} else {
-					var maxletters = localStorage.getItem("letters_" + key);
-					if (maxletters > 0) {
-						$("#textarea").attr("data-length", maxletters)
+					//手動でアカマネで変えれちゃうから
+					const maxLetters = localStorage.getItem(`${domain}_letters`)
+					if (maxLetters > 0) {
+						textarea.setAttribute('data-length', maxLetters)
 					} else {
-						$("#textarea").attr("data-length", 500)
+						textarea.setAttribute('data-length', 500)
 					}
 				}
-				if (idata[domain + "_glitch"]) {
-					$("#local-button").removeClass("hide")
+				if (idata[`${domain}_glitch`]) {
+					document.querySelector('#local-button').classList.remove('hide')
 				}
-				var profimg = acct.prof;
-				//localStorage.setItem("prof_" + key, profimg);
+				let profimg = acct.prof
 				if (!profimg) {
-					profimg = "../../img/missing.svg";
+					profimg = '../../img/missing.svg'
 				}
-				$("#acct-sel-prof").attr("src", profimg);
+				document.querySelector('#acct-sel-prof').setAttribute('src', profimg)
+				let cc = ''
 				if (domain) {
-					var cc = "(" + domain + ")";
-				} else {
-					var cc = "";
+					cc = `(${domain})`
 				}
-				$("#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 {
+				const tpb = document.querySelector('#toot-post-btn')
+				tpb.innerText = lang.lang_toot + cc
+				if (acct.background && acct.background != 'def' && acct.text && acct.text != 'def') {
+					tpb.classList.remove('indigo')
+					tpb.style.backgroundColor = `#${acct.background}`
+					tpb.style.color = `#${acct.text}`
 				}
-				if (domain == "kirishima.cloud") {
-					$("#faicon-btn").show();
+				if (domain == 'imastodon.net') {
+					trendTag()
 				} else {
-					$("#faicon-btn").hide();
-				}
-				if (domain == "imastodon.net") {
-					trendTag();
-				} else {
-					$("#trendtag").html("");
+					if (document.querySelector('#trendtag')) document.querySelector('#trendtag').innerHTML = ''
 				}
 			} 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>');
+			template = template + `
+			<option value="${strKey}" data-icon="${acct.prof}" class="left circle" ${sel}>@${acct.user}@${acct.domain}
+			</option>
+			`
 		}
-	$('select').formSelect();
-	if(!parseC){
-		parseColumn(null, true);
+		const forSrc = template + '<option value="tootsearch">Tootsearch</option>'
+		const forAdd = template + `
+			<option value="noauth">${lang.lang_login_noauth}</option>
+			<option value="webview">Twitter</option>
+		`
+		const forDir = template + `<option value="noauth">${lang.lang_login_noauth}</option>`
+		document.querySelector('#post-acct-sel').innerHTML = template
+		document.querySelector('#list-acct-sel').innerHTML = template
+		document.querySelector('#filter-acct-sel').innerHTML = template
+		document.querySelector('#src-acct-sel').innerHTML = forSrc
+		document.querySelector('#add-acct-sel').innerHTML = forAdd
+		document.querySelector('#dir-acct-sel').innerHTML = forDir
 	}
-}
-
-//バージョンエンコ
-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;
+	const elems = document.querySelectorAll('select')
+	M.FormSelect.init(elems, null)
 }
 //インスタンスティッカー
-function ticker() {
-	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) {
-		if (json.error) {
-			return;
+async function ticker() {
+	const start = 'https://toot-app.thedesk.top/toot/index.php'
+	const json = await getApi(start, null)
+	if (json) localStorage.setItem('ticker', JSON.stringify(json))
 }
-		if (json) {
-			localStorage.setItem("ticker", JSON.stringify(json));
-		}
-	});
+function isMisskey(domain) {
+	return localStorage.getItem(`mode_${domain}`) == 'misskey'
 }

app/js/login/logout.js

@@ -1,7 +1,7 @@
 //ログアウトします
 function logout() {
-	localStorage.removeItem("acct_" + acct_id + "_at");
-	localStorage.removeItem("domain_" + acct_id);
-	location.href = "index.html";
-	todc();
+	localStorage.removeItem(`acct_${acct_id}_at`)
+	localStorage.removeItem(`domain_${acct_id}`)
+	location.href = 'index.html'
+	todc()
 }

app/js/platform/end.js

@@ -1,173 +1,224 @@
 //プラットフォーム別　最後に読むやつ
 //リンクを外部で開くか内部で出すか
 $(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]+)/);
+		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(ats[2] + "@" + ats[1], "main");
+				if (!~ats[2].indexOf('@')) {
+					udgEx(url, 'main')
 					return false
 				} else {
-					postMessage(["openUrl", url], "*")
+					if(pwa) {
+						return true
+					} else {
+						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) {
-	var temp = $("#copy");
-	temp.val(string);
-	temp.select();
-	var result = document.execCommand('copy');
-	return result;
+	postMessage(['copy', string], '*')
+	return true
 }
 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;
-	context = new AudioContext();
-	context.createBufferSource().start(0);
+	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);
-	volumeControl.gain.value = 0.8
-	source.start(0);
+		//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
+	}
 }
 function nano() {
-	postMessage(["nano", null], "*")
+	postMessage(['nano', null], '*')
 }
 onmessage = function(e) {
-	if (e.data[0] == "details") {
+	console.log(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])
-	} 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") {
+	} 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 showTxt = `${lang.lang_img_DLDone}${
+			e.data[1][0]
+		}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
+		M.toast({ html: showTxt, displayLength: 5000 })
+	} else if (e.data[0] == 'parseColumn') {
 		parseColumn(e.data[1])
-	} else if (e.data[0] == "exportSettingsCore") {
-		exportSettingsCore()
-	} else if (e.data[0] == "fontList") {
+	} else if (e.data[0] == 'exportSettingsCore') {
+		var exp = exportSettingsCore()
+		postMessage(['exportSettingsCoreComplete', [e.data[1], exp]], '*')
+	} else if (e.data[0] == 'importSettingsCore') {
+		importSettingsCore(e.data[1])
+	} 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] == "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] == 'asRead') {
+		asRead()
+	} else if (e.data[0] == 'asReadEnd') {
+		asReadEnd()
+	} else if (e.data[0] == 'accessibility') {
+		console.log('atrue')
+		$('body').addClass('accessibility')
+		$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
+	} else if (e.data[0] == 'logData') {
+		$('#logs').val(e.data[1])
+		var obj = document.getElementById('logs')
+		obj.scrollTop = obj.scrollHeight
+	} 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'
+				  })
+			}
+		}
+	}
+}

app/js/platform/first.js

@@ -1,199 +1,321 @@
-document.title="TheDesk"
 $.strip_tags = function (str, allowed) {
 	if (!str) {
-		return "";
+		return ''
 	}
-	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
-		.join('');
+	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;
+		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
 	return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
-		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
-	});
-};
+		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
+	})
+}
 function escapeHTML(str) {
 	if (!str) {
-		return "";
+		return ''
 	}
-	return str.replace(/&/g, '&amp;')
-		.replace(/</g, '&lt;')
-		.replace(/>/g, '&gt;')
-		.replace(/"/g, '&quot;')
-		.replace(/'/g, '&#039;');
+	return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').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);
+	let chars = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.split('')
+	for (let i = 0, len = chars.length; i < len; i++) {
+		switch (chars[i]) {
+			case 'x':
+				chars[i] = Math.floor(Math.random() * 16).toString(16)
+				break
+			case 'y':
+				chars[i] = (Math.floor(Math.random() * 4) + 8).toString(16)
+				break
+		}
+	}
+	return chars.join('')
 }
 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 =
-			[
+		var rgb = [
 			// RGBからHEXへ変換
 			parseInt(regex[1]).toString(16),
 			parseInt(regex[2]).toString(16),
-				parseInt(regex[3]).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;
-};
+	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++;
+	var splitter = new GraphemeSplitter()
+	var arr = splitter.splitGraphemes(str)
+	return arr.length
 }
-	}
-	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;
+	//配列にする
+	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])
 		}
 	}
-	return ret;
-};
+	return newarr.join('')
+}
 //ソートするやつ
 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 = {};
+		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]);
+		data.push(arrObj[key])
 	}
-	fn(data);
+	fn(data)
 }
-localStorage.removeItem("errors");
+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,
+	}
+}
+
+function isFocused(query) {
+	const allTarget = document.querySelectorAll(query)
+	const active = document.activeElement
+	let is = false
+	for (let i = 0; i < allTarget.length; i++) {
+		if (allTarget[i] == active) {
+			is = true
+			break
+		}
+	}
+	return is
+}
+function getHeight(query) {
+	const elm = document.querySelector(query)
+	return parseFloat(getComputedStyle(elm, null).height.replace('px', ''))
+}
+function showElm(query) {
+	const allTarget = document.querySelectorAll(query)
+	for (let i = 0; i < allTarget.length; i++) {
+		const target = allTarget[i]
+		target.style.display = 'inherit'
+	}
+}
+function setAllClasses(query, className, action) {
+	const allTarget = document.querySelectorAll(query)
+	for (let i = 0; i < allTarget.length; i++) {
+		const target = allTarget[i]
+		if (action == 'add') target.classList.add(className)
+		if (action == 'remove') target.classList.remove(className)
+	}
+}
+function appendPrepend(query, elm, action) {
+	const allTarget = document.querySelectorAll(query)
+	for (let i = 0; i < allTarget.length; i++) {
+		const target = allTarget[i]
+		if (action == 'prepend') target.insertBefore(elm, target.firstChild)
+		if (action == 'append') target.appendChild(document.createTextNode(elm))
+	}
+}
+const sleep = (msec) => new Promise((resolve) => setTimeout(resolve, msec))

app/js/platform/nano.js

@@ -1,120 +1,125 @@
-
 //TL取得
+var websocket
 function tl(data) {
-	var tlid = 0;
-	var acct_id = $("#post-acct-sel").val();
-	var type = $("#type-sel").val();
-	var domain = localStorage.getItem("domain_" + acct_id);
+	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)
 	//タグの場合はカラム追加して描画
 	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) {
-		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();
-	});
+			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')
+		})
 	//Streaming接続
-	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;
+	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 wsid = websocket.length;
-	websocket[wsid] = new WebSocket(start);
-	websocket[wsid].onopen = function (mess) {
-		$("#notice_icon_" + tlid).removeClass("red-text");
+	websocket = new WebSocket(start)
+	websocket.onopen = function(mess) {
+		$('#notice_icon_' + tlid).removeClass('red-text')
 	}
-	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.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].onerror = function (error) {
-		console.error('WebSocket Error ' + error);
-	};
+	websocket.onerror = function(error) {
+		console.error('WebSocket Error ' + error)
+	}
+	websocket.onclose = function(mess) {
+		console.error('Close Streaming API:' + type)
+	}
 }
 //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() {}
@@ -123,14 +128,136 @@ function hide() { }
 $(function($) {
 	//キーボードショートカット
 	$(window).keydown(function(e) {
-		var hasFocus = $('input').is(':focus');
-		var hasFocus2 = $('textarea').is(':focus');
+		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,173 +1,250 @@
-var electron = require("electron");
-const shell = electron.shell;
-var ipc = electron.ipcRenderer;
+var electron = require('electron')
+const shell = electron.shell
+var ipc = electron.ipcRenderer
+//title bar
+const customTitlebar = require('custom-electron-titlebar')
+window.addEventListener('DOMContentLoaded', () => {
+	document.title = 'TheDesk'
+	ipc.send('acsCheck', '')
+	ipc.send('frameCheck', '')
+	ipc.on('frame', function(event, args) {
+		const file = location.href.substr(-10)
+		if (
+			file == 'index.html' ||
+			file == '/acct.html' ||
+			file == 'tting.html'
+		) {
+			new customTitlebar.Titlebar({
+				backgroundColor: customTitlebar.Color.fromHex('#000'),
+				titleHorizontalAlignment: 'right',
+				icon: '../../img/desk.png'
+			})
+		}
+		})
+})
+
 onmessage = function(e) {
-    if (e.data[0] == "openUrl") {
-        urls = e.data[1].match(/https?:\/\/(.+)/);
+	if (e.data[0] == 'openUrl') {
+		urls = e.data[1].match(/https?:\/\/(.+)/)
 		if (urls) {
-            shell.openExternal(e.data[1]);
+			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") {
+	} 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] == "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.listenerCount('itunes-np'))
-        if (ipc.listenerCount('itunes-np') > 1) {
-            return false;
-        } else {
-            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] == "downloadButton") {
-        ipc.send('download-btn', e.data[1]);
-    } else if (e.data[0] == "nano") {
-        ipc.send('nano', null);
+		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('openFinder', 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])
 	}
 }
 //version.js
-ipc.send("getPlatform", "")
+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]]))
+	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();
+	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]], "*")
+	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")
+	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)
+	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")
+	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)
+	document.getElementsByTagName('head')[0].append(styleNode)
 })
 //img.js
 ipc.on('bmp-img-comp', function(event, b64) {
-    postMessage(["media", [b64[0], "image/png", b64[1]]], "*")
-});
+	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[0], resize])
+			} else {
+				postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+			}
+		}
+		element.src = 'data:image/png;base64,' + b64[0]
+	} else {
+		postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+	}
+})
 //ui,img.js
 ipc.on('general-dl-prog', function(event, arg) {
-    console.log("Progress: " + 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]], "*")
+	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, savedFiles) {
-    var exp = exportSettingsCore()
-    ipc.send('export', [savedFiles, JSON.stringify(exp)]);
-    postMessage(["alert", "Done"], "*")
-    //cards
-    //lang
-});
+	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], "*")
-});
+	postMessage(['importSettingsCore', arg], '*')
+})
 ipc.on('savefolder', function(event, arg) {
-    localStorage.setItem("savefolder", arg);
-});
+	localStorage.setItem('savefolder', arg)
+})
 ipc.on('font-list', function(event, arg) {
-    postMessage(["fontList", arg], "*")
-});
+	postMessage(['fontList', arg], '*')
+})
 ipc.on('customSoundRender', function(event, args) {
-    postMessage(["customSoundSave", [args[0], args[1]]], "*")
-});
+	postMessage(['customSoundSave', [args[0], args[1]]], '*')
+})
 ipc.on('theme-json-list-response', function(event, args) {
-    postMessage(["ctLoadCore", args], "*")
-});
+	postMessage(['ctLoadCore', args], '*')
+})
 ipc.on('theme-json-delete-complete', function(event, args) {
-    postMessage(["ctLoad", ""], "*")
-});
+	postMessage(['ctLoad', ''], '*')
+})
 ipc.on('theme-json-response', function(event, args) {
-    postMessage(["customConnect", args], "*")
-});
+	postMessage(['customConnect', args], '*')
+})
 ipc.on('theme-json-create-complete', function(event, args) {
-    postMessage(["clearCustomImport", ""], "*")
-    postMessage(["ctLoad", ""], "*")
-});
+	postMessage(['clearCustomImport', ''], '*')
+	postMessage(['ctLoad', ''], '*')
+})
 //spotify.js
-ipc.once('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 use = arg[0]
+	var cpu = arg[1]
 	var total = arg[2]
-    postMessage(["renderMem", [use, cpu, total]], "*")
+	postMessage(['renderMem', [use, cpu, total]], '*')
+})
+//log
+ipc.on('logData', function(event, args) {
+	postMessage(['logData', args], '*')
 })
 //update.html
 ipc.on('prog', function(event, arg) {
-    postMessage(["updateProg", arg], "*")
+	postMessage(['updateProg', arg], '*')
 })
 ipc.on('mess', function(event, arg) {
-    postMessage(["updateMess", arg], "*")
+	postMessage(['updateMess', arg], '*')
 })
-var webviewDom = document.getElementById('webview');
+//misc
+ipc.on('asRead', function(event, arg) {
+	postMessage(['asRead', ''], '*')
+})
+ipc.on('asReadEnd', function(event, arg) {
+	postMessage(['asReadEnd', ''], '*')
+})
+ipc.on('accessibility', function(event, arg) {
+	postMessage(['accessibility', 'true'], '*')
+})
+var webviewDom = document.getElementById('webview')
 if (webviewDom) {
 	webviewDom.addEventListener('new-window', function(e) {
-        shell.openExternal(e.url);
-    });
+		shell.openExternal(e.url)
+	})
 }

app/js/platform/punycode.js

@@ -1,18 +1,15 @@
 /*! 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
 	}
 
 	/**
@@ -21,10 +18,8 @@
 	 * @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,
@@ -34,26 +29,22 @@
 		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',
+			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;
+		key
 
 	/*--------------------------------------------------------------------------*/
 
@@ -64,7 +55,7 @@
 	 * @returns {Error} Throws a `RangeError` with the applicable error message.
 	 */
 	function error(type) {
-		throw new RangeError(errors[type]);
+		throw new RangeError(errors[type])
 	}
 
 	/**
@@ -76,12 +67,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
 	}
 
 	/**
@@ -95,19 +86,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
 	}
 
 	/**
@@ -128,25 +119,26 @@
 			counter = 0,
 			length = string.length,
 			value,
-		    extra;
+			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
 	}
 
 	/**
@@ -159,15 +151,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('')
 	}
 
 	/**
@@ -181,15 +173,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
 	}
 
 	/**
@@ -206,7 +198,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)
 	}
 
 	/**
@@ -215,13 +207,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))
 	}
 
 	/**
@@ -248,81 +240,77 @@
 			digit,
 			t,
 			/** Cached calculation results */
-		    baseMinusT;
+			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)
 	}
 
 	/**
@@ -350,93 +338,89 @@
 			/** Cached calculation results */
 			handledCPCountPlusOne,
 			baseMinusT,
-		    qMinusT;
+			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('')
 	}
 
 	/**
@@ -452,10 +436,8 @@
 	 */
 	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
+		})
 	}
 
 	/**
@@ -471,10 +453,8 @@
 	 */
 	function toASCII(input) {
 		return mapDomain(input, function(string) {
-			return regexNonASCII.test(string)
-				? 'xn--' + encode(string)
-				: string;
-		});
+			return regexNonASCII.test(string) ? 'xn--' + encode(string) : string
+		})
 	}
 
 	/*--------------------------------------------------------------------------*/
@@ -486,7 +466,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.
@@ -494,40 +474,35 @@
 		 * @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,110 +1,124 @@
 //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 {
-		$("#textarea").attr("data-length", 500)
-	}
-	if (idata[domain + "_glitch"] === "true") {
-		$("#local-button").removeClass("hide");
+		var maxletters = localStorage.getItem(domain + 'letters_')
+		if (maxletters > 0) {
+			$('#textarea').attr('data-length', maxletters)
 		} else {
-		$("#local-button").addClass("hide");
+			$('#textarea').attr('data-length', 500)
 		}
-	var multi = localStorage.getItem("multi");
+	}
+	if (idata[domain + '_glitch'] === 'true') {
+		$('#local-button').removeClass('hide')
+	} else {
+		$('#local-button').addClass('hide')
+	}
+	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 {
@@ -113,204 +127,221 @@ function escape_html(string) {
 			'`': '&#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,209 +1,349 @@
 //絵文字ピッカー
 //最初に読み込む
-$("#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()
-		$("#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);
+	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
 		} else {
-			emojiList('home', reaction);
+			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)
+		} else {
+			emojiList('home', reaction)
 		}
 	} else {
-		$("#poll").addClass("hide")
-		$("#emoji").addClass("hide")
-		$("#suggest").html("");
-		$("#right-side").hide()
+		$('#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
+		} else {
+			width = 300
+		}
+		$('#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));
 			}
-			localStorage.setItem("emojiseek", 0);
+		})
+			.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')
 				}
-		});
+			})
 	} 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");
 			}
-			var emojis = json.emojis;
-			var md = [];
-			Object.keys(emojis).forEach(function (key) {
-				var emoji = emojis[key];
-				md.push({
-					"shortcode": emoji.name,
-					"url": emoji.url
 		})
-			});
-			if (parse == "true") {
-				$('#emoji-list').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));
+			.then(function(response) {
+				if (!response.ok) {
+					response.text().then(function(text) {
+						setLog(response.url, response.status, text)
+					})
 				}
-			localStorage.setItem("emojiseek", 0);
+				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
+					})
+				})
+				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')
 				}
-		});
+			})
 	}
 }
 
 //リストの描画
 function emojiList(target, reaction) {
-	$("#now-emoji").text(lang.lang_emoji_custom);
-	var acct_id = $("#post-acct-sel").val();
-	if (reaction && localStorage.getItem("emojiReaction_" + acct_id) != "true") {
-		console.error("Disabled")
+	$('#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')
 		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 obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
-	var num = obj.length;
+	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
 	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) {
-		var ct = 1;
-		$("#emoji-before").addClass("disabled");
-	} else {
-		$("#emoji-before").removeClass("disabled");
+		if (num > 0) {
+			var ct = 1
 		}
-	$("#emoji-next").removeClass("disabled");
-	$("#emoji-count").text(ct);
+		$('#emoji-before').addClass('disabled')
+	} else {
+		$('#emoji-before').removeClass('disabled')
+	}
+	if (page != 1) {
+		$('#emoji-next').removeClass('disabled')
+	} else {
+		$('#emoji-next').addClass('disabled')
+	}
+	$('#emoji-count').text(ct)
 	for (i = start; i < start + 126; i++) {
-		var emoji = obj[i];
+		var emoji = obj[i]
 		if (emoji) {
 			if (reaction) {
-				html = html + '<a onclick="emojiReaction(\':' + emoji.shortcode +
-					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+				if (emoji.divider) {
+					html = html + '<p style="margin-bottom:0">' + emoji.cat + '</p>'
 				} else {
-				html = html + '<a onclick="emojiInsert(\':' + emoji.shortcode +
-					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+					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>`
 					}
 				}
-	$("#emoji-list").html(html);
+			} 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>`
+					}
+				}
+			}
+		}
+	}
+	$('#emoji-list').html(html)
 }
 
 //絵文字など様々なものをテキストボックスに挿入
 function emojiInsert(code, del) {
-	var now = $("#textarea").val();
-	var selin = $("#textarea").prop('selectionStart');
-	if (localStorage.getItem("emoji-zero-width") == "yes") {
-		var blank = "​";
+	if (localStorage.getItem('emoji-zero-width') == 'yes') {
+		var blankBefore = '​'
+		var blankAfter = '​'
 	} else {
-		var blank = " ";
+		var blankBefore = ' '
+		var blankAfter = ' '
 	}
-	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();
+	var textarea = document.querySelector('#textarea')
+	var sentence = textarea.value
+	var len = sentence.length
+	var pos = textarea.selectionStart
+	if (del) {
+		var delLen = del.length
 	} else {
-		var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
-		var now = now.replace(regExp, "");
-		$("#textarea").val(now + blank + code);
+		var delLen = 0
 	}
-
-	$("#textarea").focus();
+	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
 }
 //改行挿入
 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,219 +1,274 @@
 //ドラッグ・アンド・ドロップからアップロードまで。uiのimg.jsとは異なります。
-var obj = $("body");
-var system;
+var obj = $('body')
+var system
 //ドラッグスタート
 obj.on('dragstart', function(e) {
-	system = "locked"
-});
+	system = 'locked'
+})
 //何もなくファイルが通過
 obj.on('dragend', function(e) {
-	system = "";
-});
+	system = ''
+})
 //ドラッグファイルが画面上に
 obj.on('dragenter', function(e) {
-	if (system != "locked") {
-		$("#drag").css('display', 'flex');
+	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();
+	var fr = new FileReader()
 	fr.onload = function(evt) {
-		var b64 = evt.target.result;
-		$('#b64-box').val(b64);
-		var ret = media(b64, files["type"], no)
+		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)
 				}
-	fr.readAsDataURL(files);
-	$("#mec").append(files["name"] + "/");
+			}
+			element.src = b64
+			return false
+		}
+		$('#b64-box').val(b64)
+		var ret = media(b64, files['type'], no)
+	}
+	fr.readAsDataURL(files)
+	$('#mec').append(files['name'] + '/')
 }
 
 //ファイルアップロード
-function media(b64, type, no) {
-	var l = 4;
-	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
-	var cl = c.length;
-	var r = "";
+async function media(b64, type, no, stamped) {
+	var acct_id = $('#post-acct-sel').val()
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var user = localStorage.getItem('user_' + acct_id)
+	if ($('#stamp').hasClass('stamp-avail') && !stamped) {
+		postMessage(['stampImage', [b64, user + '@' + domain]], '*')
+		return false
+	}
+	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 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;
+	$('.toot-btn-group').prop('disabled', true)
+	$('#post-acct-sel').prop('disabled', true)
+	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
 		} else {
-			var nsfw = false;
+			var nsfw = false
 		}
-		var previewer = "url"
-		fd.append('i', at);
-		//fd.append('isSensitive', nsfw);
-		httpreq.send(fd);
+		var previewer = 'url'
+		fd.append('i', at)
+		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'
+		//v2/media
+		try {
+			var id = await v2MediaUpload(domain, at, fd)
+			if(!id) {
+				var start = 'https://' + domain + '/api/v1/media'
+				httpreq.open('POST', start, true)
+				httpreq.upload.addEventListener('progress', progshow, false)
+				httpreq.responseType = 'json'
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+				httpreq.send(fd)
+			} else {
+				var mediav = $('#media').val()
+				var regExp = new RegExp('tmp_' + r, 'g')
+				mediav = mediav.replace(regExp, id)
+				$('#media').val(mediav)
+				var html = `<img src="../../img/picture.svg" class="preview-img pointer unknown" data-media="${id}" oncontextmenu="deleteImage('${id}')" onclick="altImage('${acct_id}','${id}')" title="${lang.lang_postimg_delete}">`
+				$('#preview').append(html)
+				todc()
+				if (localStorage.getItem('nsfw_' + acct_id)) {
+					$('#nsfw').addClass('yellow-text')
+					$('#nsfw').html('visibility')
+					$('#nsfw').addClass('nsfw-avail')
+				}
+				$('.toot-btn-group').prop('disabled', false)
+				$('select').formSelect()
+				$('#mec').text(lang.lang_there)
+				M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
+				$('#imgup').text('')
+				$('#imgsel').show()
+			} 
+		} catch {
+			var start = 'https://' + domain + '/api/v1/media'
+			httpreq.open('POST', start, true)
+			httpreq.upload.addEventListener('progress', progshow, false)
+			httpreq.responseType = 'json'
+			httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+			httpreq.send(fd)
+		}
 	}
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response;
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, json)
+				$('.toot-btn-group').prop('disabled', false)
+				$('select').formSelect()
+				$('#mec').text(lang.lang_there)
+				M.toast({ html: this.status + ':' +json, displayLength: 2000 })
+				$('#imgup').text('')
+				$('#imgsel').show()
+			}
 			if (!json.id) {
-				todc();
-				$("#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"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';
-				$('#preview').append(html);
+			$('#imgup').text('')
+			$('.toot-btn-group').prop('disabled', false)
+			$('select').formSelect()
+			$('#imgsel').show()
+			var img = localStorage.getItem('img')
+			if (json.type.indexOf('image') != -1) {
+				var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${json['id']}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${json['id']}')" title="${lang.lang_postimg_delete}">`
+				$('#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") {
-				$("#textarea").val($("#textarea").val() + " " + json["text_url"])
+			if (img == 'url' && json['text_url']) {
+				$('#textarea').val($('#textarea').val() + ' ' + json['text_url'])
 			}
-			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");
 		}
 	}
 }
 
 //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();
+	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,
@@ -223,19 +278,148 @@ 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
+	if($('[data-media=' + id + ']').hasClass('unknown')) {
+		fetch(start, {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/json',
+				Authorization: 'Bearer ' + at
+			}
+		})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			console.log(json)
+			$('[data-media=' + id + ']').removeClass('unknown')
+			if(json.preview_url) {
+				$('[data-media=' + id + ']').attr('src', json.preview_url)
+			}
+		})
+	} else {
+		Swal.fire({
+			title: lang.lang_postimg_desc,
+			text: lang.lang_postimg_leadContext,
+			input: 'text',
+			inputAttributes: {
+				autocapitalize: 'off'
+			},
+			showCancelButton: true,
+			confirmButtonText: 'Post',
+			showLoaderOnConfirm: true,
+			preConfirm: data => {
+				return fetch(start, {
+					method: 'PUT',
+					headers: {
+						'content-type': 'application/json',
+						Authorization: 'Bearer ' + at
+					},
+					body: JSON.stringify({
+						description: data
+					})
+				})
+					.then(function(response) {
+						if (!response.ok) {
+							response.text().then(function(text) {
+								setLog(response.url, response.status, text)
+							})
+						}
+						return response.json()
+					})
+					.catch(function(error) {
+						todo(error)
+						setLog(start, 'JSON', error)
+						console.error(error)
+					})
+					.then(function(json) {
+						console.log(json)
+						$('[data-media=' + id + ']').attr('title', data)
+					})
+			},
+			allowOutsideClick: () => !Swal.isLoading()
+		}).then(result => {
+			if (result.value) {
+				Swal.fire({
+					title: 'Complete'
+				})
+			}
+		})
+	}
 	
 }
+function stamp() {
+	if ($('#stamp').hasClass('stamp-avail')) {
+		$('#stamp').html('Off')
+		$('#stamp').removeClass('stamp-avail')
+	} else {
+		$('#stamp').html('On')
+		$('#stamp').addClass('stamp-avail')
+	}
+}
+//v2/media対応
+async function v2MediaUpload(domain, at, fd) {
+	var start = 'https://' + domain + '/api/v2/media'
+	let promise = await fetch(start, {
+		method: 'POST',
+		headers: {
+			Authorization:
+				'Bearer ' + at
+		},
+		body: fd
+	})
+	var json = await promise.json()
+	if(json.id) {
+		return json.id
+	} else {
+		return false
+	}
+}
+function alertProcessUnfinished() {
+	Swal.fire({
+		title: lang.lang_post_unfinishedMedia,
+		type: 'error',
+		showCancelButton: true,
+		confirmButtonText: lang.lang_post_retry,
+		cancelButtonText: lang.lang_no
+	}).then(result => {
+		if (result.value) {
+			post()
+		}
+	})
+}
+function syncDetail() {
+	Swal.fire({
+		title: lang.lang_post_syncDetail,
+		text: lang.lang_post_syncDetailText,
+		type: 'info'
+	})
+}

app/js/post/misskeystatus.js

@@ -1,240 +1,277 @@
 //Renpost
 function renote(id, acct_id, remote) {
-    if ($("#pub_" + id).hasClass("rted")) {
-        return false;
+	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 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 }));
+	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");
+			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')
 		}
 	}
 }
 //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 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 }));
+	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]);
+			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"];
+				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")
+						$('#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")
+						$('#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]).removeClass('hide')
 						}
-                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
+						$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(json.reactions[reactions[i]])
 					}
 				}
-                $("#pub_" + id + " .reactions").removeClass("hide");
-                $("#pub_" + id + " .reactions").toggleClass("fullreact")
+				$('#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")
+				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 + ' .reactions').removeClass('hide')
+					$('#pub_' + id + ' .reaction').removeClass('hide')
+					$('#pub_' + id + ' .reactions').addClass('fullreact')
 				}
 			}
 		}
 	}
-    $("#pub_" + id + " .freeReact").toggleClass("hide");
+	$('#pub_' + id + ' .freeReact').toggleClass('hide')
 }
 //reactioncustom
 function reactioncustom(acct_id, id) {
-    $("#reply").val(id);
-    $("#unreact").hide();
-    $("#addreact").removeClass("hide");
-    $("#post-acct-sel").val(acct_id);
-    $('select').formSelect();
-    localStorage.setItem("nohide", true);
+	$('#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();
+	$('#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 req = {}
+	req.i = at
+	req.noteId = id
 	var i = {
-        method: "POST",
-        body: JSON.stringify(req),
+		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) {
+	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;
+				return false
 			}
-        var poll = "";
+			var poll = ''
 			if (json.error) {
-            $("[toot-id=" + id + "]").hide();
-            $("[toot-id=" + id + "]").remove();
+				$('[toot-id=' + id + ']').hide()
+				$('[toot-id=' + id + ']').remove()
 			} else {
 				reactRefreshCore(json)
 			}
-    });
+		})
 }
 function reactRefreshCore(json) {
-    var id = json.id;
+	var id = json.id
 	if (json.reactions) {
-        $("#pub_" + id + " .reactions").removeClass("hide")
-        var regExp = new RegExp(":", "g");
+		$('#pub_' + id + ' .reactions').removeClass('hide')
+		var regExp = new RegExp(':', 'g')
 		Object.keys(json.reactions).forEach(function(keye) {
-            keyeClass = keye.replace(regExp, '');
+			keyeClass = keye.replace(regExp, '')
 			if (json.reactions[keye]) {
-                $("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
-                $("#pub_" + id + " .re-" + keyeClass).removeClass("hide")
+				$('#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(0)
+				if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
+					$('#pub_' + id + ' .re-' + keyeClass).addClass('hide')
 				}
-                $("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
+				$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(json.reactions[keye])
 			}
-        });
+		})
 	}
 }
 function emojiReaction(emoji) {
-    var acct_id = $("#post-acct-sel").val();
-    var id = $("#reply").val();
+	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();
+	}
+	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";
+	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 flag = 'create'
 	}
-    var start = "https://" + domain + "/api/notes/reactions/" + flag;
-    if (localStorage.getItem("mode_" + domain) != "misskey") {
-        return false;
+	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 }));
+	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");
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			$('.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 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 }));
+	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 }));
+	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;
+			var json = httpreqd.response
+			if (this.status !== 200) {
+				setLog(start, this.status, json)
+			}
 			if (!json) {
-                return false;
+				return false
 			}
-            var poll = "";
+			var poll = ''
 			if (json.poll) {
-                var choices = json.poll.choices;
+				var choices = json.poll.choices
 				Object.keys(choices).forEach(function(keyc) {
-                    var choice = choices[keyc];
+					var choice = choices[keyc]
 					if (choice.isVoted) {
-                        var myvote = twemoji.parse("✅");
+						var myvote = twemoji.parse('✅')
 					} else {
-                        var myvote = "";
+						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)
+					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,35 +1,46 @@
 /*投稿系*/
 //投稿
 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 (!localStorage.getItem("cw_sentence")) {
-		var cw_sent = 500;
+	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()
 	} else {
-		var cw_sent = localStorage.getItem("cw_sentence");
+		var user = localStorage.getItem('user_' + acct_id)
+		var ideKey = Math.floor(Date.now() / 1000) + '/TheDesk/' + user + '@' + domain
+		$('#ideKey').val(ideKey)
 	}
-	if (!localStorage.getItem("cw_letters")) {
-		var cw_ltres = 7000;
+	if (!localStorage.getItem('cw_sentence')) {
+		var cw_sent = 500
 	} else {
-		var cw_ltres = localStorage.getItem("cw_letters");
+		var cw_sent = localStorage.getItem('cw_sentence')
 	}
-	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 (!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) + '...'
 			Swal.fire({
 				title: lang.lang_post_cwtitle,
 				text: lang.lang_post_cwtxt + plus,
@@ -40,34 +51,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
@@ -75,62 +86,70 @@ 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(',')
 	}
-	if ($("#nsfw").hasClass("nsfw-avail")) {
-		var nsfw = "true";
-		toot.sensitive = nsfw;
+	var quote = $('#quote').val()
+	if (quote) {
+		toot.quote_id = quote
+	}
+	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('expire')) {
+			toot.scheduled_at = null
+			toot.expires_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-sel").val() == "mastodon-poll") {
-		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,
@@ -139,151 +158,207 @@ 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.responseType = "json";
-	httpreq.send(JSON.stringify(toot));
+	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() {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response;
-			var box = localStorage.getItem("box");
-			if (box == "yes" || !box) {
-				$("#textarea").blur();
-				hide();
+			var json = httpreq.response
+			if (this.status !== 200) {
+				if(media && this.status == 422) {
+					$('#ideKey').val('')
+					$('.toot-btn-group').prop('disabled', false)
+					alertProcessUnfinished()
+				} else {
+					setLog(start, this.status, json)
+					var box = localStorage.getItem('box')
+					if (box == 'yes' || !box) {
+						$('#textarea').blur()
+						hide()
 					}
-			$(".toot-btn-group").prop("disabled", false);
-			todc();
-			clear();
+					$('.toot-btn-group').prop('disabled', false)
+					todc()
+					clear()
 				}
+			} else {
+				$('#ideKey').val('')
+				var box = localStorage.getItem('box')
+				if (box == 'yes' || !box) {
+					$('#textarea').blur()
+					hide()
+				}
+				$('.toot-btn-group').prop('disabled', false)
+				todc()
+				clear()
+			}
+		}
+	}
+}
+function expPostMode() {
+	$('#sch-box').toggleClass('expire')
+	if($('#sch-box').hasClass('expire')) {
+		Swal.fire({
+			type: 'info',
+			title: 'Expiring toot On'
+		})
+	} else {
+		Swal.fire({
+			type: 'info',
+			title: 'Expireing toot Off'
+		})
 	}
 }
 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));
+	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;
-			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");
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, json)
 			}
-			$(".toot-btn-group").prop("disabled", false);
-			todc();
-			clear();
+			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()
 		}
 	}
 }
 
 //クリア(Shift+C)
 function clear() {
-	$("#textarea").val("");
-	if (localStorage.getItem("stable")) {
-		$("#textarea").val("#" + localStorage.getItem("stable") + " ")
+	$('#textarea').val('')
+	$('#ideKey').val('')
+	if (localStorage.getItem('stable')) {
+		$('#textarea').val('#' + localStorage.getItem('stable') + ' ')
 	}
-	$("#textarea").attr("placeholder", lang.lang_toot);
-	$("#reply").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");
-	$("#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);
-	$(".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')
+	$('#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('')
+	})
+	if (localStorage.getItem('mainuse') == 'main') {
+		$('#post-acct-sel').val(localStorage.getItem('main'))
 	}
-	$('select').formSelect();
-	$("#left-side").show();
-	$("#default-emoji").show();
-	$("#unreact").show();
-	$("#addreact").addClass("hide");
+	$('#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()
 }

app/js/post/secure.js

@@ -1,130 +1,128 @@
 /*保護系*/
 //画像保護
 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();
+		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(id) {
-	$(".cw_hide_" + id).toggleClass("cw");
-	$(".cw-long-" + id).toggleClass("hide");
+function cw_show(e) {
+	$(e).parent().parent().find('.cw_hide').toggleClass('cw')
+	$(e).parent().find('.cw_long').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;
+		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,114 +1,122 @@
 //入力時にハッシュタグと@をサジェスト
-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);
+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()
+			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
 					}
-			return;
+					$('#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()
-					$("#poll").addClass("hide")
-					$("#emoji").addClass("hide")
-				} else {
-					if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
-						$("#right-side").hide()
-					}
-				}
-				$("#suggest").html(ehtml);
-			}
-
-			var tag = new_val.match(/#(\S{3,})/);
-			var acct = new_val.match(/@(\S{3,})/);
+				var tag = new_val.match(/#(\S{3,})/)
+				var acct = new_val.match(/@(\S{3,})/)
 				if (tag && tag[1]) {
-				var q = tag[1];
+					var q = tag[1]
 				} else if (acct && acct[1]) {
-				var q = acct[1];
+					var q = acct[1]
 				} else {
-				$("#suggest").html("");
-				if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
-					$("#right-side").hide()
+					$('#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
 						}
-				return;
+						$('#post-box').css('width', width + 'px')
 					}
-			var domain = localStorage.getItem("domain_" + acct_id);
-			var at = localStorage.getItem("acct_" + acct_id + "_at");
-			suggest = "https://" + domain + "/api/v2/search?q=" + q
+					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)
+					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]);
+							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 = [];
+									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 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
+											uses: uses,
+											html: tagHTML
 										}
 										tags.push(item)
-							});
-							var num_a = -1;
-							var num_b = 1;
+									})
+									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 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
@@ -116,90 +124,156 @@ input.addEventListener("focus", function () {
 											ins = ins + '<br>'
 											nev = true
 										}
-							});
-							$("#suggest").html(ins);
-							$("#right-side").show()
-							$("#poll").addClass("hide")
-							$("#emoji").addClass("hide")
+									})
+									$('#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 = "";
+								var accts = ''
 								Object.keys(json.accounts).forEach(function(key3) {
-							var acct = json.accounts[key3];
+									var acct = json.accounts[key3]
 									if (acct.acct != q) {
-								accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
-									'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
+										//Instance Actorって…
+										if (acct.username.indexOf('.') < 0) {
+											accts =
+												accts +
+												`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
 										}
-						});
-						$("#right-side").show()
-						$("#suggest").html(accts);
-						$("#poll").addClass("hide")
-						$("#emoji").addClass("hide")
+									}
+								})
+								$('#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 {
-						if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
-							$("#right-side").hide()
+									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')
 								}
 							}
-				});
+						})
 				}
-		};
-		oldSuggest = suggest;
-		prev_value = new_val;
-	}, 1000);
-}, false);
+			}
+			oldSuggest = suggest
+			prev_value = new_val
+		}, 1000)
+	},
+	false
+)
 
-input.addEventListener("blur", function () {
-	window.clearInterval(timer);
-	favTag();
-}, false);
+input.addEventListener(
+	'blur',
+	function() {
+		window.clearInterval(timer)
+		favTag()
+	},
+	false
+)
 function tagInsert(code, del) {
-	var now = $("#textarea").val();
-	var selin = $("#textarea").prop('selectionStart');
-	if (!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
 	} else {
-		var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
-		var now = now.replace(regExp, "");
-		selin = selin - del.length;
+		var delLen = 0
 	}
-	if (selin > 0) {
-		var before = now.substr(0, selin);
-		var after = now.substr(selin, now.length);
-		newt = before + " " + code + " " + after;
+	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 {
-		newt = code + " " + now;
+		var word = blankBefore + code + blankAfter
 	}
-	$("#textarea").val(newt);
-	$("#textarea").focus();
-	if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
-		$("#right-side").hide()
+	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
+		if (!width) {
+			width = 300
 		}
-	$("#suggest").html("");
+		$('#post-box').css('width', width + 'px')
+	}
+	$('#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) {
+			}
+		})
+			.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 = "";
+					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);
+						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");
+					$('#suggest').html('Cinderella NowPlaying:Not Found')
 				}
-		});
+			})
 	}
 }

app/js/post/use-txtbox.js

@@ -1,64 +1,81 @@
 /*リプライ*/
 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();
-	$("#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()
+	mdCheck()
+	$('#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);
+	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'
 		}
-	$("#post-acct-sel").val(acct_id);
-	$('select').formSelect();
-	$("#textarea").focus();
+		$('#acct-sel-prof').attr('src', profimg)
+	}
+	$('#post-acct-sel').val(acct_id)
+	$('select').formSelect()
+	mdCheck()
+	$('#textarea').focus()
 }

app/js/tl/announParse.js

@@ -0,0 +1,145 @@
+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,278 +4,389 @@ function additional(acct_id, tlid) {
 	//メンション系
 	//$(".mention").attr("href", "");
 
-	$("#timeline-container .mention").addClass("parsed");
+	$('#timeline-container .mention').addClass('parsed')
 
-	$("#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", "#");
+	$('#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;\/?:\@&=+\$,%#]+)/)
 		if (tags) {
-			if (tags[2]) {
-				$(this).attr("onclick", 'tagShow(\'' + tags[2] + '\')');
+			var tagThis = tags[2]
+		} else {
+			var tagThis = $(this).attr('data-regTag')
 		}
 
+		if (tagThis) {
+			$(this).attr('href', "javascript:tagShow('" + tagThis + "')")
+			
 		}
-	});
+	})
 
 	//トゥートサムネ
-	$("#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');
+	$('#timeline_' + tlid + ' .toot a:not(.parsed)').each(function(i, elem) {
+		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();
-		} 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");
-					}
-				});
-			}
-
+			$(this).remove()
 		} 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();
+	})
+	$('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;
-					var emojis = json.emojis;
+					var json = this.response
+					if (this.status !== 200) {
+						setLog(start, this.status, 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", "#");
-		$(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");
-	});
+	$('#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')
+	})
 }
 
 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) {
-				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");
 				}
-			});
+				//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')
+					}
+				})
 		} 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) {
-				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 = '';
+			})
+				.then(function(response) {
+					if (!response.ok) {
+						response.text().then(function(text) {
+							setLog(response.url, response.status, text)
+						})
 					}
-					$("[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 = '';
+					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)
+					if (json.title) {
+						$('[toot-id=' + id + '] a:not(.parsed)').addClass('parsed')
+						$('[toot-id=' + id + ']').addClass('parsed')
 					}
-					$("[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>');
+				})
+		}
+	}
+}
+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) {
-						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
-							escapeHTML(json.description) + "</span>");
+			analyze = `<span class="gray">URL
+					${lang.lang_cards_check}
+					:<br>Title:
+					${escapeHTML(json.title)}
+					<br>
+					${escapeHTML(json.description)}
+					</span>`
 		}
+
+		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) {
-						$("[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>');
-
+				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]
 					}
 				}
-				if (json.title) {
-					$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
-					$("[toot-id=" + id + "]").addClass("parsed");
-				}
-			});
-		}
-
+				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) {
-	if (tlid == "notf") {
-		var tlide = "[data-notf=" + acct_id + "]";
-	} else if (tlid == "user") {
-		var tlide = "#his-data";
+	var click = false
+	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'
 		}
-	} else if (mouseover == "no") {
-		mouseover = "";
+		click = true
+	} else if (mouseover == 'no') {
+		mouseover = ''
 	}
-	if (mouseover == "hide") {
-		$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
-		$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
+	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")
 	}
 }
 
 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") {
-		$(".area-actions").addClass("hide");
-		$(".area-side").addClass("hide");
+	if (mouseover == 'hide') {
+		$('.cvo').addClass('hide-actions')
+		//$(".area-vis").addClass("hide");
+		//$(".area-actions").addClass("hide");
+		//$(".area-side").addClass("hide");
 	}
-
 }

app/js/tl/datails.js

@@ -1,22 +1,22 @@
 //トゥートの詳細
 function details(id, acct_id, tlid, mode) {
-	if (mode == "dm") {
-		$(".dm-hide").hide();
+	if (mode == 'dm') {
+		$('.dm-hide').hide()
 	} else {
-		$(".dm-hide").show();
+		$('.dm-hide').show()
 	}
-	$(".toot-reset").html('<span class="no-data">' + lang.lang_details_nodata + '</span>');
-	var html = $("#timeline_" + tlid + " [toot-id=" + id + "]").html();
-	$("#toot-this").html(html);
-	$('#tootmodal').modal('open');
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		var start = "https://" + domain + "/api/notes/show";
+	$('.toot-reset').html('<span class="no-data">' + lang.lang_details_nodata + '</span>')
+	var html = $('#timeline_' + tlid + ' [toot-id=' + id + ']').html()
+	$('#toot-this').html(html)
+	$('#tootmodal').modal('open')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+		var start = 'https://' + domain + '/api/notes/show'
 		var i = {
 			method: 'POST',
 			headers: {
-				'content-type': 'application/json',
+				'content-type': 'application/json'
 			},
 			body: JSON.stringify({
 				i: at,
@@ -24,102 +24,111 @@ function details(id, acct_id, tlid, mode) {
 			})
 		}
 	} else {
-		var start = "https://" + domain + "/api/v1/statuses/" + id;
+		var start = 'https://' + domain + '/api/v1/statuses/' + id
 		var i = {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			},
+				Authorization: 'Bearer ' + at
+			}
 		}
 	}
 
-	fetch(start, i).then(function (response) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (json) {
-		console.log(["Toot data:", json]);
-		if (!$("#timeline_" + tlid + " #pub_" + id).length) {
-			var html = parse([json], '', acct_id);
-			$("#toot-this").html(html);
-			jQuery("time.timeago").timeago();
+	fetch(start, i)
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
 			}
-		if (localStorage.getItem("mode_" + domain) == "misskey") {
-			var url = "https://" + domain + "/notes/" + json.id;
-			var scn = json.user.username;
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			console.log(['Toot data:', json])
+			if (!$('#timeline_' + tlid + ' #pub_' + id).length) {
+				var html = parse([json], '', acct_id)
+				$('#toot-this').html(html)
+				jQuery('time.timeago').timeago()
+			}
+			if (localStorage.getItem('mode_' + domain) == 'misskey') {
+				var url = 'https://' + domain + '/notes/' + json.id
+				var scn = json.user.username
 				if (!json.user.host) {
-				var local = true;
+					var local = true
 				} else {
-				var local = false;
-				scn = scn + "@" + host;
+					var local = false
+					scn = scn + '@' + host
 				}
-			var rep = "";
-			var uid = json.user.id;
+				var rep = ''
+				var uid = json.user.id
 				if (json._replyIds) {
-				replyTL(json._replyIds[0], acct_id);
+					replyTL(json._replyIds[0], acct_id)
 				}
 			} else {
 				var url = json.url
 				if (json.account.acct == json.account.username) {
-				var local = true;
+					var local = true
 				} else {
-				var local = false;
+					var local = false
 				}
-			var scn = json.account.acct;
-			var uid = json.account.id;
-			if (json["in_reply_to_id"]) {
-				replyTL(json["in_reply_to_id"], acct_id);
+				var scn = json.account.acct
+				var uid = json.account.id
+				if (json['in_reply_to_id']) {
+					replyTL(json['in_reply_to_id'], acct_id)
 				}
 			}
-		$("#toot-this .fav_ct").text(json.favourites_count);
-		$("#toot-this .rt_ct").text(json.reblogs_count);
-		$("#tootmodal").attr("data-url", url);
-		$("#tootmodal").attr("data-id", json.id);
+			$('#toot-this .fav_ct').text(json.favourites_count)
+			$('#toot-this .rt_ct').text(json.reblogs_count)
+			$('#tootmodal').attr('data-url', url)
+			$('#tootmodal').attr('data-id', json.id)
+			$('#tootmodal').attr('data-acct', acct_id)
 			if (local) {
-			$("#tootmodal").attr("data-user", scn + "@" + domain);
+				$('#tootmodal').attr('data-user', scn + '@' + domain)
 			} else {
-			$("#tootmodal").attr("data-user", scn);
+				$('#tootmodal').attr('data-user', scn)
 			}
-		getContext(id, acct_id);
-		var dom = null;
+			getContext(id, acct_id)
+			var dom = null
 			if (!local) {
-			dom = scn.replace(/.+@/g, '');
+				dom = scn.replace(/.+@/g, '')
 			} else {
-			dom = domain;
+				dom = domain
 			}
-		beforeToot(id, acct_id, dom);
-		userToot(id, acct_id, uid);
-		afterToot(id, acct_id, dom);
-		afterUserToot(id, acct_id, uid);
-		afterFTLToot(id, acct_id, dom);
-		faved(id, acct_id);
-		rted(id, acct_id);
-		if ($("#toot-this div").hasClass("cvo")) {
-			$("#toot-this").removeClass("cvo");
+			beforeToot(id, acct_id, dom)
+			userToot(id, acct_id, uid)
+			afterToot(id, acct_id, dom)
+			afterUserToot(id, acct_id, uid)
+			afterFTLToot(id, acct_id, dom)
+			faved(id, acct_id)
+			rted(id, acct_id)
+			if ($('#toot-this div').hasClass('cvo')) {
+				$('#toot-this').removeClass('cvo')
 			} else {
-			if(!$("#toot-this .cvo").hasClass("cvo")){
-				$("#toot-this").addClass("cvo");
+				if (!$('#toot-this .cvo').hasClass('cvo')) {
+					$('#toot-this').addClass('cvo')
 				}
 			}
-		if (!$("#activator").hasClass("active")) {
-			$('#det-col').collapsible('open', 4);
+			if (!$('#activator').hasClass('active')) {
+				$('#det-col').collapsible('open', 4)
 			}
-
-	});
+		})
 }
 
 //返信タイムライン
 function replyTL(id, 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/notes/show";
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+		var start = 'https://' + domain + '/api/notes/show'
 		var i = {
 			method: 'POST',
 			headers: {
-				'content-type': 'application/json',
+				'content-type': 'application/json'
 			},
 			body: JSON.stringify({
 				i: at,
@@ -129,42 +138,46 @@ function replyTL(id, acct_id) {
 	} else {
 		return false
 	}
-	fetch(start, i).then(function (response) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (json) {
-		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
-			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "thread");
-		} else {
-			var mute = [];
+	fetch(start, i)
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
 			}
-		if (localStorage.getItem("mode_" + domain) == "misskey") {
-			var templete = misskeyParse([json], '', acct_id, "", "", mute);
-			$("#toot-after").prepend(templete);
-			$("#toot-after .hide").html(lang.lang_details_filtered);
-			$("#toot-after .by_filter").css("display", "block");
-			$("#toot-after .by_filter").removeClass("hide");
-			var rep = "_replyIds";
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			var mute = getFilterTypeByAcct(acct_id, 'thread')
+			if (localStorage.getItem('mode_' + domain) == 'misskey') {
+				var templete = misskeyParse([json], '', acct_id, '', '', mute)
+				$('#toot-after').prepend(templete)
+				$('#toot-after .hide').html(lang.lang_details_filtered)
+				$('#toot-after .by_filter').css('display', 'block')
+				$('#toot-after .by_filter').removeClass('hide')
+				var rep = '_replyIds'
 				if (json[rep]) {
-				replyTL(json[rep][0], acct_id);
+					replyTL(json[rep][0], acct_id)
 				}
 			}
-
-	});
+		})
 }
 
 //コンテクストってなんですか
 function getContext(id, 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/notes/conversation";
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+		var start = 'https://' + domain + '/api/notes/conversation'
 		var i = {
 			method: 'POST',
 			headers: {
-				'content-type': 'application/json',
+				'content-type': 'application/json'
 			},
 			body: JSON.stringify({
 				i: at,
@@ -172,373 +185,481 @@ function getContext(id, acct_id) {
 			})
 		}
 	} else {
-		var start = "https://" + domain + "/api/v1/statuses/" + id + "/context";
+		var start = 'https://' + domain + '/api/v1/statuses/' + id + '/context'
 		var i = {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			},
+				Authorization: 'Bearer ' + at
 			}
 		}
-	fetch(start, i).then(function (response) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (json) {
-		if (localStorage.getItem("mode_" + domain) == "misskey") {
-			json.reverse();
-			var templete = misskeyParse(json, '', acct_id, "", "", []);
-			$("#toot-reply").html(templete);
-			$("#toot-reply .hide").html(lang.lang_details_filtered);
-			$("#toot-reply .by_filter").css("display", "block");
-			$("#toot-reply .by_filter").removeClass("hide");
-			jQuery("time.timeago").timeago();
+	}
+	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 (localStorage.getItem('mode_' + domain) == 'misskey') {
+				json.reverse()
+				var templete = misskeyParse(json, '', acct_id, '', '', [])
+				$('#toot-reply').html(templete)
+				$('#toot-reply .hide').html(lang.lang_details_filtered)
+				$('#toot-reply .by_filter').css('display', 'block')
+				$('#toot-reply .by_filter').removeClass('hide')
+				jQuery('time.timeago').timeago()
 			} else {
-			if (localStorage.getItem("filter_" + acct_id) != "undefined") {
-				var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "thread");
-			} else {
-				var mute = [];
+				var mute = getFilterTypeByAcct(acct_id, 'thread')
+				var templete = parse(json.descendants, '', acct_id, '', '', mute)
+				if (templete != '') {
+					$('#toot-after .no-data').hide()
 				}
-			var templete = parse(json.descendants, '', acct_id, "", "", mute);
-			if (templete != "") {
-				$("#toot-after .no-data").hide();
+				$('#toot-after').html(templete)
+				$('#toot-after .hide').html(lang.lang_details_filtered)
+				$('#toot-after .by_filter').css('display', 'block')
+				$('#toot-after .by_filter').removeClass('hide')
+				var templete = parse(json.ancestors, '', acct_id, '', '', mute)
+				if (templete != '') {
+					$('#toot-reply .no-data').hide()
 				}
-			$("#toot-after").html(templete);
-			$("#toot-after .hide").html(lang.lang_details_filtered);
-			$("#toot-after .by_filter").css("display", "block");
-			$("#toot-after .by_filter").removeClass("hide");
-			var templete = parse(json.ancestors, '', acct_id, "", "", mute);
-			if (templete != "") {
-				$("#toot-reply .no-data").hide();
+				$('#toot-reply').prepend(templete)
+				$('#toot-reply .hide').html(lang.lang_details_filtered)
+				$('#toot-reply .by_filter').css('display', 'block')
+				$('#toot-reply .by_filter').removeClass('hide')
+				jQuery('time.timeago').timeago()
 			}
-			$("#toot-reply").prepend(templete);
-			$("#toot-reply .hide").html(lang.lang_details_filtered);
-			$("#toot-reply .by_filter").css("display", "block");
-			$("#toot-reply .by_filter").removeClass("hide");
-			jQuery("time.timeago").timeago();
-		}
-
-	});
+		})
 }
 
 //前のトゥート(Back TL)
 function beforeToot(id, acct_id, domain) {
 	//var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		var start = "https://" + domain +
-			"/api/notes/local-timeline"
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+		var start = 'https://' + domain + '/api/notes/local-timeline'
 		fetch(start, {
 			method: 'POST',
 			headers: {
-				'content-type': 'application/json',
+				'content-type': 'application/json'
 			},
 			body: JSON.stringify({
 				i: at,
 				untilID: id
 			})
-		}).then(function (response) {
-			return response.json();
-		}).catch(function (error) {
-			todo(error);
-			console.error(error);
-		}).then(function (json) {
-			var templete = misskeyParse(json, 'noauth', acct_id);
-			$("#toot-before").html(templete);
-			jQuery("time.timeago").timeago();
-		});
+		})
+			.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 = misskeyParse(json, 'noauth', acct_id)
+				$('#toot-before').html(templete)
+				jQuery('time.timeago').timeago()
+			})
 	} else {
-		var start = "https://" + domain +
-			"/api/v1/timelines/public?local=true&max_id=" + id;
+		var start = 'https://' + domain + '/api/v1/timelines/public?local=true&max_id=' + id
 		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) {
-			var templete = parse(json, 'noauth', acct_id);
-			if (templete != "") {
-				$("#toot-before .no-data").hide();
+				'content-type': 'application/json'
 			}
-			$("#toot-before").html(templete);
-			jQuery("time.timeago").timeago();
-		});
+		})
+			.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 = parse(json, 'noauth', acct_id)
+				if (templete != '') {
+					$('#toot-before .no-data').hide()
+				}
+				$('#toot-before').html(templete)
+				jQuery('time.timeago').timeago()
+			})
 	}
 }
 //前のユーザーのトゥート
 function userToot(id, acct_id, user) {
-	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/notes"
+	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/notes'
 		fetch(start, {
 			method: 'POST',
 			headers: {
-				'content-type': 'application/json',
+				'content-type': 'application/json'
 			},
 			body: JSON.stringify({
 				i: at,
 				untilID: id,
 				userId: user
 			})
-		}).then(function (response) {
-			return response.json();
-		}).catch(function (error) {
-			todo(error);
-			console.error(error);
-		}).then(function (json) {
-			var templete = misskeyParse(json, 'noauth', acct_id);
-			$("#user-before").html(templete);
-			jQuery("time.timeago").timeago();
-		});
+		})
+			.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 = misskeyParse(json, 'noauth', acct_id)
+				$('#user-before').html(templete)
+				jQuery('time.timeago').timeago()
+			})
 	} else {
-		var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses?max_id=" + id;
+		var start = 'https://' + domain + '/api/v1/accounts/' + user + '/statuses?max_id=' + id
 		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) {
-			var templete = parse(json, '', acct_id);
-			if (templete != "") {
-				$("#user-before .no-data").hide();
+				Authorization: 'Bearer ' + at
 			}
-			$("#user-before").html(templete);
-			jQuery("time.timeago").timeago();
-		});
+		})
+			.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 = parse(json, '', acct_id)
+				if (templete != '') {
+					$('#user-before .no-data').hide()
+				}
+				$('#user-before').html(templete)
+				jQuery('time.timeago').timeago()
+			})
 	}
-
 }
 //後のLTL
 function afterToot(id, acct_id, domain) {
 	//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&min_id=" + id;
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/timelines/public?local=true&min_id=' + id
 	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) {
-		var templete = parse(json, 'noauth', acct_id);
-		if (templete != "") {
-			$("#ltl-after .no-data").hide();
+			'content-type': 'application/json'
 		}
-		$("#ltl-after").html(templete);
-		jQuery("time.timeago").timeago();
-	});
+	})
+		.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 = parse(json, 'noauth', acct_id)
+			if (templete != '') {
+				$('#ltl-after .no-data').hide()
+			}
+			$('#ltl-after').html(templete)
+			jQuery('time.timeago').timeago()
+		})
 }
 //後のUTL
 function afterUserToot(id, acct_id, user) {
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses?min_id=" + id;
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/accounts/' + user + '/statuses?min_id=' + id
 	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) {
-		var templete = parse(json, '', acct_id);
-		if (templete != "") {
-			$("#user-after .no-data").hide();
+			Authorization: 'Bearer ' + at
 		}
-		$("#user-after").html(templete);
-		jQuery("time.timeago").timeago();
-	});
+	})
+		.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 = parse(json, '', acct_id)
+			if (templete != '') {
+				$('#user-after .no-data').hide()
+			}
+			$('#user-after').html(templete)
+			jQuery('time.timeago').timeago()
+		})
 }
 //後のFTL
 function afterFTLToot(id, acct_id, domain) {
 	//var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain +
-		"/api/v1/timelines/public?min_id=" + id;
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/timelines/public?min_id=' + id
 	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) {
-		var templete = parse(json, 'noauth', acct_id);
-		if (templete != "") {
-			$("#ftl-after .no-data").hide();
+			'content-type': 'application/json'
 		}
-		$("#ftl-after").html(templete);
-		jQuery("time.timeago").timeago();
-	});
+	})
+		.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 = parse(json, 'noauth', acct_id)
+			if (templete != '') {
+				$('#ftl-after .no-data').hide()
+			}
+			$('#ftl-after').html(templete)
+			jQuery('time.timeago').timeago()
+		})
 }
 
 //ふぁぼ一覧
 function faved(id, acct_id) {
-	var domain = localStorage.getItem("domain_" + acct_id);
-	if (localStorage.getItem("mode_" + domain) == "misskey") { return false; }
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/statuses/" + id + "/favourited_by";
+	var domain = localStorage.getItem('domain_' + acct_id)
+	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+		return false
+	}
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/statuses/' + id + '/favourited_by'
 	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) {
-		var templete = userparse(json, '', acct_id);
-		if (templete != "") {
-			$("#toot-fav .no-data").hide();
+			Authorization: 'Bearer ' + at
 		}
-		$("#toot-fav").html(templete);
-	});
+	})
+		.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 = userparse(json, '', acct_id)
+			if (templete != '') {
+				$('#toot-fav .no-data').hide()
+			}
+			$('#toot-fav').html(templete)
+			jQuery('time.timeago').timeago()
+		})
 }
 
 //ブースト一覧
 function rted(id, acct_id) {
-	var domain = localStorage.getItem("domain_" + acct_id);
-	if (localStorage.getItem("mode_" + domain) == "misskey") { return false; }
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/statuses/" + id + "/reblogged_by";
+	var domain = localStorage.getItem('domain_' + acct_id)
+	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+		return false
+	}
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/statuses/' + id + '/reblogged_by'
 	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) {
-		var templete = userparse(json, '', acct_id);
-		$("#toot-rt").html(templete);
-	});
+			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 = userparse(json, '', acct_id)
+			$('#toot-rt').html(templete)
+			jQuery('time.timeago').timeago()
+		})
 }
 //URL等のコピー
 function cbCopy(mode) {
-	var url = $("#tootmodal").attr("data-url");
-	var urls = url.match(/https?:\/\/([-.a-zA-Z0-9]+)/);
-	var domain = urls[1];
-	if (mode == "emb") {
-		var emb = '<iframe src="' + url + '/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe><script src="https://' + domain + '/embed.js" async="async"></script>';
+	var url = $('#tootmodal').attr('data-url')
+	var urls = url.match(/https?:\/\/([-.a-zA-Z0-9]+)/)
+	var domain = urls[1]
+	if (mode == 'emb') {
+		var emb =
+			`<iframe src="${url}/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe>
+			<script src="https://${domain}/embed.js" async="async"></script>`
 		execCopy(emb)
 		M.toast({ html: lang.lang_details_embed, displayLength: 1500 })
 	} else {
 		if (execCopy(url)) {
 			M.toast({ html: lang.lang_details_url, displayLength: 1500 })
 		}
-
 	}
 }
 //本文のコピー
 function staCopy(id) {
-	var html = $("[toot-id=" + id + "] .toot").html();
-	html = html.replace(/^<p>(.+)<\/p>$/, "$1");
-	html = html.replace(/<br\s?\/?>/, "\n");
-	html = html.replace(/<p>/, "\n");
-	html = html.replace(/<\/p>/, "\n");
-	console.log("Copy it:\n" + html);
-	html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, "$1");
-	html = $.strip_tags(html);
+	var html = $('[toot-id=' + id + '] .toot').html()
+	html = html.replace(/^<p>(.+)<\/p>$/, '$1')
+	html = html.replace(/<br\s?\/?>/, '\n')
+	html = html.replace(/<p>/, '\n')
+	html = html.replace(/<\/p>/, '\n')
+	console.log('Copy it:\n' + html)
+	html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, '$1')
+	html = $.strip_tags(html)
 	if (execCopy(html)) {
 		M.toast({ html: lang.lang_details_txt, displayLength: 1500 })
 	}
-
 }
 //翻訳
-function trans(tar, to) {
-	var html = $("#toot-this .toot").html();
+function trans(tar, to, elem) {
+	var html = elem.parents('.cvo').find('.toot').html()
 	if (html.match(/^<p>(.+)<\/p>$/)) {
-		html = html.match(/^<p>(.+)<\/p>$/)[1];
+		html = html.match(/^<p>(.+)<\/p>$/)[1]
 	}
-	html = html.replace(/<br\s?\/?>/g, "\n");
-	html = html.replace(/<p>/g, "\n");
-	html = html.replace(/<\/p>/g, "\n");
-	html = $.strip_tags(html);
-	if (~tar.indexOf("zh")) {
-		tar = "zh";
+	html = html.replace(/<br\s?\/?>/g, '\n')
+	html = html.replace(/<p>/g, '\n')
+	html = html.replace(/<\/p>/g, '\n')
+	html = $.strip_tags(html)
+	if (~tar.indexOf('zh')) {
+		tar = 'zh'
 	}
-	$("#toot-this .additional").text("Loading...(Powered by Google Translate)");
-	var exec = 'https://script.google.com/macros/s/AKfycbxhwW5tjjop9Irg-y1zr_WsXlCKEzwWG6KuoOt_vVRDfEbRv0c/exec?format=json&text=' + encodeURIComponent(html) + '&source=' + tar + '&target=' + to
-	console.log("Try to translate from " + tar + " to " + to + " at " + exec);
+	$('#toot-this .additional').text('Loading...(Powered by Google Translate)')
+	var exec =
+		'https://script.google.com/macros/s/AKfycbxhwW5tjjop9Irg-y1zr_WsXlCKEzwWG6KuoOt_vVRDfEbRv0c/exec?format=json&text=' +
+		encodeURIComponent(html) +
+		'&source=' +
+		tar +
+		'&target=' +
+		to
+	console.log('Try to translate from ' + tar + ' to ' + to + ' at ' + exec)
 	fetch(exec, {
-		method: 'GET',
-	}).then(function (response) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (text) {
-		$("#toot-this .additional").html('<span class="gray translate">' + text.text + '</span>');
-	});
+		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(text) {
+			elem.parents('.cvo').find('.toot').append('<span class="gray translate">' + text.text + '</span>')
+		})
 }
 //ブラウザで開く
 function brws() {
-	var url = $("#tootmodal").attr("data-url");
-	postMessage(["openUrl", url], "*")
+	var url = $('#tootmodal').attr('data-url')
+	postMessage(['openUrl', url], '*')
 }
 //外部からトゥート開く
 function detEx(url, acct_id) {
-	if (acct_id == "main") {
-		acct_id = localStorage.getItem("main");
+	if (acct_id == 'main') {
+		acct_id = localStorage.getItem('main')
 	}
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/search?resolve=true&q=" + url
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url)
 	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) {
+	})
+		.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.statuses) {
-			postMessage(["openUrl", url], "*")
+				postMessage(['openUrl', url], '*')
 			} else {
-			var id = json.statuses[0].id;
-			$(".loadp").text($(".loadp").attr("href"));
-			$(".loadp").removeClass("loadp");
+				var id = json.statuses[0].id
+				$('.loadp').text($('.loadp').attr('href'))
+				$('.loadp').removeClass('loadp')
 				details(id, acct_id, 0)
 			}
-
-	});
-	return;
+		})
+	return
 }

app/js/tl/directory.js

@@ -0,0 +1,76 @@
+//ディレクトリ
+//ディレクトリトグル
+function dirMenu() {
+	$("#dir-contents").html("");
+	directory();
+	$("#left-menu a").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();
+	}
+}
+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");
+			}
+		});
+}

app/js/tl/dm.js

@@ -1,23 +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) {
+			"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) {
+		})
+		.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)
+		})
+		.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();
@@ -25,7 +33,6 @@ function dm(acct_id, tlid, type, delc, voice) {
 			//reload(type, '', acct_id, tlid, data, mute, delc,voice);
 			$(window).scrollTop(0);
 		});
-
 }
 function dmmore(tlid) {
 	var multi = localStorage.getItem("column");
@@ -33,39 +40,50 @@ 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
-		},
-	}).then(function (response) {
+			"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) {
+		})
+		.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>';
+		})
+		.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) {
@@ -212,11 +230,9 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			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 = "";
@@ -247,7 +263,7 @@ 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);
@@ -274,20 +290,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);
@@ -295,14 +311,13 @@ 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 = "";
@@ -317,8 +332,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			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);
@@ -335,8 +349,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			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);
@@ -362,15 +375,11 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				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 {
@@ -384,10 +393,9 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			mentions = "";
 			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 = "";
@@ -395,11 +403,9 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if (tagck) {
 			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,7 +421,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					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)) {
@@ -455,23 +461,21 @@ 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);
 
@@ -482,41 +486,13 @@ 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,381 +1,486 @@
 /*メディアフィルター機能*/
 //各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')
 	}
 }
+/* Remote only */
+function remoteOnly(tlid, type) {
+	var multi = localStorage.getItem('column')
+	var obj = JSON.parse(multi)
+	if (obj[tlid].data) {
+		if (obj[tlid].data.remote) {
+			obj[tlid].data.remote = false
+			var json = JSON.stringify(obj)
+			localStorage.setItem('column', json)
+			$('#sta-remote-' + tlid).text('Off')
+			$('#sta-remote-' + tlid).css('color', '#009688')
+		} else {
+			obj[tlid].data.remote = true
+			var json = JSON.stringify(obj)
+			localStorage.setItem('column', json)
+			$('#sta-remote-' + tlid).text('On')
+			$('#sta-remote-' + tlid).css('color', 'red')
+		}
+	} else {
+		obj[tlid].data = {}
+		obj[tlid].data.remote = true
+		var json = JSON.stringify(obj)
+		localStorage.setItem('column', json)
+		$('#sta-remote-' + tlid).text('On')
+		$('#sta-remote-' + tlid).css('color', 'red')
+	}
+	columnReload(tlid, type)
+}
+function remoteOnlyCk(tlid) {
+	var multi = localStorage.getItem('column')
+	var obj = JSON.parse(multi)
+	if (obj[tlid].data) {
+		if (obj[tlid].data.remote) {
+			$('#sta-remote-' + tlid).text('On')
+			$('#sta-remote-' + tlid).css('color', 'red')
+			return true
+		}
+	}
+	return false
+}
 //各TL上方のBT[BTOnly/BTExc/Off]
 function ebtToggle(tlid) {
-	var ebt = localStorage.getItem("ebt_" + tlid);
-	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 a').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) {
+	})
+		.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 = "";
+				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>";
+					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);
+				$('#filtered-words').html(filters)
 			} else {
-			$("#filtered-words").html(lang_filter_nodata);
+				$('#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 ($('#prof_filter:checked').val()) {
+		cont.push('profiles')
 	}
 	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({
+	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
-	}));
+			expires_in: time,
+		})
+	)
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response;
-			filter();
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.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)
+			$('#prof_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) {
+	})
+		.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);
+				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);
-			});
+					var context = json.context[key]
+					$('[value=' + context + ']').prop('checked', true)
+				})
 				if (json.irreversible) {
-				$("#except_filter").prop("checked", true);
+					$('#except_filter').prop('checked', true)
 				}
 				if (json.whole_word) {
-				$("#wholeword_filter").prop("checked", true);
+					$('#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);
+				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();
+	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;
-			filter();
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.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
+				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));
-		});
+		})
+			.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))
+			})
 	} 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 = [];
+	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);
+		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)
 			}
-	});
-	return mutedfilters;
+		}
+	})
+	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
 }
 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
+			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");
-	});
-
-
+	})
+		.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')
+		})
 }
 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();
+		$('[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");
+				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')
 				}
-			});
-		});
+			})
+		})
 	}
 }
 /*
@@ -386,73 +491,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;
+	var excludetxt = localStorage.getItem('exclude-' + tlid)
+	if (!excludetxt || excludetxt != '') {
+		return true
 	} else {
-		return false;
+		return false
 	}
 }
 function resetNotfFilter(tlid) {
-	localStorage.setItem("exclude-" + tlid, "")
-	parseColumn(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
+	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,262 +1,358 @@
 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 a').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) {
-			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);
+			})
+		})
+			.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 {
-		var start = "https://" + domain + "/api/v1/lists"
+					$('#lists').html(lang.lang_list_nodata)
+				}
+			})
+	} else {
+		var start = 'https://' + domain + '/api/v1/lists'
 		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 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);
+				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 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({
+	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;
-				list();
-				$("#list-add").val("")
+				var json = httpreq.response
+				if (this.status !== 200) {
+					setLog(start, this.status, this.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({
+		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;
-				list();
-				$("#list-add").val("")
+				var json = httpreq.response
+				if (this.status !== 200) {
+					setLog(start, this.status, this.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
-		},
-	}).then(function (response) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (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 lists = "";
-			var templete = userparse(json, '', acct_id);
+				var lists = ''
+				var templete = userparse(json, '', acct_id)
 				if (!json[0]) {
-				templete = lang.lang_list_nouser;
+					templete = lang.lang_list_nouser
 				}
-			$("#lists-user").html(templete);
+				$('#lists-user').html(templete)
+				jQuery('time.timeago').timeago()
 			} else {
-			$("#lists-user").html(lang.lang_list_nouser);
+				$('#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
-			},
-		}).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);
+				Authorization: 'Bearer ' + at
 			}
-		});
-		var start = "https://" + domain + "/api/v1/accounts/" + user + "/lists"
+		})
+			.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'
 		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 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);
+				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 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 {
-		var start = "https://" + domain + "/api/users/lists/list"
+					$('#his-lists-b').html(lang.lang_list_nodata)
+				}
+			})
+	} else {
+		var start = 'https://' + domain + '/api/users/lists/list'
 		fetch(start, {
 			method: 'POST',
 			body: JSON.stringify({
 				i: 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 + 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);
+			})
+		})
+			.then(function(response) {
+				if (!response.ok) {
+					response.text().then(function(text) {
+						setLog(response.url, response.status, text)
+					})
 				}
-		});
-		$("#his-lists-b").html("");
+				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('')
 	}
 }
 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));
+	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;
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.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,
@@ -264,21 +360,24 @@ 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));
+	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;
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
 			hisList(user, acct_id)
 		}
 	}

app/js/tl/misskeyparse.js

@@ -268,19 +268,7 @@ 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
 					};
-					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");
@@ -372,22 +360,20 @@ 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_" + toot.id;
+			var spoiler = "cw cw_hide";
 			var api_spoil = "gray";
-			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
-				'\')" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
+			var spoiler_show = '<a href="#" onclick="cw_show(this)" 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-' + toot.id + '">' + $.mb_substr($.strip_tagstemp(
+				var spoil = '<span class="cw_long">' + $.mb_substr($.strip_tagstemp(
 					toot.text), 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 cw_btn">' + lang.lang_parse_more + '</a><br>';
+				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>';
 			} else {
 				var content = escapeHTMLtemp(toot.text);
 				if (toot.cw) {
@@ -532,7 +518,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 + '">#' + 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 + '" data-regTag="'+tag.toLowerCase()+'">#' + 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);
@@ -917,19 +903,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 					icon: toot.avatar
 				};
 				var domain = localStorage.getItem("domain_" + acct_id);
-				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,327 +1,201 @@
 //Integrated TL
-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, {
+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, {
 		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";
-		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);
+			Authorization: 'Bearer ' + at
 		}
-			var templete = "";
-			if (localStorage.getItem("filter_" + acct_id) != "undefined") {
-				var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "mix");
-			} else {
-				var mute = [];
+	})
+	if (!promise.ok) {
+		promise.text().then(function(text) {
+			setLog(promise.url, promise.status, text)
+		})
 	}
-			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");
+	return await promise.json()
 }
-						}
-					}
-				}
-
-			});
-			$("#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, 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)
+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)
 	} 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 = 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");
+	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')
 	}
-	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].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].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 {
-				$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
-				$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
+	wsLocal[wslid].onmessage = function(mess) {
+		console.log('Receive Streaming API:(Integrated:Local)', mess)
+		integratedMessage(mess, acct_id, tlid, mute, voice)
 	}
-
-		} 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)
+	wsHome[wshid].onmessage = function(mess) {
+		console.log(['Receive Streaming API:(Integrated:Home)', mess])
+		integratedMessage(mess, acct_id, tlid, mute, voice)
 	}
-				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) {
+	wsLocal[wslid].onerror = function(error) {
 		console.error('WebSocketLocal Error')
-		console.error(error);
-		if (mode == "error") {
-			$("#notice_icon_" + tlid).addClass("red-text");
-			todo('WebSocket Error ' + 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);
+			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
+			localStorage.setItem('wserror_' + tlid, errorct)
 			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, "", "error");
+				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');
+	}
+	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);
+			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
+			localStorage.setItem('wserror_' + tlid, errorct)
 			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, "", "error");
+				reconnector(tlid, TLtype, acct_id, '', 'error')
 			}
 		}
-	};
-	websocketHome[wshid].onerror = function (error) {
+	}
+	wsHome[wshid].onerror = function(error) {
 		console.error(['WebSocketHome Error', error])
-		if (mode == "error") {
-			$("#notice_icon_" + tlid).addClass("red-text");
-			todo('WebSocket 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);
+			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
+			localStorage.setItem('wserror_' + tlid, errorct)
 			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, "", "error");
+				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');
+	}
+	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);
+			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
+			localStorage.setItem('wserror_' + tlid, errorct)
 			if (errorct < 3) {
-				reconnector(tlid, TLtype, acct_id, "", "error");
+				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)
+			} else {
+				let pool = localStorage.getItem('pool_' + tlid)
+				if (pool) {
+					pool = dom + pool
+				} else {
+					pool = dom
+				}
+				localStorage.setItem('pool_' + tlid, pool)
+			}
+			scrollck()
+			additional(acct_id, tlid)
+			jQuery('time.timeago').timeago()
+		}
+	}
+}
 //ある程度のスクロールで発火
-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();
-		});
-	});
-
-
+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()
 }

app/js/tl/notification.js

@@ -1,341 +1,361 @@
 //通知
 //取得+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.responseType = 'json'
+	httpreq.send(body)
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response;
-			var max_id = httpreq.getResponseHeader("link");
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.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);
+				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 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)
-						};
-						if (os == "darwin") {
-							var n = new Notification('TheDesk:' + domain, options);
-						} else {
-							var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
-							postMessage(["nativeNotf", nativeNotfOpt], "*")
+							icon: localStorage.getItem('prof_' + acct_id)
 						}
-
+						var n = new Notification('TheDesk:' + domain, options)
 					}
-					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") {
+					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);
+							templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
 						} else {
-							templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute);
+							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], 'notf', acct_id, tlid, -1);
+							templete = templete + userparse([obj.account], obj.type, 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()
+			//Markers
+			var markers = localStorage.getItem('markers')
+			if (markers == 'yes') {
+				markers = true
+			} else {
+				markers = false
+			}
+			if (markers) {
+				getMarker(tlid, 'notf', acct_id)
 			}
-			$("#notf-box").addClass("fetched");
-			todc();
 		}
 	}
 	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'));
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (json) {
+	}
+	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);
+				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 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)
-					};
-					if (os == "darwin") {
-						var n = new Notification('TheDesk:' + domain, options);
-					} else {
-						var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
-						postMessage(["nativeNotf", nativeNotfOpt], "*")
+							icon: localStorage.getItem('prof_' + acct_id)
 						}
-
+						var n = new Notification('TheDesk:' + domain, options)
 					}
-				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") {
+					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);
+							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], 'notf', acct_id, 'notf', -1);
+							templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
 						}
-
 					}
-			});
-			$("div[data-notf=" + acct_id + "]").html(templete);
-			$("#landing_" + tlid).hide();
-			jQuery("time.timeago").timeago();
+				})
+				$('div[data-notf=' + acct_id + ']').html(templete)
+				$('#landing_' + tlid).hide()
+				jQuery('time.timeago').timeago()
 			}
-		$("#notf-box").addClass("fetched");
-		todc();
+			$('#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);
+		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");
-
+			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) {
 			//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 (obj.type != "follow") {
-					templete = parse([obj], 'notf', acct_id, 'notf', popup);
+			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' && obj.type != 'follow_request') {
+						templete = parse([obj], 'notf', acct_id, 'notf', popup)
+					} else if (obj.type == 'follow_request') {
+						templete = userparse([obj.account], 'request', acct_id, 'notf', -1)
 					} else {
-					templete = userparse([obj], 'notf', acct_id, 'notf', popup);
+						templete = userparse([obj], obj.type, 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();
-			} else if (type == "delete") {
-				$("[toot-id=" + obj + "]").hide();
-				$("[toot-id=" + obj + "]").remove();
+					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);
+			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)
+			}
+		}
 	}
 }
 //一定のスクロールで発火
 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.responseType = 'json'
+		httpreq.send(body)
 		httpreq.onreadystatechange = function() {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.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
+				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]
 				if (json[0]) {
-					var templete = "";
-					var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
-					localStorage.setItem("lastnotf_" + acct_id, json[0].id);
+					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") {
+						var obj = json[key]
+						var mute = getFilterTypeByAcct(acct_id, 'notif')
+						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], 'notf', acct_id, 'notf', -1);
+								templete = templete + userparse([obj.account], obj.type, 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()
 			}
 		}
 	}
@@ -343,53 +363,64 @@ 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");
+	$('.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)
+	}
 }
 function allNotfRead() {
-	var multi = localStorage.getItem("multi");
+	var multi = localStorage.getItem('multi')
 	if (multi) {
-		var obj = JSON.parse(multi);
+		var obj = JSON.parse(multi)
 		Object.keys(obj).forEach(function(key) {
 			notfCanceler(key)
-		});
+		})
 	}
 }
 allNotfRead()

app/js/tl/old-mix.js

@@ -1,249 +1,375 @@
 //Integrated TL
-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");
+function mixtl(acct_id, tlid, type, delc, voice) {
+	localStorage.removeItem('morelock')
+	localStorage.setItem('now', type)
+	todo('Integrated TL Loading...(Local)')
 	//まずLocal
-	var start = "https://" + domain + "/api/v1/timelines/public?local=true";
+	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
-		},
-	}).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";
+			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(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(obj) {
-			//ホームのオブジェクトをUnix時間で走査
-			if (!$("[toot-id=" + obj[0].id + "]").length) {
-				$("#timeline_" + tlid + " .cvo").first().before(parse([obj[0]], 'home',
-					acct_id));
-					//delete obj[0];
+					Authorization: 'Bearer ' + at
 				}
-			//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;
+			})
+				.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 {
-			html = parse(
-				obj, 'home', acct_id, tlid);
-			$("#timeline_" + tlid).html(html);
+						var mute = []
 					}
-			todc();
-			mixre(acct_id, tlid);
-			additional(acct_id, tlid);
-			jQuery("time.timeago").timeago();
-		});
-	});
+					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) {
-	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);
+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)
 	websocketHome[wshid].onopen = function(mess) {
-		console.log("Connect Streaming API(Home)");
-		$("#notice_icon_" + tlid).removeClass("red-text");
+		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')
 	}
 	websocketLocal[wslid].onopen = function(mess) {
-		console.log("Connect Streaming API(Local)");
-		$("#notice_icon_" + tlid).removeClass("red-text");
+		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].onmessage = function(mess) {
-		console.log("Receive Streaming API:");
+		console.log(['Receive Streaming API:(Integrated:Local)', obj])
 
-		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);
+		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)
 				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();
-				todc();
+				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:(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);
+		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;
+					pool = templete + pool
 				} else {
 					pool = templete
 				}
-				localStorage.setItem("pool_" + tlid, pool);
-				scrollck();
-				additional(acct_id, tlid);
-				jQuery("time.timeago").timeago();
+				localStorage.setItem('pool_' + tlid, pool)
+
+				scrollck()
+
+				additional(acct_id, tlid)
+				jQuery('time.timeago').timeago()
+			} else {
+				todo('二重取得発生中')
 			}
 		}
 	}
 	websocketLocal[wslid].onerror = function(error) {
-		console.error('WebSocket Error ' + 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('WebSocket Error ' + 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')
+			}
+		}
+	}
 }
 
 //ある程度のスクロールで発火
-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);
+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(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;
+			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(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(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];
+					Authorization: 'Bearer ' + at
 				}
-			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;
+			})
+				.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')
+									}
+								}
+							}
+						}
+					})
 
-					}
-				});
-			});
-			additional(acct_id, tlid);
-			jQuery("time.timeago").timeago();
-			todc();
-		});
-	});
-
+					$('#timeline_' + tlid).append(templete)
+					additional(acct_id, tlid)
+					jQuery('time.timeago').timeago()
+					moreloading = false
+					todc()
+				})
+		})
 }

app/js/tl/poll.js

@@ -1,17 +1,37 @@
 //アンケートのトグル
 function pollToggle() {
-    if ($("#poll").hasClass("hide")) {
-        $("#right-side").show()
-        $("#poll").removeClass("hide")
+	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 {
-        $("#right-side").hide()
-        $("#emoji").addClass("hide")
-        $("#poll").addClass("hide")
+			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){
@@ -22,98 +42,81 @@ 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) {
-    if ($('.vote_' + acct_id + '_' + id + '_' + to).hasClass("sel")) {
-        $('.vote_' + acct_id + '_' + id + '_' + to).css("background-color", "transparent")
-        $('.vote_' + acct_id + '_' + id + '_' + to).removeClass("sel");
+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').each(function (i, elem) {
-                if (i == to) {
-                    $(this).css("background-color", "var(--emphasized)");
-                    $(this).addClass("sel");
+			$('.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 {
-                    $(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");
+			$(elem).css('background-color', 'var(--emphasized)')
+			$(elem).addClass('sel')
 		}
 	}
-
 }
-function voteMastodon(acct_id, id) {
-    var choice = [];
-    $('.vote_' + acct_id + '_' + id + ' div').each(function (i, elem) {
-        if ($(this).hasClass("sel")) {
-            choice.push(i + "");
+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 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 }));
+	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)
+		voteMastodonrefresh(acct_id, id, target)
 	}
 }
 function showResult(acct_id, id) {
-    $('.vote_' + acct_id + '_' + id + '_result').toggleClass("hide")
+	$('.vote_' + acct_id + '_' + id + '_result').toggleClass('hide')
 }
-function voteMastodonrefresh(acct_id, id) {
-    var datetype = localStorage.getItem("datetype");
+function voteMastodonrefresh(acct_id, id, target) {
+	var datetype = localStorage.getItem('datetype')
 	if (!datetype) {
-        datetype = "absolute";
+		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();
+	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 (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			var json = httpreqd.response
+			console.log(['Refresh vote', json])
 			if (!json) {
-                return false;
+				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)
+			var poll = pollParse(json, acct_id, json.emojis)
+			$(`#vote${target}`).html(poll)
 		}
 	}
 }

app/js/tl/speech.js

@@ -1,108 +1,183 @@
-$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");
+$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')
 speechSynthesis.cancel()
-if (!localStorage.getItem("voice_vol")) {
-    localStorage.setItem("voice_vol", 1)
+if (!localStorage.getItem('voice_vol')) {
+	localStorage.setItem('voice_vol', 1)
 }
-$synthes.rate = localStorage.getItem("voice_speed");
-$synthes.pitch = localStorage.getItem("voice_pitch");
-$synthes.volume = localStorage.getItem("voice_vol");
+voiceRate = localStorage.getItem('voice_speed')
+$synthes.rate = voiceRate
+voicePitch = localStorage.getItem('voice_pitch')
+$synthes.pitch = voicePitch
+voiceVol = localStorage.getItem('voice_vol')
+$synthes.volume = voiceVol
 function say(msgr) {
-    msg = voiceParse(msgr);
-    var voice = localStorage.getItem("voicebank");
-    var obj = JSON.parse(voice);
+	msg = voiceParse(msgr)
+	var voice = localStorage.getItem('voicebank')
+	var obj = JSON.parse(voice)
 	if (!obj) {
-        var json = JSON.stringify([msg]);
-        localStorage.setItem("voicebank", json);
+		var json = JSON.stringify([msg])
+		localStorage.setItem('voicebank', json)
 	} else {
-        obj.push([msg]);
-        var json = JSON.stringify(obj);
-        localStorage.setItem("voicebank", json);
+		obj.push([msg])
+		var json = JSON.stringify(obj)
+		localStorage.setItem('voicebank', json)
 	}
-
 }
 $repeat = setInterval(function() {
 	if (!speechSynthesis.speaking) {
-        var voice = localStorage.getItem("voicebank");
+		var voice = localStorage.getItem('voicebank')
 		if (voice) {
-            var obj = JSON.parse(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);
+				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)
+				}
+
+				obj.splice(0, 1)
+				var json = JSON.stringify(obj)
+				localStorage.setItem('voicebank', json)
 			}
 		}
 	}
-}, 300);
+}, 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);
+	var voiceck = localStorage.getItem('voice_' + tlid)
 	if (voiceck) {
-        localStorage.removeItem("voice_" + tlid);
+		localStorage.removeItem('voice_' + tlid)
 		speechSynthesis.cancel()
-        $("#sta-voice-" + tlid).text("Off");
-        $("#sta-voice-" + tlid).css("color", 'red');
-        parseColumn(tlid);
+		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);
+		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);
+	var voiceck = localStorage.getItem('voice_' + tlid)
 	if (voiceck) {
-        $("#sta-voice-" + tlid).text("On");
-        $("#sta-voice-" + tlid).css("color", '#009688');
+		$('#sta-voice-' + tlid).text('On')
+		$('#sta-voice-' + tlid).css('color', '#009688')
 	} else {
-        $("#sta-voice-" + tlid).text("Off");
-        $("#sta-voice-" + tlid).css("color", 'red');
+		$('#sta-voice-' + tlid).text('Off')
+		$('#sta-voice-' + tlid).css('color', 'red')
 	}
 }
 function voicePlay() {
 	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);
+		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)
+		}
 	}
 }
 
 function voiceSettings() {
-    localStorage.setItem("voice_speed", $("#voicespeed").val() / 10);
-    localStorage.setItem("voice_pitch", $("#voicepitch").val() / 50);
-    localStorage.setItem("voice_vol", $("#voicevol").val() / 100);
+	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 })
 }
 function voiceSettingLoad() {
-    var speed = localStorage.getItem("voice_speed");
-    var pitch = localStorage.getItem("voice_pitch");
-    var vol = localStorage.getItem("voice_vol");
+	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);
+		$('#voicespeed').val(speed * 10)
+		$('#voicespeedVal').text(speed * 10)
 	}
 	if (pitch) {
-        $("#voicepitch").val(pitch * 50);
+		$('#voicepitch').val(pitch * 50)
+		$('#voicepitchVal').text(pitch * 50)
 	}
 	if (vol) {
-        $("#voicevol").val(vol * 100);
+		$('#voicevol').val(vol * 100)
+		$('#voicevolVal').text(vol * 100)
+	}
+}
+function bouyomiConnect(sends) {
+	var socket = new WebSocket('ws://localhost:50002/')
+	socket.onopen = function() {
+		socket.send(sends)
 	}
 }

app/js/tl/src.js

@@ -1,193 +1,271 @@
 //検索
 //検索ボックストグル
 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 a').removeClass('active')
+	$('#searchMenu').addClass('active')
+	$('.menu-content').addClass('hide')
+	$('#src-box').removeClass('hide')
 	//$('ul.tabs').tabs('select_tab', 'src-sta');
 }
 
 //検索取得
-function src(mode) {
-	$("#src-contents").html("");
-	var q = $("#src").val();
-	var acct_id = $("#src-acct-sel").val();
-	if (acct_id == "tootsearch") {
-		tsAdd(q)
-		return false;
+function src(mode, offset) {
+	if (!offset) {
+		$('#src-contents').html('')
+		var add = ''
+	} else {
+		var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
 	}
-	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");
+
+	var q = $('#src').val()
+	var acct_id = $('#src-acct-sel').val()
+	if (acct_id == 'tootsearch') {
+		tsAdd(q)
+		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')
 	}
 	if (!mode) {
-		var start = "https://" + domain + "/api/v2/search?q=" + q
+		var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(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) {
-		return response.json();
-	}).catch(function (error) {
-		src("v1")
-		return false;
-	}).then(function (json) {
-		console.log(["Search", 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 = "";
+				var tags = ''
 				Object.keys(json.hashtags).forEach(function(key4) {
-				var tag = json.hashtags[key4];
+					var tag = json.hashtags[key4]
 					if (mode) {
-					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
-						'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
+						tags =
+							tags +
+							`<a onclick="tl('tag','${tag}','${acct_id}','add')" class="pointer">
+								#${escapeHTML(tag)}
+							</a>
+							<br> `
 					} else {
-					tags = tags + graphDraw(tag, acct_id);
+						tags = tags + graphDraw(tag, acct_id)
 					}
-
-			});
-			$("#src-contents").append("Tags<br>" + tags);
+				})
+				$('#src-contents').append('Tags<br>' + tags)
 			}
 			//トゥート
 			if (json.statuses[0]) {
-			var templete = parse(json.statuses, '', acct_id);
-			$("#src-contents").append("<br>Mentions<br>" + templete);
+				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);
-			$("#src-contents").append("<br>Accounts<br>" + templete);
+				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");
+	if(!q || q=='undefined') {
+		return false
+	}
+	var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
+	console.log('Toot search at ' + start)
+	$('#notice_' + tlid).text('tootsearch(' + q + ')')
+	$('#notice_icon_' + tlid).text('search')
 	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 (raw) {
-		var templete = "";
-		var json = raw.hits.hits;
-		var max_id = raw["hits"].length;
+		}
+	})
+		.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"];
+				var toot = json[i]['_source']
 				if (lastid != toot.uri) {
 					if (toot && toot.account) {
-					templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
+						templete = templete + parse([toot], 'noauth', null, tlid, 0, [], 'tootsearch')
 					}
 				}
-			var lastid = toot.uri;
+				var lastid = toot.uri
 			}
 			if (!templete) {
-			templete = lang.lang_details_nodata;
+				templete = lang.lang_details_nodata
 			} else {
-			templete = templete + '<div class="hide ts-marker" data-maxid="' + max_id + '"></div>';
+				templete = templete + `<div class="hide ts-marker" data-maxid="${max_id}"></div>`
 			}
-		$("#timeline_" + tlid).html(templete);
+			$('#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) {
-		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;
+		}
+	})
+		.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"];
+				var toot = json[i]['_source']
 				if (lastid != toot.uri) {
 					if (toot && toot.account) {
-					templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
+						templete = templete + parse([toot], 'noauth', null, tlid, 0, [], 'tootsearch')
 					}
 				}
-			var lastid = toot.uri;
+				var lastid = toot.uri
 			}
 			if (!templete) {
-			templete = lang.lang_details_nodata;
+				templete = lang.lang_details_nodata
 			} else {
-			templete = templete + '<div class="hide ts-marker" data-maxid="' + max_id + '"></div>';
+				templete = templete + `<div class="hide ts-marker" data-maxid="${max_id}"></div>`
 			}
-		$("#timeline_" + tlid).append(templete);
+			$('#timeline_' + tlid).append(templete)
 
-		jQuery("time.timeago").timeago();
-	});
+			jQuery('time.timeago').timeago()
+		})
 }
 function graphDraw(tag, acct_id) {
-	var tags = "";
-	var his = tag.history;
-	var max = Math.max.apply(null, [his[0].uses, his[1].uses, his[2].uses, his[3].uses, his[4].uses, his[5].uses, his[6].uses]);
-	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;
+	var tags = ''
+	var his = tag.history
+	return graphDrawCore(his, tag)
 }
-
-	return tags;
+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>`
 }
 /*
 <svg version="1.1" viewbox="0 0 50 300" width="100%" height="50">
@@ -195,47 +273,88 @@ function graphDraw(tag, acct_id) {
 </svg>
 */
 function trend() {
-	console.log("get trend")
-	$("#src-contents").html("");
-	var acct_id = $("#src-acct-sel").val();
-	if(acct_id=="tootsearch"){
-		return false;
+	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) {
-		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;
-				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);
-			});
-
-	});
+			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 = ''
+			Object.keys(json).forEach(function(keye) {
+				var tag = json[keye]
+				var his = tag.history
+				tags = graphDrawCore(his, tag)
+
+				$('#src-contents').append(tags)
+			})
+		})
+}
+function srcBox(mode) {
+	var selectedText = window.getSelection().toString()
+	if (mode == 'open') {
+		$('#pageSrc').removeClass('hide')
+	} else if (mode == 'close') {
+		if(!selectedText) {
+			$('#pageSrc').addClass('hide')
+			$('#pageSrc').removeClass('keep')
+		}
+	} else {
+		$('#pageSrc').toggleClass('hide')
+	}
+	if(!$('#pageSrc').hasClass('keep')) {
+		$('#pageSrcInput').val(selectedText)
+	}
+}
+$('#pageSrcInput').click(function() {
+	$('#pageSrc').addClass('keep')
+})
+$('#pageSrcInput').on('input', function(evt) {
+	if(!$('#pageSrcInput').val()) {
+		$('#pageSrc').removeClass('keep')
+	}
+})
+document.addEventListener('selectionchange', function() {
+	var selectedText = window.getSelection().toString()
+	if (selectedText && !$('input').is(':focus') && !$('textarea').is(':focus')) {
+		srcBox('open')
+	}
+})
+function doSrc(type) {
+	$('#pageSrc').addClass('hide')
+	$('#pageSrc').removeClass('keep')
+	var q = $('#pageSrcInput').val()
+	if(type == 'web') {
+		var start = localStorage.getItem('srcUrl')
+		if(!start) {
+			start = 'https://google.com/search?q={q}'
+		}
+		start = start.replace(/{q}/, q)
+		postMessage(["openUrl", start], "*")
+	} else if(type == 'ts') {
+		tsAdd(q)
+	}
 }

app/js/tl/tag.js

@@ -1,130 +1,225 @@
 //タグ表示
 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) {
-    $("[data-tag=" + decodeURI(tag).toLowerCase() + "]").toggleClass("hide");
+	console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']')
+	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
 }
 //タグ追加
 function tagPin(tag) {
-    var tags = localStorage.getItem("tag");
+	var tags = localStorage.getItem('tag')
 	if (!tags) {
-        var obj = [];
+		var obj = []
 	} else {
-        var obj = JSON.parse(tags);
+		var obj = JSON.parse(tags)
 	}
-    var can;
+	var can
 	Object.keys(obj).forEach(function(key) {
-        var tagT = obj[key];
+		var tagT = obj[key]
 		if (tagT == tag) {
-            can = true;
+			can = true
 		} else {
-            can = false;
+			can = false
 		}
-    });
+	})
 	if (!can) {
-        obj.push(tag);
+		obj.push(tag)
 	}
-    var json = JSON.stringify(obj);
-    localStorage.setItem("tag", json);
-    favTag();
+	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");
+	$('#taglist').html('')
+	var tagarr = localStorage.getItem('tag')
 	if (!tagarr) {
-        var obj = [];
+		var obj = []
 	} else {
-        var obj = JSON.parse(tagarr);
+		var obj = JSON.parse(tagarr)
 	}
-    var tags = "";
-    var nowPT = localStorage.getItem("stable")
+	var tags = ''
+	var nowPT = localStorage.getItem('stable')
 	Object.keys(obj).forEach(function(key) {
-        var tag = obj[key];
+		var tag = obj[key]
 		if (nowPT != tag) {
-            console.log("stable tags:" + nowPT + "/" + tag);
-            var ptt = lang.lang_tags_realtime;
-            var nowon = "";
+			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 + ")";
+			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> ';
-    });
+		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);
+		$('#taglist').append('My Tags:' + tags)
 	} else {
-        $("#taglist").append("");
+		$('#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"
+	$('.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) {
+			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;
+				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>');
+					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("");
+				$('#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")
+	var nowPT = localStorage.getItem('stable')
 	if (nowPT == tag) {
-        localStorage.removeItem("stable");
+		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 + " ")
+		localStorage.setItem('stable', tag)
+		M.toast({
+			html: lang.lang_tags_tagwarn.replace('{{tag}}', tag).replace('{{tag}}', tag),
+			displayLength: 3000
+		})
+		brInsert('#' + tag + ' ')
 	}
-    favTag();
+	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'
+	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 })
+		})
+}
+//タグのフィルタ
+function addTag(id) {
+	var columns = JSON.parse(localStorage.getItem('column'))
+	var column = columns[id]
+	if(!column.data.name) {
+		var name = column.data
+	} else {
+		var name = column.data.name
+	}
+	var col = localStorage.getItem('column')
+	var o = JSON.parse(col)
+	var obj = o[id]
+	obj.data = {
+		'name': name,
+		'all': $(`#all_tm-${id}`).val(),
+		'any': $(`#any_tm-${id}`).val(),
+		'none': $(`#none_tm-${id}`).val(),
+	}
+	o[id] = obj
+	var json = JSON.stringify(o)
+	console.log(json)
+	localStorage.setItem('column',json)
+	columnReload(id, 'tag')
+}
+

app/js/ui/img.js

@@ -1,259 +1,259 @@
 /*イメージビューワー*/
 //postのimg.jsとは異なります。
 function imgv(id, key, acct_id) {
-	$("#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);
+	$('#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');
-			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));
+		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()
 		}
-			}, 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) {
-	$("#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 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
 	}
-	var murl = $("#" + id + "-image-" + key).attr("data-url");
 	if (murl) {
-		$('#imgmodal').attr('src', '../../img/loading.svg');
-		var type = $("#" + id + "-image-" + key).attr("data-type");
+		$('#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") {
-				xhr = new XMLHttpRequest;
-				xhr.open('GET', murl, true);
-				xhr.responseType = "arraybuffer";
-				xhr.addEventListener('progress', function (event) {
+			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));
+				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(); // ドラッグスクロール設定
-				$('#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;
+		},
+		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;
-				var height = element.naturalHeight;
-				var windowH = $(window).height();
-				var windowW = $(window).width();
-				$("#imagemodal").css("bottom", "0")
-				$("#imagemodal img").css("width", "auto")
+					var width = element.naturalWidth
+					if(width < 650) {
+						width = 650;
+					}
+					var height = element.naturalHeight
+					var windowH = $(window).height()
+					var windowW = $(window).width()
+					$('#imagemodal').css('bottom', '0')
+					$('#imagemodal img').css('width', 'auto')
 					if (height < windowH) {
-					$("#imagemodal").css("height", height + 60 + "px")
-					$("#imagemodal img").css("height", "100%")
+						$('#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", "100%")
-						var heightS = windowW * 0.8 / width * height;
-						$("#imagemodal").css("height", heightS + 60 + "px")
+							$('#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")
+							$('#imagemodal').css('width', width + 'px')
 						}
 					} else {
-					$("#imagemodal img").css("width", "auto")
-					var widthS = windowH / height * width;
+						$('#imagemodal img').css('width', 'auto')
+						var widthS = (windowH / height) * width
 						if (widthS < windowW) {
-						$("#imagemodal").css("width", widthS + "px")
+							$('#imagemodal').css('width', widthS + 'px')
 						} else {
-						$("#imagemodal").css("width", "100vw")
+							$('#imagemodal').css('width', '100vw')
 						}
 
-					$("#imagemodal").css("height", "100vh")
-					$("#imagemodal img").css("height", "calc(100vh - 60px)")
+						$('#imagemodal').css('height', '100vh')
+						$('#imagemodal img').css('height', 'calc(100vh - 60px)')
 					}
 				}
-			if ($("#" + id + "-image-" + (key * 1 + 1)).length === 0) {
-				$("#image-next").prop("disabled", true);
+				if ($('#' + id + '-image-' + (key * 1 + 1)).length == 0) {
+					$('#image-next').prop('disabled', true)
 				} else {
-				$("#image-next").prop("disabled", false);
+					$('#image-next').prop('disabled', false)
 				}
-			if ($("#" + id + "-image-" + (key * 1 - 1)).length === 0) {
-				$("#image-prev").prop("disabled", true);
+				if ($('#' + id + '-image-' + (key * 1 - 1)).length == 0) {
+					$('#image-prev').prop('disabled', true)
 				} else {
-				$("#image-prev").prop("disabled", false);
+					$('#image-prev').prop('disabled', false)
 				}
-			element.src = murl;
-
-		});
+				element.src = b64
+				var endTime = new Date()
+				var proctime = endTime.getTime() - startTime.getTime()
+				$('#imgsec').text(proctime)
+				$('#imgmodal').attr('src', b64)
 			}
 		}
+	}
+	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 () {
+;(function() {
 	$.fn.dragScroll = function() {
-		var target = this;
-		$(this).mousedown(function (event) {
+		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'
-		});
+					.data('scrollTop', this.scrollTop)
+				return false
+			})
+			.css({
+				overflow: 'hidden', // スクロールバー非表示
+				cursor: 'move'
+			})
 		// ウィンドウから外れてもイベント実行
-		$(document).mousemove(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; // 文字列選択を抑止
+					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) {
+			})
+			.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'
-		}); //指が触れたか検知
+					.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);
-		});
-
-		return this;
+				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - getX(event))
+				target.scrollTop($(target).data('scrollTop') + $(target).data('y') - getY(event))
+				return false // 文字列選択を抑止
+			} else {
 			}
-})(jQuery);
+		}) //指が動いたか検知
+		$(this).on('touchend', function(event) {
+			$(target).data('down', false)
+		})
+
+		return this
+	}
+})(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");
+var element = document.getElementById('imagemodal')
 element.onmousewheel = function(e) {
-	var delta = e.wheelDelta;
+	var delta = e.wheelDelta
 	if (delta > 0) {
 		zoom(1.1)
 	} else {
@@ -263,22 +263,33 @@ 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 url = $("#imgmodal").attr("src");
-	if (localStorage.getItem("savefolder")) {
-		var save = localStorage.getItem("savefolder");
-	} else {
-		var save = "";
+	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
 	}
-	postMessage(["generalDL", [url, save, false]], "*")
-
+	var save = localStorage.getItem('savefolder')
+	if (!save || save == 'null') {
+		var save = ''
+	}
+	postMessage(['generalDL', [murl, save, false]], '*')
 }
 function openFinder(dir) {
-	postMessage(["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 })
 }

app/js/ui/menu.js

@@ -17,12 +17,23 @@ function menu() {
     }
     $('#menu').css("left", left + "px")
     $('#menu').css("top", top + "px")
+    var height = localStorage.getItem("menu-height");
+    var width = localStorage.getItem("menu-width");
+    if(height){
+      $('#menu').css("height", height + "px")
+    }else{
+      $('#menu').css("height", "460px")
+    }
+    if(width){
+      $('#menu').css("width", width + "px")
+    }
     $('#menu').fadeIn();
     $("#menu-bar").html("TheDesk " + localStorage.getItem("ver"));
     $(".menu-content").addClass("hide");
     $("#add-box").removeClass("hide");
     $("#left-menu div").removeClass("active");
     $("#addColumnMenu").addClass("active");
+    $("#addColumnMenu").click();
   } else {
     $('#menu').fadeOut()
     $("#menu").removeClass("appear")
@@ -49,7 +60,19 @@ $(function () {
       localStorage.setItem("menu-top", top);
     }
   });
+  $("#menu").resizable({
+    minHeight: 150,
+    minWidth: 200,
+    stop: function (event, ui) {
+      localStorage.setItem("menu-height", ui.size.height);
+      localStorage.setItem("menu-width", ui.size.width);
+    }
+  });
 });
 function help() {
-  postMessage(["openUrl", "https://docs.thedesk.top"], "*")
+  $("#left-menu a").removeClass("active");
+	$("#helpMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+	$("#help-box").removeClass("hide");
+  postMessage(["sendSinmpleIpc", "getLogs"], "*")
 }

app/js/ui/post-box.js

@@ -1,111 +1,145 @@
 /*ささやきボックス(Cr民並感)*/
 //✕隠す
 function hide() {
-	$("#right-side").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)
 	$('#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()
+	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")
-	$('#post-box').fadeIn();
-	$('#textarea').characterCounter();
+	$('#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')
+	} else {
+		$('#post-box').css('width', '300px')
+	}
+	$('#post-box').fadeIn()
+	$('#textarea').characterCounter()
+	
+	mdCheck()
 }
 
 $(function () {
-	$("#post-box").draggable({
-		handle: "#post-bar",
+	
+	$('#post-box').draggable({
+		handle: '#post-bar',
 		stop: function () {
-			var left = $('#post-box').offset().left;
+			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({
+		minHeight: 150,
+		minWidth: 100,
+		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')
 	}
 }
+window.onload = initPostbox
+function initPostbox() {
 	$('#posttgl').click(function (e) {
-	if (!$('#post-box').hasClass("appear")) {
-		show();
+		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")
-});
+		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)
+		localStorage.setItem('nohide', true)
 		var countup = function () {
-		localStorage.removeItem("nohide")
+			localStorage.removeItem('nohide')
 		}
 		//setTimeout(remove, 100);
-	$('.cvo').removeClass("selectedToot")
+		$('.cvo').removeClass('selectedToot')
 		selectedColumn = 0
 		selectedToot = 0
-});
+	})
+}

app/js/ui/scroll.js

@@ -1,49 +1,70 @@
 //スクロールで続きを読む
 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');
-		//一番上ならためていた新しいトゥートを表示
+	$('.tl-box').each(function(i, elem) {
+		var tlid = $(this).attr('tlid')
+		var len = $('#timeline_' + tlid + ' .cvo').length
+		//一番上ならためていた新しいトゥートを表示ないしtealなら未読管理モード
 		if ($(this).scrollTop() === 0) {
-			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 ($("#timeline_" + tlid + " .cvo").length > 30) {
-				for (var i = 30; i < $("#timeline_" + tlid + " .cvo").length; i++) {
-					$("#timeline_" + tlid + " .cvo").eq(i).remove();
+			if (len > 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) {
-			console.log("kicked more loading:" + tlid);
-			moreload('', tlid);
+		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)
 		}
-	});
+	})
 }
 
 function goTop(id) {
-	if ($("#timeline_box_" + id + "_box .tl-box").scrollTop() > 500) {
-		$("#timeline_box_" + id + "_box .tl-box").scrollTop(500)
+	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)
 	}
-	$("#timeline_box_" + id + "_box .tl-box").animate({ scrollTop: 0 });
+	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 })
 }
 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/sort.js

@@ -33,7 +33,7 @@ function sortLoad () {
 			var acctdata = user + "@" + domain;
 		}
 
-		var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, escapeHTML(acct.data), acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
+		var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, acct.data, acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_sort_gothis + '">forward</i></a> <a onclick="removeColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>';
 		$("#sort").append(html);
@@ -111,7 +111,7 @@ function sort() {
 }
 //ソートボタントグル
 function sortMenu() {
-	$("#left-menu div").removeClass("active");
+	$("#left-menu a").removeClass("active");
 	$("#sortMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#sort-box").removeClass("hide");

app/js/ui/spotify.js

@@ -1,180 +1,294 @@
 function spotifyConnect() {
-    var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing";
-    var platform = localStorage.getItem("platform");
-    if (platform == "win32") {
-        postMessage(["openUrl", auth], "*")
-        postMessage(["sendSinmpleIpc", "quit"], "*")
+	var auth = 'https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing'
+	var platform = localStorage.getItem('platform')
+	if (platform == 'win32') {
+		postMessage(['openUrl', auth], '*')
+		postMessage(['sendSinmpleIpc', 'quit'], '*')
 	} else {
-        auth = auth + "&state=code";
-        $("#spotify-code-show").removeClass("hide");
-        postMessage(["openUrl", auth], "*")
+		auth = auth + '&state=code'
+		$('#spotify-code-show').removeClass('hide')
+		postMessage(['openUrl', auth], '*')
 	}
-
-
 }
 function spotifyAuth() {
-    var code = $("#spotify-code").val();
-    localStorage.setItem("spotify", "code");
-    localStorage.setItem("spotify-refresh", code);
-    $("#spotify-code-show").addClass("hide");
-    $("#spotify-enable").addClass("disabled");
-    $("#spotify-disable").removeClass("disabled");
+	var code = $('#spotify-code').val()
+	localStorage.setItem('spotify', 'code')
+	localStorage.setItem('spotify-refresh', code)
+	$('#spotify-code-show').addClass('hide')
+	$('#spotify-enable').addClass('disabled')
+	$('#spotify-disable').removeClass('disabled')
 }
 function spotifyDisconnect() {
-    localStorage.removeItem("spotify");
-    localStorage.removeItem("spotify-refresh");
-    checkSpotify();
+	localStorage.removeItem('spotify')
+	localStorage.removeItem('spotify-refresh')
+	checkSpotify()
 }
 function checkSpotify() {
-    if (localStorage.getItem("spotify")) {
-        $("#spotify-enable").addClass("disabled");
-        $("#spotify-disable").removeClass("disabled");
+	if (localStorage.getItem('spotify')) {
+		$('#spotify-enable').addClass('disabled')
+		$('#spotify-disable').removeClass('disabled')
 	} else {
-        $("#spotify-enable").removeClass("disabled");
-        $("#spotify-disable").addClass("disabled");
+		$('#spotify-enable').removeClass('disabled')
+		$('#spotify-disable').addClass('disabled')
 	}
-    var content = localStorage.getItem("np-temp");
-    if (!content || content == "" || content == "null") {
-        var content = "#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
+	var content = localStorage.getItem('np-temp')
+	if (!content || content == '' || content == 'null') {
+		var content = '#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk'
 	}
-    $("#np-temp").val(content);
-    var flag = localStorage.getItem("artwork");
+	$('#np-temp').val(content)
+	var flag = localStorage.getItem('artwork')
 	if (flag) {
-        $("#awk_yes").prop("checked", true);
+		$('#awk_yes').prop('checked', true)
 	} else {
-        $("#awk_no").prop("checked", true);
+		$('#awk_no').prop('checked', true)
+	}
+	var flag2 = localStorage.getItem('complete-artwork')
+	if (flag2) {
+		$('#amw_yes').prop('checked', true)
+	} else {
+		$('#amw_no').prop('checked', true)
 	}
 }
 function spotifyFlagSave() {
-    var awk = $("[name=awk]:checked").val();
-    if (awk == "yes") {
-        localStorage.setItem("artwork", "yes");
+	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");
+		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 })
 	}
 }
 function nowplaying(mode) {
-    if (mode == "spotify") {
-        var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
-        var at = localStorage.getItem("spotify");
+	if (mode == 'spotify') {
+		var start = 'https://thedesk.top/now-playing?at=' + localStorage.getItem('spotify') + '&rt=' + localStorage.getItem('spotify-refresh')
+		var at = localStorage.getItem('spotify')
 		if (at) {
 			fetch(start, {
 				method: 'GET',
 				headers: {
-                    'content-type': 'application/json'
+					'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) {
-                console.table(json);
+					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;
+						return false
 					}
-                var item = json.item;
-                var img = item.album.images[0].url;
-                var flag = localStorage.getItem("artwork");
+					var item = json.item
+					var img = item.album.images[0].url
+					var flag = localStorage.getItem('artwork')
 					if (flag) {
-                    postMessage(["bmpImage", [img, 0]], "*")
+						postMessage(['bmpImage', [img, 0]], '*')
 					}
-                var content = localStorage.getItem("np-temp");
-                if (!content || content == "" || content == "null") {
-                    var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
+					var content = localStorage.getItem('np-temp')
+					if (!content || content == '' || content == 'null') {
+						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
 					}
-                var regExp = new RegExp("{song}", "g");
-                content = content.replace(regExp, item.name);
-                var regExp = new RegExp("{album}", "g");
-                content = content.replace(regExp, item.album.name);
-                var regExp = new RegExp("{artist}", "g");
-                content = content.replace(regExp, item.artists[0].name);
-                var regExp = new RegExp("{url}", "g");
-                content = content.replace(regExp, item.external_urls.spotify);
-                var regExp = new RegExp("{composer}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{hz}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{bitRate}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{lyricist}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{bpm}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{genre}", "g");
-                content = content.replace(regExp, "");
-                $("#textarea").val(content);
-            });
+					var regExp = new RegExp('{song}', 'g')
+					content = content.replace(regExp, item.name)
+					var regExp = new RegExp('{album}', 'g')
+					content = content.replace(regExp, item.album.name)
+					var regExp = new RegExp('{artist}', 'g')
+					content = content.replace(regExp, item.artists[0].name)
+					var regExp = new RegExp('{url}', 'g')
+					content = content.replace(regExp, item.external_urls.spotify)
+					var regExp = new RegExp('{composer}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{hz}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{bitRate}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{lyricist}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{bpm}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{genre}', 'g')
+					content = content.replace(regExp, '')
+					$('#textarea').val(content)
+				})
 		} else {
 			Swal.fire({
 				type: 'info',
-                title: lang.lang_spotify_acct
+				title: lang.lang_spotify_acct,
 			})
 		}
-    } else if (mode == "itunes") {
-        postMessage(["itunes", ""], "*")
+	} else if (mode == 'itunes') {
+		postMessage(['itunes', ''], '*')
+	} else if (mode == 'lastFm') {
+		var user = localStorage.getItem('lastFmUser')
+		var start = 'https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=' + user + '&limit=1&api_key=8f113803bfea951b6dde9e56d32458b2&format=json'
+
+		if (user) {
+			fetch(start, {
+				method: 'GET',
+				headers: {
+					'content-type': 'application/json',
+				},
+			})
+				.then(function (response) {
+					if (!response.ok) {
+						response.text().then(function (text) {
+							setLog(response.url, response.status, text)
+						})
+					}
+					return response.json()
+				})
+				.catch(function (error) {
+					todo(error)
+					setLog(start, 'JSON', error)
+					console.error(error)
+				})
+				.then(function (json) {
+					console.table(json)
+					if (!json || !json.recenttracks) {
+						console.error('no data')
+						return false
+					}
+					var item = json.recenttracks.track[0]
+					if(!item['@attr']) return false
+					var img = item.image[3]['#text']
+					var isImg = item.streamable*1
+					var flag = localStorage.getItem('artwork')
+					if (flag && isImg && img) {
+						postMessage(['bmpImage', [img, 0]], '*')
+					}
+					var content = localStorage.getItem('np-temp')
+					if (!content || content == '' || content == 'null') {
+						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
+					}
+					var regExp = new RegExp('{song}', 'g')
+					content = content.replace(regExp, item.name)
+					var regExp = new RegExp('{album}', 'g')
+					content = content.replace(regExp, item.album['#text'])
+					var regExp = new RegExp('{artist}', 'g')
+					content = content.replace(regExp, item.artist['#text'])
+					var regExp = new RegExp('{url}', 'g')
+					content = content.replace(regExp,'')
+					var regExp = new RegExp('{composer}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{hz}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{bitRate}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{lyricist}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{bpm}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{genre}', 'g')
+					content = content.replace(regExp, '')
+					$('#textarea').val(content)
+				})
+		} else {
+			Swal.fire({
+				type: 'info',
+				title: lang.lang_spotify_acct,
+			})
 		}
 	}
-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}";
+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") {
+	var flag = localStorage.getItem('artwork')
+	var platform = localStorage.getItem('platform')
+	var aaw = { aaw: '', album: '' }
+	if (platform == 'win32') {
 		if (flag && arg.path) {
-            media(arg.path, "image/png", "new");
+			media(arg.path, 'image/png', 'new')
 		}
-    } else if (platform == "darwin") {
-        if (flag && arg.existsArtwork) {
-            media(arg.artworks[0].data, "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
+			aaw = await getUnknownAA(q)
+			postMessage(['bmpImage', [aaw.aaw, 0]], '*')
 		}
 	}
-    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);
+	var regExp = new RegExp('{song}', 'g')
+	content = content.replace(regExp, arg.name)
+	var regExp = new RegExp('{album}', 'g')
+	if (arg.album) {
+		if (arg.album.name) {
+			content = content.replace(regExp, arg.album.name)
+		} else {
+			if (aaw.album) content = content.replace(regExp, aaw.album)
+			content = content.replace(regExp, '-')
+		}
+	} else {
+		if (aaw.album) content = content.replace(regExp, aaw.album)
+		content = content.replace(regExp, '-')
+	}
+	var regExp = new RegExp('{artist}', 'g')
+	content = content.replace(regExp, arg.artist)
+	var regExp = new RegExp('{url}', 'g')
+	content = content.replace(regExp, '')
+	var regExp = new RegExp('{composer}', 'g')
+	content = content.replace(regExp, arg.composer)
+	var regExp = new RegExp('{hz}', 'g')
+	content = content.replace(regExp, arg.sampleRate / 1000 + 'kHz')
+	var regExp = new RegExp('{lyricist}', 'g')
+	content = content.replace(regExp, '')
+	var regExp = new RegExp('{bpm}', 'g')
+	content = content.replace(regExp, '')
+	var regExp = new RegExp('{bitRate}', 'g')
+	content = content.replace(regExp, arg.bitRate + 'kbps')
+	var regExp = new RegExp('{genre}', 'g')
+	content = content.replace(regExp, arg.genre)
+	$('#textarea').val(content)
 }
 function spotifySave() {
-    var temp = $("#np-temp").val();
-    localStorage.setItem("np-temp", temp);
+	var temp = $('#np-temp').val()
+	localStorage.setItem('np-temp', temp)
 	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
 }
 if (location.search) {
-    var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
-    var mode = m[1];
-    var codex = m[2];
-    if (mode == "spotify") {
-        var coder = codex.split(":");
-        localStorage.setItem("spotify", coder[0]);
-        localStorage.setItem("spotify-refresh", coder[1]);
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
+	var mode = m[1]
+	var codex = m[2]
+	if (mode == 'spotify') {
+		var coder = codex.split(':')
+		localStorage.setItem('spotify', coder[0])
+		localStorage.setItem('spotify-refresh', coder[1])
 	} else {
-
 	}
-
+}
+async function getUnknownAA(q) {
+	const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song'
+	let promise = await fetch(start, {
+		method: 'GET',
+	})
+	const json = await promise.json()
+	if (!json.resultCount) {
+		return []
+	}
+	const data = json.results[0].artworkUrl100
+	return { aaw: data.replace(/100x100/, '512x512'), album: json.results[0].collectionName }
 }

app/js/ui/theme.js

@@ -1,32 +1,35 @@
 //テーマ適用
 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('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('polartheme')
+	el.classList.remove('snowtheme')
+	el.classList.remove('customtheme')
+	el.classList.add(theme + 'theme')
+	var font = localStorage.getItem('font')
 	if (font) {
-		el.style.fontFamily = font;
+		font = font.replace(/"(.+)"/, '$1')
+		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,196 +1,293 @@
 //左下のメッセージ
-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! It\\\'s a nice client!\')"><span style="font-size:20px">TheDesk</span> ' + localStorage.getItem("ver") + '[<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 +
+				'\')"> ' +
+				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")
-		var json = nowplaying("spotifytips")
-		spotifytips(json)
+		localStorage.setItem('tips', 'spotify')
+		spotifytips()
+	} else if (mode == 'itunes') {
+		tipsToggle()
+		localStorage.setItem('tips', 'itunes')
+		itunestips()
 	}
 }
 //メモリ
 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) + "%)")
+	$('#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
-		},
-	}).then(function (response) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (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;
+				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>');
+					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("");
+				$('#tips-text').html('')
 			}
-	});
-
+		})
 }
 //Spotify
+spotint = null
 function spotifytips() {
-	var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
-	var at = localStorage.getItem("spotify");
+	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')
 	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) {
-			var ms = json.progress_ms;
-			var last = 1000 - ms % 1000;
-			var item = json.item;
-			var img = item.album.images[0].url;
-			var artisttxt = "";
+		})
+			.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(async function(json) {
+				var ms = json.progress_ms
+				if(!ms) {
+					tips('ver')
+					return false
+				}
+				var last = 1000 - (ms % 1000)
+				var item = json.item
+				var img = item.album.images[0].url
+				var artisttxt = ''
 				for (i = 0; i < item.artists.length; i++) {
 					if (i > 0) {
-					artisttxt = artisttxt + "," + item.artists[i].name;
+						artisttxt = artisttxt + ',' + item.artists[i].name
 					} else {
-					artisttxt = item.artists[0].name;
+						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;
+				artisttxt = escapeHTML(artisttxt)
+				await 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;
+					s = '0' + s
 				}
-			var m = (Math.round(ms) - Math.round(ms) % 60) / 60;
-			var ts = Math.round(tms) % 60;
+				var m = (Math.round(ms) - (Math.round(ms) % 60)) / 60
+				var ts = Math.round(tms) % 60
 				if (ts < 10) {
-				ts = "0" + ts;
+					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);
-		});
+				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)
+			})
 	} else {
 		Swal.fire({
 			type: 'info',
 			title: lang.lang_spotify_acct
 		})
+		tips('ver')
+		return false
 	}
 }
 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;
-function clock() {
-	var now = new Date();
-	var last = 1000 - now.getTime() % 1000;
-	sleep(last);
-	clockint = setInterval(clockStart, 1000);
+var clockint
+async function clock() {
+	var now = new Date()
+	var last = 1000 - (now.getTime() % 1000)
+	await 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
 	}
-function sleep(waitMsec) {
-	var startMsec = new Date();
-	while (new Date() - startMsec < waitMsec);
+	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 tipsToggle() {
-	$("#tips").toggleClass("hide");
-	$("#tips-menu").toggleClass("hide");
-}
-if (localStorage.getItem("tips")) {
-	tips(localStorage.getItem("tips"));
+	$('#tips').toggleClass('hide')
+	$('#tips-menu').toggleClass('hide')
 }
+

app/js/userdata/his-data.js

@@ -1,56 +1,68 @@
 //ユーザーデータ表示
 //タイムライン
-function utl(user, more, acct_id) {
+function utlShow(user, more, acct_id) {
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (user == "--now") {
-		var user = $('#his-data').attr("user-id");
+		var user = $("#his-data").attr("user-id");
 	}
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
 		if (more) {
-			var sid = $("#his-tl .cvo").last().attr("toot-id");
+			var sid = $("#his-tl .cvo")
+				.last()
+				.attr("toot-id");
 			var plus = "?max_id=" + sid;
 		} else {
 			var plus = "";
 		}
-		var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses" +
-			plus;
+		var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses" + plus;
 		var i = {
-			method: 'GET',
+			method: "GET",
 			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			}
+				"content-type": "application/json",
+				Authorization: "Bearer " + at
 			}
+		};
 	} else {
-		var req = { i: at }
+		var req = { i: at };
 		if (more) {
-			var sid = $("#his-tl .cvo").last().attr("toot-id");
+			var sid = $("#his-tl .cvo")
+				.last()
+				.attr("toot-id");
 			req.maxId = sid;
 		}
 		req.userId = user;
-		var start = "https://" + domain + "/api/users/notes"
+		var start = "https://" + domain + "/api/users/notes";
 		var i = {
-			method: 'POST',
+			method: "POST",
 			headers: {
-				'content-type': 'application/json',
+				"content-type": "application/json"
 			},
 			body: JSON.stringify(req)
+		};
 	}
+	fetch(start, i)
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text);
+				});
 			}
-	fetch(start, i).then(function (response) {
 			return response.json();
-	}).catch(function (error) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function(json) {
 			if (localStorage.getItem("mode_" + domain) == "misskey") {
-			var templete = misskeyParse(json, '', acct_id, 'user');
+				var templete = misskeyParse(json, "", acct_id, "user");
 			} else {
-			var templete = parse(json, '', acct_id, 'user');
+				var templete = parse(json, "", acct_id, "user");
 			}
 			if (!json[0]) {
 				templete = lang.lang_details_nodata + "<br>";
@@ -59,7 +71,7 @@ function utl(user, more, acct_id) {
 				$("#his-tl-contents").append(templete);
 			} else {
 				if (localStorage.getItem("mode_" + domain) != "misskey") {
-				pinutl(templete, user, acct_id)
+					pinutl(templete, user, acct_id);
 				} else {
 					$("#his-tl-contents").html(templete);
 				}
@@ -67,32 +79,60 @@ function utl(user, more, acct_id) {
 			jQuery("time.timeago").timeago();
 		});
 }
+function utlAdd() {
+	var acct_id = $("#his-data").attr("use-acct");
+	var user = $("#his-data").attr("user-id");
+	var add = {
+		domain: acct_id,
+		type: 'utl',
+		data: {
+			id: user,
+			acct: $("#his-acct").attr('fullname')
+		}
+	}
+	var multi = localStorage.getItem('column')
+	var obj = JSON.parse(multi)
+	localStorage.setItem('card_' + obj.length, 'true')
+	obj.push(add)
+	var json = JSON.stringify(obj)
+	localStorage.setItem('column', json)
+	parseColumn('add')
+	hisclose()
+}
 //ピン留めTL
 function pinutl(before, user, acct_id) {
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (user == "--now") {
-		var user = $('#his-data').attr("user-id");
+		var user = $("#his-data").attr("user-id");
 	}
 	var plus = "?pinned=1";
-	var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses" +
-		plus
+	var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses" + plus;
 	fetch(start, {
-		method: 'GET',
+		method: "GET",
 		headers: {
-			'content-type': 'application/json',
-			'Authorization': 'Bearer ' + at
-		},
-	}).then(function (response) {
+			"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) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
-		var templete = parse(json, 'pinned', acct_id, 'user');
+		})
+		.then(function(json) {
+			var templete = parse(json, "pinned", acct_id, "user");
 			if (!json[0]) {
 				templete = "";
 			}
@@ -104,55 +144,67 @@ function pinutl(before, user, acct_id) {
 //フォローリスト
 function flw(user, more, acct_id) {
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (user == "--now") {
-		var user = $('#his-data').attr("user-id");
+		var user = $("#his-data").attr("user-id");
 	}
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		var req = { i: at }
+		var req = { i: at };
 		if (more) {
-			var sid = $("#his-follow-list .cvo").last().attr("user-id");
+			var sid = $("#his-follow-list .cvo")
+				.last()
+				.attr("user-id");
 			req.maxId = sid;
 		}
 		req.userId = user;
-		var start = "https://" + domain + "/api/users/following"
+		var start = "https://" + domain + "/api/users/following";
 		var i = {
-			method: 'POST',
+			method: "POST",
 			headers: {
-				'content-type': 'application/json',
+				"content-type": "application/json"
 			},
 			body: JSON.stringify(req)
-		}
+		};
 	} else {
 		if (more) {
-			var sid = $("#his-follow-list .cvo").last().attr("user-id");
+			var sid = $("#his-follow-list .cvo")
+				.last()
+				.attr("user-id");
 			var plus = "?max_id=" + sid;
 		} else {
 			var plus = "";
 		}
-		var start = "https://" + domain + "/api/v1/accounts/" + user + "/following" +
-			plus
+		var start = "https://" + domain + "/api/v1/accounts/" + user + "/following" + plus;
 		var i = {
-			method: 'GET',
+			method: "GET",
 			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
+				"content-type": "application/json",
+				Authorization: "Bearer " + at
 			}
+		};
 	}
+	fetch(start, i)
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text);
+				});
 			}
-	fetch(start, i).then(function (response) {
 			return response.json();
-	}).catch(function (error) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function(json) {
 			if (localStorage.getItem("mode_" + domain) == "misskey") {
-			var templete = misskeyUserparse(json, '', acct_id);
+				var templete = misskeyUserparse(json, "", acct_id);
 			} else {
-			var templete = userparse(json, '', acct_id);
+				var templete = userparse(json, "", acct_id);
 			}
 			if (templete == "") {
 				templete = lang.lang_details_nodata + "<br>";
@@ -162,63 +214,74 @@ function flw(user, more, acct_id) {
 			} else {
 				$("#his-follow-list-contents").html(templete);
 			}
-
-
+			jQuery("time.timeago").timeago();
 		});
 }
 
 //フォロワーリスト
 function fer(user, more, acct_id) {
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (user == "--now") {
-		var user = $('#his-data').attr("user-id");
+		var user = $("#his-data").attr("user-id");
 	}
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		var req = { i: at }
+		var req = { i: at };
 		if (more) {
-			var sid = $("#his-follower-list .cvo").last().attr("user-id");
+			var sid = $("#his-follower-list .cvo")
+				.last()
+				.attr("user-id");
 			req.maxId = sid;
 		}
 		req.userId = user;
-		var start = "https://" + domain + "/api/users/followers"
+		var start = "https://" + domain + "/api/users/followers";
 		var i = {
-			method: 'POST',
+			method: "POST",
 			headers: {
-				'content-type': 'application/json',
+				"content-type": "application/json"
 			},
 			body: JSON.stringify(req)
-		}
+		};
 	} else {
 		if (more) {
-			var sid = $("#his-follower-list .cvo").last().attr("user-id");
+			var sid = $("#his-follower-list .cvo")
+				.last()
+				.attr("user-id");
 			var plus = "?max_id=" + sid;
 		} else {
 			var plus = "";
 		}
-		var start = "https://" + domain + "/api/v1/accounts/" + user + "/followers" +
-			plus
+		var start = "https://" + domain + "/api/v1/accounts/" + user + "/followers" + plus;
 		var i = {
-			method: 'GET',
+			method: "GET",
 			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
+				"content-type": "application/json",
+				Authorization: "Bearer " + at
 			}
+		};
 	}
+	fetch(start, i)
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text);
+				});
 			}
-	fetch(start, i).then(function (response) {
 			return response.json();
-	}).catch(function (error) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function(json) {
 			if (localStorage.getItem("mode_" + domain) == "misskey") {
-			var templete = misskeyUserparse(json, '', acct_id);
+				var templete = misskeyUserparse(json, "", acct_id);
 			} else {
-			var templete = userparse(json, '', acct_id);
+				var templete = userparse(json, "", acct_id);
 			}
 			if (templete == "") {
 				templete = lang.lang_details_nodata + "<br>";
@@ -228,7 +291,7 @@ function fer(user, more, acct_id) {
 			} else {
 				$("#his-follower-list-contents").html(templete);
 			}
-
+			jQuery("time.timeago").timeago();
 		});
 }
 
@@ -236,51 +299,64 @@ function fer(user, more, acct_id) {
 //お気に入り一覧
 function showFav(more, acct_id) {
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
 		if (more) {
-			var sid = $("#his-fav-list .cvo").last().attr("toot-id");
+			var sid = $("#his-fav-list .cvo")
+				.last()
+				.attr("toot-id");
 			var plus = "?max_id=" + sid;
 		} else {
 			var plus = "";
 		}
-		var start = "https://" + domain + "/api/v1/favourites" + plus
+		var start = "https://" + domain + "/api/v1/favourites" + plus;
 		var i = {
-			method: 'GET',
+			method: "GET",
 			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			}
+				"content-type": "application/json",
+				Authorization: "Bearer " + at
 			}
+		};
 	} else {
-		var req = { i: at }
+		var req = { i: at };
 		if (more) {
-			var sid = $("#his-fav-list .cvo").last().attr("toot-id");
+			var sid = $("#his-fav-list .cvo")
+				.last()
+				.attr("toot-id");
 			req.maxId = sid;
 		}
-		var start = "https://" + domain + "/api/i/favorites"
+		var start = "https://" + domain + "/api/i/favorites";
 		var i = {
-			method: 'POST',
+			method: "POST",
 			headers: {
-				'content-type': 'application/json',
+				"content-type": "application/json"
 			},
 			body: JSON.stringify(req)
-		}
+		};
 	}
 
-	fetch(start, i).then(function (response) {
+	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) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function(json) {
 			if (localStorage.getItem("mode_" + domain) != "misskey") {
-			var templete = parse(json, '', acct_id, 'user');
+				var templete = parse(json, "", acct_id, "user");
 			} else {
-			var templete = misskeyParse(json, '', acct_id, 'user');
+				var templete = misskeyParse(json, "", acct_id, "user");
 			}
 			if (!json[0]) {
 				templete = lang.lang_details_nodata + "<br>";
@@ -297,64 +373,76 @@ function showFav(more, acct_id) {
 //ミュートリスト
 function showMut(more, acct_id) {
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		var req = { i: at }
+		var req = { i: at };
 		if (more) {
-			var sid = $("#his-muting-list .cvo").last().attr("user-id");
+			var sid = $("#his-muting-list .cvo")
+				.last()
+				.attr("user-id");
 			req.maxId = sid;
 		}
-		var start = "https://" + domain + "/api/mute/list"
+		var start = "https://" + domain + "/api/mute/list";
 		var i = {
-			method: 'POST',
+			method: "POST",
 			headers: {
-				'content-type': 'application/json',
+				"content-type": "application/json"
 			},
 			body: JSON.stringify(req)
-		}
+		};
 	} else {
 		if (more) {
-			var sid = $("#his-muting-list .cvo").last().attr("user-id");
+			var sid = $("#his-muting-list .cvo")
+				.last()
+				.attr("user-id");
 			var plus = "?max_id=" + sid;
 		} else {
 			var plus = "";
 		}
-		var start = "https://" + domain + "/api/v1/mutes" + plus
+		var start = "https://" + domain + "/api/v1/mutes" + plus;
 		var i = {
-			method: 'GET',
+			method: "GET",
 			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			}
+				"content-type": "application/json",
+				Authorization: "Bearer " + at
 			}
+		};
 	}
 
-	fetch(start, i).then(function (response) {
+	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) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function(json) {
 			if (!json[0]) {
 				templete = lang.lang_details_nodata + "<br>";
 			}
-		var templete = userparse(json, '', acct_id);
+			var templete = userparse(json, "", acct_id);
 			if (more) {
 				$("#his-muting-list-contents").append(templete);
 			} else {
 				$("#his-muting-list-contents").html(templete);
 			}
-
 		});
 }
 
 //ブロックリスト
 function showBlo(more, acct_id) {
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
@@ -363,82 +451,104 @@ function showBlo(more, acct_id) {
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (more) {
-		var sid = $("#his-blocking-list .cvo").last().attr("user-id");
+		var sid = $("#his-blocking-list .cvo")
+			.last()
+			.attr("user-id");
 		var plus = "?max_id=" + sid;
 	} else {
 		var plus = "";
 	}
-	var start = "https://" + domain + "/api/v1/blocks" + plus
+	var start = "https://" + domain + "/api/v1/blocks" + plus;
 	fetch(start, {
-		method: 'GET',
+		method: "GET",
 		headers: {
-			'content-type': 'application/json',
-			'Authorization': 'Bearer ' + at
-		},
-	}).then(function (response) {
+			"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) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function(json) {
 			if (!json[0]) {
 				templete = lang.lang_details_nodata + "<br>";
 			}
-		var templete = userparse(json, '', acct_id);
+			var templete = userparse(json, "", acct_id);
 			if (more) {
 				$("#his-blocking-list-contents").append(templete);
 			} else {
 				$("#his-blocking-list-contents").html(templete);
 			}
-
+			jQuery("time.timeago").timeago();
 		});
 }
 
 //フォロリクリスト
 function showReq(more, acct_id) {
-
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		var req = { i: at }
+		var req = { i: at };
 		if (more) {
-			var sid = $("#his-request-list .cvo").last().attr("user-id");
+			var sid = $("#his-request-list .cvo")
+				.last()
+				.attr("user-id");
 			req.maxId = sid;
 		}
-		var start = "https://" + domain + "/following/requests/list"
+		var start = "https://" + domain + "/following/requests/list";
 		var i = {
-			method: 'POST',
+			method: "POST",
 			headers: {
-				'content-type': 'application/json',
+				"content-type": "application/json"
 			},
 			body: JSON.stringify(req)
-		}
+		};
 	} else {
 		if (more) {
-			var sid = $("#his-request-list .cvo").last().attr("user-id");
+			var sid = $("#his-request-list .cvo")
+				.last()
+				.attr("user-id");
 			var plus = "?max_id=" + sid;
 		} else {
 			var plus = "";
 		}
-		var start = "https://" + domain + "/api/v1/follow_requests" + plus
+		var start = "https://" + domain + "/api/v1/follow_requests" + plus;
 		var i = {
-			method: 'GET',
+			method: "GET",
 			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
+				"content-type": "application/json",
+				Authorization: "Bearer " + at
 			}
+		};
 	}
+	fetch(start, i)
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text);
+				});
 			}
-	fetch(start, i).then(function (response) {
 			return response.json();
-	}).catch(function (error) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
-
+		})
+		.then(function(json) {
 			if (localStorage.getItem("mode_" + domain) != "misskey") {
 				var templete = userparse(json, "request", acct_id);
 			} else {
@@ -453,14 +563,14 @@ function showReq(more, acct_id) {
 			} else {
 				$("#his-request-list-contents").html(templete);
 			}
-
+			jQuery("time.timeago").timeago();
 		});
 }
 
 //ドメインブロックリスト
 function showDom(more, acct_id) {
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
@@ -469,49 +579,56 @@ function showDom(more, acct_id) {
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (more) {
-		var sid = $("#his-domain-list .cvo").last().attr("user-id");
+		var sid = $("#his-domain-list .cvo")
+			.last()
+			.attr("user-id");
 		var plus = "?max_id=" + sid;
 	} else {
 		var plus = "";
 	}
-	var start = "https://" + domain + "/api/v1/domain_blocks" + plus
+	var start = "https://" + domain + "/api/v1/domain_blocks" + plus;
 	fetch(start, {
-		method: 'GET',
+		method: "GET",
 		headers: {
-			'content-type': 'application/json',
-			'Authorization': 'Bearer ' + at
-		},
+			"content-type": "application/json",
+			Authorization: "Bearer " + at
+		}
 		//body: JSON.stringify({})
-	}).then(function (response) {
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text);
+				});
+			}
 			return response.json();
-	}).catch(function (error) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function(json) {
 			var templete = "";
 			if (!json[0]) {
 				templete = lang.lang_details_nodata + "<br>";
 			}
 			Object.keys(json).forEach(function(key) {
 				var domain = json[key];
-			templete = templete + domain +
-				'<i class="material-icons gray pointer" onclick="domainblock(\'' +
-				domain + '\',\'DELETE\')">cancel</i>' +
-				'<div class="divider"></div>';
+				templete = templete + domain + '<i class="material-icons gray pointer" onclick="domainblock(\'' + domain + "','DELETE')\">cancel</i>" + '<div class="divider"></div>';
 			});
 			if (more) {
 				$("#his-domain-list-contents").append(templete);
 			} else {
 				$("#his-domain-list-contents").html(templete);
 			}
-
 		});
 }
 
 //フォローレコメンデーションリスト
 function showFrl(more, acct_id) {
 	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
+		var acct_id = $("#his-data").attr("use-acct");
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
@@ -520,29 +637,39 @@ function showFrl(more, acct_id) {
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (more) {
-		var sid = $("#his-follow-recom-list .cvo").last().attr("user-id");
+		var sid = $("#his-follow-recom-list .cvo")
+			.last()
+			.attr("user-id");
 		var plus = "?max_id=" + sid;
 	} else {
 		var plus = "";
 	}
-	var start = "https://" + domain + "/api/v1/suggestions" + plus
+	var start = "https://" + domain + "/api/v1/suggestions" + plus;
 	fetch(start, {
-		method: 'GET',
+		method: "GET",
 		headers: {
-			'content-type': 'application/json',
-			'Authorization': 'Bearer ' + at
-		},
-	}).then(function (response) {
+			"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) {
+		})
+		.catch(function(error) {
 			$("#his-follow-recom-contents").html(lang.lang_details_nodata + "(" + lang.lang_hisdata_frcreq + ")<br>");
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function(json) {
 			if (!json[0]) {
 				console.warn("No suggestions(recommend) data");
 				templete = lang.lang_details_nodata + "(" + lang.lang_hisdata_frcwarn + ")<br>";
 			} else {
-			var templete = userparse(json, '', acct_id);
+				var templete = userparse(json, "", acct_id);
 			}
 
 			if (more) {
@@ -550,94 +677,65 @@ function showFrl(more, acct_id) {
 			} else {
 				$("#his-follow-recom-contents").html(templete);
 			}
-
+			jQuery("time.timeago").timeago();
 		});
 }
 //Keybase
-function udAdd(start) {
-	fetch(start, {
-		method: 'GET',
+function udAdd(acct_id, id, start) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var proof = "https://" + domain + "/api/v1/accounts/" + id + "/identity_proofs";
+	fetch(proof, {
+		method: "GET",
 		headers: {
-			'Accept': 'application/json'
-		},
+			"content-type": "application/json",
+			Authorization: "Bearer " + at
+		}
 		//body: JSON.stringify({})
-	}).then(function (response) {
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text);
+				});
+			}
 			return response.json();
-	}).catch(function (error) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
-		var fields = json.attachment;
+		})
+		.then(function(json) {
+			var fields = json;
 			for (var i = 0; i < fields.length; i++) {
-			if (fields[i].type == "IdentityProof") {
-				if (fields[i].signatureAlgorithm == "keybase") {
-					var html = '<a href="https://keybase.io/' + fields[i].name + '" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].signatureAlgorithm)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].signatureAlgorithm) + ':' + escapeHTML(fields[i].name) + '</a>';
-				} else {
-					var html = '<span class="cbadge teal" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].signatureAlgorithm)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].signatureAlgorithm) + ':' + escapeHTML(fields[i].name) + '</span>';
-				}
-				$("#his-proof-prof").append(html)
-			}
+				var html = '<a href="' + fields[i].proof_url + '" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].provider)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].provider) + ":" + escapeHTML(fields[i].provider_username) + "</a>";
+				$("#his-proof-prof").append(html);
 			}
 		});
 	fetch("https://notestock.osa-p.net/api/v1/isstock.json?id=" + start.replace("@", "users/"), {
-		method: 'GET',
+		method: "GET",
 		headers: {
-			'Accept': 'application/json'
-		},
-	}).then(function (response) {
+			Accept: "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) {
+		})
+		.catch(function(error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function(json) {
 			if (json.user.public_view) {
 				var html = '<a href="' + json.user.url + '" target="_blank" class="cbadge purple waves-effect" style="max-width:200px;" title="Notestock">Notestock</a>';
-			$("#his-proof-prof").append(html)
+				$("#his-proof-prof").append(html);
 			}
 		});
-
-}
-
-
-//ユーザーマッチングリスト
-function showMat() {
-
-	$("#his-matching-list-contents").html(lang.lang_hisdata_taketime);
-	var full = $("#his-acct").attr("fullname");
-	var acct_id = $("#his-data").attr("use-acct");
-	full = full.split("@");
-	var start = "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-filtered-api.cgi?" + full[1] + "+" + full[0];
-	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) {
-		var templete = "";
-		Object.keys(json).forEach(function (key) {
-			var user = json[key];
-			templete = templete +
-				'<div class="" style="padding-top:5px;">' +
-				'<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' +
-				'<div style="flex-basis:40px;"><a onclick="udgEx(\'' + user.user + '\',' +
-				acct_id + ');" user="' + user.user + '" class="udg">' +
-				'<img src="' + user.avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' +
-				'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"><big>' +
-				escapeHTML(user.screen_name) + '</big></div>' +
-				'<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' +
-				user.user + '@' + user.host + '</div>' +
-				'</div>' +
-				'<div class="divider"></div>' +
-				'</div>' +
-				'</div>';
-		});
-		$("#his-matching-list").css("height", $("#his-float-data").height() - $("#his-basic-prof").height() - $("#his-des").height() - $("#his-plus-action").height() + "px");
-		$("#his-matching-list-contents").html(templete);
-	});
 }

app/js/userdata/prof-edit.js

@@ -1,64 +1,68 @@
 //プロフ編集
 //文字系
 function profedit() {
-	var acct_id = $('#his-data').attr("use-acct");
-	todo("Updating...");
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/accounts/update_credentials";
-	var name = $("#his-name-val").val();
-	var des = $("#his-des-val").val();
-	var httpreq = new XMLHttpRequest();
-	httpreq.open('PATCH', start, true);
-	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = "json";
-	httpreq.send(JSON.stringify({
+	var acct_id = $('#his-data').attr('use-acct')
+	todo('Updating...')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/accounts/update_credentials'
+	var name = $('#his-name-val').val()
+	var des = $('#his-des-val').val()
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('PATCH', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send(
+		JSON.stringify({
 			display_name: name,
 			note: des,
-	}));
+		})
+	)
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			$('#his-data').modal('close');
-			todc();
+			$('#his-data').modal('close')
+			todc()
 		}
 	}
 }
 
 //画像系
 function imgChange(imgfile, target) {
-	var acct_id = $('#his-data').attr("use-acct");
-	todo("アップロードしています")
+	var acct_id = $('#his-data').attr('use-acct')
+	todo('アップロードしています')
 	if (!imgfile.files.length) {
-		console.warn("No Image to upload");
-		return;
+		console.warn('No Image to upload')
+		return
 	}
-	var file = imgfile.files[0];
-	var fr = new FileReader();
+	var file = imgfile.files[0]
+	var fr = new FileReader()
 	fr.onload = function (evt) {
-		var b64 = this.result;
-		var blob = toBlob(b64, 'image/png');
-		var fd = new FormData();
-		fd.append(target, blob);
-		var domain = localStorage.getItem("domain_" + acct_id);
-		var at = localStorage.getItem("acct_" + acct_id + "_at");
-		var start = "https://" + domain + "/api/v1/accounts/update_credentials";
-		var httpreq = new XMLHttpRequest();
-		httpreq.open('PATCH', start, true);
-		httpreq.upload.addEventListener("progress", progshow, false);
-		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-		httpreq.responseType = "json";
-		httpreq.send(fd);
+		var b64 = this.result
+		var blob = toBlob(b64, 'image/png')
+		var fd = new FormData()
+		fd.append(target, blob)
+		var domain = localStorage.getItem('domain_' + acct_id)
+		var at = localStorage.getItem('acct_' + acct_id + '_at')
+		var start = 'https://' + domain + '/api/v1/accounts/update_credentials'
+		var httpreq = new XMLHttpRequest()
+		httpreq.open('PATCH', start, true)
+		httpreq.upload.addEventListener('progress', progshow, false)
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+		httpreq.responseType = 'json'
+		httpreq.send(fd)
 		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.response;
-				$('#his-data').modal('close');
-				todc();
-				localStorage.removeItem("image");
+				var json = httpreq.response
+				if (this.status !== 200) {
+					setLog(start, this.status, this.response)
+				}
+				$('#his-data').modal('close')
+				todc()
 			}
 		}
 	}
-	$("#prof-change").html($("#prof-change").html());
-	$("#header-change").html($("#header-change").html());
-	fr.readAsDataURL(file);
+	$('#prof-change').html($('#prof-change').html())
+	$('#header-change').html($('#header-change').html())
+	fr.readAsDataURL(file)
 }

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,26 +21,37 @@ 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; }
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/search?resolve=true&q=" + user
-	fetch(start, {
-		method: 'GET',
-		headers: {
-			'content-type': 'application/json',
-			'Authorization': 'Bearer ' + at
+	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);
+	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);
+				});
 			}
-	}).then(function (response) {
 			return response.json();
-	}).catch(function (error) {
+		})
+		.catch(function (error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
-		if (json.accounts) {
+		})
+		.then(function (json) {
+			if (json.accounts[0]) {
 				var id = json.accounts[0].id;
 				udg(id, acct_id);
 			} else {
-			postMessage(["openUrl", url], "*")
+				postMessage(["openUrl", user], "*");
 			}
 		});
 	return true;
@@ -53,49 +64,60 @@ 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
-		},
-	}).then(function (response) {
+			"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) {
+		})
+		.catch(function (error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.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").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 })
+				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);
+			$("#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");
+				$("#his-data").attr("remote", "true");
 				var fullname = json.acct;
 			} else {
-			$('#his-data').attr("remote", "false");
+				$("#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);
+			utlShow(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);
 
@@ -110,8 +132,7 @@ function udg(user, acct_id) {
 				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 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);
@@ -126,7 +147,7 @@ function udg(user, acct_id) {
 			$("#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-data").css("background-image", "url(" + json.header + ")");
 			$("#his-sta").text(json.statuses_count);
 			$("#his-follow").text(json.following_count);
 			var flerc = json.followers_count;
@@ -137,52 +158,68 @@ function udg(user, acct_id) {
 			$("#his-since").text(crat(json.created_at));
 			$("#his-openin").attr("data-href", json.url);
 			if (json.fields) {
+				var table = "";
 				if (json.fields.length > 0) {
-				note = note + '<table id="his-field">'
+					$("#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);"
+							var color = "rgba(121,189,154,.25);";
 						} else {
 							var when = "";
-						var color = "inherit"
+							var color = "inherit";
 						}
-					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>';
+						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>";
 					}
-				note = note + '</table>'
+					table = table + "</table>";
 					$("#his-des").html(twemoji.parse(note));
 				} else {
-				$("#his-des").html(twemoji.parse(note));
+					$("#his-des").css("max-height", "400px");
 				}
+				$("#his-table").html(twemoji.parse(table));
 			} else {
-			$("#his-des").html(twemoji.parse(note));
+				$("#his-des").css("max-height", "400px");
 			}
+			$("#his-des").html(twemoji.parse(note));
 			if (json.bot) {
 				$("#his-bot").html(lang.lang_showontl_botacct);
 			}
 			$("#his-des").attr("data-acct", acct_id);
-		$('#his-data').css('background-size', 'cover');
-		$("#his-data .tab-content").css("height", $("#his-float-timeline").height() - 70 + "px")
+			$("#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);
+				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)); }
+					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 = des.replace(/<br \/>/g, "\n");
 				des = $.strip_tags(des);
 				$("#his-des-val").val(des);
 				$("#his-follow-btn").hide();
@@ -202,8 +239,13 @@ function udg(user, acct_id) {
 				$(".only-his-data").show();
 			}
 			todc();
+			if (json.locked) {
+				$('#his-data').addClass('locked')
+			} else {
+				$('#his-data').removeClass('locked')
+			}
 			//外部データ取得(死かもしれないので)
-		udAdd(json.url);
+			udAdd(acct_id, user, json.url);
 		});
 }
 function misskeyUdg(user, acct_id) {
@@ -214,58 +256,67 @@ 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) {
+	})
+		.then(function (response) {
+			if (!response.ok) {
+				response.text().then(function (text) {
+					setLog(response.url, response.status, text);
+				});
+			}
 			return response.json();
-	}).catch(function (error) {
+		})
+		.catch(function (error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function (json) {
 			//一つ前のユーザーデータ
 			if (!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").attr("history", localStorage.getItem("history"));
 			}
-		$('#his-data').modal('open');
-		$('#his-data').attr("user-id", user);
-		$('#his-data').attr("use-acct", acct_id);
+			$("#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");
+				$("#his-data").attr("remote", "false");
 				var fullname = json.username + "@" + json.host;
 			} else {
-			$('#his-data').attr("remote", "false");
+				$("#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);
+			utlShow(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
+				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-data").css("background-image", "url(" + json.bannerUrl + ")");
 			$("#his-sta").text(json.notesCount);
 			$("#his-follow").text(json.followingCount);
 			$("#his-follower").text(json.followersCount);
@@ -275,17 +326,17 @@ function misskeyUdg(user, acct_id) {
 			if (json.isCat) {
 				$("#his-bot").html("Cat" + twemoji.parse("😺"));
 			}
-		$('#his-data').css('background-size', 'cover');
+			$("#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);
+				showFrl("", acct_id);
 				$("#his-name-val").val(json.name);
 				var des = json.note;
-			des = nl2br(des)
+				des = nl2br(des);
 				des = $.strip_tags(des);
 				$("#his-des-val").val(des);
 				$("#his-follow-btn").hide();
@@ -303,10 +354,10 @@ function misskeyUdg(user, acct_id) {
 				if (json.isFollowing) {
 					//自分がフォローしている
 					$("#his-data").addClass("following");
-				$("#his-follow-btn").text(lang.lang_status_unfollow);
+					$("#his-follow-btn-text").text(lang.lang_status_unfollow);
 					hisList(user, acct_id);
 				} else {
-				$("#his-follow-btn").text(lang.lang_status_follow);
+					$("#his-follow-btn-text").text(lang.lang_status_follow);
 				}
 				if (json.isFollowed) {
 					//フォローされてる
@@ -315,9 +366,9 @@ function misskeyUdg(user, acct_id) {
 				$("#his-block-btn").hide();
 				if (json.isMuted) {
 					$("#his-data").addClass("muting");
-				$("#his-mute-btn").text(lang.lang_status_unmute);
+					$("#his-mute-btn-text").text(lang.lang_status_unmute);
 				} else {
-				$("#his-mute-btn").text(lang.lang_status_mute);
+					$("#his-mute-btn-text").text(lang.lang_status_mute);
 				}
 				$(".only-my-data").hide();
 				$(".only-his-data").show();
@@ -327,15 +378,15 @@ function misskeyUdg(user, acct_id) {
 }
 //一つ前のユーザーデータ表示
 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();
 }
 
@@ -345,25 +396,39 @@ 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
-		},
-	}).then(function (response) {
+			"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) {
+		})
+		.catch(function (error) {
 			todo(error);
+			setLog(start, "JSON", error);
 			console.error(error);
-	}).then(function (json) {
+		})
+		.then(function (json) {
 			var json = json[0];
+			if (json.requested) {
+				//フォロリク中
+				$('#his-data').addClass('following')
+				$("#his-follow-btn-text").text(lang.lang_status_requesting)
+			}
 			if (json.following) {
 				//自分がフォローしている
-			$("#his-data").addClass("following");
-			$("#his-follow-btn").text(lang.lang_status_unfollow);
+				$("#his-data").addClass("following")
+				$("#his-follow-btn-text").text(lang.lang_status_unfollow);
 				hisList(user, acct_id);
 			} else {
-			$("#his-follow-btn").text(lang.lang_status_follow);
+				$("#his-follow-btn-text").text(lang.lang_status_follow);
 			}
 			if (json.followed_by) {
 				//フォローされてる
@@ -371,76 +436,77 @@ function relations(user, acct_id) {
 			}
 			if (json.blocking) {
 				$("#his-data").addClass("blocking");
-			$("#his-block-btn").text(lang.lang_status_unblock);
+				$("#his-block-btn-text").text(lang.lang_status_unblock);
 			} else {
-			$("#his-block-btn").text(lang.lang_status_block);
+				$("#his-block-btn-text").text(lang.lang_status_block);
 			}
 			if (json.muting) {
 				$("#his-data").addClass("muting");
-			$("#his-mute-btn").text(lang.lang_status_unmute);
+				$("#his-mute-btn-text").text(lang.lang_status_unmute);
 			} else {
-			$("#his-mute-btn").text(lang.lang_status_mute);
+				$("#his-mute-btn-text").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);
+				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute);
 			} else {
-			$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
+				$("#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(lang.lang_showontl_domain + lang.lang_status_unblock);
+				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock);
 			} else {
-			$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
+				$("#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(lang.lang_status_unendorse)
+				$("#his-end-btn-text").text(lang.lang_status_unendorse);
 			} else {
 				$("#his-end-btn").removeClass("endorsed");
-			$("#his-end-btn").text(lang.lang_status_endorse)
+				$("#his-end-btn-text").text(lang.lang_status_endorse);
 			}
 			//Blocked
 			if (json.blocked_by) {
-			$("#his-float-timeline").hide();
+				$("#my-data-nav .btn").addClass("disabled");
+				$(".his-var-content").hide();
 				$("#his-float-blocked").show();
-			$("#his-follow-btn").hide()
+				$("#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();
+	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() {
-	$(".tab-content:eq(0)").show();
-	$(".tab-content:gt(0)").hide();
+	$(".his-var-content:eq(0)").show();
+	$(".his-var-content:gt(0)").hide();
+	$("#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");
@@ -448,6 +514,7 @@ 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();
@@ -455,33 +522,41 @@ function reset() {
 	$("#his-notf-btn").show();
 	$("#his-domain-btn").show();
 	$("#his-emp-btn").show();
-	$("#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-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-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("");
+	$('#his-data').removeClass('locked')
+	$('#his-data').removeClass('requesting')
 }
-$('#my-data-nav .tab').on('click', function () {
-	var target = $(this).find("a").attr("go");
-	$("#my-data-nav .tab").removeClass("active-back");
+$("#my-data-nav .anc-link").on("click", function () {
+	var target = $(this).attr("go");
+	if (target) {
+		$("#my-data-nav .anc-link").removeClass("active-back");
 		$(this).addClass("active-back");
 		$(target).show();
-	$(".tab-content:not(" + target + ")").hide();
+		$(".his-var-content:not(" + target + ")").hide();
+	}
 });

app/main.js

@@ -1,223 +1,337 @@
-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 Menu = electron.Menu
-const join = require('path').join;
+const electron = require('electron')
 // アプリケーションをコントロールするモジュール
-const app = electron.app;
+const app = electron.app
+// Electronの初期化完了後に実行
+app.on('ready', createWindow)
+const fs = require('fs')
+const language = require('./main/language.js')
+const css = require('./main/css.js')
+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 BrowserWindow = electron.BrowserWindow;
+const BrowserWindow = electron.BrowserWindow
 // メインウィンドウはGCされないようにグローバル宣言
-let mainWindow;
-if (process.argv.indexOf("--dev") === -1) {
-	var packaged = true;
-} else {
-	var packaged = false;
-	console.log(
-		"||\\\\\\ \n"+
-		"||||  \\\\\\\\ \n"+
-		"||||     \\\\\\\\ \n"+
-		"|||| Am I a \\\\\\\\ \n"+
-		"|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n"+
-		"||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n"+
-		"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n"+
-		"|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/\__ \\   < \n"+
-		"||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n"+
-		"||||          /////         \n"+
-		"||||       /////\n"+
-		"||||     /////\n"+
-		"||||//////"
-	)
-	console.log("Welcome!")
-}
-var info_path = join(app.getPath("userData"), "window-size.json");
-var max_info_path = join(app.getPath("userData"), "max-window-size.json");
-var lang_path = join(app.getPath("userData"), "language");
-var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
-try {
-	fs.readFileSync(ha_path, 'utf8');
-	app.disableHardwareAcceleration()
-	if(!packaged) console.log("disabled: Hardware Acceleration");
-} catch{
-	if(!packaged) console.log("enabled: Hardware Acceleration");
-}
-var window_size;
-try {
-	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'));
-} catch (e) {
-	window_size = {
-		width: 1000,
-		height: 750
-	}; // デフォルトバリュー
-}
-var max_window_size;
-try {
-	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'));
-} catch (e) {
-	max_window_size = {
-		width: "string",
-		height: "string",
-		x: "string",
-		y: "string"
+let mainWindow
 
-	}; // デフォルトバリュー
+// アプリが多重起動しないようにする
+const gotTheLock = app.requestSingleInstanceLock()
+
+if (!gotTheLock) {
+	app.quit()
+} else {
+	app.on('second-instance', () => {
+		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
+		// Someone tried to run a second instance, we should focus our window.
+		if (mainWindow) {
+			if (mainWindow.isMinimized()) mainWindow.restore()
+			mainWindow.focus()
 		}
+	})
+}
+
+// 全てのウィンドウが閉じたら終了
+app.on('window-all-closed', function () {
+	electron.session.defaultSession.clearCache(() => {})
+	app.quit()
+})
 function isFile(file) {
 	try {
-		fs.statSync(file);
+		fs.statSync(file)
 		return true
 	} catch (err) {
 		if (err.code === 'ENOENT') return false
 	}
 }
-// 全てのウィンドウが閉じたら終了
-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() {
+	var lang_path = join(app.getPath('userData'), 'language')
 	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)
+	//Opening
+	const package = fs.readFileSync(__dirname + '/package.json')
+	if(lang == 'ja') {
+		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
+		var show = maxims[Math.floor(Math.random() * maxims.length)]
+	} else if(lang == 'ja-KS') {
+		//ja-KSも作れたらいいね
+		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
+		var show = maxims[Math.floor(Math.random() * maxims.length)]
+	} else{
+		var show = 'TheDesk 2018'
+	}
+	const data = JSON.parse(package)
+	const version = data.version
+	const codename = data.codename
+	var openingWindow = new BrowserWindow({
+		width: 300,
+		height: 400,
+		transparent: false,
+		frame: false,
+		resizable: false,
+	})
+	openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`)
+
+	if (process.argv.indexOf('--dev') === -1) {
+		var packaged = true
+	} else {
+		var packaged = false
+		console.log(
+			'||\\\\\\ \n' +
+				'||||  \\\\\\\\ \n' +
+				'||||     \\\\\\\\ \n' +
+				'|||| Am I a \\\\\\\\ \n' +
+				'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
+				'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
+				"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
+				'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
+				'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
+				'||||          /////         \n' +
+				'||||       /////\n' +
+				'||||     /////\n' +
+				'||||//////'
+		)
+		console.log('If it does not show the window, you might forget `npm run construct`.')
+	}
+
+	var info_path = join(app.getPath('userData'), 'window-size.json')
+	var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
+	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
+	var ua_path = join(app.getPath('userData'), 'useragent')
+	var frame_path = join(app.getPath('userData'), 'frame')
+	try {
+		fs.readFileSync(ha_path, 'utf8')
+		app.disableHardwareAcceleration()
+		if (!packaged) console.log('disabled: Hardware Acceleration')
+	} catch {
+		if (!packaged) console.log('enabled: Hardware Acceleration')
+	}
+	var window_size
+	try {
+		window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
+	} catch (e) {
+		window_size = {
+			width: 1000,
+			height: 750,
+		} // デフォルトバリュー
+	}
+	var max_window_size
+	try {
+		max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
+	} catch (e) {
+		max_window_size = {
+			width: 'string',
+			height: 'string',
+			x: 'string',
+			y: 'string',
+		} // デフォルトバリュー
+	}
+
+	try {
+		var frameRaw = fs.readFileSync(frame_path, 'utf8')
+		if (frameRaw == 'false') {
+			var frame = false
+			var frameTitle = 'hidden'
+		} else {
+			var frame = true
+			var frameTitle = 'default'
+		}
+	} catch {
+		var frame = true
 	}
-	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
 	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
+		width: window_size.width,
+		height: window_size.height,
+		x: window_size.x,
+		y: window_size.y,
+		show: false,
+		frame: frame,
 	}
-	} else if (platform == "win32") {
-		var arg = {
-			webPreferences: {
-				webviewTag: true,
-				nodeIntegration: false,
-				contextIsolation: true,
-				preload: join(__dirname, "js", "platform", "preload.js")
-			},
-			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false
+	if (platform == 'linux') {
+		arg.resizable = true
+		arg.icon = __dirname + '/desk.png'
+	} else if (platform == 'win32') {
+		arg.simpleFullscreen = true
+	} else if (platform == 'darwin') {
+		arg.simpleFullscreen = true
+		arg.titleBarStyle = frameTitle
 	}
-	} else if (platform == "darwin") {
-		var arg = {
-			webPreferences: {
-				webviewTag: true,
-				nodeIntegration: false,
-				contextIsolation: true,
-				preload: join(__dirname, "js", "platform", "preload.js")
-			},
-			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false
-		}
-	}
-	mainWindow = new BrowserWindow(arg);
+	mainWindow = new BrowserWindow(arg)
 	mainWindow.once('page-title-updated', () => {
+		openingWindow.close()
 		mainWindow.show()
+		console.log('Accessibility: ' + app.accessibilitySupportEnabled)
 		if (window_size.max) {
-			mainWindow.maximize();
+			mainWindow.maximize()
 		}
 	})
+	if (!packaged) mainWindow.toggleDevTools()
 	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 = ''
 	}
-	mainWindow.loadURL(base + lang + '/index.html' + 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 })
 	if (!window_size.x && !window_size.y) {
-		mainWindow.center();
+		mainWindow.center()
 	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function () {
-		electron.ipcMain.removeAllListeners();
-		mainWindow = null;
-	});
-	mainWindow.on('close', 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) {
 		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))
 	}
-		fs.writeFileSync(info_path, JSON.stringify(size));
-	});
 	mainWindow.on('maximize', function () {
-		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
-	});
+		writePos(mainWindow)
+		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()))
+	})
+	mainWindow.on('minimize', function () {
+		writePos(mainWindow)
+		mainWindow.webContents.send('asRead', '')
+	})
 
-	var platform = process.platform;
-	var bit = process.arch;
-	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir)));
-	//CSS
-	css.css(mainWindow);
-	//アップデータとダウンロード
-	dl.dl(mainWindow, lang_path, base, dirname);
-	//画像選択と画像処理
-	img.img(mainWindow, dir);
-	//NowPlaying
-	np.TheDeskNowPlaying(mainWindow);
-	//その他system
-	systemFunc.system(mainWindow, dir, lang, dirname);
+	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)
+	}
+	//CSS
+	css.css(mainWindow)
+	//アップデータとダウンロード
+	dl.dl(mainWindow, lang_path, base, dirname)
+	//画像選択と画像処理
+	img.img(mainWindow, dir)
+	//NowPlaying
+	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
 }
-// Electronの初期化完了後に実行
-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, JSON.stringify(JSON5.parse(arg)));
+		fs.writeFileSync(themecss, JSON5.stringify(JSON5.parse(arg)));
 		if (JSON5.parse(arg)["id"]) {
 			e.sender.webContents.send('theme-json-create-complete', "");
 		} else {
@@ -39,13 +39,14 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-json-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
-		var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
-		e.sender.webContents.send('theme-json-response', json);
+		var raw = fs.readFileSync(themecss, 'utf8')
+		var json = JSON5.parse(raw);
+		e.sender.webContents.send('theme-json-response', [json, raw]);
 	})
 	ipc.on('theme-css-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
 		try {
-			var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
 
 			var primary = json.vars.primary;
 			var secondary = json.vars.secondary;
@@ -67,21 +68,52 @@ function css(mainWindow) {
 				if (json.props.TheDeskAccent) {
 					var emphasized = json.props.TheDeskAccent
 				} else {
-					var emphasized = secondary;
+					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
 				}
 			} else {
-				var emphasized = primary;
+				var emphasized = primary
+				var acs = secondary
+				var active = primary
+				var modal = secondary
+				var bottom = primary
+				var postbox = primary
+				var subcolor = primary
 			}
 
 			var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
 				"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
-				secondary + ";--subcolor:" + primary + ";--box:" + primary +
-				";--sidebar:" + primary + ";--shared:" + emphasized + ";" +
-				"--notfbox:" + secondary + ";--emphasized:" + primary + ";--his-data:" +
+				modal + ";--subcolor:" + subcolor + ";--box:" + subcolor +
+				";--sidebar:" + bottom + ";--shared:" + emphasized + ";" +
+				"--notfbox:" + secondary + ";--emphasized:" + active + ";--his-data:" +
 				secondary +
-				";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
+				";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
 				primary +
-				";--accentbtn:" + primary + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
+				";--accentbtn:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
 				"--gray:" + gray + ";"+
 				".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
 			e.sender.webContents.send('theme-css-response', css);
@@ -92,15 +124,19 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-json-list', function (e, arg) {
 		fs.readdir(app.getPath("userData"), function (err, files) {
-			if (err) throw err;
+			if (err || !files) throw err;
 			var fileList = files.filter(function (file) {
-				var tfile = join(app.getPath("userData"), file);
-				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile); //絞り込み
+				if(file.match(/\.thedesktheme$/)){
+					var tfile = join(app.getPath("userData"), file)
+					return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
+				}else{
+					return null
+				}
 			})
 			var themes = [];
 			for (var i = 0; i < fileList.length; i++) {
 				var themecss = join(app.getPath("userData"), fileList[i]);
-				var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+				var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
 				themes.push({
 					name: json.name,
 					id: json.id

app/main/dl.js

@@ -1,128 +1,137 @@
 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;
+	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") {
+		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
-			});
-			//updatewin.openDevTools()
-			var lang = fs.readFileSync(lang_path, 'utf8');
-			updatewin.loadURL(base + lang + '/update.html');
-
-			return "true"
+				transparent: false, // ウィンドウの背景を透過
+				frame: false, // 枠の無いウィンドウ
+				resizable: false,
+				show: false
+			})
+			var lang = fs.readFileSync(lang_path, 'utf8')
+			updatewin.loadURL(base + lang + '/update.html')
+			updatewin.webContents.once('dom-ready', () => {
+				updatewin.show()
+			 })
+			return 'true'
 		} else {
-			return false;
+			return false
 		}
 	})
 	//アプデDL
-	ipc.on('download-btn', (e, args) => {
+	ipc.on('download-btn', async (e, args) => {
 		function dl(url, file, dir, e) {
-
-			e.sender.webContents.send('mess', "ダウンロードを開始します。");
+			e.sender.webContents.send('mess', 'Start...')
 			const opts = {
 				directory: dir,
+				filename: file,
 				openFolderWhenDone: true,
 				onProgress: function(event) {
-					e.sender.webContents.send('prog', event);
+					e.sender.webContents.send('prog', [event, args[2]])
 				},
 				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;
-		dialog.showSaveDialog(null, {
+		var platform = process.platform
+		var bit = process.arch
+		var options = {
 			title: 'Save',
-			defaultPath: app.getPath('home') + "/" + args[1]
-		}, (savedFiles) => {
-			console.log(savedFiles);
-			if (!savedFiles) {
-				return false;
+			defaultPath: app.getPath('home') + '/' + args[1]
 		}
-			if (platform == "win32") {
-				var m = savedFiles.match(/(.+)\\(.+)$/);
+		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(/(.+)\/(.+)$/);
+			var m = savedFiles.match(/(.+)\/(.+)$/)
 		}
 		//console.log(m);
 		if (isExistFile(savedFiles)) {
-				fs.unlinkSync(savedFiles);
+			fs.unlinkSync(savedFiles)
 		}
-			dl(args[0], args[1], m[1], e);
-		});
-	});
+		console.log(m)
+		dl(args[0], m[2], 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
+		const filename = args[0].match(/https:\/\/.+\/(.+\..+)$/)
+		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);
+				event.sender.webContents.send('general-dl-prog', e)
 			},
 			saveAs: false
-		};
-		download(BrowserWindow.getFocusedWindow(),
-			args[0], opts)
-			.then(dl => {
-				event.sender.webContents.send('general-dl-message', dir);
-			})
-			.catch(console.error);
-	});
-	ipc.on('open-finder', (e, folder) => {
-
-		shell.showItemInFolder(folder)
-	});
 		}
-exports.dl = dl;
+		download(BrowserWindow.getFocusedWindow(), args[0], opts)
+			.then(dl => {
+				if(filename[1]) {
+					if (platform == 'win32') {
+						var name = dir + '\\' + filename[1]
+					} else if (platform == 'linux' || platform == 'darwin') {
+						var name = dir + '/' + filename[1]
+					}
+				} else {
+					var name = dir
+				}
+				event.sender.webContents.send('general-dl-message', name)
+			})
+			.catch(console.error)
+	})
+	ipc.on('openFinder', (e, folder) => {
+		console.log(folder)
+		shell.showItemInFolder(folder)
+	})
+}
+exports.dl = dl

app/main/img.js

@@ -1,43 +1,87 @@
 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;
+	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, {
+		let fileNames = dialog.showOpenDialogSync(mainWindow, {
 			properties: ['openFile', 'multiSelections'],
 			title: '添付ファイルを選択',
 			defaultPath: '.',
 			filters: [
-                { name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] },
+				{
+					name: 'メディアファイル',
+					extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'],
+				},
 				{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
 				{ name: '動画', extensions: ['mp4', 'webm'] },
-                { name: '全てのファイル', extensions: ['*'] }
-            ]
-        }, (fileNames) => {
+				{ name: '全てのファイル', extensions: ['*'] },
+			],
+		})
 		if (!fileNames) {
-                return false;
+			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']);
+			var path = fileNames[i]
+			var bin = fs.readFileSync(path, 'base64')
+			e.sender.webContents.send('resizeJudgement', [bin, 'new'])
 		}
-        });
-    });
+	})
 	ipc.on('bmp-image', (e, args) => {
-
-        var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
 		Jimp.read(args[0], function (err, lenna) {
-            if (err) throw err;
+			if (err) throw err
 			lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
-                e.sender.webContents.send('bmp-img-comp', [src, args[1]]);
-            });
-        });
-
-    });
+				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'
 		}
-exports.img = img;
+		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])
+						})
+					})
+				}
+			})
+		})
+	})
+}
+exports.img = img