width mistake

Fix: cannot sort column if using some kind of TL

.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

@@ -5,6 +5,7 @@
  
 [![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
+[![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
 [![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
 ![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
@@ -13,6 +14,7 @@ Mastodon/Misskey client for PC(Windows/Linux/macOS)
 Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)    
 
 <a href="https://www.patreon.com/cutls"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160"></a>  
+<a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a>
 ![Screenshots1](https://thedesk.top/img/scr1.png)  
 
 ## License
@@ -20,12 +22,12 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
 [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  
 
 The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/)
-[Press Kit](https://dl.thedesk.top/press/TheDesk+PressKit.zip)  
+[Press Kit](https://d2upiril6ywqp9.cloudfront.net/press/TheDesk+PressKit.zip)  
 
-* [PNG](https://dl.thedesk.top/press/TheDesk.png)
-* [Monotone SVG](https://dl.thedesk.top/press/TheDesk.svg)
-* [ico](https://dl.thedesk.top/press/TheDesk.ico)
-* [icns](https://dl.thedesk.top/press/TheDesk.icns)
+* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
+* [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)
 
 The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
 
@@ -38,24 +40,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.
@@ -76,15 +66,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
@@ -98,6 +110,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
@@ -118,8 +145,24 @@ 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.  
+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

@@ -5,6 +5,7 @@
  
 [![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
+[![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
 [![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
 ![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
@@ -20,12 +21,13 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
 [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  
 
 アイコンは[クリエイティブ・コモンズ 表示-非営利-継承](https://creativecommons.org/licenses/by-nc-sa/4.0/)で提供されています。  
-[プレスキット](https://dl.thedesk.top/press/TheDesk+PressKit.zip)  
+[プレスキット](https://d2upiril6ywqp9.cloudfront.net/press/TheDesk+PressKit.zip)  
 
-* [PNG](https://dl.thedesk.top/press/TheDesk.png)
-* [Monotone SVG](https://dl.thedesk.top/press/TheDesk.svg)
-* [ico](https://dl.thedesk.top/press/TheDesk.ico)
-* [icns](https://dl.thedesk.top/press/TheDesk.icns)
+* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
+* [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)
 
 標準の通知音は [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) で提供されています。
 
@@ -38,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`フォルダ内で実行
@@ -70,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
 # 実行している環境向けにビルド
@@ -99,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(非推奨)
@@ -121,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で不具合が発生することがあります。  
@@ -129,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,122 +1,139 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="ja">
+	<head>
+		<title>TheDesk</title>
+		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
+		<link href="./css/font-awesome.css" rel="stylesheet" type="text/css" />
+		<link href="./css/themes.css" type="text/css" rel="stylesheet" />
+		<link href="./css/master.css" type="text/css" rel="stylesheet" />
+		<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet" />
+		<meta charset="utf-8" />
+		<style>
+			body {
+				font-family: 'Open Sans';
+				-webkit-app-region: drag;
+				cursor: move;
+				padding: 5px;
+				padding-top: 15px;
+			}
 
-<head>
-    <title>TheDesk</title>
-    <meta content="width=device-width,initial-scale=1.0" name="viewport">
-    <link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
-    <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
-    <link href="./css/themes.css" type="text/css" rel="stylesheet">
-    <link href="./css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
-    <meta charset="utf-8">
-    <style>
-        body {
-            font-family: 'Open Sans';
-            -webkit-app-region: drag;
-            cursor: move;
-        }
+			a,
+			button {
+				-webkit-app-region: no-drag;
+			}
 
-        a,
-        button {
-            -webkit-app-region: no-drag;
-        }
+			.container {
+				width: 100%;
+				display: grid;
+				grid-template-columns: 1fr 1fr;
+				grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
+				grid-template-areas: 'name1 data1' 'name2 data2' 'name3 data3' 'name4 data4' 'name5 data5' 'name6 data6';
+				text-align: left;
+				margin: 5px;
+			}
 
-        .container {
-            width: 100%;
-            display: grid;
-            grid-template-columns: 1fr 1fr;
-            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5';
-            text-align: left;
-            margin: 5px;
-        }
+			.area-name1 {
+				grid-area: name1;
+			}
 
-        .area-name1 {
-            grid-area: name1;
-        }
+			.area-data1 {
+				grid-area: data1;
+			}
 
-        .area-data1 {
-            grid-area: data1;
-        }
+			.area-name2 {
+				grid-area: name2;
+			}
 
-        .area-name2 {
-            grid-area: name2;
-        }
+			.area-data2 {
+				grid-area: data2;
+			}
 
-        .area-data2 {
-            grid-area: data2;
-        }
+			.area-name3 {
+				grid-area: name3;
+			}
 
-        .area-name3 {
-            grid-area: name3;
-        }
+			.area-data3 {
+				grid-area: data3;
+			}
 
-        .area-data3 {
-            grid-area: data3;
-        }
+			.area-name4 {
+				grid-area: name4;
+			}
 
-        .area-name4 {
-            grid-area: name4;
-        }
+			.area-data4 {
+				grid-area: data4;
+			}
 
-        .area-data4 {
-            grid-area: data4;
-        }
+			.area-name5 {
+				grid-area: name5;
+			}
 
-        .area-name5 {
-            grid-area: name5;
-        }
+			.area-data5 {
+				grid-area: data5;
+			}
 
-        .area-data5 {
-            grid-area: data5;
-        }
-    </style>
-</head>
+			.area-name6 {
+				grid-area: name6;
+			}
 
-<body class="center " style="overflow:hidden">
-    <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
-    <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-    <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
-    <img src="./img/desk.png" 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>
-    <div class="cp">Copyright &copy; TheDesk 2018<br>
-        Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
-        Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a
-            href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pl.kpherox.dev/kPherox"
-            target="_blank">kPherox</a> and all users
-        <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️"
-            title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
-        <br><a href="https://thedesk.top" target="_blank">Web site</a></div>
-    <button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i
-            class="material-icons left">close</i>Close</button>
-    <script type="text/javascript" src="./js/ui/theme.js"></script>
-    <script>
-        var about = JSON.parse(localStorage.getItem("about"));
-        $("#now").text(localStorage.getItem("ver"));
-        $("#node").text(about[0]);
-        $("#chrome").text(about[1]);
-        $("#electron").text(about[2]);
-        if (location.search) {
-            var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/);
-            var ver = m[1];
-            $("#ver").text(ver);
-        }
-        $(document).on('click', 'a', e => {
-            var url = $(e.target).attr('href');
-            postMessage(["openUrl", url], "*")
-            return false;
-        });
-    </script>
+			.area-data6 {
+				grid-area: data6;
+			}
+		</style>
+	</head>
+
+	<body class="center" style="overflow: hidden;">
+		<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
+		<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
+		<script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
+		<img src="./img/desk.svg" style="max-width: 62%;" />
+		<h5>TheDesk</h5>
+		<div class="container">
+			<div class="area-name1">Display version</div>
+			<div class="area-data1" id="now"></div>
+			<div class="area-name2">Internal version</div>
+			<div class="area-data2" id="ver"></div>
+			<div class="area-name3">Commit(7chars)</div>
+			<div class="area-data3" id="hash"></div>
+			<div class="area-name4">Chromium</div>
+			<div class="area-data4" id="chrome"></div>
+			<div class="area-name5">Electron</div>
+			<div class="area-data5" id="electron"></div>
+			<div class="area-name6">Node.js</div>
+			<div class="area-data6" id="node"></div>
+		</div>
+		<div class="cp">
+			Copyright &copy; TheDesk 2018<br />
+			Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br />
+			Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a
+				href="https://pl.kpherox.dev/kPherox"
+				target="_blank"
+				>kPherox</a
+			>
+			and all users
+			<img draggable="false" style="width: 0.8rem; top: 1px; margin-left: 1px; position: relative;" alt="❤️" title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png" />
+			<br /><a href="https://thedesk.top" target="_blank">Web site</a>
+		</div>
+		<button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
+		<script type="text/javascript" src="./js/ui/theme.js"></script>
+		<script>
+			var about = JSON.parse(localStorage.getItem('about'))
+			$('#now').text(localStorage.getItem('ver'))
+			$('#node').text(about[0])
+			$('#chrome').text(about[1])
+			$('#electron').text(about[2])
+			if (location.search) {
+				var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/)
+				var ver = m[1]
+				$('#ver').text(ver)
+			}
+			$('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
+			$(document).on('click', 'a', (e) => {
+				var url = $(e.target).attr('href')
+				postMessage(['openUrl', url], '*')
+				return false
+			})
+		</script>
+	</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

@@ -1,476 +1,608 @@
 /*共通CSS*/
 html,
 body {
-  /*transform: translate3d(0,0,0);*/
-  overflow: hidden;
-  user-select: none;
-  cursor: default;
-  font-size: 13px;
-  height: 100vh;
-  background-color: var(--bg);
-  color: var(--color);
+	/*transform: translate3d(0,0,0);*/
+	overflow: hidden;
+	user-select: none;
+	cursor: default;
+	height: 100vh;
+	color: var(--color);
 }
-.btn {
-  margin: 5px;
-  text-transform: none;
+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;
+	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;
+	display: inline;
 }
 option {
-  display: none;
+	display: none;
 }
 #mainView {
-  padding: 10px;
-  overflow: scroll;
-  height: auto;
+	padding: 10px;
+	overflow: scroll;
+	height: auto;
 }
 #message {
-  display: none;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  background-color: black;
-  color: white;
-  z-index: 9999;
+	display: none;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	background-color: black;
+	color: white;
+	z-index: 9999;
 }
 #imagemodal,
 #videomodal {
-  display: none;
-  max-width: 100vw;
-  max-height: 100vh;
-  position: fixed;
-  z-index: 9;
-  top: 0 !important;
+	display: none;
+	max-width: 100vw;
+	max-height: 100vh;
+	position: fixed;
+	z-index: 9;
+	top: 0 !important;
 }
 #videomodal,
 #tootmodal {
-  background-color: var(--modal);
+	background-color: var(--modal);
 }
 #imagemodal .modal-content {
-  overflow: hidden;
-  padding: 0;
+	overflow: hidden;
+	padding: 0;
 }
 #imagemodal .modal-footer {
-  overflow-x: scroll;
-  overflow-y: hidden;
+	overflow-x: hidden;
+	overflow-y: hidden;
 }
 
 #imagewrap {
-  width: 100%;
-  height: 100%;
+	width: 100%;
+	height: 100%;
 }
 .pointer {
-  cursor: pointer;
+	cursor: pointer;
 }
 .badge {
-  min-width: 0 !important;
-  margin-left: 5px !important;
+	min-width: 0 !important;
+	margin-left: 0.4rem !important;
 }
-.unvisible{
-  opacity: 0;
+.unvisible {
+	opacity: 0;
 }
 .bbcode-pulse-loadings,
 .bbcode-pulse-loading,
 .fa-pulse {
-  display: inline-block;
-  animation-duration: 3s;
-  animation-fill-mode: both;
-  animation-iteration-count: infinite;
-  animation-name: pulse;
+	display: inline-block;
+	animation-duration: 3s;
+	animation-fill-mode: both;
+	animation-iteration-count: infinite;
+	animation-name: pulse;
 }
 @keyframes pulse {
-  from,
-  50%,
-  to {
-    opacity: 1;
-  }
-  25%,
-  75% {
-    opacity: 0;
-  }
+	from,
+	50%,
+	to {
+		opacity: 1;
+	}
+	25%,
+	75% {
+		opacity: 0;
+	}
 }
 @keyframes shake {
-  from,
-  to {
-    -webkit-transform: translate3d(0, 0, 0);
-    transform: translate3d(0, 0, 0);
-  }
+	from,
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
 
-  10%,
-  30%,
-  50%,
-  70%,
-  90% {
-    -webkit-transform: translate3d(-10px, 0, 0);
-    transform: translate3d(-10px, 0, 0);
-  }
+	10%,
+	30%,
+	50%,
+	70%,
+	90% {
+		-webkit-transform: translate3d(-10px, 0, 0);
+		transform: translate3d(-10px, 0, 0);
+	}
 
-  20%,
-  40%,
-  60%,
-  80% {
-    -webkit-transform: translate3d(10px, 0, 0);
-    transform: translate3d(10px, 0, 0);
-  }
+	20%,
+	40%,
+	60%,
+	80% {
+		-webkit-transform: translate3d(10px, 0, 0);
+		transform: translate3d(10px, 0, 0);
+	}
 }
 
 .shake {
-  display: inline-block;
-  animation-duration: 1s;
-  animation-fill-mode: both;
-  animation-iteration-count: infinite;
-  animation-name: shake;
+	display: inline-block;
+	animation-duration: 1s;
+	animation-fill-mode: both;
+	animation-iteration-count: infinite;
+	animation-name: shake;
 }
 code:before,
 .pre:before {
-  content: "Code";
-  font-size: 1.8rem;
-  line-height: 1em;
-  font-family: monospace, monospace;
-  color: #999;
-  position: absolute;
-  right: 0;
-  top: 0;
+	content: 'Code';
+	font-size: 1.8rem;
+	line-height: 1em;
+	font-family: monospace, monospace;
+	color: #999;
+	position: absolute;
+	right: 0;
+	top: 0;
 }
 code,
 pre {
-  color: white;
-  display: block;
-  border-left: 5px solid;
-  border-color: #079903;
-  padding-left: 10px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  margin-left: 5px;
-  background-color: #000;
-  padding: 1em 1em 1em;
-  position: relative;
-  border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
+	color: white;
+	display: block;
+	border-left: 5px solid;
+	border-color: #079903;
+	padding-left: 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: 0.75rem;
+	border-bottom-right-radius: 0.75rem;
+	border-bottom-left-radius: 0.75rem;
+	white-space: normal;
 }
 blockquote,
 .quote p {
-  margin: 0;
+	margin: 0;
 }
 blockquote,
 .quote {
-  color: black;
-  background-color: #ddd;
-  padding: 1em 1em 1em;
-  position: relative;
-  border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
+	color: black;
+	background-color: #ddd;
+	padding: 1em 1em 1em;
+	position: relative;
+	border-top-left-radius: 0.75rem;
+	border-bottom-right-radius: 0.75rem;
+	border-bottom-left-radius: 0.5rem;
 }
 blockquote:before,
 .quote:before {
-  content: "Quote";
-  font-size: 1.8rem;
-  line-height: 1em;
-  font-family: Open Sans, cursive;
-  color: #999;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-.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;
+	content: 'Quote';
+	font-size: 1.8rem;
+	line-height: 1em;
+	font-family: Open Sans, cursive;
+	color: #999;
+	position: absolute;
+	right: 0;
+	top: 0;
 }
 .pixiv-post {
-  color: black;
-  background-color: #fff;
-  padding: 1em 1em 1em;
-  position: relative;
-  border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
-  border-left: 5px solid #0096fa;
+	color: black;
+	background-color: #fff;
+	padding: 1em 1em 1em;
+	position: relative;
+	border-top-left-radius: 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";
-  font-size: 1.8rem;
-  line-height: 1em;
-  font-family: Open Sans;
-  color: #999;
-  position: absolute;
-  right: 0;
-  top: 0;
+	content: 'From Pixiv';
+	font-size: 1.8rem;
+	line-height: 1em;
+	font-family: Open Sans;
+	color: #999;
+	position: absolute;
+	right: 0;
+	top: 0;
+}
+#start {
+	display: none;
+	position: fixed;
+	width: 100vw;
+	height: calc(100vh - 3rem);
+	background-color: var(--bg);
+	color: var(--color);
+	z-index: 99999;
+	justify-content: center;
+	align-items: center;
 }
 #drag {
-  display: none;
-  position: fixed;
-  width: 100vw;
-  height: 100vh;
-  background-color: var(--bg);
-  color: var(--color);
-  z-index: 99999;
-  justify-content: center;
-  align-items: center;
+	display: none;
+	position: fixed;
+	width: 100vw;
+	height: 100vh;
+	background-color: var(--bg);
+	color: var(--color);
+	z-index: 99999;
+	justify-content: center;
+	align-items: center;
 }
 #drag-content {
-  font-size: 2rem;
-}
-.radio {
-  font-family: "Baloo Bhai";
+	font-size: 2rem;
 }
 #pip {
-  z-index: 504;
-  width: 418px;
-  background-color: var(--subcolor);
-  position: absolute;
+	z-index: 504;
+	width: 418px;
+	background-color: var(--subcolor);
+	position: absolute;
 }
 .pip-bottom {
-  bottom: 10px;
+	bottom: 10px;
 }
 .pip-left {
-  left: 10px;
+	left: 10px;
 }
 .pip-top {
-  top: 10px;
+	top: 10px;
 }
 .pip-right {
-  right: 10px;
+	right: 10px;
 }
 #pip-content .material-icons {
-  display: none;
+	display: none;
 }
 .big-text {
-  font-size: 1.2rem;
+	font-size: 1.2rem;
 }
 #releasenote {
-  background-color: var(--modal);
+	background-color: var(--modal);
 }
 #releasenote li {
-  list-style-type: disc;
+	list-style-type: disc;
 }
 @media only screen and (min-width: 993px) {
-  #toast-container {
-    top: auto;
-    right: auto;
-    bottom: 5%;
-    left: 4%;
-    max-width: 86%;
-  }
+	#toast-container {
+		top: auto;
+		right: auto;
+		bottom: 5%;
+		left: 4%;
+		max-width: 86%;
+	}
 }
 .show {
-  animation: show 0.2s linear 0s;
+	animation: show 0.2s linear 0s;
 }
 @keyframes show {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: 1;
+	}
 }
 .hide-anime {
-  animation: hide 0.2s linear 0s;
-  display: none;
+	animation: hide 0.2s linear 0s;
+	display: none;
 }
 @keyframes hide {
-  from {
-    opacity: 1;
-  }
-  to {
-    opacity: 0;
-  }
+	from {
+		opacity: 1;
+	}
+	to {
+		opacity: 0;
+	}
 }
 .collapsible-header,
 .tabs {
-  background-color: var(--subcolor);
+	background-color: var(--subcolor);
 }
 .collapsible-header:focus {
-  background-color: var(--subcolor);
+	background-color: var(--subcolor) !important;
 }
 .modal-footer {
-  background-color: var(--modalfooter) !important;
+	background-color: var(--modalfooter) !important;
 }
 .font {
-  font-size: 1.5rem;
-  margin-bottom: 5px;
+	font-size: 1.5rem;
+	margin-bottom: 0.4rem;
 }
 .font:hover {
-  background-color: #999;
+	background-color: #999;
 }
 .release-do {
-  border: solid 2px;
-  border-color: var(--color);
-  padding: 5px;
+	border: solid 2px;
+	border-color: var(--color);
+	padding: 5px;
 }
 #pickers {
-  display: flex;
-  flex-wrap: wrap;
+	display: flex;
+	flex-wrap: wrap;
 }
 #menu {
-  position: fixed;
-  z-index: 9999;
-  background-color: var(--box);
-  width: 540px;
-  top: calc(50% - 150px);
-  left: calc(50% - 250px);
-  padding: 5px;
-  border: thin solid gray;
-  border-radius: 5px;
+	position: fixed;
+	z-index: 9999;
+	background-color: var(--postbox);
+	width: 540px;
+	top: calc(50% - 150px);
+	left: calc(50% - 250px);
+	padding: 0.4rem;
+	border: thin solid gray;
+	border-radius: 0.4rem;
+	overflow: hidden;
 }
 #menu-wrapper {
-  margin-left: -5px;
-  display: flex;
+	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;
-  width: 100%;
-  height: 50px;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
+#left-menu a {
+	padding-left: 0.4rem;
+	width: 100%;
+	height: 3rem;
+	display: flex;
+	align-items: center;
+	cursor: pointer;
+	color: var(--color);
 }
-#left-menu div:hover {
-  background-color: var(--beforehover);
+#left-menu a:hover {
+	background-color: var(--beforehover);
 }
 #left-menu span {
-  margin-left: 5px;
+	margin-left: 0.4rem;
 }
-#left-menu div.active {
-  background-color: var(--emphasized);
+#left-menu a.active {
+	background-color: var(--emphasized);
 }
 #right-menu {
-  width: 380px;
-  max-height: 375px;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  padding: 5px;
+	width: 100%;
+	overflow-y: scroll;
+	overflow-x: hidden;
+	padding: 0.4rem;
 }
 #tltype {
-  display: flex;
-  flex-wrap: wrap;
+	display: flex;
+	flex-wrap: wrap;
 }
 #tltype .type {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  width: 170px;
-  height: 40px;
-  cursor: pointer;
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	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);
+	background-color: var(--beforehover);
 }
 #tltype .active {
-  background-color: var(--emphasized);
+	background-color: var(--emphasized);
 }
 #tltype i {
-  font-size: 30px;
+	font-size: 2.3rem;
 }
 #tltype i.sub-icon {
-  font-size: 20px;
-  position: relative;
-  color: var(--beforehover);
-  left: -15px;
+	font-size: 1.53rem;
+	position: absolute;
+	color: var(--beforehover);
+	left: 0.9rem;
+	bottom: 0.4rem;
+	background-color: #fff;
 }
 .drag-bar {
-  cursor: move;
-  text-align: center;
-  width: calc(100% + 10px);
-  border-radius: 5px;
-  background-color: var(--box);
-  filter: brightness(80%);
-  margin-left: -5px;
-  margin-right: -5px;
-  margin-top: -5px;
-  font-size: 16px;
-  padding: 4px;
+	cursor: move;
+	text-align: center;
+	width: calc(100% + 0.8rem);
+	border-radius: 5px;
+	background-color: var(--box);
+	filter: brightness(80%);
+	margin-left: -0.4rem;
+	margin-right: -0.4rem;
+	margin-top: -0.4rem;
+	font-size: 1.3rem;
+	padding: 0.3rem;
 }
 #something-wrong {
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+	flex-direction: column;
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	display: flex;
+	justify-content: center;
+	align-items: center;
 }
 #support-btm {
-  position: fixed;
-  bottom: -300px;
-  width: 100vw;
-  background-color: var(--box);
-  z-index: 9999;
-  padding: 10px;
-  display: grid;
-  grid-template-columns: 3fr 1fr 1fr;
-  grid-template-rows: 1fr 36px;
-  grid-template-areas: "note middle right" "note close close";
+	position: fixed;
+	bottom: -300px;
+	width: 100vw;
+	background-color: var(--box);
+	z-index: 9999;
+	padding: 0.8rem;
+	display: grid;
+	grid-template-columns: 3fr 1fr 1fr;
+	grid-template-rows: 1fr 2.7rem;
+	grid-template-areas: 'note middle right' 'note close close';
 }
 #support-btm-en,
 #support-btm-ja {
-  grid-area: note;
+	grid-area: note;
 }
 #support-btm-middle {
-  grid-area: middle;
+	grid-area: middle;
 }
 #support-btm-right {
-  grid-area: right;
+	grid-area: right;
 }
 #support-btm-close {
-  grid-area: close;
+	grid-area: close;
 }
 .select-wrapper .dropdown-content {
-  width: 250px !important;
+	width: 19.2rem !important;
 }
-input, textarea {
-  color: var(--color);
-  font-size: 1rem !important;
-  font-family: inherit;
+input,
+textarea {
+	color: var(--color);
+	font-size: 1rem !important;
+	font-family: inherit;
 }
-.swal2-popup{
-  background-color: var(--notfbox) !important;
+.swal2-popup {
+	background-color: var(--notfbox) !important;
 }
-.swal2-title, .swal2-content{
-  color: var(--color) !important;
+.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 {
-  width: 5px;
-  height: 10px;
-  background: rgba(0, 0, 0, 0.05);
+	width: 5px;
+	height: 10px;
+	background: rgba(0, 0, 0, 0.05);
 }
 ::-webkit-scrollbar-track {
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
 }
 /* Handle */
 ::-webkit-scrollbar-thumb {
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-  background: #607d8b;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	background: #607d8b;
+	-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+}
+/* Web Fonts */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-weight: 300;
+	src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.ttf') format('truetype');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+	font-family: 'Material Icons';
+	font-style: normal;
+	font-weight: 400;
+	src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
+}
+.material-icons {
+	font-family: 'Material Icons';
+	font-weight: normal;
+	font-style: normal;
+	font-size: 1.84rem;
+	line-height: 1;
+	letter-spacing: normal;
+	text-transform: none;
+	display: inline-block;
+	white-space: nowrap;
+	word-wrap: normal;
+	direction: ltr;
+	-webkit-font-feature-settings: 'liga';
+	-webkit-font-smoothing: antialiased;
+}
+.pwaView .pwa,
+.pwaView .mac,
+.pwaView .win {
+	display: none;
+}
+.win32 .mac,
+.linux .mac {
+	display: none;
+}
+.linux .win,
+.darwin .win {
+	display: none;
 }

app/css/post.css

@@ -1,146 +1,148 @@
 /*トゥートボックス向けCSS*/
 #post-box {
-  display: none;
-  position: fixed;
-  left: calc(50vw - 150px);
-  top: 50vh;
-  background-color: var(--postbox);
-  border: thin solid gray;
-  z-index: 501;
-  min-width: 300px;
-  max-width: 100%;
-  padding: 5px;
-  border-radius: 5px;
+	display: none;
+	position: fixed;
+	left: calc(50vw - 150px);
+	top: 50vh;
+	background-color: var(--postbox);
+	border: thin solid gray;
+	z-index: 501;
+	max-width: 100%;
+	padding: 0.4rem;
+	border-radius: 0.4rem;
+	overflow: hidden;
 }
 textarea {
-  min-height: 100px !important;
-  font-family: inherit;
+	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;
-  color: gray;
-  cursor: pointer;
-  position: absolute;
-  right: 2px;
-  top: 4px;
+	font-size: 0.5rem;
+	color: gray;
+	cursor: pointer;
+	position: absolute;
+	right: 2px;
+	top: 4px;
 }
 .more-show {
-  display: none;
+	display: none;
 }
 #drag {
-  width: 100%;
-  height: 100px;
+	width: 100%;
+	height: 100px;
 }
 #post-btn {
-  display: none;
+	display: none;
 }
 #vis {
-  text-transform: capitalize;
+	text-transform: capitalize;
 }
 #cw-text {
-  display: none;
+	display: none;
 }
 #sch-box {
-  display: none;
+	display: none;
 }
 #sch-box input {
-  width: auto;
+	width: auto;
 }
 .picker__close,
 .picker__today,
 .picker__clear {
-  color: #26a69a !important;
+	color: #26a69a !important;
 }
 .cw {
-  display: none;
+	display: none;
 }
 .sensitive {
-  filter: blur(50px);
+	filter: blur(50px);
 }
 #emoji {
 }
 #suggest {
-  max-height: 300px;
-  overflow-y: scroll;
+	max-height: 23rem;
+	overflow-y: scroll;
 }
 #emoji-list {
-  width: 100%;
-  height: 200px;
-  overflow-y: scroll;
+	width: 100%;
+	height: 15.4rem;
+	overflow-y: scroll;
 }
 #preview-field {
-  display: none;
+	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;
+	display: inline-block;
+	width: 3.8rem;
+	max-height: 7.7rem;
 }
 #default-emoji a {
-  color: var(--color);
-  margin-right: 2px;
+	color: var(--color);
+	margin-right: 0.15rem;
 }
 .character-counter {
-  position: relative;
-  top: -25px;
+	position: relative;
+	top: -1.9rem;
 }
 .trendtag {
-  overflow-y: scroll;
-  max-height: 100px;
+	overflow-y: scroll;
+	max-height: 7.7rem;
 }
 #toot-btn-field {
-  display: flex;
+	display: flex;
 }
 #toot-post-btn {
-  width: calc(100% - 10px);
-  padding: 0;
-  margin-top: 10px;
+	width: calc(100% - 0.7rem);
+	padding: 0;
+	margin-top: 0.7rem;
+	height: 2.7rem;
 }
 #toot-sec-btn {
-  width: 30px;
-  padding: 0;
-  margin-top: 10px;
+	width: 2.3rem;
+	padding: 0;
+	margin-top: 0.7rem;
 }
 #left-side {
-  float: left;
-  width: 300px;
+	float: left;
+	overflow-x: hidden;
+	height: calc(100% - 2.5rem);
 }
 #right-side {
-  display: none;
-  float: left;
-  width: 300px;
-  padding: 5px;
+	display: none;
+	float: left;
+	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 {
-  background-color: var(--accentbtn);
+#posttgl,
+#toot-post-btn {
+	background-color: var(--accentbtn);
+	color: var(--color);
 }
 /*mini*/
 .mini-post .mize {
-  display: none !important;
+	display: none !important;
 }
 .mini-post #textarea {
-  padding: 0;
+	padding: 0;
 }
 .mini-post #post-box {
-  width: 200px;
-  min-width: 100px;
+	width: 15.4rem;
+	min-width: 7.7rem;
 }
 .mini-post #toot-field {
-  padding: 0;
+	padding: 0;
 }
 .mini-post #toot-btn-field {
-  padding: 0;
+	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

@@ -17,6 +17,7 @@
   --accentbtn: #009688;
   --selected: #c0c0c0;
   --selectedWithShare: #b2babd;
+  --gray: #757575;
 }
 #imagemodal {
   background: url("../img/pixel.white.svg");
@@ -40,6 +41,7 @@
   --accentbtn: #3f51b5;
   --selected: #3f3f3f;
   --selectedWithShare: #003a30;
+  --gray: #cccccc;
 }
 .blacktheme #imagemodal {
   background: url("../img/pixel.svg");
@@ -63,6 +65,7 @@
   --accentbtn: #00acc1;
   --selected: #214f8a;
   --selectedWithShare: #003a30;
+  --gray: #cccccc ;
 }
 .indigotheme #imagemodal {
   background: url("../img/pixel.svg");
@@ -86,6 +89,7 @@
   --accentbtn: #827717;
   --selected: #6d352b;
   --selectedWithShare: #003a30;
+  --gray: #cccccc;
 }
 .browntheme #imagemodal {
   background: url("../img/pixel.svg");
@@ -109,6 +113,7 @@
   --accentbtn: #33691e;
   --selected: #78c17a;
   --selectedWithShare: #caa266;
+  --gray: #757575;
 }
 .greentheme #imagemodal {
   background: url("../img/pixel.white.svg");
@@ -132,7 +137,56 @@
   --accentbtn: #2f7bb7;
   --selected: #9dcade;
   --selectedWithShare: #c1dac4;
+  --gray: #757575;
 }
 .bluetheme #imagemodal {
   background: url("../img/pixel.white.svg");
 }
+.polartheme {
+  --bg: #2e3440;
+  --drag: rgba(0, 0, 0, 0.8);
+  --color: white;
+  --beforehover: #8d94a0;
+  --modal: #3b4252;
+  --subcolor: #434c5e;
+  --box: #4c566a;
+  --sidebar: #3b4252;
+  --shared: #2d3b58;
+  --notfbox: #2a3857;
+  --emphasized: #2f4b86;
+  --his-data: rgba(0, 0, 0, 0.8);
+  --active: #2a3857;
+  --postbox: #434c5e;
+  --modalfooter: #485166;
+  --accentbtn: #2f4b86;
+  --selected: #464f61;
+  --selectedWithShare: #3e527e;
+  --gray: #cccccc;
+}
+.polartheme #imagemodal {
+  background: url("../img/pixel.svg");
+}
+.snowtheme {
+  --bg: #eceff4;
+  --drag: rgba(255, 255, 255, 0.8);
+  --color: #36425a;
+  --beforehover: #344058;
+  --modal: #e5e9f0;
+  --subcolor: #d8dee9;
+  --box: #c0c8d6;
+  --sidebar: #eeeeee;
+  --shared: #c3d4e6;
+  --notfbox: #d8dee9;
+  --emphasized: #88c0d0;
+  --his-data: rgba(255, 255, 255, 0.9);
+  --active: #8fbcbb;
+  --postbox: #d8dee9;
+  --modalfooter: #b2bed4;
+  --accentbtn: #81a1c1;
+  --selected: #b4bdd0;
+  --selectedWithShare: #a3afbb;
+  --gray: #5c6c8c;
+}
+.snowtheme #imagemodal {
+  background: url("../img/pixel.white.svg");
+}

app/css/userdata.css

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

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

app/img/desk_full.svg

@@ -1,122 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-              "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="7.11022in" height="7.11022in"
-     viewBox="0 0 512 512">
-  <path id="選択範囲 #1"
-        fill="white" stroke="white" stroke-width="1"
-        d="M 96.00,16.00
-           C 99.85,16.01 102.39,15.12 104.00,19.00
-             104.00,19.00 97.00,19.00 97.00,19.00
-             97.00,19.00 108.00,22.07 108.00,22.07
-             108.00,22.07 144.00,43.08 144.00,43.08
-             144.00,43.08 181.83,64.31 181.83,64.31
-             181.83,64.31 223.00,88.26 223.00,88.26
-             223.00,88.26 247.00,102.22 247.00,102.22
-             247.00,102.22 257.00,107.00 257.00,107.00
-             260.09,110.36 266.43,114.39 271.00,115.00
-             271.00,115.00 298.00,133.00 298.00,133.00
-             298.00,133.00 300.00,132.00 300.00,132.00
-             300.00,132.00 312.00,141.00 312.00,141.00
-             312.00,141.00 314.00,140.00 314.00,140.00
-             318.40,144.39 334.83,152.80 341.00,156.45
-             341.00,156.45 404.00,192.94 404.00,192.94
-             404.00,192.94 425.67,205.63 425.67,205.63
-             428.70,208.64 426.87,211.86 425.12,215.00
-             425.12,215.00 412.26,237.00 412.26,237.00
-             410.65,240.07 409.02,245.62 404.90,245.68
-             401.70,245.72 396.83,242.47 394.00,240.87
-             394.00,240.87 370.00,226.89 370.00,226.89
-             370.00,226.89 282.00,176.51 282.00,176.51
-             282.00,176.51 271.00,169.52 271.00,169.52
-             271.00,169.52 261.00,164.31 261.00,164.31
-             257.45,162.08 251.05,157.46 247.00,157.00
-             247.00,157.00 234.00,148.55 234.00,148.55
-             234.00,148.55 208.17,133.78 208.17,133.78
-             208.17,133.78 190.00,124.00 190.00,124.00
-             190.00,124.00 163.00,107.60 163.00,107.60
-             163.00,107.60 103.00,73.00 103.00,73.00
-             103.00,73.00 103.00,453.00 103.00,453.00
-             103.00,453.00 127.00,439.42 127.00,439.42
-             127.00,439.42 170.00,414.58 170.00,414.58
-             170.00,414.58 237.17,376.24 237.17,376.24
-             237.17,376.24 256.00,364.59 256.00,364.59
-             256.00,364.59 264.00,360.53 264.00,360.53
-             264.00,360.53 285.00,348.20 285.00,348.20
-             285.00,348.20 292.99,344.12 292.99,344.12
-             292.99,344.12 299.28,339.83 299.28,339.83
-             299.28,339.83 320.00,328.41 320.00,328.41
-             320.00,328.41 362.00,304.05 362.00,304.05
-             362.00,304.05 371.91,297.68 371.91,297.68
-             371.91,297.68 379.04,294.41 379.04,294.41
-             379.04,294.41 410.00,276.00 410.00,276.00
-             410.00,276.00 416.00,285.00 416.00,285.00
-             416.81,288.83 421.21,296.21 424.00,299.00
-             424.00,299.00 423.00,301.00 423.00,301.00
-             427.24,303.72 430.62,312.17 432.00,317.00
-             432.00,317.00 388.00,342.67 388.00,342.67
-             388.00,342.67 317.00,383.55 317.00,383.55
-             317.00,383.55 279.00,405.32 279.00,405.32
-             279.00,405.32 264.00,415.00 264.00,415.00
-             264.00,415.00 262.00,414.00 262.00,414.00
-             262.00,414.00 250.00,423.00 250.00,423.00
-             250.00,423.00 248.00,422.00 248.00,422.00
-             248.00,422.00 238.00,428.92 238.00,428.92
-             238.00,428.92 218.00,440.67 218.00,440.67
-             218.00,440.67 207.00,448.00 207.00,448.00
-             207.00,448.00 193.00,455.18 193.00,455.18
-             193.00,455.18 176.00,465.08 176.00,465.08
-             176.00,465.08 166.09,470.31 166.09,470.31
-             166.09,470.31 137.00,487.31 137.00,487.31
-             137.00,487.31 103.00,506.00 103.00,506.00
-             103.00,506.00 104.00,509.00 104.00,509.00
-             104.00,509.00 57.00,509.00 57.00,509.00
-             57.00,509.00 57.00,16.00 57.00,16.00
-             57.00,16.00 96.00,16.00 96.00,16.00 Z
-           M 102.00,72.00
-           C 102.00,72.00 103.00,73.00 103.00,73.00
-             103.00,73.00 103.00,72.00 103.00,72.00
-             103.00,72.00 102.00,72.00 102.00,72.00 Z
-           M 261.00,190.61
-           C 270.30,188.63 274.03,177.15 280.77,179.78
-             284.36,181.18 284.28,187.65 284.72,191.00
-             285.35,195.85 287.64,207.99 286.57,212.00
-             285.51,216.00 282.42,218.30 280.78,222.00
-             277.54,229.29 282.79,236.85 282.99,245.00
-             283.38,261.24 274.02,264.52 266.36,276.00
-             261.36,283.50 258.58,297.05 259.09,306.00
-             259.91,320.41 263.09,322.38 271.02,333.00
-             273.09,335.77 275.09,339.39 272.11,342.37
-             269.94,344.63 266.39,343.51 264.00,342.37
-             258.40,339.52 252.76,332.51 249.91,327.00
-             246.61,320.60 248.26,314.37 244.57,310.23
-             240.72,305.90 235.19,306.50 231.18,310.23
-             225.69,315.34 221.16,325.22 218.00,332.00
-             226.04,333.96 232.79,331.61 234.00,342.00
-             234.00,342.00 175.00,342.00 175.00,342.00
-             166.62,341.85 166.77,339.11 162.00,338.56
-             158.39,338.15 148.72,341.68 145.00,343.05
-             138.31,345.53 120.54,352.22 119.64,360.00
-             119.01,365.49 125.06,367.91 127.00,374.00
-             115.41,373.03 104.20,364.93 108.88,352.00
-             111.36,345.12 117.06,343.57 123.00,340.75
-             132.86,336.05 141.94,332.38 149.58,323.96
-             151.40,321.95 154.62,318.26 155.92,316.00
-             155.92,316.00 166.03,283.00 166.03,283.00
-             169.87,271.08 179.16,256.26 189.00,248.52
-             199.37,240.36 208.38,237.36 221.00,234.66
-             226.45,233.50 237.77,232.36 240.99,227.79
-             244.55,222.75 241.98,216.26 240.34,211.00
-             237.46,201.77 234.64,193.69 237.00,184.00
-             244.82,185.47 252.94,192.32 261.00,190.61 Z
-           M 102.00,453.00
-           C 102.00,453.00 103.00,454.00 103.00,454.00
-             103.00,454.00 103.00,453.00 103.00,453.00
-             103.00,453.00 102.00,453.00 102.00,453.00 Z
-           M 102.00,505.00
-           C 102.00,505.00 103.00,506.00 103.00,506.00
-             103.00,506.00 103.00,505.00 103.00,505.00
-             103.00,505.00 102.00,505.00 102.00,505.00 Z" />
+<?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">
+	.st0{display:none;}
+	.st1{fill:none;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#FFFFFF;}
+	.st4{fill:#FFFFFF;}
+	.st5{fill:#none;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
+</style>
+<g id="レイヤー_1" class="st0">
+</g>
+<g id="レイヤー_2">
+	<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+	<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
+	
+		<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
+	
+		<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
+	<path class="st5" d="M714.5,2953.5"/>
+	<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
+		c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
+		c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
+		c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
+		c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
+		c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
+		c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
+	<rect class="st7" width="4096" height="4096"/>
+	<path class="st1" d="M-58,1122"/>
+</g>
 </svg>

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

@@ -0,0 +1,136 @@
+<?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">
+<style type="text/css">
+	.st0{fill:#040000;}
+	.st1{fill:#040000;stroke:#040000;stroke-miterlimit:10;}
+	.st2{clip-path:url(#SVGID_2_);}
+	.st3{clip-path:url(#SVGID_4_);}
+	.st4{fill:none;}
+	.st5{fill:#FFFFFF;}
+	.st6{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
+	.st7{fill:#F0842E;}
+	.st8{fill:#3D4FA0;}
+	.st9{fill:#63451F;stroke:#FFFFFF;stroke-width:20;stroke-miterlimit:10;}
+	.st10{fill:#63451F;}
+</style>
+<g id="DrawBlack">
+	<polyline id="BG_1_" class="st0" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+	<rect id="Left_1_" x="678.5" y="128.48" class="st1" width="450" height="3821.5"/>
+	
+		<rect id="Top_1_" x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st0" width="450" height="3117.62"/>
+	<g id="Finger_1_">
+		<g>
+			<defs>
+				
+					<rect id="SVGID_1_" x="-626.54" y="666.18" transform="matrix(0.9063 -0.4226 0.4226 0.9063 -723.8983 1097.2598)" width="5478.6" height="3030.2"/>
+			</defs>
+			<clipPath id="SVGID_2_">
+				<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+			</clipPath>
+			<g id="g14_3_" class="st2">
+				<g id="g44_1_" transform="translate(17.2764,0.8682)">
+					<path id="path46_1_" class="st0" d="M2605.11,3533.86c0,0,159.85-112.71,149-195.05c-10.68-85.2-127.58-48.89-127.58-48.89
+						s136.18-82.82,112.7-180.35c-22.17-91.83-167.38-48.54-167.38-48.54s119.56-92.9,85.39-182.75
+						c-28.87-75.6-188.03-44.94-188.03-44.94s651.47-417.09,718.51-459.5c66.86-42.42,160.29-131.95,87.28-198.12
+						c-72.76-66.37-205.83-7.85-269.88,32.69c-64.01,40.62-874.42,553.28-1153.93,730.24c-29.84,18.84-169.66,107.16-186.59,118.03
+						c-69.96,44.42-112.22,42.02-74.07-13.01c51.14-73.63,74.73-139.7,55.45-222.1c-20.44-86.69-114.31-161.6-159.65-186.44
+						c-84.35-46.21-197.27-61.16-306.71-33.34c-170.83,43.44-256.98,149.65-157.15,218.26c149.29,102.66,148.88,244.02,37.82,381.07
+						c-261.05,322.06-363.57,512.7-142.28,713.95c241.24,219.53,812.72,166.75,1276.35-126.35
+						C2218.92,3773.38,2605.11,3533.86,2605.11,3533.86"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g id="Eyes_1_">
+		<g>
+			<defs>
+				<rect id="SVGID_3_" x="95.01" y="544.01" width="3526.99" height="3526.99"/>
+			</defs>
+			<clipPath id="SVGID_4_">
+				<use xlink:href="#SVGID_3_"  style="overflow:visible;"/>
+			</clipPath>
+			<g id="g14_2_" class="st3">
+				<g id="g24_1_" transform="translate(15.4063,25.5)">
+					<path id="path26_1_" class="st0" d="M1588.99,1547.21c0,135.3-87.78,244.93-195.94,244.93
+						c-108.16,0-195.94-109.63-195.94-244.93c0-135.2,87.78-244.93,195.94-244.93C1501.21,1302.28,1588.99,1412.01,1588.99,1547.21"
+						/>
+				</g>
+				<g id="g32_1_" transform="translate(9.6709,29.667)">
+					<path id="path34_1_" class="st0" d="M1032.82,1134.8c-16.07-8.52-29.69-21.85-38.31-38.99c-21.16-42.03-3.92-90.82,38.5-109.04
+						c417.95-179.29,754.29-4.21,768.39,3.33c42.42,22.63,59.57,73.28,38.31,113.06c-21.16,39.68-72.5,53.49-114.92,31.16
+						c-12.05-6.27-277.46-140.3-615.07,4.6C1084.54,1149.59,1056.13,1147.24,1032.82,1134.8"/>
+				</g>
+				<g id="g36_1_" transform="translate(14.7427,16.4277)">
+					<path id="path38_1_" class="st0" d="M1524.64,2445.12c-13.32-12.44-23.12-28.71-27.04-47.61c-9.7-45.95,19.4-88.76,65.15-95.42
+						c449.89-66.43,730.09,188.99,741.94,199.86c35.27,32.72,38.7,85.92,8.03,119.04c-30.57,32.92-83.77,33.11-118.94,0.59
+						c-10.19-9.01-232.39-206.52-595.87-152.93C1570.78,2472.65,1543.94,2463.15,1524.64,2445.12"/>
+				</g>
+				<g id="g40_1_" transform="translate(20.4307,25.917)">
+					<path id="path42_1_" class="st0" d="M2076.21,1505.94c-15.28-9.6-28.02-23.81-35.47-41.54c-18.32-43.3,2.25-90.92,45.75-106.2
+						c429.22-150.48,752.91,47.03,766.53,55.55c40.66,25.47,54.28,77.1,30.47,115.41c-23.71,38.21-76.03,48.5-116.68,23.32
+						c-11.76-7.15-267.27-158.81-613.99-37.23C2126.96,1524.26,2098.75,1519.95,2076.21,1505.94"/>
+				</g>
+				<g id="g28_1_" transform="translate(26,24.5)">
+					<path id="path30_1_" class="st0" d="M2616.28,1646.19c0,135.3-87.69,244.93-195.94,244.93
+						c-108.16,0-195.94-109.63-195.94-244.93c0-135.2,87.78-244.93,195.94-244.93C2528.6,1401.26,2616.28,1510.99,2616.28,1646.19"
+						/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+<g id="Path">
+	<path id="CutLine" class="st4" d="M528,128C532-14,669,0,669,0h346l2629,1464c0,0,78,34,28,108s-217,359-217,359s-22,9,9,226
+		s-204,313-204,313l-545,356c0,0,421.37,492.67,29.68,732.33S1798,4056,1798,4056s28.13,15-290.94,15s-828.56,0-828.56,0
+		S531,4102,528,3904S528,128,528,128z"/>
+</g>
+<g id="Draw">
+	<polyline id="BG" class="st5" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+	<rect id="Left" x="678.5" y="128.48" class="st6" width="450" height="3821.5"/>
+	
+		<rect id="Top" x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st7" width="450" height="3117.62"/>
+	<g id="Finger">
+		<g id="g44" transform="translate(17.2764,0.8682)">
+			<path id="path46" class="st8" d="M2605.11,3533.86c0,0,159.85-112.71,149-195.05c-10.68-85.2-127.58-48.89-127.58-48.89
+				s136.18-82.82,112.7-180.35c-22.17-91.83-167.38-48.54-167.38-48.54s119.56-92.9,85.39-182.75
+				c-28.87-75.6-188.03-44.94-188.03-44.94s651.47-417.09,718.51-459.5c66.86-42.42,160.29-131.95,87.28-198.12
+				c-72.76-66.37-205.83-7.85-269.88,32.69c-64.01,40.62-874.42,553.28-1153.93,730.24c-29.84,18.84-169.66,107.16-186.59,118.03
+				c-69.96,44.42-112.22,42.02-74.07-13.01c51.14-73.63,74.73-139.7,55.45-222.1c-20.44-86.69-114.31-161.6-159.65-186.44
+				c-84.35-46.21-197.27-61.16-306.71-33.34c-170.83,43.44-256.98,149.65-157.15,218.26c149.29,102.66,148.88,244.02,37.82,381.07
+				c-261.05,322.06-363.57,512.7-142.28,713.95c241.24,219.53,812.72,166.75,1276.35-126.35
+				C2218.92,3773.38,2605.11,3533.86,2605.11,3533.86"/>
+		</g>
+	</g>
+	<g id="Eyes">
+		<g id="g24" transform="translate(15.4063,25.5)">
+			<path id="path26" class="st9" d="M1588.99,1547.21c0,135.3-87.78,244.93-195.94,244.93c-108.16,0-195.94-109.63-195.94-244.93
+				c0-135.2,87.78-244.93,195.94-244.93C1501.21,1302.28,1588.99,1412.01,1588.99,1547.21"/>
+		</g>
+		<g id="g32" transform="translate(9.6709,29.667)">
+			<path id="path34" class="st9" d="M1032.82,1134.8c-16.07-8.52-29.69-21.85-38.31-38.99c-21.16-42.03-3.92-90.82,38.5-109.04
+				c417.95-179.29,754.29-4.21,768.39,3.33c42.42,22.63,59.57,73.28,38.31,113.06c-21.16,39.68-72.5,53.49-114.92,31.16
+				c-12.05-6.27-277.46-140.3-615.07,4.6C1084.54,1149.59,1056.13,1147.24,1032.82,1134.8"/>
+		</g>
+		<g id="g36" transform="translate(14.7427,16.4277)">
+			<path id="path38" class="st9" d="M1524.64,2445.12c-13.32-12.44-23.12-28.71-27.04-47.61c-9.7-45.95,19.4-88.76,65.15-95.42
+				c449.89-66.43,730.09,188.99,741.94,199.86c35.27,32.72,38.7,85.92,8.03,119.04c-30.57,32.92-83.77,33.11-118.94,0.59
+				c-10.19-9.01-232.39-206.52-595.87-152.93C1570.78,2472.65,1543.94,2463.15,1524.64,2445.12"/>
+		</g>
+		<g id="g40" transform="translate(20.4307,25.917)">
+			<path id="path42" class="st9" d="M2076.21,1505.94c-15.28-9.6-28.02-23.81-35.47-41.54c-18.32-43.3,2.25-90.92,45.75-106.2
+				c429.22-150.48,752.91,47.03,766.53,55.55c40.66,25.47,54.28,77.1,30.47,115.41c-23.71,38.21-76.03,48.5-116.68,23.32
+				c-11.76-7.15-267.27-158.81-613.99-37.23C2126.96,1524.26,2098.75,1519.95,2076.21,1505.94"/>
+		</g>
+		<g id="g28" transform="translate(26,24.5)">
+			<path id="path30" class="st10" d="M2616.28,1646.19c0,135.3-87.69,244.93-195.94,244.93c-108.16,0-195.94-109.63-195.94-244.93
+				c0-135.2,87.78-244.93,195.94-244.93C2528.6,1401.26,2616.28,1510.99,2616.28,1646.19"/>
+		</g>
+	</g>
+</g>
+</svg>

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

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

app/js/common/keyshortcut.js

@@ -1,180 +1,204 @@
 selectedColumn = 0
 selectedToot = 0
-$(function ($) {
+$(function($) {
 	//キーボードショートカット
-	$(window).keydown(function (e) {
-		var hasFocus = $('input').is(':focus');
-		var hasFocus2 = $('textarea').is(':focus');
-		if (document.getElementById("webview")) {
-			if ($("#webviewsel:checked").val()) {
-				var wv = false;
+	$(window).keydown(function(e) {
+		var hasFocus = $('input').is(':focus')
+		var hasFocus2 = $('textarea').is(':focus')
+		if (document.getElementById('webview')) {
+			if ($('#webviewsel:checked').val()) {
+				var wv = false
 			} else {
-				var wv = true;
+				var wv = true
 			}
 		} else {
-			var wv = true;
+			var wv = true
+		}
+		//Enter
+		if (e.keyCode === 13) {
+			if ($('#src').is(':focus')) {
+				src()
+				return false
+			}
+			if ($('#list-add').is(':focus')) {
+				makeNewList()
+				return false
+			}
 		}
 		//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 (!$('#post-box').hasClass('appear')) {
+					show()
+					$('textarea').focus()
 				} else {
-					hide();
+					hide()
 				}
-				return false;
+				return false
 			}
 			//N:新トゥート
 			if (e.keyCode === 78) {
-				if (!$("#post-box").hasClass("appear")) {
-					show();
+				if (!$('#post-box').hasClass('appear')) {
+					show()
 				}
-				$('textarea').focus();
-				return false;
+				$('textarea').focus()
+				return false
 			}
 			//Ctrl+E:全ての通知未読を既読にする
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 69) {
-					allNotfRead();
-					return false;
+					allNotfRead()
+					return false
+				}
+			}
+			//Ctrl+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;
+					var kz = e.keyCode - 49
+					goColumn(kz)
+					return false
 				}
 			}
 			//矢印:選択
-			if (e.code == "ArrowLeft") {
+			if (e.code == 'ArrowLeft') {
 				//left
-				if ($("#imagemodal").hasClass("open")) {
-					imgCont('next');
-					return false;
+				if ($('#imagemodal').hasClass('open')) {
+					imgCont('prev')
+					return false
 				}
 				if (selectedColumn > 0) {
 					selectedColumn--
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false;
-			} else if (e.code == "ArrowUp") {
+				return false
+			} else if (e.code == 'ArrowUp') {
 				//up
-				if ($("#imagemodal").hasClass("open")) {
-					return false;
+				if ($('#imagemodal').hasClass('open')) {
+					return false
 				}
 				if (selectedToot > 0) {
 					selectedToot--
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false;
-			} else if (e.code == "ArrowRight") {
+				return false
+			} else if (e.code == 'ArrowRight') {
 				//right
-				if ($("#imagemodal").hasClass("open")) {
-					imgCont('prev');
-					return false;
+				if ($('#imagemodal').hasClass('open')) {
+					imgCont('next')
+					return false
 				}
-				if (selectedColumn < $(".tl-box").length - 1) {
+				if (selectedColumn < $('.tl-box').length - 1) {
 					selectedColumn++
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false;
-			} else if (e.code == "ArrowDown") {
+				return false
+			} else if (e.code == 'ArrowDown') {
 				//down
-				if ($("#imagemodal").hasClass("open")) {
-					return false;
+				if ($('#imagemodal').hasClass('open')) {
+					return false
 				}
 				selectedToot++
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
 			}
 			//Ctrl+U:0,0選択
 			if (event.ctrlKey || event.metaKey) {
@@ -182,29 +206,29 @@ $(function ($) {
 					selectedToot = 0
 					selectedColumn = 0
 					tootSelector(0, 0)
-					return false;
+					return false
 				}
 			}
 			//選択時
 			if (e.keyCode == 70) {
-				var id = $(".selectedToot").attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var id = $('.selectedToot').attr('unique-id')
+				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
 				fav(id, acct_id, false)
-				return false;
+				return false
 			}
 			if (e.keyCode == 66) {
-				var id = $(".selectedToot").attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var id = $('.selectedToot').attr('unique-id')
+				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
 				rt(id, acct_id, false)
-				return false;
+				return false
 			}
 			if (e.keyCode == 82) {
-				var id = $(".selectedToot").attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
-				var ats_cm = $('.selectedToot .rep-btn').attr("data-men")
-				var mode = $('.selectedToot .rep-btn').attr("data-visen")
+				var id = $('.selectedToot').attr('unique-id')
+				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
+				var ats_cm = $('.selectedToot .rep-btn').attr('data-men')
+				var mode = $('.selectedToot .rep-btn').attr('data-visen')
 				re(id, ats_cm, acct_id, mode)
-				return false;
+				return false
 			}
 		}
 		//textareaフォーカス時
@@ -213,23 +237,27 @@ $(function ($) {
 				//C+S+(No):ワンクリ
 				if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 					if (e.keyCode >= 49 && e.keyCode <= 51) {
-						var no = e.keyCode - 48;
-						if (localStorage.getItem("oks-" + no)) { $("#textarea").val($("#textarea").val() + localStorage.getItem("oks-" + no)) }
-						return false;
+						var no = e.keyCode - 48
+						if (localStorage.getItem('oks-' + no)) {
+							$('#textarea').val($('#textarea').val() + localStorage.getItem('oks-' + no))
+						}
+						return false
 					}
 				}
 			}
 		}
-	});
+	})
 	//クリアボタン
-	$("#clear").click(function () {
-		clear();
-	});
-});
+	$('#clear').click(function() {
+		clear()
+	})
+})
 //選択する
 function tootSelector(column, toot) {
-	$('.cvo').removeClass("selectedToot")
-	$('#timeline_' + column + ' .cvo').eq(toot).addClass("selectedToot")
+	$('.cvo').removeClass('selectedToot')
+	$('#timeline_' + column + ' .cvo')
+		.eq(toot)
+		.addClass('selectedToot')
 	var scr = $('.tl-box[tlid=' + column + ']').scrollTop()
 	var elem = $('.selectedToot').offset().top
 	var top = elem - $('.tl-box').height() + scr
@@ -244,4 +272,4 @@ function tootSelector(column, toot) {
 			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
 		}
 	}
-}
+}

app/js/common/modal.js

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

app/js/common/time.js

@@ -37,7 +37,6 @@
     }
   };
   var $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: []
       }

app/js/common/version.js

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

app/js/emoji/default-emoji.js

@@ -1,91 +1,105 @@
-var defaultemojiList = ["activity", "flag", "food", "nature", "object", "people", "place", "symbol"];
+var defaultemojiList = ['activity', 'flag', 'food', 'nature', 'object', 'people', 'place', 'symbol']
 var defaultemoji = {
-    activity: activity,
-    flag: flag,
-    food: food,
-    nature: nature,
-    object: object,
-    people: people,
-    place: place,
-    symbol: symbol
-};
-if (lang == "ja") {
-    var defaultemojiname = {
-        activity: "活動",
-        flag: "国旗",
-        food: "食べ物",
-        nature: "自然",
-        object: "もの",
-        people: "ひと",
-        place: "場所",
-        symbol: "記号"
-    };
+	activity: activity,
+	flag: flag,
+	food: food,
+	nature: nature,
+	object: object,
+	people: people,
+	place: place,
+	symbol: symbol
+}
+if (lang == 'ja') {
+	var defaultemojiname = {
+		activity: '活動',
+		flag: '国旗',
+		food: '食べ物',
+		nature: '自然',
+		object: 'もの',
+		people: 'ひと',
+		place: '場所',
+		symbol: '記号'
+	}
 } else {
-    var defaultemojiname = {
-        activity: "Activities",
-        flag: "Flags",
-        food: "Foods",
-        nature: "Nature",
-        object: "Tools",
-        people: "People",
-        place: "Places",
-        symbol: "Symbols"
-    };
+	var defaultemojiname = {
+		activity: 'Activities',
+		flag: 'Flags',
+		food: 'Foods',
+		nature: 'Nature',
+		object: 'Tools',
+		people: 'People',
+		place: 'Places',
+		symbol: 'Symbols'
+	}
 }
 
 function defaultEmoji(target) {
-    var 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");
+    var announcement = false
+    if ($('#media').val() == 'announcement') {
+        announcement = true
+    }
+	var json = defaultemoji[target]
+	var emojis = ''
+	Object.keys(json).forEach(function(key) {
+        var emoji = json[key]
+        if (announcement) {
+            var def = `<a onclick="emojiReactionDef('${emoji['shortcode']}')" class="pointer">`
+        } else {
+            var def = `<a onclick="defEmoji('${emoji['shortcode']}')" class="pointer">`
+        }
+		emojis =
+			emojis +
+			`${def}
+            <span style="
+                width: 20px; height: 20px; display: inline-block; background-image: url('../../img/sheet.png'); background-size: 4900%;
+                 background-position:${emoji['css']};"></span>
+            </a>`
+	})
+	$('#emoji-list').html(emojis)
+	$('#now-emoji').text(lang.lang_defaultemojis_text.replace('{{cat}}', defaultemojiname[target]))
+	$('.emoji-control').addClass('hide')
 }
 function customEmoji() {
-    $("#emoji-suggest").val("");
-    $(".emoji-control").removeClass("hide");
-    emojiList('home')
+	$('#emoji-suggest').val('')
+	$('.emoji-control').removeClass('hide')
+	emojiList('home')
 }
 function defEmoji(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 now = $("#textarea").val();
-    var selin = localStorage.getItem("cursor");
-    var now = $("#textarea").val();
-    if (selin > 0) {
-        var before = now.substr(0, selin);
-        var after = now.substr(selin, now.length);
-        newt = before + emoji + after;
-    } else {
-        newt = emoji + now;
-    }
-    $("#textarea").val(newt);
-    $("#textarea").focus();
-    var selin = $("#textarea").prop('selectionStart');
-    if (!selin) {
-        selin = 0;
-    }
-    localStorage.setItem("cursor", selin);
+	var selin = $('#textarea').prop('selectionStart')
+	if (!selin) {
+		selin = 0
+	}
+	var emojiraw = newpack.filter(function(item, index) {
+		if (item.short_name == target) return true
+	})
+	var hex = emojiraw[0].unified.split('-')
+	if (hex.length === 2) {
+		emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1])
+	} else {
+		emoji = twemoji.convert.fromCodePoint(hex[0])
+	}
+	var now = $('#textarea').val()
+	var before = now.substr(0, selin)
+	var after = now.substr(selin, now.length)
+	newt = before + emoji + after
+	$('#textarea').val(newt)
+	$('#textarea').focus()
 }
 function faicon() {
-    var json = faicons;
-    var emojis = "";
-    Object.keys(json).forEach(function (key) {
-        var emoji = json[key];
-        var eje = emoji.replace(/fa-/g, "");
-        emojis = emojis + '<a onclick="emojiInsert(\'[faicon]' + eje + '[/faicon]\')" class="pointer white-text" style="font-size:24px"><i class="fa ' + emoji + '"></i></a>';
-    });
-    $("#emoji-list").html(emojis);
-    $("#now-emoji").text("faicon");
-    $(".emoji-control").addClass("hide");
-}
+	var json = faicons
+	var emojis = ''
+	Object.keys(json).forEach(function(key) {
+		var emoji = json[key]
+		var eje = emoji.replace(/fa-/g, '')
+		emojis =
+			emojis +
+			'<a onclick="emojiInsert(\'[faicon]' +
+			eje +
+			'[/faicon]\')" class="pointer white-text" style="font-size:24px"><i class="fa ' +
+			emoji +
+			'"></i></a>'
+	})
+	$('#emoji-list').html(emojis)
+	$('#now-emoji').text('faicon')
+	$('.emoji-control').addClass('hide')
+}

app/js/login/instance.js

@@ -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,11 @@ 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

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

app/js/platform/end.js

@@ -1,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]+)/);
-		if(!toot){
+		toot = url.match(/https:\/\/([^+_]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
+		if (!toot) {
 			//Pleroma対策
-			toot = url.match(/https:\/\/([^+_]+)\/users\/([a-zA-Z0-9_]+)\/statuses\/([0-9]+)/);
+			toot = url.match(/https:\/\/([^+_]+)\/users\/([a-zA-Z0-9_]+)\/statuses\/([0-9]+)/)
 		}
 		//タグのURLぽかったら
-		var tags = [];
-		tags = url.match(
-			/https:\/\/([^+_]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
-		);
+		var tags = []
+		tags = url.match(/https:\/\/([^+_]+)\/tags\/([_a-zA-Z0-9\&=+\%]+)/)
 		//メンションっぽかったら
-		var ats = [];
-		ats = url.match(
-			/https:\/\/([^+_]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
-		);
+		var ats = []
+		ats = url.match(/https:\/\/([^+_]+)\/@([_a-zA-Z0-9\&=+\%]+)/)
 		if (toot) {
 			if (toot[1]) {
-				var acct_id = $a.parent().attr("data-acct");
+				var acct_id = $a.parent().attr('data-acct')
 				if (!acct_id) {
-					acct_id = 0;
+					acct_id = 0
 				}
-				$a.parent().addClass("loadp")
-				$a.parent().text("Loading...")
-				detEx(url, acct_id);
+				$a.parent().addClass('loadp')
+				$a.parent().text('Loading...')
+				detEx(url, acct_id)
 			}
-
 		} else if (tags) {
 			if (tags[2]) {
-				var acct_id = $a.parent().attr("data-acct");
+				var acct_id = $a.parent().attr('data-acct')
 				if (!acct_id) {
-					acct_id = 0;
+					acct_id = 0
 				}
 				tl('tag', decodeURI(tags[2]), acct_id, 'add')
 			}
 		} else if (ats) {
 			if (ats[2]) {
 				//Quesdon判定
-				if (!~ats[2].indexOf("@")) {
-					udgEx(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);
-	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);
+	window.AudioContext = window.AudioContext || window.webkitAudioContext
+	if (soundFile) {
+		soundFile.stop()
+	}
+	context = new AudioContext()
+	context.createBufferSource().start(0)
+	context.decodeAudioData(request.response, function(buf) {
+		//console.log("Playing:" , source)
+		source.buffer = buf
+		source.loop = false
+	})
+	source = context.createBufferSource()
+	volumeControl = context.createGain()
+	source.connect(volumeControl)
+	volumeControl.connect(context.destination)
+	var cvol = localStorage.getItem('customVol')
+	if (cvol) {
+		vol = cvol
+	} else {
+		vol = 0.8
+	}
+	volumeControl.gain.value = vol
+	source.start(0)
+	soundFile = source
+
+	function newFunction() {
+		var source
+		return source
+	}
 }
 function nano() {
-	postMessage(["nano", null], "*")
+	postMessage(['nano', null], '*')
 }
-onmessage = function (e) {
-	if (e.data[0] == "details") {
+onmessage = function(e) {
+	console.log(e)
+	if (e.data[0] == 'details') {
 		details(e.data[1][0], e.data[1][1])
-	} else if (e.data[0] == "udg") {
+	} 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") {
-		parseColumn()
-	} else if (e.data[0] == "exportSettingsCore") {
-		exportSettingsCore()
-	} else if (e.data[0] == "fontList") {
+	} 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') {
+		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,198 +1,284 @@
-$.strip_tags = function (str, allowed) {
+$.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;
-	return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
-		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
-	});
-};
+		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
+	return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
+		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
+	})
+}
 function escapeHTML(str) {
 	if (!str) {
-		return "";
+		return ''
 	}
-	return str.replace(/&/g, '&amp;')
+	return str
+		.replace(/&/g, '&amp;')
 		.replace(/</g, '&lt;')
 		.replace(/>/g, '&gt;')
 		.replace(/"/g, '&quot;')
-		.replace(/'/g, '&#039;');
+		.replace(/'/g, '&#039;')
 }
 //PHPのnl2brと同様
 function nl2br(str) {
 	if (!str) {
-		return "";
+		return ''
 	}
-	str = str.replace(/\r\n/g, "<br />");
-	str = str.replace(/(\n|\r)/g, "<br />");
-	return str;
+	str = str.replace(/\r\n/g, '<br />')
+	str = str.replace(/(\n|\r)/g, '<br />')
+	return str
 }
 function br2nl(str) {
 	if (!str) {
-		return "";
+		return ''
 	}
-	str = str.replace(/<br \/>/g, "\r\n");
-	return str;
+	str = str.replace(/<br \/>/g, '\r\n')
+	return str
 }
 function formattime(date) {
-	var str = date.getFullYear() + "-";
+	var str = date.getFullYear() + '-'
 	if (date.getMonth() + 1 < 10) {
-		str = str + "0" + (date.getMonth() + 1) + "-";
+		str = str + '0' + (date.getMonth() + 1) + '-'
 	} else {
-		str = str + (date.getMonth() + 1) + "-";
+		str = str + (date.getMonth() + 1) + '-'
 	}
 	if (date.getDate() < 10) {
-		str = str + "0" + date.getDate()
+		str = str + '0' + date.getDate()
 	} else {
 		str = str + date.getDate()
 	}
-	str = str + "T";
+	str = str + 'T'
 	if (date.getHours() < 10) {
-		str = str + "0" + date.getHours() + ":"
+		str = str + '0' + date.getHours() + ':'
 	} else {
-		str = str + date.getHours() + ":"
+		str = str + date.getHours() + ':'
 	}
 	if (date.getMinutes() < 10) {
-		str = str + "0" + date.getMinutes()
+		str = str + '0' + date.getMinutes()
 	} else {
 		str = str + date.getMinutes()
 	}
-	return escapeHTML(str);
+	return escapeHTML(str)
 }
 function formattimeutc(date) {
-	var str = date.getUTCFullYear() + "-";
+	var str = date.getUTCFullYear() + '-'
 	if (date.getUTCMonth() + 1 < 10) {
-		str = str + "0" + (date.getUTCMonth() + 1) + "-";
+		str = str + '0' + (date.getUTCMonth() + 1) + '-'
 	} else {
-		str = str + (date.getUTCMonth() + 1) + "-";
+		str = str + (date.getUTCMonth() + 1) + '-'
 	}
 	if (date.getUTCDate() < 10) {
-		str = str + "0" + date.getUTCDate()
+		str = str + '0' + date.getUTCDate()
 	} else {
 		str = str + date.getUTCDate()
 	}
-	str = str + "T";
+	str = str + 'T'
 	if (date.getUTCHours() < 10) {
-		str = str + "0" + date.getUTCHours() + ":"
+		str = str + '0' + date.getUTCHours() + ':'
 	} else {
-		str = str + date.getUTCHours() + ":"
+		str = str + date.getUTCHours() + ':'
 	}
 	if (date.getUTCMinutes() < 10) {
-		str = str + "0" + date.getUTCMinutes()
+		str = str + '0' + date.getUTCMinutes()
 	} else {
 		str = str + date.getUTCMinutes()
 	}
-	return escapeHTML(str);
+	return escapeHTML(str)
 }
-postMessage(["sendSinmpleIpc", "custom-css-request"], "*")
+postMessage(['sendSinmpleIpc', 'custom-css-request'], '*')
 function makeCID() {
-	return randomStr(8) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(12);
+	return (
+		randomStr(8) +
+		'-' +
+		randomStr(4) +
+		'-' +
+		randomStr(4) +
+		'-' +
+		randomStr(4) +
+		'-' +
+		randomStr(12)
+	)
 }
 function randomStr(l) {
 	// 生成する文字列に含める文字セット
-	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
-	var cl = c.length;
-	var r = "";
+	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
+	var cl = c.length
+	var r = ''
 	for (var i = 0; i < l; i++) {
-		r += c[Math.floor(Math.random() * cl)];
+		r += c[Math.floor(Math.random() * cl)]
 	}
-	return r;
+	return r
 }
 function rgbToHex(color) {
 	// HEXに変換したものを代入する変数
-	var hex = '';
+	var hex = ''
 
 	// 第1引数がHEXのとき変換処理は必要ないのでそのままreturn
 	// IE8の場合はjQueryのcss()関数でHEXを返すので除外
 	if (color.match(/^#[a-f\d]{3}$|^#[a-f\d]{6}$/i)) {
-		return color;
+		return color
 	}
 
 	// 正規表現
-	var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/);
+	var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/)
 
 	// 正規表現でマッチしたとき
 	if (regex) {
-		var rgb =
-			[
-				// RGBからHEXへ変換
-				parseInt(regex[1]).toString(16),
-				parseInt(regex[2]).toString(16),
-				parseInt(regex[3]).toString(16)
-			];
+		var rgb = [
+			// RGBからHEXへ変換
+			parseInt(regex[1]).toString(16),
+			parseInt(regex[2]).toString(16),
+			parseInt(regex[3]).toString(16)
+		]
 
 		for (var i = 0; i < rgb.length; ++i) {
 			// rgb(1,1,1)のようなときHEXに変換すると1桁になる
 			// 1桁のときは前に0を足す
 			if (rgb[i].length == 1) {
-				rgb[i] = '0' + rgb[i];
+				rgb[i] = '0' + rgb[i]
 			}
-			hex += rgb[i];
+			hex += rgb[i]
 		}
 
-		return hex;
+		return hex
 	}
 
-	console.error(color + ':第1引数はRGB形式で入力');
+	console.error(color + ':第1引数はRGB形式で入力')
 }
 /*マルチバイト用切り出し*/
-$.isSurrogatePear = function (upper, lower) {
-	return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <= 0xDFFF;
-};
-$.mb_strlen = function (str) {
-	var 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++;
+$.isSurrogatePear = function(upper, lower) {
+	return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
+}
+$.mb_strlen = function(str) {
+	var splitter = new GraphemeSplitter()
+	var arr = splitter.splitGraphemes(str)
+	return arr.length
+}
+$.mb_substr = function(str, begin, end) {
+	//配列にする
+	var splitter = new GraphemeSplitter()
+	var arr = splitter.splitGraphemes(str)
+	var newarr = []
+	for (var i = 0; i < arr.length; i++) {
+		if (i >= begin && i <= end) {
+			newarr.push(arr[i])
 		}
 	}
-	return ret;
-};
-$.mb_substr = function (str, begin, end) {
-	var ret = '';
-	for (var i = 0, len = 0; i < str.length; i++ , len++) {
-		var upper = str.charCodeAt(i);
-		var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
-		var s = '';
-		if ($.isSurrogatePear(upper, lower)) {
-			i++;
-			s = String.fromCharCode(upper, lower);
-		} else {
-			s = String.fromCharCode(upper);
-		}
-		if (begin <= len && len < end) {
-			ret += s;
-		}
-	}
-	return ret;
-};
+	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 = {};
+	data = data.sort(function(a, b) {
+		var x = a[key]
+		var y = b[key]
+		if (x > y) return num_a
+		if (x < y) return num_b
+		return 0
+	})
+	var arrObj = {}
 	for (var i = 0; i < data.length; i++) {
-		arrObj[data[i]['family']] = data[i];
+		arrObj[data[i]['family']] = data[i]
 	}
-	data = [];
+	data = []
 	for (var key in arrObj) {
-		data.push(arrObj[key]);
+		data.push(arrObj[key])
+	}
+	fn(data)
+}
+function setLog(txt1, txt2, txt3) {
+	//url,statuscode,responsetext
+	var text = new Date().toUTCString()
+	text = text + ',' + txt1 + ',' + txt2 + ',' + escapeCsv(txt3)
+	console.error(text)
+	postMessage(['log', text], '*')
+}
+function escapeCsv(str) {
+	if (!str) {
+		return str
+	}
+	var result
+	result = str.toString().replace(/\"/g, '""')
+	if (result.indexOf(',') >= 0) {
+		result = '"' + result + '"'
+	}
+	return result
+}
+function evalAttr(json, attr, lenCk) {
+	if (json[attr]) {
+		if (lenCk) {
+			if (json[attr][0]) {
+				return true
+			} else {
+				return false
+			}
+		} else {
+			return true
+		}
+	} else {
+		return false
+	}
+}
+function statusModel(now) {
+	if (!now) {
+		var now = new Date().toString()
+	}
+	return {
+		id: '',
+		created_at: now,
+		in_reply_to_id: null,
+		in_reply_to_account_id: null,
+		sensitive: false,
+		spoiler_text: '',
+		visibility: 'public',
+		language: 'en',
+		uri: '',
+		url: '',
+		replies_count: 0,
+		reblogs_count: 0,
+		favourites_count: 0,
+		favourited: false,
+		reblogged: false,
+		muted: false,
+		bookmarked: false,
+		pinned: false,
+		content: '<p><i>No status here</i></p>',
+		reblog: null,
+		application: {
+			name: null,
+			website: null
+		},
+		account: {
+			id: '',
+			username: '',
+			acct: '',
+			display_name: '',
+			locked: false,
+			bot: false,
+			created_at: now,
+			note: '',
+			url: '',
+			avatar: '',
+			avatar_static: '',
+			header: '',
+			header_static: '',
+			followers_count: 0,
+			following_count: 0,
+			statuses_count: 0,
+			last_status_at: now,
+			emojis: [],
+			fields: []
+		},
+		media_attachments: [],
+		mentions: [],
+		tags: [],
+		card: null,
+		poll: null
 	}
-	fn(data);
 }
-localStorage.removeItem("errors");

app/js/platform/nano.js

@@ -1,136 +1,263 @@
-
 //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() { }
-function todc() { }
-function hide() { }
-$(function ($) {
+function todo() {}
+function todc() {}
+function hide() {}
+$(function($) {
 	//キーボードショートカット
-	$(window).keydown(function (e) {
-		var hasFocus = $('input').is(':focus');
-		var hasFocus2 = $('textarea').is(':focus');
+	$(window).keydown(function(e) {
+		var hasFocus = $('input').is(':focus')
+		var hasFocus2 = $('textarea').is(':focus')
 		//Ctrl+Enter:投稿
 		if (event.ctrlKey) {
 			if (e.keyCode === 13) {
-				post();
-				return false;
+				post()
+				return false
 			}
 		}
-	});
-});
+	})
+})
+function set() {
+	$('#menu').toggleClass('hide')
+	if ($('#menu').hasClass('hide')) {
+		$('#setting').text('Setting')
+	} else {
+		$('#setting').text('Close')
+	}
+}
+
+var multi = localStorage.getItem('multi')
+if (!multi) {
+	var obj = [
+		{
+			at: localStorage.getItem(localStorage.getItem('domain_' + acct_id) + '_at'),
+			name: localStorage.getItem('name_' + acct_id),
+			domain: localStorage.getItem('domain_' + acct_id),
+			user: localStorage.getItem('user_' + acct_id),
+			prof: localStorage.getItem('prof_' + acct_id)
+		}
+	]
+	var json = JSON.stringify(obj)
+	localStorage.setItem('multi', json)
+} else {
+	var obj = JSON.parse(multi)
+}
+var templete
+var last = localStorage.getItem('last-use')
+var sel
+Object.keys(obj).forEach(function(key) {
+	var acct = obj[key]
+	var list = key * 1 + 1
+	if (key == last) {
+		sel = 'selected'
+	} else {
+		sel = ''
+	}
+	templete = `<option value="${key}" ${sel}>${acct.user}@${acct.domain}</option>`
+	$('#post-acct-sel').append(templete)
+})
+function mov() {
+	return false
+}
+function resetmv() {
+	return false
+}
+function post() {
+	var acct_id = $('#post-acct-sel').val()
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/statuses'
+	var str = $('#textarea').val()
+	var toot = {
+		status: str
+	}
+	var vis = loadVis(acct_id)
+	toot.visibility = vis
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send(JSON.stringify(toot))
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			$('#textarea').val('')
+		}
+	}
+}
+function loadVis(acct_id) {
+	var vist = localStorage.getItem('vis')
+	if (!vist) {
+		return 'public'
+	} else {
+		if (vist == 'memory') {
+			var memory = localStorage.getItem('vis-memory-' + acct_id)
+			if (!memory) {
+				memory = 'public'
+			}
+			return memory
+		} else if (vist == 'server' || vist == 'useapi') {
+			var multi = localStorage.getItem('multi')
+			var obj = JSON.parse(multi)
+			var memory = obj[acct_id]['vis']
+			if (!memory) {
+				memory = 'public'
+			}
+			return memory
+		} else {
+			return vist
+		}
+	}
+}
+function loader() {
+	var acct_id = $('#post-acct-sel').val()
+	console.log(loadVis(acct_id))
+	$('#vis-sel').val(loadVis(acct_id))
+}
+loader()
+$('textarea').height(15) //init
+$('textarea').css('lineHeight', '1rem') //init
+
+$('textarea').on('input', function(evt) {
+	if (evt.target.scrollHeight > evt.target.offsetHeight) {
+		$(evt.target).height(evt.target.scrollHeight)
+	} else {
+		var lineHeight = Number(
+			$(evt.target)
+				.css('lineHeight')
+				.split('px')[0]
+		)
+		while (true) {
+			$(evt.target).height($(evt.target).height() - lineHeight)
+			if (evt.target.scrollHeight > evt.target.offsetHeight) {
+				$(evt.target).height(evt.target.scrollHeight)
+				break
+			}
+		}
+	}
+})

app/js/platform/preload.js

@@ -1,173 +1,250 @@
-var electron = require("electron");
-const shell = electron.shell;
-var ipc = electron.ipcRenderer;
-onmessage = function (e) {
-    if (e.data[0] == "openUrl") {
-        urls = e.data[1].match(/https?:\/\/(.+)/);
-        if (urls) {
-            shell.openExternal(e.data[1]);
-        }
-    } else if (e.data[0] == "sendSinmpleIpc") {
-        ipc.send(e.data[1], "")
-    } else if (e.data[0] == "dialogStore") {
-        ipc.send("dialogStore", e.data[1])
-    } else if (e.data[0] == "bmpImage") {
-        ipc.send('bmp-image', e.data[1]);
-    } else if (e.data[0] == "dialogCW") {
-        ipc.send("dialogCW", e.data[1])
-    } else if (e.data[0] == "nativeNotf") {
-        console.log(e.data[1])
-        ipc.send('native-notf', e.data[1]);
-    } else if (e.data[0] == "dialogClient") {
-        ipc.send("dialogClient", e.data[1])
-    } else if (e.data[0] == "generalDL") {
-        ipc.send('general-dl', e.data[1]);
-    } else if (e.data[0] == "openFinder") {
-        ipc.send('open-finder', e.data[1]);
-    } else if (e.data[0] == "columnDel") {
-        ipc.send('column-del', e.data[1]);
-    } else if (e.data[0] == "lang") {
-        ipc.send('lang', e.data[1]);
-    } else if (e.data[0] == "exportSettings") {
-        ipc.send('exportSettings', e.data[1]);
-    } else if (e.data[0] == "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);
-    }
-}
-//version.js
-ipc.send("getPlatform", "")
-ipc.on('platform', function (event, args) {
-    localStorage.setItem("platform", args[0])
-    localStorage.setItem("bit", args[1])
-    localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4]]))
+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'
+			})
+		}
+		})
 })
 
-ipc.on('reload', function (event, arg) {
-    location.reload();
+onmessage = function(e) {
+	if (e.data[0] == 'openUrl') {
+		urls = e.data[1].match(/https?:\/\/(.+)/)
+		if (urls) {
+			shell.openExternal(e.data[1])
+		}
+	} else if (e.data[0] == 'sendSinmpleIpc') {
+		ipc.send(e.data[1], '')
+	} else if (e.data[0] == 'dialogStore') {
+		ipc.send('dialogStore', e.data[1])
+	} else if (e.data[0] == 'bmpImage') {
+		ipc.send('bmp-image', e.data[1])
+	} else if (e.data[0] == 'resizeImage') {
+		ipc.send('resize-image', e.data[1])
+	} else if (e.data[0] == 'stampImage') {
+		ipc.send('stamp-image', e.data[1])
+	} else if (e.data[0] == 'dialogCW') {
+		ipc.send('dialogCW', e.data[1])
+	} else if (e.data[0] == 'nativeNotf') {
+		console.log(e.data[1])
+		ipc.send('native-notf', e.data[1])
+	} else if (e.data[0] == 'dialogClient') {
+		ipc.send('dialogClient', e.data[1])
+	} else if (e.data[0] == 'generalDL') {
+		ipc.send('general-dl', e.data[1])
+	} else if (e.data[0] == 'openFinder') {
+		ipc.send('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.on('platform', function(event, args) {
+	localStorage.setItem('platform', args[0])
+	localStorage.setItem('bit', args[1])
+	localStorage.setItem('about', JSON.stringify([args[2], args[3], args[4], args[5]]))
+})
+
+ipc.on('reload', function(event, arg) {
+	location.reload()
 })
 //Native Notf
-ipc.on('shownotf', function (event, args) {
-    if (args["type"] == "toot") {
-        postMessage(["details", [id, acct_id]], "*")
-    } else if (args["type"] == "userdata") {
-        postMessage(["udg", [user, acct_id]], "*")
-    }
+ipc.on('shownotf', function(event, args) {
+	if (args['type'] == 'toot') {
+		postMessage(['details', [id, acct_id]], '*')
+	} else if (args['type'] == 'userdata') {
+		postMessage(['udg', [user, acct_id]], '*')
+	}
 })
 
 //first.js
-ipc.on('custom-css-response', function (event, arg) {
-    if (arg == "") { return false; }
-    var styleNode = document.createElement("style");
-    styleNode.setAttribute("type", "text/css")
+ipc.on('custom-css-response', function(event, arg) {
+	if (arg == '') {
+		return false
+	}
+	var styleNode = document.createElement('style')
+	styleNode.setAttribute('type', 'text/css')
 
-    var content = document.createTextNode(arg)
-    styleNode.append(content)
-    document.getElementsByTagName("head")[0].append(styleNode)
+	var content = document.createTextNode(arg)
+	styleNode.append(content)
+	document.getElementsByTagName('head')[0].append(styleNode)
 })
-ipc.on('theme-css-response', function (event, arg) {
-    if (arg == "") { return false; }
-    var styleNode = document.createElement("style");
-    styleNode.setAttribute("type", "text/css")
+ipc.on('theme-css-response', function(event, arg) {
+	if (arg == '') {
+		return false
+	}
+	var styleNode = document.createElement('style')
+	styleNode.setAttribute('type', 'text/css')
 
-    var content = document.createTextNode(arg)
-    styleNode.append(content)
-    document.getElementsByTagName("head")[0].append(styleNode)
+	var content = document.createTextNode(arg)
+	styleNode.append(content)
+	document.getElementsByTagName('head')[0].append(styleNode)
 })
 //img.js
-ipc.on('bmp-img-comp', function (event, b64) {
-    postMessage(["media", [b64[0], "image/png", b64[1]]], "*")
-});
-//ui,img.js
-ipc.on('general-dl-prog', function (event, arg) {
-    console.log("Progress: " + arg);
+ipc.on('bmp-img-comp', function(event, b64) {
+	if (b64[2]) {
+		var stamped = true
+	} else {
+		var stamped = false
+	}
+	postMessage(['media', [b64[0], 'image/png', b64[1], stamped]], '*')
 })
-ipc.on('general-dl-message', function (event, arg) {
-    var argC = arg.replace(/\\/g, "\\\\") + "\\\\.";
-    console.log("saved")
-    postMessage(["toastSaved", [arg, argC]], "*")
+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)
+})
+ipc.on('general-dl-message', function(event, arg) {
+	var argC = arg.replace(/\\/g, '\\\\')
+	console.log('saved')
+	postMessage(['toastSaved', [arg, argC]], '*')
 })
 //setting.js
-ipc.on('langres', function (event, arg) {
-    location.href = "../" + lang + "/setting.html"
-});
-ipc.on('exportSettingsFile', function (event, savedFiles) {
-    var exp = exportSettingsCore()
-    ipc.send('export', [savedFiles, JSON.stringify(exp)]);
-    postMessage(["alert", "Done"], "*")
-    //cards
-    //lang
-});
-ipc.on('config', function (event, arg) {
-    postMessage(["importSettingsCore", arg], "*")
-});
-ipc.on('savefolder', function (event, arg) {
-    localStorage.setItem("savefolder", arg);
-});
-ipc.on('font-list', function (event, arg) {
-    postMessage(["fontList", arg], "*")
-});
-ipc.on('customSoundRender', function (event, args) {
-    postMessage(["customSoundSave", [args[0], args[1]]], "*")
-});
-ipc.on('theme-json-list-response', function (event, args) {
-    postMessage(["ctLoadCore", args], "*")
-});
-ipc.on('theme-json-delete-complete', function (event, args) {
-    postMessage(["ctLoad", ""], "*")
-});
-ipc.on('theme-json-response', function (event, args) {
-    postMessage(["customConnect", args], "*")
-});
-ipc.on('theme-json-create-complete', function (event, args) {
-    postMessage(["clearCustomImport", ""], "*")
-    postMessage(["ctLoad", ""], "*")
-});
+ipc.on('langres', function(event, arg) {
+	location.href = '../' + arg + '/setting.html'
+})
+ipc.on('exportSettingsFile', function(event, arg) {
+	postMessage(['exportSettingsCore', arg], '*')
+})
+ipc.on('exportAllComplete', function(event, arg) {
+	postMessage(['alert', 'Complete'], '*')
+})
+ipc.on('config', function(event, arg) {
+	postMessage(['importSettingsCore', arg], '*')
+})
+ipc.on('savefolder', function(event, arg) {
+	localStorage.setItem('savefolder', arg)
+})
+ipc.on('font-list', function(event, arg) {
+	postMessage(['fontList', arg], '*')
+})
+ipc.on('customSoundRender', function(event, args) {
+	postMessage(['customSoundSave', [args[0], args[1]]], '*')
+})
+ipc.on('theme-json-list-response', function(event, args) {
+	postMessage(['ctLoadCore', args], '*')
+})
+ipc.on('theme-json-delete-complete', function(event, args) {
+	postMessage(['ctLoad', ''], '*')
+})
+ipc.on('theme-json-response', function(event, args) {
+	postMessage(['customConnect', args], '*')
+})
+ipc.on('theme-json-create-complete', function(event, args) {
+	postMessage(['clearCustomImport', ''], '*')
+	postMessage(['ctLoad', ''], '*')
+})
 //spotify.js
-ipc.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 total = arg[2]
-    postMessage(["renderMem", [use, cpu, total]], "*")
+ipc.on('memory', function(event, arg) {
+	var use = arg[0]
+	var cpu = arg[1]
+	var total = arg[2]
+	postMessage(['renderMem', [use, cpu, total]], '*')
+})
+//log
+ipc.on('logData', function(event, args) {
+	postMessage(['logData', args], '*')
 })
 //update.html
-ipc.on('prog', function (event, arg) {
-    postMessage(["updateProg", arg], "*")
+ipc.on('prog', function(event, arg) {
+	postMessage(['updateProg', arg], '*')
 })
-ipc.on('mess', function (event, arg) {
-    postMessage(["updateMess", arg], "*")
+ipc.on('mess', function(event, arg) {
+	postMessage(['updateMess', arg], '*')
 })
-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);
-    });
+	webviewDom.addEventListener('new-window', function(e) {
+		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,39 +18,33 @@
 	 * @type Object
 	 */
 	var punycode,
-
-	/** Highest positive signed 32-bit float value */
-	maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
-
-	/** Bootstring parameters */
-	base = 36,
-	tMin = 1,
-	tMax = 26,
-	skew = 38,
-	damp = 700,
-	initialBias = 72,
-	initialN = 128, // 0x80
-	delimiter = '-', // '\x2D'
-
-	/** Regular expressions */
-	regexPunycode = /^xn--/,
-	regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
-	regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
-
-	/** Error messages */
-	errors = {
-		'overflow': 'Overflow: input needs wider integers to process',
-		'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
-		'invalid-input': 'Invalid input'
-	},
-
-	/** Convenience shortcuts */
-	baseMinusTMin = base - tMin,
-	floor = Math.floor,
-	stringFromCharCode = String.fromCharCode,
-
-	/** Temporary variable */
-	key;
+		/** Highest positive signed 32-bit float value */
+		maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
+		/** Bootstring parameters */
+		base = 36,
+		tMin = 1,
+		tMax = 26,
+		skew = 38,
+		damp = 700,
+		initialBias = 72,
+		initialN = 128, // 0x80
+		delimiter = '-', // '\x2D'
+		/** Regular expressions */
+		regexPunycode = /^xn--/,
+		regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
+		regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
+		/** Error messages */
+		errors = {
+			overflow: 'Overflow: input needs wider integers to process',
+			'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
+			'invalid-input': 'Invalid input'
+		},
+		/** Convenience shortcuts */
+		baseMinusTMin = base - tMin,
+		floor = Math.floor,
+		stringFromCharCode = String.fromCharCode,
+		/** Temporary variable */
+		key
 
 	/*--------------------------------------------------------------------------*/
 
@@ -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
 	}
 
 	/**
@@ -125,28 +116,29 @@
 	 */
 	function ucs2decode(string) {
 		var output = [],
-		    counter = 0,
-		    length = string.length,
-		    value,
-		    extra;
+			counter = 0,
+			length = string.length,
+			value,
+			extra
 		while (counter < length) {
-			value = string.charCodeAt(counter++);
-			if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
+			value = string.charCodeAt(counter++)
+			if (value >= 0xd800 && value <= 0xdbff && counter < length) {
 				// high surrogate, and there is a next character
-				extra = string.charCodeAt(counter++);
-				if ((extra & 0xFC00) == 0xDC00) { // low surrogate
-					output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
+				extra = string.charCodeAt(counter++)
+				if ((extra & 0xfc00) == 0xdc00) {
+					// low surrogate
+					output.push(((value & 0x3ff) << 10) + (extra & 0x3ff) + 0x10000)
 				} else {
 					// unmatched surrogate; only append this code unit, in case the next
 					// code unit is the high surrogate of a surrogate pair
-					output.push(value);
-					counter--;
+					output.push(value)
+					counter--
 				}
 			} else {
-				output.push(value);
+				output.push(value)
 			}
 		}
-		return output;
+		return output
 	}
 
 	/**
@@ -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))
 	}
 
 	/**
@@ -234,95 +226,91 @@
 	function decode(input) {
 		// Don't use UCS-2
 		var output = [],
-		    inputLength = input.length,
-		    out,
-		    i = 0,
-		    n = initialN,
-		    bias = initialBias,
-		    basic,
-		    j,
-		    index,
-		    oldi,
-		    w,
-		    k,
-		    digit,
-		    t,
-		    /** Cached calculation results */
-		    baseMinusT;
+			inputLength = input.length,
+			out,
+			i = 0,
+			n = initialN,
+			bias = initialBias,
+			basic,
+			j,
+			index,
+			oldi,
+			w,
+			k,
+			digit,
+			t,
+			/** Cached calculation results */
+			baseMinusT
 
 		// Handle the basic code points: let `basic` be the number of input code
 		// points before the last delimiter, or `0` if there is none, then copy
 		// the first basic code points to the output.
 
-		basic = input.lastIndexOf(delimiter);
+		basic = input.lastIndexOf(delimiter)
 		if (basic < 0) {
-			basic = 0;
+			basic = 0
 		}
 
 		for (j = 0; j < basic; ++j) {
 			// if it's not a basic code point
 			if (input.charCodeAt(j) >= 0x80) {
-				error('not-basic');
+				error('not-basic')
 			}
-			output.push(input.charCodeAt(j));
+			output.push(input.charCodeAt(j))
 		}
 
 		// Main decoding loop: start just after the last delimiter if any basic code
 		// points were copied; start at the beginning otherwise.
 
-		for (index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
-
+		for (index = basic > 0 ? basic + 1 : 0; index < inputLength /* no final expression */; ) {
 			// `index` is the index of the next character to be consumed.
 			// Decode a generalized variable-length integer into `delta`,
 			// which gets added to `i`. The overflow checking is easier
 			// if we increase `i` as we go, then subtract off its starting
 			// value at the end to obtain `delta`.
-			for (oldi = i, w = 1, k = base; /* no condition */; k += base) {
-
+			for (oldi = i, w = 1, k = base /* no condition */; ; k += base) {
 				if (index >= inputLength) {
-					error('invalid-input');
+					error('invalid-input')
 				}
 
-				digit = basicToDigit(input.charCodeAt(index++));
+				digit = basicToDigit(input.charCodeAt(index++))
 
 				if (digit >= base || digit > floor((maxInt - i) / w)) {
-					error('overflow');
+					error('overflow')
 				}
 
-				i += digit * w;
-				t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+				i += digit * w
+				t = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias
 
 				if (digit < t) {
-					break;
+					break
 				}
 
-				baseMinusT = base - t;
+				baseMinusT = base - t
 				if (w > floor(maxInt / baseMinusT)) {
-					error('overflow');
+					error('overflow')
 				}
 
-				w *= baseMinusT;
-
+				w *= baseMinusT
 			}
 
-			out = output.length + 1;
-			bias = adapt(i - oldi, out, oldi == 0);
+			out = output.length + 1
+			bias = adapt(i - oldi, out, oldi == 0)
 
 			// `i` was supposed to wrap around from `out` to `0`,
 			// incrementing `n` each time, so we'll fix that now:
 			if (floor(i / out) > maxInt - n) {
-				error('overflow');
+				error('overflow')
 			}
 
-			n += floor(i / out);
-			i %= out;
+			n += floor(i / out)
+			i %= out
 
 			// Insert `n` at position `i` of the output
-			output.splice(i++, 0, n);
-
+			output.splice(i++, 0, n)
 		}
 
-		return ucs2encode(output);
+		return ucs2encode(output)
 	}
 
 	/**
@@ -334,109 +322,105 @@
 	 */
 	function encode(input) {
 		var n,
-		    delta,
-		    handledCPCount,
-		    basicLength,
-		    bias,
-		    j,
-		    m,
-		    q,
-		    k,
-		    t,
-		    currentValue,
-		    output = [],
-		    /** `inputLength` will hold the number of code points in `input`. */
-		    inputLength,
-		    /** Cached calculation results */
-		    handledCPCountPlusOne,
-		    baseMinusT,
-		    qMinusT;
+			delta,
+			handledCPCount,
+			basicLength,
+			bias,
+			j,
+			m,
+			q,
+			k,
+			t,
+			currentValue,
+			output = [],
+			/** `inputLength` will hold the number of code points in `input`. */
+			inputLength,
+			/** Cached calculation results */
+			handledCPCountPlusOne,
+			baseMinusT,
+			qMinusT
 
 		// Convert the input in UCS-2 to Unicode
-		input = ucs2decode(input);
+		input = ucs2decode(input)
 
 		// Cache the length
-		inputLength = input.length;
+		inputLength = input.length
 
 		// Initialize the state
-		n = initialN;
-		delta = 0;
-		bias = initialBias;
+		n = initialN
+		delta = 0
+		bias = initialBias
 
 		// Handle the basic code points
 		for (j = 0; j < inputLength; ++j) {
-			currentValue = input[j];
+			currentValue = input[j]
 			if (currentValue < 0x80) {
-				output.push(stringFromCharCode(currentValue));
+				output.push(stringFromCharCode(currentValue))
 			}
 		}
 
-		handledCPCount = basicLength = output.length;
+		handledCPCount = basicLength = output.length
 
 		// `handledCPCount` is the number of code points that have been handled;
 		// `basicLength` is the number of basic code points.
 
 		// Finish the basic string - if it is not empty - with a delimiter
 		if (basicLength) {
-			output.push(delimiter);
+			output.push(delimiter)
 		}
 
 		// Main encoding loop:
 		while (handledCPCount < inputLength) {
-
 			// All non-basic code points < n have been handled already. Find the next
 			// larger one:
 			for (m = maxInt, j = 0; j < inputLength; ++j) {
-				currentValue = input[j];
+				currentValue = input[j]
 				if (currentValue >= n && currentValue < m) {
-					m = currentValue;
+					m = currentValue
 				}
 			}
 
 			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
 			// but guard against overflow
-			handledCPCountPlusOne = handledCPCount + 1;
+			handledCPCountPlusOne = handledCPCount + 1
 			if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
-				error('overflow');
+				error('overflow')
 			}
 
-			delta += (m - n) * handledCPCountPlusOne;
-			n = m;
+			delta += (m - n) * handledCPCountPlusOne
+			n = m
 
 			for (j = 0; j < inputLength; ++j) {
-				currentValue = input[j];
+				currentValue = input[j]
 
 				if (currentValue < n && ++delta > maxInt) {
-					error('overflow');
+					error('overflow')
 				}
 
 				if (currentValue == n) {
 					// Represent delta as a generalized variable-length integer
-					for (q = delta, k = base; /* no condition */; k += base) {
-						t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+					for (q = delta, k = base /* no condition */; ; k += base) {
+						t = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias
 						if (q < t) {
-							break;
+							break
 						}
-						qMinusT = q - t;
-						baseMinusT = base - t;
-						output.push(
-							stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
-						);
-						q = floor(qMinusT / baseMinusT);
+						qMinusT = q - t
+						baseMinusT = base - t
+						output.push(stringFromCharCode(digitToBasic(t + (qMinusT % baseMinusT), 0)))
+						q = floor(qMinusT / baseMinusT)
 					}
 
-					output.push(stringFromCharCode(digitToBasic(q, 0)));
-					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
-					delta = 0;
-					++handledCPCount;
+					output.push(stringFromCharCode(digitToBasic(q, 0)))
+					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength)
+					delta = 0
+					++handledCPCount
 				}
 			}
 
-			++delta;
-			++n;
-
+			++delta
+			++n
 		}
-		return output.join('');
+		return output.join('')
 	}
 
 	/**
@@ -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,316 +1,346 @@
 //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");
-	} 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 maxletters = localStorage.getItem('letters_' + acct_id)
+		if (maxletters > 0) {
+			$('#textarea').attr('data-length', maxletters)
 		} else {
-			$("#toot-post-btn").css("background-color", "");
-			$("#toot-post-btn").css("color", "");
-			$("#toot-post-btn").addClass("indigo");
-
+			$('#textarea').attr('data-length', 500)
 		}
 	}
-	loadVis();
+	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)
+		} else {
+			$('#toot-post-btn').css('background-color', '')
+			$('#toot-post-btn').css('color', '')
+			$('#toot-post-btn').addClass('indigo')
+		}
+	}
+	loadVis()
 }
 //BOXのトグルボタン
 function mdToggle() {
-	$(".markdown").toggleClass("hide");
-	$(".anti-markdown").toggleClass("hide");
-	if ($(".markdown").hasClass("hide")) {
-		localStorage.setItem("md", "hide");
+	$('.markdown').toggleClass('hide')
+	$('.anti-markdown').toggleClass('hide')
+	if ($('.markdown').hasClass('hide')) {
+		localStorage.setItem('md', 'hide')
 	} else {
-		localStorage.removeItem("md");
+		localStorage.removeItem('md')
 	}
-
 }
 //最初に読み込みます(MD対応インスタンスかチェック)
-if (localStorage.getItem("md") == "hide") {
-	$(".markdown").addClass("hide");
-	$(".anti-markdown").removeClass("hide");
+if (localStorage.getItem('md') == 'hide') {
+	$('.markdown').addClass('hide')
+	$('.anti-markdown').removeClass('hide')
 }
 //タグを選んだ時に(BB版)
 function tagsel(tag) {
-	var acct_id = $("#post-acct-sel").val();
-	if (!localStorage.getItem("bb_" + acct_id)) {
-		return false;
+	var acct_id = $('#post-acct-sel').val()
+	if (!localStorage.getItem('bb_' + acct_id)) {
+		return false
 	}
-	if (tag == "large" || tag == "size" || tag == "color" || tag == "colorhex") {
-		var sub = $("#" + tag).val();
-		var sub = sub.replace(/#/g, "");
-		surroundHTML(tag + "=" + sub, tag);
-	} else if (tag == "flip=vertical" || tag == "flip=horizontal") {
-		surroundHTML(tag, "flip");
+	if (tag == 'large' || tag == 'size' || tag == 'color' || tag == 'colorhex') {
+		var sub = $('#' + tag).val()
+		var sub = sub.replace(/#/g, '')
+		surroundHTML(tag + '=' + sub, tag)
+	} else if (tag == 'flip=vertical' || tag == 'flip=horizontal') {
+		surroundHTML(tag, 'flip')
 	} else {
-		surroundHTML(tag, tag);
+		surroundHTML(tag, tag)
 	}
-	$("#textarea").focus();
+	$('#textarea').focus()
 }
 //HTMLをエスケープしてXSSを防ぐ
 function escape_html(string) {
 	if (typeof string !== 'string') {
-		return string;
+		return string
 	}
-	return string.replace(/[&'`"<>]/g, function (match) {
+	return string.replace(/[&'`"<>]/g, function(match) {
 		return {
 			'&': '&amp;',
 			"'": '&#x27;',
 			'`': '&#x60;',
 			'"': '&quot;',
 			'<': '&lt;',
-			'>': '&gt;',
+			'>': '&gt;'
 		}[match]
-	});
+	})
 }
 //テキストボックスで選択したやつをタグで囲む(BB版)
 function surroundHTML(tagS, tagE) {
-	var acct_id = $("#post-acct-sel").val();
-	if (!localStorage.getItem("bb_" + acct_id)) {
-		return false;
+	var acct_id = $('#post-acct-sel').val()
+	if (!localStorage.getItem('bb_' + acct_id)) {
+		return false
 	}
-	var target = document.getElementById("textarea");
-	var pos = getAreaRange(target);
+	var target = document.getElementById('textarea')
+	var pos = getAreaRange(target)
 
-	var val = target.value;
-	var range = val.slice(pos.start, pos.end);
-	var beforeNode = val.slice(0, pos.start);
-	var afterNode = val.slice(pos.end);
-	var insertNode;
+	var val = target.value
+	var range = val.slice(pos.start, pos.end)
+	var beforeNode = val.slice(0, pos.start)
+	var afterNode = val.slice(pos.end)
+	var insertNode
 	if (range || pos.start != pos.end) {
-		insertNode = '[' + tagS + ']' + range + '[/' + tagE + ']';
-		target.value = beforeNode + insertNode + afterNode;
-	}
-
-	else if (pos.start == pos.end) {
-		insertNode = '[' + tagS + ']' + '[/' + tagE + ']';
-		target.value = beforeNode + insertNode + afterNode;
+		insertNode = '[' + tagS + ']' + range + '[/' + tagE + ']'
+		target.value = beforeNode + insertNode + afterNode
+	} else if (pos.start == pos.end) {
+		insertNode = '[' + tagS + ']' + '[/' + tagE + ']'
+		target.value = beforeNode + insertNode + afterNode
 	}
 }
 function markdown(tag, ck, br, space) {
-	if (space == "before") {
-		tagE = tag;
-		tag = " " + tag;
+	if (space == 'before') {
+		tagE = tag
+		tag = ' ' + tag
 	} else {
-		tagE = tag;
+		tagE = tag
 	}
-	surroundMD(tag, tagE, ck, br);
-	$("#textarea").focus();
+	surroundMD(tag, tagE, ck, br)
+	$('#textarea').focus()
 }
 function surroundMD(tagS, tagE, ck, br) {
-	var acct_id = $("#post-acct-sel").val();
-	if (!localStorage.getItem("md_" + acct_id)) {
-		return false;
+	var acct_id = $('#post-acct-sel').val()
+	if (!localStorage.getItem('md_' + acct_id)) {
+		return false
 	}
-	var target = document.getElementById("textarea");
-	var pos = getAreaRange(target);
+	var target = document.getElementById('textarea')
+	var pos = getAreaRange(target)
 
-	var val = target.value;
-	var range = val.slice(pos.start, pos.end);
-	var beforeNode = val.slice(0, pos.start);
-	var afterNode = val.slice(pos.end);
-	var insertNode;
-	if (br == "yes") {
-		var br = "\n";
+	var val = target.value
+	var range = val.slice(pos.start, pos.end)
+	var beforeNode = val.slice(0, pos.start)
+	var afterNode = val.slice(pos.end)
+	var insertNode
+	if (br == 'yes') {
+		var br = '\n'
 	} else {
-		var br = "";
+		var br = ''
 	}
 
-	if ((range || pos.start != pos.end) && ck == "yes") {
-		insertNode = tagS + range + tagE;
-		target.value = beforeNode + insertNode + br + afterNode;
-	}
-
-	else if (pos.start == pos.end || ck == "no") {
-		insertNode = tagS + range;
-		target.value = beforeNode + insertNode + br + afterNode;
+	if ((range || pos.start != pos.end) && ck == 'yes') {
+		insertNode = tagS + range + tagE
+		target.value = beforeNode + insertNode + br + afterNode
+	} else if (pos.start == pos.end || ck == 'no') {
+		insertNode = tagS + range
+		target.value = beforeNode + insertNode + br + afterNode
 	}
 }
 
 //テキストボックスの前後チェック
 function getAreaRange(obj) {
-	var pos = new Object();
+	var pos = new Object()
 	if (window.getSelection()) {
-		pos.start = obj.selectionStart;
-		pos.end = obj.selectionEnd;
+		pos.start = obj.selectionStart
+		pos.end = obj.selectionEnd
 	}
 
-	return pos;
+	return pos
 }
 
 //Markdownのリンク挿入
 function markdownLink() {
-	var acct_id = $("#post-acct-sel").val();
-	if (!localStorage.getItem("md_" + acct_id)) {
-		return false;
+	var acct_id = $('#post-acct-sel').val()
+	if (!localStorage.getItem('md_' + acct_id)) {
+		return false
 	}
-	var linkIns = "[" + $("#linkt").val() + "]" + "(" + $("#link2").val() + ")";
-	if (linkIns != "[]()") {
-		$("#textarea").val($("#textarea").val() + linkIns);
-		$("#linkt").val("");
-		$("#link2").val("");
-		$("#textarea").focus();
+	var linkIns = '[' + $('#linkt').val() + ']' + '(' + $('#link2').val() + ')'
+	if (linkIns != '[]()') {
+		$('#textarea').val($('#textarea').val() + linkIns)
+		$('#linkt').val('')
+		$('#link2').val('')
+		$('#textarea').focus()
 	}
 }
 //Markdownのimg挿入
 function markdownImage() {
-	var acct_id = $("#post-acct-sel").val();
-	if (!localStorage.getItem("md_" + acct_id)) {
-		return false;
+	var acct_id = $('#post-acct-sel').val()
+	if (!localStorage.getItem('md_' + acct_id)) {
+		return false
 	}
-	var imgIns = "![" + $("#image").val() + "]" + "(" + $("#image2").val() + ")";
-	if (imgIns != "![]()") {
-		$("#textarea").val($("#textarea").val() + imgIns);
-		$("#image").val("");
-		$("#image2").val("");
-		$("#textarea").focus();
+	var imgIns = '![' + $('#image').val() + ']' + '(' + $('#image2').val() + ')'
+	if (imgIns != '![]()') {
+		$('#textarea').val($('#textarea').val() + imgIns)
+		$('#image').val('')
+		$('#image2').val('')
+		$('#textarea').focus()
 	}
 }
 //文字数をチェック(hタグ用)
 function str_count(all, part) {
-	return (all.match(new RegExp(part, "g")) || []).length;
+	return (all.match(new RegExp(part, 'g')) || []).length
 }
 
 //プレビュー
 function preview() {
-	$("#preview-field").show();
-	$("#toot-field").hide();
-	$("#preview-btn").hide();
-	var bb = escape_html($("#textarea").val());
+	$('#preview-field').show()
+	$('#toot-field').hide()
+	$('#preview-btn').hide()
+	var bb = escape_html($('#textarea').val())
 	//quote
-	var bb = bb.replace(/>(.+)$/g, '<blockquote>$1<\/blockquote>');
+	var bb = bb.replace(/>(.+)$/g, '<blockquote>$1</blockquote>')
 	//spin
-	var bb = bb.replace(/\[spin\](.+)\[\/spin\]/g, '<span class="fa fa-spin">$1<\/span>');
+	var bb = bb.replace(/\[spin\](.+)\[\/spin\]/g, '<span class="fa fa-spin">$1</span>')
 	//pulse
-	var bb = bb.replace(/\[pulse\](.+)\[\/pulse\]/g, '<span class="bbcode-pulse-loading">$1<\/span>');
+	var bb = bb.replace(/\[pulse\](.+)\[\/pulse\]/g, '<span class="bbcode-pulse-loading">$1</span>')
 	//large
-	var bb = bb.replace(/\[large=([0-9]{1,2})x\](.+)\[\/large\]/g, '<span class="fa fa-$1x">$2<\/span>');
+	var bb = bb.replace(
+		/\[large=([0-9]{1,2})x\](.+)\[\/large\]/g,
+		'<span class="fa fa-$1x">$2</span>'
+	)
 	//vertical
-	var bb = bb.replace(/\[flip=vertical\](.+)\[\/flip\]/g, '<span class="fa fa-flip-vertical">$1<\/span>');
+	var bb = bb.replace(
+		/\[flip=vertical\](.+)\[\/flip\]/g,
+		'<span class="fa fa-flip-vertical">$1</span>'
+	)
 	//horizontal
-	var bb = bb.replace(/\[flip=horizontal\](.+)\[\/flip\]/g, '<span class="fa fa-flip-horizontal">$1<\/span>');
+	var bb = bb.replace(
+		/\[flip=horizontal\](.+)\[\/flip\]/g,
+		'<span class="fa fa-flip-horizontal">$1</span>'
+	)
 	//b
-	var bb = bb.replace(/\[b\](.+)\[\/b\]/g, '<b>$1<\/b>');
+	var bb = bb.replace(/\[b\](.+)\[\/b\]/g, '<b>$1</b>')
 	//i
-	var bb = bb.replace(/\[i\](.+)\[\/i\]/g, '<i>$1<\/i>');
+	var bb = bb.replace(/\[i\](.+)\[\/i\]/g, '<i>$1</i>')
 	//u
-	var bb = bb.replace(/\[u\](.+)\[\/u\]/g, '<u>$1<\/u>');
+	var bb = bb.replace(/\[u\](.+)\[\/u\]/g, '<u>$1</u>')
 	//s
-	var bb = bb.replace(/\[s\](.+)\[\/s\]/g, '<s>$1<\/s>');
+	var bb = bb.replace(/\[s\](.+)\[\/s\]/g, '<s>$1</s>')
 	//size
-	var bb = bb.replace(/\[size=([0-9]{1,2})\](.+)\[\/size\]/g, '<span style="font-size:$1px">$2<\/span>');
+	var bb = bb.replace(
+		/\[size=([0-9]{1,2})\](.+)\[\/size\]/g,
+		'<span style="font-size:$1px">$2</span>'
+	)
 	//colorhex
-	var bb = bb.replace(/\[colorhex=([A-Fa-f0-9]+)\](.+)\[\/colorhex\]/g, '<span style="color:#$1">$2<\/span>');
+	var bb = bb.replace(
+		/\[colorhex=([A-Fa-f0-9]+)\](.+)\[\/colorhex\]/g,
+		'<span style="color:#$1">$2</span>'
+	)
 	//code
-	var bb = bb.replace(/`(.+)`/g, '<code>$1<\/code>');
+	var bb = bb.replace(/`(.+)`/g, '<code>$1</code>')
 	//head
-	var m;
-	m = bb.match(/^#{1,6}(.+)$/gm);
+	var m
+	m = bb.match(/^#{1,6}(.+)$/gm)
 	if (m) {
 		for (let i = 0; i < m.length; i++) {
-			var t = m[i].match(/^#{1,6}(.+)$/);
-			var indexct = '<h' + str_count(m[i], "#") + '>' + t[1] + '</h' + str_count(m[i], "#") + '>';
-			var bb = bb.replace(new RegExp(m[i], ""), indexct);
+			var t = m[i].match(/^#{1,6}(.+)$/)
+			var indexct = '<h' + str_count(m[i], '#') + '>' + t[1] + '</h' + str_count(m[i], '#') + '>'
+			var bb = bb.replace(new RegExp(m[i], ''), indexct)
 		}
 	}
 	//list(ul)
-	var li;
-	li = bb.match(/^\- (.+)$/gm);
+	var li
+	li = bb.match(/^\- (.+)$/gm)
 	if (li) {
 		for (let l = 0; l < li.length; l++) {
-			var u = li[l].match(/^\- (.+)$/);
-			var listUl = '<li>' + u[1] + '</li>';
+			var u = li[l].match(/^\- (.+)$/)
+			var listUl = '<li>' + u[1] + '</li>'
 			if (l == 0) {
-				listUl = '<ul>' + listUl;
+				listUl = '<ul>' + listUl
 			}
 			if (l == li.length - 1) {
-				listUl = listUl + '</ul>';
+				listUl = listUl + '</ul>'
 			}
-			var bb = bb.replace(new RegExp(li[l], ""), listUl);
+			var bb = bb.replace(new RegExp(li[l], ''), listUl)
 		}
 	}
 	//list(ol)
-	var li;
-	li = bb.match(/^1\. (.+)$/gm);
+	var li
+	li = bb.match(/^1\. (.+)$/gm)
 	if (li) {
 		for (let l = 0; l < li.length; l++) {
-			var u = li[l].match(/^1\. (.+)$/);
-			var listUl = '<li>' + u[1] + '</li>';
+			var u = li[l].match(/^1\. (.+)$/)
+			var listUl = '<li>' + u[1] + '</li>'
 			if (l === 0) {
-				listUl = '<ol>' + listUl;
+				listUl = '<ol>' + listUl
 			}
 			if (l === li.length - 1) {
-				listUl = listUl + '</ol>';
+				listUl = listUl + '</ol>'
 			}
-			var bb = bb.replace(new RegExp(li[l], ""), listUl);
+			var bb = bb.replace(new RegExp(li[l], ''), listUl)
 		}
 	}
 	//img
-	var bb = bb.replace(/!\[(.+)\]\((https:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g, '<img src="$2" text="$1" style="width:100%">');
+	var bb = bb.replace(
+		/!\[(.+)\]\((https:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g,
+		'<img src="$2" text="$1" style="width:100%">'
+	)
 	//link
-	var bb = bb.replace(/\[(.+)\]\((https?:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g, '<a href="$2" target="_blank">$1<\/a>');
-	bb = nl2br(bb);
-	bb = bb.replace(new RegExp("</li><br />", "g"), "");
-	$("#md-preview").html(bb);
+	var bb = bb.replace(
+		/\[(.+)\]\((https?:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g,
+		'<a href="$2" target="_blank">$1</a>'
+	)
+	bb = nl2br(bb)
+	bb = bb.replace(new RegExp('</li><br />', 'g'), '')
+	$('#md-preview').html(bb)
 }
 //Editで戻る
 function previewEdit() {
-	$("#preview-field").hide();
-	$("#toot-field").show();
-	$("#preview-btn").show();
-	$("#md-preview").html("");
-}
+	$('#preview-field').hide()
+	$('#toot-field').show()
+	$('#preview-btn').show()
+	$('#md-preview').html('')
+}

app/js/post/emoji.js

@@ -1,215 +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
 	}
-	localStorage.setItem("cursor", selin);
-
-	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);
-			if (!started) {
-				emojiList('home')
-			}
-		});
+		})
+			.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
+		})
+			.then(function(response) {
+				if (!response.ok) {
+					response.text().then(function(text) {
+						setLog(response.url, response.status, text)
+					})
+				}
+				return response.json()
+			})
+			.catch(function(error) {
+				todo(error)
+				setLog(start, 'JSON', error)
+				console.error(error)
+			})
+			.then(function(json) {
+				if (json.enableEmojiReaction) {
+					localStorage.setItem('emojiReaction_' + acct_id, 'true')
+				} else {
+					localStorage.setItem('emojiReaction_' + acct_id, 'disabled')
+				}
+				var emojis = json.emojis
+				var md = { uncategorized: [] }
+				Object.keys(emojis).forEach(function(key) {
+					var emoji = emojis[key]
+					md['uncategorized'].push({
+						shortcode: emoji.name,
+						url: emoji.url,
+						listed: true
+					})
 				})
-			});
-			if (parse == "true") {
-				$('#emoji-list').text('Parsing...');
-				//絵文字をマストドン公式と同順にソート
-				md.sort(function (a, b) {
-					if (a.shortcode < b.shortcode) return -1;
-					if (a.shortcode > b.shortcode) return 1;
-					return 0;
-				});
-				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
-			} else {
-				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
-			}
-			localStorage.setItem("emojiseek", 0);
-			if (!started) {
-				emojiList('home')
-			}
-		});
+				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");
+		if (num > 0) {
+			var ct = 1
+		}
+		$('#emoji-before').addClass('disabled')
 	} else {
-		$("#emoji-before").removeClass("disabled");
+		$('#emoji-before').removeClass('disabled')
 	}
-	$("#emoji-next").removeClass("disabled");
-	$("#emoji-count").text(ct);
+	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 {
+					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>`
+					}
+				}
 			} else {
-				html = html + '<a onclick="emojiInsert(\':' + 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 {
+					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);
+	$('#emoji-list').html(html)
 }
 
 //絵文字など様々なものをテキストボックスに挿入
 function emojiInsert(code, del) {
-	var now = $("#textarea").val();
-	var selin = localStorage.getItem("cursor");
-	if (localStorage.getItem("emoji-zero-width") == "yes") {
-		var brank = "​";
+	if (localStorage.getItem('emoji-zero-width') == 'yes') {
+		var blankBefore = '​'
+		var blankAfter = '​'
 	} else {
-		var brank = " ";
+		var blankBefore = ' '
+		var blankAfter = ' '
 	}
-	var now = $("#textarea").val();
-	if (selin > 0) {
-		var before = now.substr(0, selin);
-		var after = now.substr(selin, now.length);
-		newt = before + brank + code + brank + after;
+	var textarea = document.querySelector('#textarea')
+	var sentence = textarea.value
+	var len = sentence.length
+	var pos = textarea.selectionStart
+	if (del) {
+		var delLen = del.length
 	} else {
-		newt = code + brank;
+		var delLen = 0
 	}
-	if (!del) {
-		$("#textarea").val(newt);
-		//emoji();
+	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 regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
-		var now = now.replace(regExp, "");
-		$("#textarea").val(now + brank + code);
+		var word = blankBefore + code + blankAfter
 	}
-
-	$("#textarea").focus();
-	var selin = $("#textarea").prop('selectionStart');
-	if (!selin) {
-		selin = 0;
-	}
-	localStorage.setItem("cursor", selin);
+	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,276 @@
 //ドラッグ・アンド・ドロップからアップロードまで。uiのimg.jsとは異なります。
-var obj = $("body");
-var system;
+var obj = $('body')
+var system
 //ドラッグスタート
-obj.on('dragstart', function (e) {
-	system = "locked"
-});
+obj.on('dragstart', function(e) {
+	system = 'locked'
+})
 //何もなくファイルが通過
-obj.on('dragend', function (e) {
-	system = "";
-});
+obj.on('dragend', function(e) {
+	system = ''
+})
 //ドラッグファイルが画面上に
-obj.on('dragenter', function (e) {
-	if (system != "locked") {
-		$("#drag").css('display', 'flex');
+obj.on('dragenter', function(e) {
+	if (system != 'locked') {
+		$('#drag').css('display', 'flex')
 	}
-
-});
-$("body").on('dragover', function (e) {
-	e.stopPropagation();
-	e.preventDefault();
-});
+})
+$('body').on('dragover', function(e) {
+	e.stopPropagation()
+	e.preventDefault()
+})
 //ドロップした
-$("body").on('drop', function (e) {
-	if (system != "locked") {
-		$("#drag").css('display', 'none');
-		e.preventDefault();
-		var files = e.originalEvent.dataTransfer.files;
-		pimg(files);
+$('body').on('drop', function(e) {
+	if (system != 'locked') {
+		$('#drag').css('display', 'none')
+		e.preventDefault()
+		var files = e.originalEvent.dataTransfer.files
+		pimg(files)
 	}
-});
+})
 //何もなくファイルが通過
-$("#drag").on('dragleave', function (e) {
-	$("#drag").css('display', 'none');
-});
+$('#drag').on('dragleave', function(e) {
+	$('#drag').css('display', 'none')
+})
 
 //複数アップ
 function pimg(files) {
-	console.table(files);
+	console.table(files)
 	for (i = 0; i < files.length; i++) {
-		var dot = files[i].path.match(/\.(.+)$/)[1];
-		if (dot == "bmp" || dot == "BMP") {
-			postMessage(["bmpImage", [files[i].path, i]], "*")
-			todo(lang.lang_progress);
-
+		var dot = files[i].path.match(/\.(.+)$/)[1]
+		if (dot == 'bmp' || dot == 'BMP') {
+			postMessage(['bmpImage', [files[i].path, i]], '*')
+			todo(lang.lang_progress)
 		} else {
-			handleFileUpload(files[i], obj, i);
+			handleFileUpload(files[i], obj, i)
 		}
 	}
 }
 //ドラッグ・アンド・ドロップを終了
 function closedrop() {
-	$("#drag").css('display', 'none');
+	$('#drag').css('display', 'none')
 }
 //ファイル選択
 function fileselect() {
-	postMessage(["sendSinmpleIpc", "file-select"], "*")
+	postMessage(['sendSinmpleIpc', 'file-select'], '*')
 }
 
 //ファイル読み込み
 function handleFileUpload(files, obj, no) {
-	var fr = new FileReader();
-	fr.onload = function (evt) {
-		var b64 = evt.target.result;
-		$('#b64-box').val(b64);
-		var ret = media(b64, files["type"], no)
+	var fr = new FileReader()
+	fr.onload = function(evt) {
+		var b64 = evt.target.result
+		var resize = localStorage.getItem('uploadCrop') * 1
+		if (resize > 0) {
+			var element = new Image()
+			var width
+			element.onload = function() {
+				var width = element.naturalWidth
+				var height = element.naturalHeight
+				if (width > resize || height > resize) {
+					postMessage(['resizeImage', [b64, resize]], '*')
+					return false
+				} else {
+					$('#b64-box').val(b64)
+					var ret = media(b64, files['type'], no)
+				}
+			}
+			element.src = b64
+			return false
+		}
+		$('#b64-box').val(b64)
+		var ret = media(b64, files['type'], no)
 	}
-	fr.readAsDataURL(files);
-	$("#mec").append(files["name"] + "/");
+	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)
+	localStorage.setItem('image', 'busy')
+	todo('Image Upload...')
+	var media = toBlob(b64, type)
+	var fd = new FormData()
+	fd.append('file', media)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var httpreq = new XMLHttpRequest()
+	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+		var start = 'https://' + domain + '/api/drive/files/create'
+		httpreq.open('POST', start, true)
+		httpreq.upload.addEventListener('progress', progshow, false)
+		httpreq.responseType = 'json'
+		if ($('#nsfw').hasClass('nsfw-avail')) {
+			var nsfw = true
 		} 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()
+				localStorage.removeItem('image')
+			} 
+		} catch {
+			var start = 'https://' + domain + '/api/v1/media'
+			httpreq.open('POST', start, true)
+			httpreq.upload.addEventListener('progress', progshow, false)
+			httpreq.responseType = 'json'
+			httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+			httpreq.send(fd)
+		}
 	}
-	httpreq.onreadystatechange = function () {
+	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();
-	fr.onload = function (e) {
+	var fr = new FileReader()
+	fr.onload = function(e) {
 		// onload内ではe.target.resultにbase64が入っているのであとは煮るなり焼くなり
-		var base64 = e.target.result;
-		var mediav = $("#media").val();
+		var base64 = e.target.result
+		var mediav = $('#media').val()
 		if (mediav) {
-			var i = mediav.split(",").length;
+			var i = mediav.split(',').length
 		}
 		// DataTransferItem の type に mime tipes があるのでそれを使う
 		media(base64, imageType, i)
-	};
-	fr.readAsDataURL(imageFile);
+	}
+	fr.readAsDataURL(imageFile)
 
 	// 画像以外がペーストされたときのために、元に戻しておく
-});
+})
 function deleteImage(key) {
 	Swal.fire({
 		title: lang.lang_postimg_delete,
@@ -223,19 +280,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,241 +1,278 @@
 //Renpost
 function renote(id, acct_id, remote) {
-    if ($("#pub_" + id).hasClass("rted")) {
-        return false;
-    }
-    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_" + acct_id + "_at");
-    var start = "https://" + domain + "/api/notes/create";
-    if (localStorage.getItem("mode_" + domain) != "misskey") {
-        return false;
-    }
-    var httpreq = new XMLHttpRequest();
-    httpreq.open('POST', start, true);
-    httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = "json";
-    httpreq.send(JSON.stringify({ i: at, renoteId: id }));
-    httpreq.onreadystatechange = function () {
-        if (httpreq.readyState === 4) {
-            var json = httpreq.response;
-            console.log(["Success: renote", json]);
-            $("[toot-id=" + id + "]").addClass("rted");
-            $(".rt_" + id).toggleClass("teal-text");
-        }
-    }
+	if ($('#pub_' + id).hasClass('rted')) {
+		return false
+	}
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/notes/create'
+	if (localStorage.getItem('mode_' + domain) != 'misskey') {
+		return false
+	}
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.responseType = 'json'
+	httpreq.send(JSON.stringify({ i: at, renoteId: id }))
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			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 httpreq = new XMLHttpRequest();
-    httpreq.open('POST', start, true);
-    httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = "json";
-    httpreq.send(JSON.stringify({ i: at, noteId: id }));
-    httpreq.onreadystatechange = function () {
-        if (httpreq.readyState === 4) {
-            var json = httpreq.response;
-            console.log(["Success: reaction", json]);
-            if (json.reactions) {
-                var reactions = ["like", "love", "laugh", "hmm", "surprise", "congrats", "angry", "confused", "pudding", "rip"];
-                for (var i = 0; i < reactions.length; i++) {
-                    if (json.reactions[reactions[i]]) {
-                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
-                        $("#pub_" + id + " .re-" + reactions[i]).removeClass("hide")
-                    } else {
-                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(0)
-                        if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
-                            $("#pub_" + id + " .re-" + reactions[i]).addClass("hide")
-                        } else {
-                            $("#pub_" + id + " .re-" + reactions[i]).removeClass("hide")
-                        }
-                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
-                    }
-                }
-                $("#pub_" + id + " .reactions").removeClass("hide");
-                $("#pub_" + id + " .reactions").toggleClass("fullreact")
-            } else {
-                if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
-                    $("#pub_" + id + " .reactions").addClass("hide")
-                    $("#pub_" + id + " .reactions").removeClass("fullreact")
-                } else {
-                    $("#pub_" + id + " .reactions").removeClass("hide");
-                    $("#pub_" + id + " .reaction").removeClass("hide");
-                    $("#pub_" + id + " .reactions").addClass("fullreact");
-                }
-            }
-        }
-    }
-    $("#pub_" + id + " .freeReact").toggleClass("hide");
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/notes/show'
+	if (localStorage.getItem('mode_' + domain) != 'misskey') {
+		return false
+	}
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.responseType = 'json'
+	httpreq.send(JSON.stringify({ i: at, noteId: id }))
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, json)
+			}
+			console.log(['Success: reaction', json])
+			if (json.reactions) {
+				var reactions = [
+					'like',
+					'love',
+					'laugh',
+					'hmm',
+					'surprise',
+					'congrats',
+					'angry',
+					'confused',
+					'pudding',
+					'rip'
+				]
+				for (var i = 0; i < reactions.length; i++) {
+					if (json.reactions[reactions[i]]) {
+						$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(json.reactions[reactions[i]])
+						$('#pub_' + id + ' .re-' + reactions[i]).removeClass('hide')
+					} else {
+						$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(0)
+						if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
+							$('#pub_' + id + ' .re-' + reactions[i]).addClass('hide')
+						} else {
+							$('#pub_' + id + ' .re-' + reactions[i]).removeClass('hide')
+						}
+						$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(json.reactions[reactions[i]])
+					}
+				}
+				$('#pub_' + id + ' .reactions').removeClass('hide')
+				$('#pub_' + id + ' .reactions').toggleClass('fullreact')
+			} else {
+				if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
+					$('#pub_' + id + ' .reactions').addClass('hide')
+					$('#pub_' + id + ' .reactions').removeClass('fullreact')
+				} else {
+					$('#pub_' + id + ' .reactions').removeClass('hide')
+					$('#pub_' + id + ' .reaction').removeClass('hide')
+					$('#pub_' + id + ' .reactions').addClass('fullreact')
+				}
+			}
+		}
+	}
+	$('#pub_' + id + ' .freeReact').toggleClass('hide')
 }
 //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);
-    show()
-    emojiToggle(true)
-    $("#left-side").hide();
-    $("#default-emoji").hide();
+	$('#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()
 }
 function reactRefresh(acct_id, id) {
-    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_" + acct_id + "_at");
-    var start = "https://" + domain + "/api/notes/show";
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/notes/show'
 
-    var req = {};
-    req.i = at;
-    req.noteId = id;
-    var i = {
-        method: "POST",
-        body: JSON.stringify(req),
-    }
-    fetch(start, i,
-    ).then(function (response) {
-        return response.json();
-    }).catch(function (error) {
-        todo(error);
-        console.error(error);
-    }).then(function (json) {
-        if (!json) {
-            return false;
-        }
-        var poll = "";
-        if (json.error) {
-            $("[toot-id=" + id + "]").hide();
-            $("[toot-id=" + id + "]").remove();
-        } else {
-            reactRefreshCore(json)
-        }
-    });
+	var req = {}
+	req.i = at
+	req.noteId = id
+	var i = {
+		method: 'POST',
+		body: JSON.stringify(req)
+	}
+	fetch(start, i)
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			if (!json) {
+				return false
+			}
+			var poll = ''
+			if (json.error) {
+				$('[toot-id=' + id + ']').hide()
+				$('[toot-id=' + id + ']').remove()
+			} else {
+				reactRefreshCore(json)
+			}
+		})
 }
 function reactRefreshCore(json) {
-    var id = json.id;
-    if (json.reactions) {
-        $("#pub_" + id + " .reactions").removeClass("hide")
-        var regExp = new RegExp(":", "g");
-        Object.keys(json.reactions).forEach(function (keye) {
-            keyeClass = keye.replace(regExp, '');
-            if (json.reactions[keye]) {
-                $("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
-                $("#pub_" + id + " .re-" + keyeClass).removeClass("hide")
-            } else {
-                $("#pub_" + id + " .re-" + keyeClass + "ct").text(0)
-                if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
-                    $("#pub_" + id + " .re-" + keyeClass).addClass("hide")
-                }
-                $("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
-            }
-        });
-    }
+	var id = json.id
+	if (json.reactions) {
+		$('#pub_' + id + ' .reactions').removeClass('hide')
+		var regExp = new RegExp(':', 'g')
+		Object.keys(json.reactions).forEach(function(keye) {
+			keyeClass = keye.replace(regExp, '')
+			if (json.reactions[keye]) {
+				$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(json.reactions[keye])
+				$('#pub_' + id + ' .re-' + keyeClass).removeClass('hide')
+			} else {
+				$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(0)
+				if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
+					$('#pub_' + id + ' .re-' + keyeClass).addClass('hide')
+				}
+				$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(json.reactions[keye])
+			}
+		})
+	}
 }
 function emojiReaction(emoji) {
-    var acct_id = $("#post-acct-sel").val();
-    var id = $("#reply").val();
-    reaction(emoji, id, acct_id, null)
-    clear();
-    hide();
+	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()
 }
 function reaction(mode, id, acct_id, tlid) {
-    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_" + acct_id + "_at");
-    if ($(".fav_" + id).hasClass("yellow-text")) {
-        var flag = "delete";
-    } else {
-        var flag = "create";
-    }
-    var start = "https://" + domain + "/api/notes/reactions/" + flag;
-    if (localStorage.getItem("mode_" + domain) != "misskey") {
-        return false;
-    }
-    var httpreq = new XMLHttpRequest();
-    httpreq.open('POST', start, true);
-    httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = "json";
-    httpreq.send(JSON.stringify({ i: at, noteId: id, reaction: mode }));
-    httpreq.onreadystatechange = function () {
-        if (httpreq.readyState === 4) {
-            $(".fav_" + id).toggleClass("yellow-text");
-        }
-    }
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	if ($('.fav_' + id).hasClass('yellow-text')) {
+		var flag = 'delete'
+	} else {
+		var flag = 'create'
+	}
+	var start = 'https://' + domain + '/api/notes/reactions/' + flag
+	if (localStorage.getItem('mode_' + domain) != 'misskey') {
+		return false
+	}
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.responseType = 'json'
+	httpreq.send(JSON.stringify({ i: at, noteId: id, reaction: mode }))
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			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 httpreq = new XMLHttpRequest();
-    httpreq.open('POST', start, true);
-    httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = "json";
-    httpreq.send(JSON.stringify({ i: at, noteId: id, choice: to }));
-    httpreq.onreadystatechange = function () {
-        voterefresh(acct_id, id)
-    }
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/notes/polls/vote'
+	if (localStorage.getItem('mode_' + domain) != 'misskey') {
+		return false
+	}
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.responseType = 'json'
+	httpreq.send(JSON.stringify({ i: at, noteId: id, choice: to }))
+	httpreq.onreadystatechange = function() {
+		voterefresh(acct_id, id)
+	}
 }
 function voterefresh(acct_id, id) {
-    var httpreqd = new XMLHttpRequest();
-    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_" + acct_id + "_at");
-    var start = "https://" + domain + "/api/notes/show";
-    httpreqd.open('POST', start, true);
-    httpreqd.setRequestHeader('Content-Type', 'application/json');
-    httpreqd.responseType = 'json';
-    httpreqd.send(JSON.stringify({ i: at, noteId: id }));
-    httpreqd.onreadystatechange = function () {
-        if (httpreqd.readyState == 4) {
-            var json = httpreqd.response;
-            if (!json) {
-                return false;
-            }
-            var poll = "";
-            if (json.poll) {
-                var choices = json.poll.choices;
-                Object.keys(choices).forEach(function (keyc) {
-                    var choice = choices[keyc];
-                    if (choice.isVoted) {
-                        var myvote = twemoji.parse("✅");
-                    } else {
-                        var myvote = "";
-                    }
-                    poll = poll + '<div class="pointer vote" onclick="vote(\'' + acct_id + '\',\'' + json.id + '\',' + choice.id + ')">' + escapeHTML(choice.text) + '(' + choice.votes + '' + myvote + ')</div>';
-                });
-                $(".vote_" + json.id).html(poll)
-            }
-        }
-    }
-}
+	var httpreqd = new XMLHttpRequest()
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/notes/show'
+	httpreqd.open('POST', start, true)
+	httpreqd.setRequestHeader('Content-Type', 'application/json')
+	httpreqd.responseType = 'json'
+	httpreqd.send(JSON.stringify({ i: at, noteId: id }))
+	httpreqd.onreadystatechange = function() {
+		if (httpreqd.readyState == 4) {
+			var json = httpreqd.response
+			if (this.status !== 200) {
+				setLog(start, this.status, json)
+			}
+			if (!json) {
+				return false
+			}
+			var poll = ''
+			if (json.poll) {
+				var choices = json.poll.choices
+				Object.keys(choices).forEach(function(keyc) {
+					var choice = choices[keyc]
+					if (choice.isVoted) {
+						var myvote = twemoji.parse('✅')
+					} else {
+						var myvote = ''
+					}
+					poll = poll + `<div class="pointer vote" onclick="vote('${acct_id}','${json.id}',"${choice.id}')">${escapeHTML(choice.text)}(${choice.votes})${myvote})</div>`
+				})
+				$('.vote_' + json.id).html(poll)
+			}
+		}
+	}
+}

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,66 @@ function post(mode, postvis) {
 	if (reply) {
 		toot.in_reply_to_id = reply
 	}
-	var media = $("#media").val();
+	var media = $('#media').val()
 	if (media) {
-		toot.media_ids = media.split(",");
+		toot.media_ids = media.split(',')
 	}
-	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('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 +154,194 @@ 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));
-	httpreq.onreadystatechange = function () {
+	console.table(toot)
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.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()
+				}
+			} else {
+				$('#ideKey').val('')
+				var box = localStorage.getItem('box')
+				if (box == 'yes' || !box) {
+					$('#textarea').blur()
+					hide()
+				}
+				$('.toot-btn-group').prop('disabled', false)
+				todc()
+				clear()
 			}
-			$(".toot-btn-group").prop("disabled", false);
-			todc();
-			clear();
 		}
 	}
 }
 function misskeyPost() {
-	var str = $("#textarea").val();
-	var acct_id = $("#post-acct-sel").val();
-	localStorage.setItem("last-use", acct_id);
-	var domain = localStorage.getItem("domain_" + acct_id);
-	$(".toot-btn-group").prop("disabled", true);
-	todo("Posting");
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/notes/create";
-	var reply = $("#reply").val();
+	var str = $('#textarea').val()
+	var acct_id = $('#post-acct-sel').val()
+	localStorage.setItem('last-use', acct_id)
+	var domain = localStorage.getItem('domain_' + acct_id)
+	$('.toot-btn-group').prop('disabled', true)
+	todo('Posting')
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/notes/create'
+	var reply = $('#reply').val()
 	var toot = {
 		text: str
 	}
 	if (reply) {
-		if (reply.indexOf("renote") !== -1) {
-			toot.renoteId = reply.replace("renote_", "")
+		if (reply.indexOf('renote') !== -1) {
+			toot.renoteId = reply.replace('renote_', '')
 		} else {
 			toot.replyId = reply
 		}
 	}
 
-	var media = $("#media").val();
+	var media = $('#media').val()
 	if (media) {
-		toot.mediaIds = media.split(",");
+		toot.mediaIds = media.split(',')
 	}
-	if ($("#nsfw").hasClass("nsfw-avail")) {
-		var nsfw = "true";
-		toot.sensitive = nsfw;
+	if ($('#nsfw').hasClass('nsfw-avail')) {
+		var nsfw = 'true'
+		toot.sensitive = nsfw
 	} else {
-		var nsfw = "false";
+		var nsfw = 'false'
 	}
-	var vis = $("#vis").text();
-	if (vis == "unlisted") {
-		vis = "home"
-	} else if (vis == "direct") {
-		vis = "specified";
-		toot.visibleUserIds = str.match(/@([a-zA-Z0-9_@.-]+)(\s|$)/g).join('').split("@");
+	var vis = $('#vis').text()
+	if (vis == 'unlisted') {
+		vis = 'home'
+	} else if (vis == 'direct') {
+		vis = 'specified'
+		toot.visibleUserIds = str
+			.match(/@([a-zA-Z0-9_@.-]+)(\s|$)/g)
+			.join('')
+			.split('@')
 	}
-	if (vis != "inherit") {
-		toot.visibility = vis;
+	if (vis != 'inherit') {
+		toot.visibility = vis
 	}
-	if ($("#cw").hasClass("cw-avail")) {
-		var spo = $("#cw-text").val();
-		cw();
-		toot.cw = spo;
+	if ($('#cw').hasClass('cw-avail')) {
+		var spo = $('#cw-text').val()
+		cw()
+		toot.cw = spo
 	} else {
-		var spo = "";
+		var spo = ''
 	}
-	toot.i = at;
-	var httpreq = new XMLHttpRequest();
-	httpreq.open('POST', start, true);
-	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.responseType = "json";
-	httpreq.send(JSON.stringify(toot));
-	httpreq.onreadystatechange = function () {
+	toot.i = at
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.responseType = 'json'
+	httpreq.send(JSON.stringify(toot))
+	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
-			if (str.indexOf(localStorage.getItem("stable")) == -1) {
-				localStorage.removeItem("stable")
+			if (str.indexOf(localStorage.getItem('stable')) == -1) {
+				localStorage.removeItem('stable')
 			}
-			var json = httpreq.response;
-			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('')
+	})
+	localStorage.removeItem('image')
+	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();
+	if (ins) {
+		ins.close()
 	}
 }
 function loadVis() {
-	var vist = localStorage.getItem("vis");
+	var vist = localStorage.getItem('vis')
 	if (!vist) {
-		vis("public");
+		vis('public')
 	} else {
-		if (vist == "memory") {
-			var acct_id = $("#post-acct-sel").val();
-			var memory = localStorage.getItem("vis-memory-" + acct_id);
+		if (vist == 'memory') {
+			var acct_id = $('#post-acct-sel').val()
+			var memory = localStorage.getItem('vis-memory-' + acct_id)
 			if (!memory) {
-				memory = "public";
+				memory = 'public'
 			}
-			vis(memory);
-		} else if (vist == "useapi") {
-			var acct_id = $("#post-acct-sel").val();
-			var multi = localStorage.getItem("multi");
-			var obj = JSON.parse(multi);
-			var memory = obj[acct_id]["vis"];
+			vis(memory)
+		} else if (vist == 'useapi') {
+			var acct_id = $('#post-acct-sel').val()
+			var multi = localStorage.getItem('multi')
+			var obj = JSON.parse(multi)
+			var memory = obj[acct_id]['vis']
 			if (!memory) {
-				memory = "public";
+				memory = 'public'
 			}
-			vis(memory);
+			vis(memory)
 		} else {
-			vis(vist);
+			vis(vist)
 		}
 	}
 }
-loadVis();
+loadVis()
 
 //コンテントワーニング
 function cw() {
-	if ($("#cw").hasClass("cw-avail")) {
-		$("#cw-text").val();
-		$("#cw-text").hide();
-		$("#cw").removeClass("yellow-text");
-		$("#cw").removeClass("cw-avail");
+	if ($('#cw').hasClass('cw-avail')) {
+		$('#cw-text').val()
+		$('#cw-text').hide()
+		$('#cw').removeClass('yellow-text')
+		$('#cw').removeClass('cw-avail')
 	} else {
-		$("#cw-text").show();
-		$("#cw").addClass("yellow-text");
-		$("#cw").addClass("cw-avail");
-		var cwt = localStorage.getItem("cw-text");
+		$('#cw-text').show()
+		$('#cw').addClass('yellow-text')
+		$('#cw').addClass('cw-avail')
+		var cwt = localStorage.getItem('cw-text')
 		if (cwt) {
-			$("#cw-text").val(cwt);
+			$('#cw-text').val(cwt)
 		}
 	}
 }
 //TLでコンテントワーニングを表示トグル
-function cw_show(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;
+$(function() {
+	$('#cw-text').on('change', function(event) {
+		var acct_id = $('#post-acct-sel').val()
+		var domain = localStorage.getItem('domain_' + acct_id)
+		var cwlen = $('#cw-text').val().length
 
-		if (idata[domain + "_letters"]) {
-			$("#textarea").attr("data-length", idata[domain + "_letters"] - cwlen)
+		if (idata[domain + '_letters']) {
+			$('#textarea').attr('data-length', idata[domain + '_letters'] - cwlen)
 		} else {
-			$("#textarea").attr("data-length", 500 - cwlen)
+			$('#textarea').attr('data-length', 500 - cwlen)
 		}
-
-
-	});
-});
+	})
+})
 //スケジュール
 function schedule() {
-	if ($("#sch-box").hasClass("sch-avail")) {
-		$("#sch-box").hide();
-		$("#sch-box").removeClass("sch-avail");
+	if ($('#sch-box').hasClass('sch-avail')) {
+		$('#sch-box').hide()
+		$('#sch-box').removeClass('sch-avail')
 	} else {
-		var date = new Date();
+		var date = new Date()
 
-		$("#sch-box").show();
-		$("#sch-date").val(formattime(date));
-		$("#sch-box").addClass("sch-avail");
+		$('#sch-box').show()
+		$('#sch-date').val(formattime(date))
+		$('#sch-box').addClass('sch-avail')
 	}
 }

app/js/post/suggest.js

@@ -1,204 +1,279 @@
 //入力時にハッシュタグと@をサジェスト
-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 () {
-	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()
-			}
-			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,})/);
-			if (tag && tag[1]) {
-				var q = tag[1];
-			} else if (acct && acct[1]) {
-				var q = acct[1];
-			} else {
-				$("#suggest").html("");
-				if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
-					$("#right-side").hide()
-				}
-				return;
-			}
-			var domain = localStorage.getItem("domain_" + acct_id);
-			var at = localStorage.getItem("acct_" + acct_id + "_at");
-			suggest = "https://" + domain + "/api/v2/search?q=" + q
-			if (suggest != oldSuggest) {
-				console.log("Try to get suggest at " + suggest)
-				fetch(suggest, {
-					method: 'GET',
-					headers: {
-						'content-type': 'application/json',
-						'Authorization': 'Bearer ' + at
-					},
-				}).then(function (response) {
-					return response.json();
-				}).catch(function (error) {
-					todo(error);
-					console.error(error);
-				}).then(function (json) {
-					console.log(["Search", json]);
-					//ハッシュタグ
-					if (json.hashtags[0] && tag) {
-						if (tag[1]) {
-							var tags = [];
-							Object.keys(json.hashtags).forEach(function (key4) {
-								var tag = json.hashtags[key4];
-								var his = tag.history;
-								var uses = his[0].uses * 1 + his[1].uses * 1 + his[2].uses * 1 + his[3].uses * 1 + his[4].uses * 1 + his[5].uses * 1 + his[6].uses * 1;
-								tagHTML = '<br><a onclick="tagInsert(\'#' + escapeHTML(tag.name) + '\',\'#' + q + '\')" class="pointer">#' +
-									escapeHTML(tag.name) + '</a>&nbsp;' + uses + 'toot(s)'
-								var item = {
-									"uses": uses,
-									"html": tagHTML
-								}
-								tags.push(item)
-							});
-							var num_a = -1;
-							var num_b = 1;
-							tags = tags.sort(function (a, b) {
-								var x = a["uses"];
-								var y = b["uses"];
-								if (x > y) return num_a;
-								if (x < y) return num_b;
-								return 0;
-							});
-							var ins = ""
-							var nev = false
-							Object.keys(tags).forEach(function (key7) {
-								ins = ins + tags[key7].html
-								if (key7 <= 0 && !nev) {
-									ins = ins + '<br>'
-									nev = true
-								}
-							});
-							$("#suggest").html(ins);
-							$("#right-side").show()
-							$("#poll").addClass("hide")
-							$("#emoji").addClass("hide")
-						}
-					} else if (json.accounts[0] && acct[1]) {
-						var accts = "";
-						Object.keys(json.accounts).forEach(function (key3) {
-							var acct = json.accounts[key3];
-							if (acct.acct != q) {
-								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")
+input.addEventListener(
+	'focus',
+	function() {
+		localStorage.removeItem('cursor')
+		var acct_id = $('#post-acct-sel').val()
+		$('#suggest').html('')
+		window.clearInterval(timer)
+		timer = window.setInterval(function() {
+			var new_val = input.value
+			if (new_val == '') {
+				$('#suggest').html('')
+				if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+					$('#right-side').hide()
+					$('#right-side').css('width', '300px')
+					$('#left-side').css('width', '100%')
+					var width = localStorage.getItem('postbox-width')
+					if (width) {
+						width = width.replace('px', '') * 1
 					} else {
-						if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
-							$("#right-side").hide()
-						}
+						width = 300
 					}
-				});
+					$('#post-box').css('width', width + 'px')
+				}
+				return
 			}
-		};
-		oldSuggest = suggest;
-		prev_value = new_val;
-	}, 1000);
-}, false);
+			if (prev_val != new_val) {
+				var tag = new_val.match(/#(\S{3,})/)
+				var acct = new_val.match(/@(\S{3,})/)
+				if (tag && tag[1]) {
+					var q = tag[1]
+				} else if (acct && acct[1]) {
+					var q = acct[1]
+				} else {
+					$('#suggest').html('')
+					if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+						$('#right-side').hide()
+						$('#right-side').css('width', '300px')
+						$('#left-side').css('width', '100%')
+						var width = localStorage.getItem('postbox-width')
+						if (width) {
+							width = width.replace('px', '') * 1
+						} else {
+							width = 300
+						}
+						$('#post-box').css('width', width + 'px')
+					}
+					return
+				}
+				var domain = localStorage.getItem('domain_' + acct_id)
+				var at = localStorage.getItem('acct_' + acct_id + '_at')
+				suggest = 'https://' + domain + '/api/v2/search?q=' + q
+				if (suggest != oldSuggest) {
+					console.log('Try to get suggest at ' + suggest)
+					fetch(suggest, {
+						method: 'GET',
+						headers: {
+							'content-type': 'application/json',
+							Authorization: 'Bearer ' + at
+						}
+					})
+						.then(function(response) {
+							if (!response.ok) {
+								response.text().then(function(text) {
+									setLog(response.url, response.status, text)
+								})
+							}
+							return response.json()
+						})
+						.catch(function(error) {
+							todo(error)
+							setLog(start, 'JSON', error)
+							console.error(error)
+						})
+						.then(function(json) {
+							console.log(['Search', json])
+							//ハッシュタグ
+							if (json.hashtags[0] && tag) {
+								if (tag[1]) {
+									var tags = []
+									Object.keys(json.hashtags).forEach(function(key4) {
+										var tag = json.hashtags[key4]
+										var his = tag.history
+										var uses =
+											his[0].uses * 1 +
+											his[1].uses * 1 +
+											his[2].uses * 1 +
+											his[3].uses * 1 +
+											his[4].uses * 1 +
+											his[5].uses * 1 +
+											his[6].uses * 1
+										tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
+											tag.name
+										)}','#${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
 
-input.addEventListener("blur", function () {
-	window.clearInterval(timer);
-	favTag();
-}, false);
+										var item = {
+											uses: uses,
+											html: tagHTML
+										}
+										tags.push(item)
+									})
+									var num_a = -1
+									var num_b = 1
+									tags = tags.sort(function(a, b) {
+										var x = a['uses']
+										var y = b['uses']
+										if (x > y) return num_a
+										if (x < y) return num_b
+										return 0
+									})
+									var ins = ''
+									var nev = false
+									Object.keys(tags).forEach(function(key7) {
+										ins = ins + tags[key7].html
+										if (key7 <= 0 && !nev) {
+											ins = ins + '<br>'
+											nev = true
+										}
+									})
+									$('#suggest').html(ins)
+									$('#right-side').show()
+									$('#right-side').css('width', '200px')
+									$('#left-side').css('width', 'calc(100% - 200px)')
+									var width = localStorage.getItem('postbox-width')
+									if (width) {
+										width = width.replace('px', '') * 1 + 200
+									} else {
+										width = 500
+									}
+									$('#post-box').css('width', width + 'px')
+									$('#poll').addClass('hide')
+									$('#emoji').addClass('hide')
+								}
+							} else if (json.accounts[0] && acct[1]) {
+								var accts = ''
+								Object.keys(json.accounts).forEach(function(key3) {
+									var acct = json.accounts[key3]
+									if (acct.acct != q) {
+										//Instance Actorって…
+										if (acct.username.indexOf('.') < 0) {
+											accts =
+												accts +
+												`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
+										}
+									}
+								})
+								$('#right-side').show()
+								$('#right-side').css('width', '200px')
+								$('#left-side').css('width', 'calc(100% - 200px)')
+								var width = localStorage.getItem('postbox-width')
+								if (width) {
+									width = width.replace('px', '') * 1 + 200
+								} else {
+									width = 500
+								}
+								$('#post-box').css('width', width + 'px')
+								$('#suggest').html(accts)
+								$('#poll').addClass('hide')
+								$('#emoji').addClass('hide')
+							} else {
+								if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+									$('#right-side').hide()
+									$('#right-side').css('width', '300px')
+									$('#left-side').css('width', '100%')
+									var width = localStorage.getItem('postbox-width')
+									if (width) {
+										width = width.replace('px', '') * 1
+									} else {
+										width = 300
+									}
+									$('#post-box').css('width', width + 'px')
+								}
+							}
+						})
+				}
+			}
+			oldSuggest = suggest
+			prev_value = new_val
+		}, 1000)
+	},
+	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
+		}
+		$('#post-box').css('width', width + 'px')
 	}
-	$("#suggest").html("");
+	$('#suggest').html('')
 }
 function cgNPs(q) {
-	suggest = "https://cg.toot.app/api/v1/search/light?q=" + q
+	suggest = 'https://cg.toot.app/api/v1/search/light?q=' + q
 	if (suggest != oldSuggest) {
-		console.log("Try to get suggest at " + suggest)
+		console.log('Try to get suggest at ' + suggest)
 		fetch(suggest, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json'
-			},
-		}).then(function (response) {
-			return response.json();
-		}).catch(function (error) {
-			todo(error);
-			console.error(error);
-		}).then(function (json) {
-			if (json[0]) {
-				var tags = "";
-				Object.keys(json).forEach(function (key4) {
-					var tag = json[key4];
-					tags = tags + '<a onclick="cgNP(\'' + json[key4] + '\')" class="pointer">' + escapeHTML(json[key4]) + '</a>  ';
-				});
-				$("#suggest").html("Cinderella NowPlaying:" + tags);
-			} else {
-				$("#suggest").html("Cinderella NowPlaying:Not Found");
 			}
-		});
+		})
+			.then(function(response) {
+				if (!response.ok) {
+					response.text().then(function(text) {
+						setLog(response.url, response.status, text)
+					})
+				}
+				return response.json()
+			})
+			.catch(function(error) {
+				todo(error)
+				setLog(start, 'JSON', error)
+				console.error(error)
+			})
+			.then(function(json) {
+				if (json[0]) {
+					var tags = ''
+					Object.keys(json).forEach(function(key4) {
+						var tag = json[key4]
+						tags =
+							tags +
+							`<a onclick="cgNp('${json[key4]}')" class="pointer">${escapeHTML(json[key4])}</a>`
+					})
+					$('#suggest').html('Cinderella NowPlaying:' + tags)
+				} else {
+					$('#suggest').html('Cinderella NowPlaying:Not Found')
+				}
+			})
 	}
-}
+}

app/js/post/use-txtbox.js

@@ -1,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'
+		}
+		$('#acct-sel-prof').attr('src', profimg)
 	}
-	$("#textarea").focus();
-	$("#post-acct-sel").val(acct_id);
-	$('select').formSelect();
-}
+	$('#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();
-		xmlHttpRequest.onreadystatechange = function () {
+	})
+	$('i.unparsed').each(function(i, elem) {
+		var dem = $(this).text()
+		var dom = $(this)
+		var start = './js/emoji/emoji-map.json'
+		var xmlHttpRequest = new XMLHttpRequest()
+		xmlHttpRequest.onreadystatechange = function() {
 			if (this.readyState === 4 && this.status === 200) {
 				if (this.response) {
-					var json = this.response;
-					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 = '';
-					}
-					$("[toot-id=" + id + "] .additional").html(
-						'<div class="pixiv-post"><b><a href="' + json.author_url + '" target="_blank">' + escapeHTML(json.author_name) + '</a></b><br>' + escapeHTML(json.title) + pxvImg + '</div>');
-				} else {
+					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 + "] .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')
 					}
-					if (json.html) {
-						$("[toot-id=" + id + "] .additional").html(json.html + '<i class="material-icons sml pointer" onclick="pip(\'' + id + '\')" title="' + lang.lang_cards_pip + '">picture_in_picture_alt</i>');
-
-					}
-				}
-				if (json.title) {
-					$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
-					$("[toot-id=" + id + "]").addClass("parsed");
-				}
-			});
+				})
 		}
-
 	}
 }
+function cardHtml(json, acct_id, id) {
+	var analyze = ''
+	var domain = json.url.match(/^https?:\/{2,}(.*?)(?:\/|\?|#|$)/)[1];
+	var ok = [
+		"pixiv.net",
+		"twitter.com",
+		"mobile.twitter.com",
+		"open.spotify.com",
+		"youtube.com",
+		"youtu.be",
+		"m.youtube.com",
+		"www.youtube.com",
+		"nicovideo.jp",
+		"twitcasting.tv"
+	]
+	var isHad = _.includes(ok, domain);
+	if (json.provider_name == 'pixiv') {
+		if (json.image) {
+			var pxvImg = `
+			<br><img src="${json.image}" style="max-width:100%" 
+					onclick="imgv('pixiv_${id}',0,'pixiv')" id="pixiv_${id}-image-0" 
+					data-url="${json.embed_url}" 
+				data-type="image">
+			`
+		} else {
+			var pxvImg = ''
+		}
+		analyze = `<div class="pixiv-post"><b><a href="
+				${json.author_url}
+				" target="_blank">
+				${escapeHTML(json.author_name)}
+				</a></b><br>
+				${escapeHTML(json.title)}
+				${pxvImg}
+				</div>`
+	} else {
+		if (json.title) {
+			analyze = `<span class="gray">URL
+					${lang.lang_cards_check}
+					:<br>Title:
+					${escapeHTML(json.title)}
+					<br>
+					${escapeHTML(json.description)}
+					</span>`
+		}
 
+		if (json.html || json.provider_name == 'Twitter') {
+			if(isHad) {
+				var prved = `<img class="emoji" draggable="false" alt="✅" 
+					src="https://twemoji.maxcdn.com/v/12.1.3/72x72/2705.png">`
+				var title = lang.lang_cards_trusted
+			}else{
+				var prved = '<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/26a0.png">'
+				var title = lang.lang_cards_untrusted
+			}
+			analyze =`<a onclick="cardHtmlShow('${acct_id}','${id}')" class="add-show pointer" title="${title}">
+			${lang.lang_parse_html}(${domain})${prved}
+			</a>${analyze}<br>`
+		}
+	}
+	return analyze
+}
+function cardHtmlShow(acct_id, id) {
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var text = $('[toot-id=' + id + '] .toot a').attr('href')
+	var urls = text.match(
+		/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
+	)
+	var id = $('[toot-id=' + id + '] .toot a')
+		.parents('.cvo')
+		.attr('toot-id')
+	var start = 'https://' + domain + '/api/v1/statuses/' + id
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
+		}
+		//body: JSON.stringify({})
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			json = json.card
+			if (json.html) {
+				analyze =
+					json.html +
+					`<i class="material-icons sml pointer" onclick="pip('
+								${id}
+								')" title="
+								${lang.lang_cards_pip}
+								">picture_in_picture_alt</i>`
+			}
+			if (json.provider_name == 'Twitter') {
+				var url = json.author_url
+				var status = json.url.match(/^https:\/\/twitter.com\/[_a-zA-Z0-9-]+\/status\/([0-9]+)/);
+				var statusId = false
+				if(status){
+					if(status.length > 0){
+						var statusId = status[1]
+					}
+				}
+				console.log(statusId)
+				if(statusId){
+					url = json.url
+					analyze = `
+					<blockquote class="twitter-tweet" data-dnt="true"><strong>${json.author_name}</strong><br>${json.description}<a href="${url}">${json.url}</a></blockquote>
+					<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script> 
+					`
+				}
+			}
+			$('[toot-id=' + id + '] .additional').html(analyze)
+		})
+}
 //各TL上方のLink[On/Off]
 function cardToggle(tlid) {
-	var card = localStorage.getItem("card_" + tlid);
+	var card = localStorage.getItem('card_' + tlid)
 	if (!card) {
-		localStorage.setItem("card_" + tlid, "true");
-		$("#sta-card-" + tlid).text("Off");
-		$("#sta-card-" + tlid).css("color", 'red');
+		localStorage.setItem('card_' + tlid, 'true')
+		$('#sta-card-' + tlid).text('Off')
+		$('#sta-card-' + tlid).css('color', 'red')
 	} else {
-		localStorage.removeItem("card_" + tlid);
-		$("#sta-card-" + tlid).text("On");
-		$("#sta-card-" + tlid).css("color", '#009688');
+		localStorage.removeItem('card_' + tlid)
+		$('#sta-card-' + tlid).text('On')
+		$('#sta-card-' + tlid).css('color', '#009688')
 	}
 }
 //各TL上方のLink[On/Off]をチェック
 function cardCheck(tlid) {
-	var card = localStorage.getItem("card_" + tlid);
+	var card = localStorage.getItem('card_' + tlid)
 	if (!card) {
-		$("#sta-card-" + tlid).text("On");
-		$("#sta-card-" + tlid).css("color", '#009688');
+		$('#sta-card-' + tlid).text('On')
+		$('#sta-card-' + tlid).css('color', '#009688')
 	} else {
-		$("#sta-card-" + tlid).text("Off");
-		$("#sta-card-" + tlid).css("color", 'red');
+		$('#sta-card-' + tlid).text('Off')
+		$('#sta-card-' + tlid).css('color', 'red')
 	}
 }
 
 function mov(id, tlid, type) {
-	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/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,31 +1,38 @@
 //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) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (json) {
-		var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + '</div>';
-		localStorage.setItem("lastobj_" + tlid, json[0].id)
-		$("#timeline_" + tlid).html(templete);
-		additional(acct_id, tlid);
-		jQuery("time.timeago").timeago();
-		todc();
-		//reload(type, '', acct_id, tlid, data, mute, delc,voice);
-		$(window).scrollTop(0);
-	});
-
+			"content-type": "application/json",
+			Authorization: "Bearer " + at
+		}
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text);
+				});
+			}
+			return response.json();
+		})
+		.catch(function(error) {
+			todo(error);
+			setLog(start, "JSON", error);
+			console.error(error);
+		})
+		.then(function(json) {
+			var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>";
+			localStorage.setItem("lastobj_" + tlid, json[0].id);
+			$("#timeline_" + tlid).html(templete);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			todc();
+			//reload(type, '', acct_id, tlid, data, mute, delc,voice);
+			$(window).scrollTop(0);
+		});
 }
 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) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (json) {
-		var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + '</div>';
-		$("#timeline_" + tlid).append(templete);
-		additional(acct_id, tlid);
-		jQuery("time.timeago").timeago();
-		moreloading = false;
+			"content-type": "application/json",
+			Authorization: "Bearer " + at
+		}
 	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text);
+				});
+			}
+			return response.json();
+		})
+		.catch(function(error) {
+			todo(error);
+			setLog(start, "JSON", error);
+			console.error(error);
+		})
+		.then(function(json) {
+			var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>";
+			$("#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) {
@@ -198,7 +216,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	}
 	var local = [];
 	var times = [];
-	Object.keys(obj).forEach(function (key) {
+	Object.keys(obj).forEach(function(key) {
 		var conv_id = obj[key].id;
 		var toot = obj[key].last_status;
 		var dis_name = escapeHTML(toot.account.display_name);
@@ -209,14 +227,12 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//絵文字があれば
 		if (actemojick) {
-			Object.keys(toot.account.emojis).forEach(function (key5) {
+			Object.keys(toot.account.emojis).forEach(function(key5) {
 				var emoji = toot.account.emojis[key5];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url +
-					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				dis_name = dis_name.replace(regExp, emoji_url);
-
 			});
 		}
 		var noticeavatar = "";
@@ -232,7 +248,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var fullname = toot.account.acct + "@" + domain;
 		}
 		if (useremp) {
-			Object.keys(useremp).forEach(function (key10) {
+			Object.keys(useremp).forEach(function(key10) {
 				var user = useremp[key10];
 				if (user == fullname) {
 					boostback = "emphasized";
@@ -247,19 +263,19 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var locked = "";
 		}
 		if (!toot.application) {
-			var via = '';
+			var via = "";
 			viashow = "hide";
 		} else {
 			var via = escapeHTML(toot.application.name);
 			//強調チェック
-			Object.keys(emp).forEach(function (key6) {
+			Object.keys(emp).forEach(function(key6) {
 				var cli = emp[key6];
 				if (cli == via) {
 					boostback = "emphasized";
 				}
 			});
 			//ミュートチェック
-			Object.keys(mute).forEach(function (key7) {
+			Object.keys(mute).forEach(function(key7) {
 				var cli = mute[key7];
 				if (cli == via) {
 					boostback = "hide";
@@ -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 = "";
@@ -314,11 +329,10 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//絵文字があれば
 		if (emojick) {
-			Object.keys(toot.emojis).forEach(function (key5) {
+			Object.keys(toot.emojis).forEach(function(key5) {
 				var emoji = toot.emojis[key5];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url +
-					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
@@ -332,11 +346,10 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//絵文字があれば
 		if (nicoemojick) {
-			Object.keys(toot.profile_emojis).forEach(function (keynico) {
+			Object.keys(toot.profile_emojis).forEach(function(keynico) {
 				var emoji = toot.profile_emojis[keynico];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url +
-					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
@@ -356,21 +369,17 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if (mediack) {
 			hasmedia = "hasmedia";
 			var cwdt = 100 / toot.media_attachments.length;
-			Object.keys(toot.media_attachments).forEach(function (key2) {
+			Object.keys(toot.media_attachments).forEach(function(key2) {
 				var media = toot.media_attachments[key2];
 				var purl = media.preview_url;
 				media_ids = media_ids + media.id + ",";
 				var url = media.url;
 				if (toot.sensitive && nsfw) {
-					var sense = "sensitive"
+					var sense = "sensitive";
 				} else {
-					var sense = ""
+					var sense = "";
 				}
-				viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
-					acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
-					'" data-type="' + media.type + '" class="img-parsed"><img src="' +
-					purl + '" class="' + sense +
-					' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;"></a></span>';
+				viewer = viewer + "<a onclick=\"imgv('" + id + "','" + key2 + "','" + acct_id + '\')" id="' + id + "-image-" + key2 + '" data-url="' + url + '" data-type="' + media.type + '" class="img-parsed"><img src="' + purl + '" class="' + sense + ' toot-img pointer" style="width:' + cwdt + "%; height:" + imh + 'px;"></a></span>';
 			});
 			media_ids = media_ids.slice(0, -1);
 		} else {
@@ -382,24 +391,21 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		//メンションであれば
 		if (menck) {
 			mentions = "";
-			Object.keys(toot.mentions).forEach(function (key3) {
+			Object.keys(toot.mentions).forEach(function(key3) {
 				var mention = toot.mentions[key3];
-				mentions = mentions + '<a onclick="udg(\'' + mention.id + '\',' +
-					acct_id + ')" class="pointer">@' + mention.acct + '</a> ';
+				mentions = mentions + "<a onclick=\"udg('" + mention.id + "'," + acct_id + ')" class="pointer">@' + mention.acct + "</a> ";
 			});
-			mentions = '<div style="float:right">' + mentions + '</div>';
+			mentions = '<div style="float:right">' + mentions + "</div>";
 		}
 		var tagck = toot.tags[0];
 		var tags = "";
 		//タグであれば
 		if (tagck) {
-			Object.keys(toot.tags).forEach(function (key4) {
+			Object.keys(toot.tags).forEach(function(key4) {
 				var tag = toot.tags[key4];
-				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ':<a onclick="tl(\'tag\',\'' + tag.name + '\',' + acct_id +
-					',\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag.name) + '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag.name) + '">Toot</a>　' +
-					'<a onclick="tagPin(\'' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag.name) + '">Pin</a></span> ';
+				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ":<a onclick=\"tl('tag','" + tag.name + "'," + acct_id + ',\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", "#" + tag.name) + '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", "#" + tag.name) + '">Toot</a>　' + "<a onclick=\"tagPin('" + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagpin.replace("{{tag}}", "#" + tag.name) + '">Pin</a></span> ';
 			});
-			tags = '<div style="float:right">' + tags + '</div>';
+			tags = '<div style="float:right">' + tags + "</div>";
 		}
 		//アニメ再生
 		if (gif == "yes") {
@@ -409,13 +415,13 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//ワードミュート
 		if (wordmute) {
-			Object.keys(wordmute).forEach(function (key8) {
+			Object.keys(wordmute).forEach(function(key8) {
 				var worde = wordmute[key8];
 				if (worde) {
 					if (worde.tag) {
 						var word = worde.tag;
 					} else {
-						var word = worde
+						var word = worde;
 					}
 					var regExp = new RegExp(word, "g");
 					if ($.strip_tags(content).match(regExp)) {
@@ -426,7 +432,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//ワード強調
 		if (wordemp) {
-			Object.keys(wordemp).forEach(function (key9) {
+			Object.keys(wordemp).forEach(function(key9) {
 				var word = wordemp[key9];
 				if (word) {
 					var word = word.tag;
@@ -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();
+		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();
+		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) {
-		if (json) {
-			var filters = "";
-			Object.keys(json).forEach(function (key) {
-				var filterword = json[key];
-				var context = filterword.context.join(',');
-				filters = filters + escapeHTML(filterword.phrase) + '<span class="sml">(for ' + context + ')</span>:<a onclick="filterEdit(\'' + filterword.id + '\',\'' + acct_id +
-					'\')" class="pointer">' + lang.lang_edit + '</a>/<a onclick="filterDel(' + filterword.id + ',' + acct_id +
-					')" class="pointer">' + lang.lang_del + '</a><br> ';
-			});
-			if (filters == "") {
-				filters = lang.lang_filter_nodata + "<br>";
+	})
+		.then(function (response) {
+			if (!response.ok) {
+				response.text().then(function (text) {
+					setLog(response.url, response.status, text)
+				})
 			}
-			$("#filtered-words").html(filters);
-		} else {
-			$("#filtered-words").html(lang_filter_nodata);
-		}
-	});
+			return response.json()
+		})
+		.catch(function (error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function (json) {
+			if (json) {
+				var filters = ''
+				Object.keys(json).forEach(function (key) {
+					var filterword = json[key]
+					var context = filterword.context.join(',')
+					filters =
+						filters +
+						escapeHTML(filterword.phrase) +
+						`<span class="sml">(for ${context})</span>:
+						<a onclick="filterEdit('${filterword.id}','${acct_id}')" class="pointer">
+							${lang.lang_edit}
+						</a>/
+						<a onclick="filterDel('${filterword.id}','${acct_id}')" class="pointer">
+							${lang.lang_del}
+						</a><br> `
+				})
+				if (filters == '') {
+					filters = lang.lang_filter_nodata + '<br>'
+				}
+				$('#filtered-words').html(filters)
+			} else {
+				$('#filtered-words').html(lang_filter_nodata)
+			}
+		})
 }
 function filterTime(day, hour, min) {
-	$("#days_filter").val(day)
-	$("#hours_filter").val(hour)
-	$("#mins_filter").val(min)
+	$('#days_filter').val(day)
+	$('#hours_filter').val(hour)
+	$('#mins_filter').val(min)
 }
 function makeNewFilter() {
-	var acct_id = $("#filter-acct-sel").val();
-	var phr = $("#filter-add-word").val();
-	var cont = [];
-	if ($("#home_filter:checked").val()) {
-		cont.push("home");
+	var acct_id = $('#filter-acct-sel').val()
+	var phr = $('#filter-add-word').val()
+	var cont = []
+	if ($('#home_filter:checked').val()) {
+		cont.push('home')
 	}
-	if ($("#local_filter:checked").val()) {
-		cont.push("public");
+	if ($('#local_filter:checked').val()) {
+		cont.push('public')
 	}
-	if ($("#notf_filter:checked").val()) {
-		cont.push("notifications");
+	if ($('#notf_filter:checked').val()) {
+		cont.push('notifications')
 	}
-	if ($("#conv_filter:checked").val()) {
-		cont.push("thread");
+	if ($('#conv_filter:checked').val()) {
+		cont.push('thread')
+	}
+	if ($('#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({
-		phrase: phr,
-		context: cont,
-		irreversible: exc,
-		whole_word: who,
-		expires_in: time
-	}));
+	var httpreq = new XMLHttpRequest()
+	httpreq.open(method, start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send(
+		JSON.stringify({
+			phrase: phr,
+			context: cont,
+			irreversible: exc,
+			whole_word: who,
+			expires_in: time,
+		})
+	)
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response;
-			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) {
-		if (json) {
-			var now = new Date();
-			now = now.getTime();
-			var now = Math.floor(now / 1000);
-			$("#filter-add-word").val(json.phrase);
-			Object.keys(json.context).forEach(function (key) {
-				var context = json.context[key];
-				$("[value=" + context + "]").prop("checked", true);
-			});
-			if (json.irreversible) {
-				$("#except_filter").prop("checked", true);
+	})
+		.then(function (response) {
+			if (!response.ok) {
+				response.text().then(function (text) {
+					setLog(response.url, response.status, text)
+				})
 			}
-			if (json.whole_word) {
-				$("#wholeword_filter").prop("checked", true);
+			return response.json()
+		})
+		.catch(function (error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function (json) {
+			if (json) {
+				var now = new Date()
+				now = now.getTime()
+				var now = Math.floor(now / 1000)
+				$('#filter-add-word').val(json.phrase)
+				Object.keys(json.context).forEach(function (key) {
+					var context = json.context[key]
+					$('[value=' + context + ']').prop('checked', true)
+				})
+				if (json.irreversible) {
+					$('#except_filter').prop('checked', true)
+				}
+				if (json.whole_word) {
+					$('#wholeword_filter').prop('checked', true)
+				}
+				var expires = date(json.expires_at, 'unix') - now
+				var mins = Math.floor(expires / 60) % 60
+				var hours = Math.floor(expires / 3600) % 24
+				var days = Math.floor(expires / 3600 / 24)
+				$('#days_filter').val(days)
+				$('#hours_filter').val(hours)
+				$('#mins_filter').val(mins)
 			}
-			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();
+	localStorage.setItem('exclude-' + key, excludetxt)
+	parseColumn(key)
 }
 function excludeCk(key, target) {
-	var exc = localStorage.getItem("exclude-" + key);
+	var exc = localStorage.getItem('exclude-' + key)
 	if (!exc) {
-		return "";
+		return ''
 	}
 	if (~exc.indexOf(target)) {
-		return "checked"
+		return 'checked'
 	} else {
-		return "";
+		return ''
 	}
 }
-function checkNotfFilter(tlid){
-	var excludetxt = localStorage.getItem("exclude-" + tlid);
-	if(!excludetxt || excludetxt != ""){
-		return true;
-	}else{
-		return false;
-	}
-}
-function resetNotfFilter(tlid){
-	localStorage.setItem("exclude-" + tlid, "")
-	parseColumn();
-}
-function notfFilter(id,tlid,acct_id){
-	var excludetxt = localStorage.getItem("exclude-" + tlid);
-	if (excludetxt || excludetxt !="") {
-		excludetxt = excludetxt + "&account_id="+id
+function checkNotfFilter(tlid) {
+	var excludetxt = localStorage.getItem('exclude-' + tlid)
+	if (!excludetxt || excludetxt != '') {
+		return true
 	} else {
-		excludetxt = "?account_id="+id
+		return false
 	}
-	localStorage.setItem("exclude-" + tlid, excludetxt)
-	parseColumn();
-}
+}
+function resetNotfFilter(tlid) {
+	localStorage.setItem('exclude-' + tlid, '')
+	parseColumn(tlid)
+}
+function notfFilter(id, tlid, acct_id) {
+	var excludetxt = localStorage.getItem('exclude-' + tlid)
+	if (excludetxt || excludetxt != '') {
+		excludetxt = excludetxt + '&account_id=' + id
+	} else {
+		excludetxt = '?account_id=' + id
+	}
+	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 {
+					$('#lists').html(lang.lang_list_nodata)
+				}
+			})
 	} else {
-		var start = "https://" + domain + "/api/v1/lists"
+		var start = 'https://' + domain + '/api/v1/lists'
 		fetch(start, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			},
-		}).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({
-			title: text
-		}));
-		httpreq.onreadystatechange = function () {
+	var acct_id = $('#list-acct-sel').val()
+	var text = $('#list-add').val()
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	if (localStorage.getItem('mode_' + domain) != 'misskey') {
+		var start = 'https://' + domain + '/api/v1/lists'
+		var httpreq = new XMLHttpRequest()
+		httpreq.open('POST', start, true)
+		httpreq.setRequestHeader('Content-Type', 'application/json')
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+		httpreq.responseType = 'json'
+		httpreq.send(
+			JSON.stringify({
+				title: text
+			})
+		)
+		httpreq.onreadystatechange = function() {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.response;
-				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({
-			i: at,
-			title: text
-		}));
-		httpreq.onreadystatechange = function () {
+		var start = 'https://' + domain + '/api/users/lists/create'
+		var httpreq = new XMLHttpRequest()
+		httpreq.open('POST', start, true)
+		httpreq.setRequestHeader('Content-Type', 'application/json')
+		httpreq.responseType = 'json'
+		httpreq.send(
+			JSON.stringify({
+				i: at,
+				title: text
+			})
+		)
+		httpreq.onreadystatechange = function() {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.response;
-				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) {
-		if (json) {
-			var lists = "";
-			var templete = userparse(json, '', acct_id);
-			if (!json[0]) {
-				templete = lang.lang_list_nouser;
-			}
-			$("#lists-user").html(templete);
-		} else {
-			$("#lists-user").html(lang.lang_list_nouser);
+			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)
+				if (!json[0]) {
+					templete = lang.lang_list_nouser
+				}
+				$('#lists-user').html(templete)
+				jQuery('time.timeago').timeago()
+			} else {
+				$('#lists-user').html(lang.lang_list_nouser)
+			}
+		})
 }
 function hisList(user, acct_id) {
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	if (localStorage.getItem("mode_" + domain) != "misskey") {
-		var start = "https://" + domain + "/api/v1/lists"
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	if (localStorage.getItem('mode_' + domain) != 'misskey') {
+		var start = 'https://' + domain + '/api/v1/lists'
 		fetch(start, {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			},
-		}).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 {
+					$('#his-lists-b').html(lang.lang_list_nodata)
+				}
+			})
 	} else {
-		var start = "https://" + domain + "/api/users/lists/list"
+		var start = 'https://' + domain + '/api/users/lists/list'
 		fetch(start, {
 			method: 'POST',
 			body: JSON.stringify({
 				i: at
-			}),
-		}).then(function (response) {
-			return response.json();
-		}).catch(function (error) {
-			todo(error);
-			console.error(error);
-		}).then(function (json) {
-			if (json) {
-				var lists = "";
-				Object.keys(json).forEach(function (key) {
-					var list = json[key];
-					lists = lists + list.title + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
-						'\')" class="pointer">' + lang.lang_list_show + '</a>/<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
-						'\')" class="pointer">' + lang.lang_list_add + lang.lang_list_add_misskey + '</a><br>';
-				});
-				$("#his-lists-a").html(lists);
-			} else {
-				$("#his-lists-a").html(lang.lang_list_nodata);
-			}
-		});
-		$("#his-lists-b").html("");
+			})
+		})
+			.then(function(response) {
+				if (!response.ok) {
+					response.text().then(function(text) {
+						setLog(response.url, response.status, text)
+					})
+				}
+				return response.json()
+			})
+			.catch(function(error) {
+				todo(error)
+				setLog(start, 'JSON', error)
+				console.error(error)
+			})
+			.then(function(json) {
+				if (json) {
+					var lists = ''
+					Object.keys(json).forEach(function(key) {
+						var list = json[key]
+						lists =
+							lists +
+							list.title +
+							`:<a onclick="listShow('${list.id}','${escapeHTML(
+								list.title
+							)}','${acct_id}')" class="pointer">
+								${lang.lang_list_show}
+							</a>/
+							<a onclick="listAdd('${list.id}','${user}','${acct_id}')" class="pointer">
+								${lang.lang_list_add}
+								${lang.lang_list_add_misskey}
+							'</a><br>`
+					})
+					$('#his-lists-a').html(lists)
+				} else {
+					$('#his-lists-a').html(lang.lang_list_nodata)
+				}
+			})
+		$('#his-lists-b').html('')
 	}
 }
 function listAdd(id, user, acct_id) {
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		var start = "https://" + domain + "/api/users/lists/push"
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+		var start = 'https://' + domain + '/api/users/lists/push'
 		var i = {
 			i: at,
 			listId: id,
 			userId: user
 		}
 	} else {
-		var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
+		var start = 'https://' + domain + '/api/v1/lists/' + id + '/accounts'
 		var i = {
 			account_ids: [user]
 		}
 	}
-	var httpreq = new XMLHttpRequest();
-	httpreq.open('POST', start, true);
-	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = "json";
-	httpreq.send(JSON.stringify(i));
-	httpreq.onreadystatechange = function () {
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send(JSON.stringify(i))
+	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response;
+			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,22 +360,25 @@ function listRemove(id, user, acct_id) {
 			userId: user
 		}
 	} else {
-		var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
+		var start = 'https://' + domain + '/api/v1/lists/' + id + '/accounts'
 		var method = 'DELETE'
 		var i = {
 			account_ids: [user]
 		}
 	}
-	var httpreq = new XMLHttpRequest();
-	httpreq.open(method, start, true);
-	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = "json";
-	httpreq.send(JSON.stringify(i));
-	httpreq.onreadystatechange = function () {
+	var httpreq = new XMLHttpRequest()
+	httpreq.open(method, start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send(JSON.stringify(i))
+	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response;
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
 			hisList(user, acct_id)
 		}
 	}
-}
+}

app/js/tl/misskeyparse.js

@@ -184,9 +184,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				noticeavatar = toot.user.avatarUrl;
 			}
 			noticeavatar = '<a onclick="udg(\'' + toot.user.id +
-				'\',' + acct_id + ');" user="' + toot.user.username + '" class="udg">' +
+				'\',' + acct_id + ');" user="' + toot.user.username + '" class="udg notf-icon">' +
 				'<img src="' + noticeavatar +
-				'" width="20" class="notf-icon prof-img" user="' + toot.user.username +
+				'" width="20" class="prof-img" user="' + toot.user.username +
 				'"></a>';
 			if (toot.type == "reply") {
 				var what = lang.lang_parse_mentioned;
@@ -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], "*")
-					}
+					var n = new Notification('TheDesk:' + domain, options);
 				}
 				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">' + 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">' + 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) {
@@ -510,7 +496,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
 						'" data-type="image" class="img-parsed"><img src="' +
 						purl + '" class="' + sense +
-						' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;"></a></span>';
+						' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;" onerror="this.src=\'../../img/loading.svg\'"></a></span>';
 				}
 
 			});
@@ -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);
@@ -788,7 +774,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'\',' + acct_id + ');" user="' + toot.user.username + '" class="udg">' +
 			'<img src="' + avatar +
 			'" width="40" class="prof-img" user="' + toot.user.username +
-			'"></a></div>' +
+			'" onerror="this.src=\'../../img/loading.svg\'"></a></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;"> @' +
@@ -892,7 +878,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		}
 		var ftxt = lang.lang_parse_followed;
 		if (popup > 0 || popup == -1) {
-			var notftext = '<span class="cbadge"title="' + date(toot.createdAt,
+			var notftext = '<span class="cbadge" title="' + date(toot.createdAt,
 				'absolute') + '(' + lang.lang_parse_notftime + ')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 					datetype) +
 				'</span>' + ftxt + '<br>';
@@ -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], "*")
-				}
+				var n = new Notification('TheDesk:' + domain, options);
 			}
 		}
 		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);
-			}
-			var templete = "";
-			if (localStorage.getItem("filter_" + acct_id) != "undefined") {
-				var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "mix");
-			} else {
-				var mute = [];
-			}
-			Object.keys(timeline).forEach(function (key) {
-				var pkey = key * 1 + 1;
-				if (pkey < timeline.length) {
-					if (date(timeline[key].created_at, "unix") != date(timeline[pkey].created_at, "unix")) {
-						if (type == "integrated") {
-							templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
-						} else if (type == "plus") {
-							if (timeline[key].account.acct == timeline[key].account.username) {
-								templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "plus");
-							}
-						}
-					}
-				}
-
-			});
-			$("#landing_" + tlid).hide();
-			$("#timeline_" + tlid).html(templete);
-			mixre(acct_id, tlid, type, mute, delc, voice);
-			additional(acct_id, tlid);
-			jQuery("time.timeago").timeago();
-			todc();
-		});
-	});
+			Authorization: 'Bearer ' + at
+		}
+	})
+	if (!promise.ok) {
+		promise.text().then(function(text) {
+			setLog(promise.url, promise.status, text)
+		})
+	}
+	return await promise.json()
 }
 
-
 //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();
-			}
-
-		} else if (type == "update") {
-			var templete = parse([obj], '', acct_id, tlid, "", mute);
-			if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
-				if (voice) {
-					say(obj.content)
-				}
-				var templete = parse([obj], type, acct_id, tlid, "", mute, "mix");
-				var pool = localStorage.getItem("pool_" + tlid);
-				if (pool) {
-					pool = templete + pool;
-				} else {
-					pool = templete
-				}
-				localStorage.setItem("pool_" + tlid, pool);
-
-				scrollck();
-
-				additional(acct_id, tlid);
-				jQuery("time.timeago").timeago();
-			} else {
-				todo("二重取得発生中");
-			}
-
-		}
+	wsLocal[wslid].onmessage = function(mess) {
+		console.log('Receive Streaming API:(Integrated:Local)', mess)
+		integratedMessage(mess, acct_id, tlid, mute, voice)
 	}
-	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("二重取得発生中");
-			}
-		}
+	wsHome[wshid].onmessage = function(mess) {
+		console.log(['Receive Streaming API:(Integrated:Home)', mess])
+		integratedMessage(mess, acct_id, tlid, mute, voice)
 	}
-	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 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");
-							}
-						}
-					}
+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
 				}
-
-			});
-
-			$("#timeline_" + tlid).append(templete);
-			additional(acct_id, tlid);
-			jQuery("time.timeago").timeago();
-			moreloading = false;
-			todc();
-		});
-	});
-
-
+				localStorage.setItem('pool_' + tlid, pool)
+			}
+			scrollck()
+			additional(acct_id, tlid)
+			jQuery('time.timeago').timeago()
+		}
+	}
+}
+//ある程度のスクロールで発火
+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.onreadystatechange = function () {
+	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);
-				Object.keys(json).forEach(function (key) {
-					var obj = json[key];
-					if (lastnotf == obj.id && key > 0 && native == "yes") {
-						var ct = key;
+				var templete = ''
+				var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
+				localStorage.setItem('lastnotf_' + acct_id, json[0].id)
+				Object.keys(json).forEach(function(key) {
+					var obj = json[key]
+					if (lastnotf == obj.id && key > 0 && native == 'yes') {
+						var ct = key
 						if (key > 14) {
-							ct = "15+";
+							ct = '15+'
 						}
-						var os = localStorage.getItem("platform");
+						var os = localStorage.getItem('platform')
 						var options = {
 							body: ct + lang.lang_notf_new,
-							icon: localStorage.getItem("prof_" + acct_id)
-						};
-						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) {
-		if (json[0]) {
-			var templete = "";
-			var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
-			localStorage.setItem("lastnotf_" + acct_id, json[0].id);
-			Object.keys(json).forEach(function (key) {
-				var obj = json[key];
-				if (lastnotf == obj.id && key > 0 && native == "yes") {
-					var ct = key;
-					if (key > 14) {
-						ct = "15+";
+	fetch(start, i)
+		.then(function(response) {
+			console.log('header to get param:' + response.headers.get('link'))
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			if (json[0]) {
+				var templete = ''
+				var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
+				localStorage.setItem('lastnotf_' + acct_id, json[0].id)
+				Object.keys(json).forEach(function(key) {
+					var obj = json[key]
+					if (lastnotf == obj.id && key > 0 && native == 'yes') {
+						var ct = key
+						if (key > 14) {
+							ct = '15+'
+						}
+						var os = localStorage.getItem('platform')
+						var options = {
+							body: ct + lang.lang_notf_new,
+							icon: localStorage.getItem('prof_' + acct_id)
+						}
+						var n = new Notification('TheDesk:' + domain, options)
 					}
-					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);
+					var mute = getFilterTypeByAcct(acct_id, 'notif')
+					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
+					if (obj.type != 'follow' && obj.type != 'move') {
+						if (misskey) {
+							templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
+						} else {
+							templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
+						}
 					} else {
-						var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
-						postMessage(["nativeNotf", nativeNotfOpt], "*")
+						if (misskey) {
+							templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
+						} else {
+							templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
+						}
 					}
-
-				}
-				if (localStorage.getItem("filter_" + acct_id) != "undefined") {
-					var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "notif");
-				} else {
-					var mute = [];
-				}
-				if (obj.type != "follow") {
-					if (misskey) {
-						templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
-					} else {
-						templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute);
-					}
-				} else {
-					if (misskey) {
-						templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
-					} else {
-						templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1);
-					}
-
-				}
-			});
-			$("div[data-notf=" + acct_id + "]").html(templete);
-			$("#landing_" + tlid).hide();
-			jQuery("time.timeago").timeago();
-		}
-		$("#notf-box").addClass("fetched");
-		todc();
-		notfWS(misskey, acct_id, tlid, domain, at)
-	});
-
+				})
+				$('div[data-notf=' + acct_id + ']').html(templete)
+				$('#landing_' + tlid).hide()
+				jQuery('time.timeago').timeago()
+			}
+			$('#notf-box').addClass('fetched')
+			todc()
+			notfWS(misskey, acct_id, tlid, domain, at)
+		})
 }
 function notfWS(misskey, acct_id, tlid, domain, at) {
 	if (!misskey) {
-		if (localStorage.getItem("streaming_" + acct_id)) {
-			var wss = localStorage.getItem("streaming_" + acct_id)
+		if (localStorage.getItem('streaming_' + acct_id)) {
+			var wss = localStorage.getItem('streaming_' + acct_id)
 		} else {
-			var wss = "wss://" + domain
+			var wss = 'wss://' + domain
 		}
-		var start = wss + "/api/v1/streaming/?stream=user&access_token=" +
-			at;
-
-		var wsid = websocketNotf.length;
-		websocketNotf[acct_id] = new WebSocket(start);
-		websocketNotf[acct_id].onopen = function (mess) {
-			console.table({ "acct_id": acct_id, "type": "Connect Streaming API(Notf)", "domain": domain, "message": [mess] })
-			$("i[data-notf=" + acct_id + "]").removeClass("red-text");
+		var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
 
+		var wsid = websocketNotf.length
+		websocketNotf[acct_id] = new WebSocket(start)
+		websocketNotf[acct_id].onopen = function(mess) {
+			console.table({
+				acct_id: acct_id,
+				type: 'Connect Streaming API(Notf)',
+				domain: domain,
+				message: [mess]
+			})
+			$('i[data-notf=' + acct_id + ']').removeClass('red-text')
 		}
-		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");
+		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')
 			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);
-				} else {
-					templete = userparse([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], 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)
+					}
+					jQuery('time.timeago').timeago()
 				}
-				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();
+			} else if (type == 'delete') {
+				$('[toot-id=' + obj + ']').hide()
+				$('[toot-id=' + obj + ']').remove()
+			}
+		}
+		websocketNotf[acct_id].onerror = function(error) {
+			console.error('WebSocket Error ' + error)
+			errorct++
+			console.log(errorct)
+			if (errorct < 3) {
+				notfWS(misskey, acct_id, tlid, domain, at)
+			}
+		}
+		websocketNotf[acct_id].onclose = function(error) {
+			console.error('WebSocket Close ' + error)
+			errorct++
+			console.log(errorct)
+			if (errorct < 3) {
+				notfWS(misskey, acct_id, tlid, domain, at)
 			}
 		}
-		websocketNotf[acct_id].onerror = function (error) {
-			console.error('WebSocket Error ' + error);
-			notfWS(misskey, acct_id, tlid, domain, at)
-		};
 	}
 }
 //一定のスクロールで発火
 function notfmore(tlid) {
-	console.log({ "status": "kicked", "status": moreloading });
-	var multi = localStorage.getItem("column");
-	var obj = JSON.parse(multi);
-	var acct_id = obj[tlid].domain;
+	console.log({ status: 'kicked', status: moreloading })
+	var multi = localStorage.getItem('column')
+	var obj = JSON.parse(multi)
+	var acct_id = obj[tlid].domain
 	if (!type) {
-		var type = obj[tlid].type;
+		var type = obj[tlid].type
 	} else {
-		var data;
+		var data
 	}
-	var sid = $("#timeline_" + tlid + " .notif-marker").last().attr("data-maxid");
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var domain = localStorage.getItem("domain_" + acct_id);
+	var sid = $('#timeline_' + tlid + ' .notif-marker')
+		.last()
+		.attr('data-maxid')
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var domain = localStorage.getItem('domain_' + acct_id)
 	if (sid && !moreloading) {
-		moreloading = true;
-		var httpreq = new XMLHttpRequest();
-		if (localStorage.getItem("mode_" + domain) == "misskey") {
-			var misskey = true;
-			var start = "https://" + domain + "/api/i/notifications";
-			httpreq.open(POST, start, true);
-			httpreq.setRequestHeader('Content-Type', 'application/json');
+		moreloading = true
+		var httpreq = new XMLHttpRequest()
+		if (localStorage.getItem('mode_' + domain) == 'misskey') {
+			var misskey = true
+			var start = 'https://' + domain + '/api/i/notifications'
+			httpreq.open(POST, start, true)
+			httpreq.setRequestHeader('Content-Type', 'application/json')
 			var body = JSON.stringify({
 				i: at,
 				untilID: sid
-			});
+			})
 		} else {
-			var misskey = false;
-			if (localStorage.getItem("exclude-" + tlid)) {
-				var exc = localStorage.getItem("exclude-" + tlid) + "&max_id=" + sid;
+			var misskey = false
+			if (localStorage.getItem('exclude-' + tlid)) {
+				var exc = localStorage.getItem('exclude-' + tlid) + '&max_id=' + sid
 			} else {
-				var exc = "?max_id=" + sid;
+				var exc = '?max_id=' + sid
 			}
-			var start = "https://" + domain + "/api/v1/notifications" + exc;
-			httpreq.open("GET", start, true);
-			httpreq.setRequestHeader('Content-Type', 'application/json');
-			httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-			var body = "";
+			var start = 'https://' + domain + '/api/v1/notifications' + exc
+			httpreq.open('GET', start, true)
+			httpreq.setRequestHeader('Content-Type', 'application/json')
+			httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+			var body = ''
 		}
 
-		httpreq.responseType = "json";
-		httpreq.send(body);
-		httpreq.onreadystatechange = function () {
+		httpreq.responseType = 'json'
+		httpreq.send(body)
+		httpreq.onreadystatechange = function() {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.response;
-				console.log(["More notifications on " + tlid, json]);
-				var max_id = httpreq.getResponseHeader("link").match(/[?&]{1}max_id=([0-9]+)/)[1];
-				if (json[0]) {
-					var templete = "";
-					var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
-					localStorage.setItem("lastnotf_" + acct_id, json[0].id);
-					Object.keys(json).forEach(function (key) {
-						var obj = json[key];
-						if (localStorage.getItem("filter_" + acct_id) != "undefined") {
-							var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "notif");
-						} else {
-							var mute = [];
-						}
-						if (obj.type != "follow") {
-							if (misskey) {
-								templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
-							} else {
-								templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute);
-							}
-						} else {
-							if (misskey) {
-								templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
-							} else {
-								templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1);
-							}
-
-						}
-					});
-					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();
+				var json = httpreq.response
+				if (this.status !== 200) {
+					setLog(start, this.status, this.response)
 				}
-				$("#notf-box").addClass("fetched");
-				todc();
+				console.log(['More notifications on ' + tlid, json])
+				var max_id = httpreq.getResponseHeader('link').match(/[?&]{1}max_id=([0-9]+)/)[1]
+				if (json[0]) {
+					var templete = ''
+					var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
+					localStorage.setItem('lastnotf_' + acct_id, json[0].id)
+					Object.keys(json).forEach(function(key) {
+						var obj = json[key]
+						var mute = getFilterTypeByAcct(acct_id, 'notif')
+						if (obj.type != 'follow') {
+							if (misskey) {
+								templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
+							} else {
+								templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
+							}
+						} else {
+							if (misskey) {
+								templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
+							} else {
+								templete = templete + userparse([obj.account], 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()
+				}
+				$('#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");
-}
-function allNotfRead() {
-	var multi = localStorage.getItem("multi");
-	if (multi) {
-		var obj = JSON.parse(multi);
-		Object.keys(obj).forEach(function (key) {
-			notfCanceler(key)
-		});
+	$('.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)
 	}
 }
-allNotfRead()
+function allNotfRead() {
+	var multi = localStorage.getItem('multi')
+	if (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";
-		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];
-			}
-			//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;
-						}
-
-				});
-			}
-			});
-		}else{
-			html = parse(
-				obj, 'home', acct_id, tlid);
-			$("#timeline_" + tlid).html(html);
+			Authorization: 'Bearer ' + at
 		}
-			todc();
-			mixre(acct_id, tlid);
-			additional(acct_id, tlid);
-			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(jsonL) {
+			var start = 'https://' + domain + '/api/v1/timelines/home'
+			fetch(start, {
+				method: 'GET',
+				headers: {
+					'content-type': 'application/json',
+					Authorization: 'Bearer ' + at
+				}
+			})
+				.then(function(response) {
+					if (!response.ok) {
+						response.text().then(function(text) {
+							setLog(response.url, response.status, text)
+						})
+					}
+					return response.json()
+				})
+				.catch(function(error) {
+					todo(error)
+					setLog(start, 'JSON', error)
+					console.error(error)
+				})
+				.then(function(jsonH) {
+					var homearr = []
+					var timeline = jsonL.concat(jsonH)
+					timeline.sort(function(a, b) {
+						if (date(a.created_at, 'unix') >= date(b.created_at, 'unix')) return -1
+						if (date(a.created_at, 'unix') < date(b.created_at, 'unix')) return 1
+						return 0
+					})
+					if (type == 'integrated') {
+						timeline.splice(20)
+					}
+					var templete = ''
+					if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
+						var mute = getFilterType(JSON.parse(localStorage.getItem('filter_' + acct_id)), 'mix')
+					} else {
+						var mute = []
+					}
+					Object.keys(timeline).forEach(function(key) {
+						var pkey = key * 1 + 1
+						if (pkey < timeline.length) {
+							if (
+								date(timeline[key].created_at, 'unix') != date(timeline[pkey].created_at, 'unix')
+							) {
+								if (type == 'integrated') {
+									templete = templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'mix')
+								} else if (type == 'plus') {
+									if (timeline[key].account.acct == timeline[key].account.username) {
+										templete =
+											templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'plus')
+									}
+								}
+							}
+						}
+					})
+					$('#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;
-		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
+		}
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
 			}
-			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;
-						}
-
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(jsonL) {
+			var start = 'https://' + domain + '/api/v1/timelines/home?max_id=' + sid
+			fetch(start, {
+				method: 'GET',
+				headers: {
+					'content-type': 'application/json',
+					Authorization: 'Bearer ' + at
+				}
+			})
+				.then(function(response) {
+					if (!response.ok) {
+						response.text().then(function(text) {
+							setLog(response.url, response.status, text)
+						})
 					}
-				});
-			});
-			additional(acct_id, tlid);
-			jQuery("time.timeago").timeago();
-			todc();
-		});
-	});
+					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')
+									}
+								}
+							}
+						}
+					})
 
-}
+					$('#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")
-    } else {
-        $("#right-side").hide()
-        $("#emoji").addClass("hide")
-        $("#poll").addClass("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 {
+			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,97 +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");
-    } else {
-        if (!mul) {
-            $('.vote_' + acct_id + '_' + id + ' div').each(function (i, elem) {
-                if (i == to) {
-                    $(this).css("background-color", "var(--emphasized)");
-                    $(this).addClass("sel");
-                } else {
-                    $(this).css("background-color", "transparent")
-                    $(this).removeClass("sel");
-                }
-            });
-        } else {
-            $('.vote_' + acct_id + '_' + id + '_' + to).css("background-color", "var(--emphasized)")
-            $('.vote_' + acct_id + '_' + id + '_' + to).addClass("sel");
-        }
-    }
-
+function voteSelMastodon(acct_id, id, to, mul, elem) {
+	if ($(elem).hasClass('sel')) {
+		$(elem).css('background-color', 'transparent')
+		$(elem).removeClass('sel')
+	} else {
+		if (!mul) {
+			$('.vote_' + acct_id + '_' + id + ' div').css('background-color', 'transparent')
+			$('.vote_' + acct_id + '_' + id + ' div').removeClass('sel')
+			$(elem).css('background-color', 'var(--emphasized)')
+			$(elem).addClass('sel')
+		} else {
+			$(elem).css('background-color', 'var(--emphasized)')
+			$(elem).addClass('sel')
+		}
+	}
 }
-function voteMastodon(acct_id, id) {
-    var choice = [];
-    $('.vote_' + acct_id + '_' + id + ' div').each(function (i, elem) {
-        if ($(this).hasClass("sel")) {
-            choice.push(i + "");
-        }
-    });
-    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_" + acct_id + "_at");
-    var start = "https://" + domain + "/api/v1/polls/" + id + "/votes";
-    if (localStorage.getItem("mode_" + domain) == "misskey") {
-        return false;
-    }
-    var httpreq = new XMLHttpRequest();
-    httpreq.open('POST', start, true);
-    httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-    httpreq.responseType = "json";
-    httpreq.send(JSON.stringify({ choices: choice }));
-    httpreq.onreadystatechange = function () {
-        voteMastodonrefresh(acct_id, id)
-    }
+function voteMastodon(acct_id, id, target) {
+	var choice = []
+	$(`#vote${target} div`).each(function(i, elem) {
+		if ($(this).hasClass('sel')) {
+			choice.push(i + '')
+		}
+	})
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/polls/' + id + '/votes'
+	if (localStorage.getItem('mode_' + domain) == 'misskey') {
+		return false
+	}
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send(JSON.stringify({ choices: choice }))
+	httpreq.onreadystatechange = function() {
+		voteMastodonrefresh(acct_id, id, target)
+	}
 }
 function showResult(acct_id, id) {
-    $('.vote_' + acct_id + '_' + id + '_result').toggleClass("hide")
+	$('.vote_' + acct_id + '_' + id + '_result').toggleClass('hide')
+}
+function voteMastodonrefresh(acct_id, id, target) {
+	var datetype = localStorage.getItem('datetype')
+	if (!datetype) {
+		datetype = 'absolute'
+	}
+	var httpreqd = new XMLHttpRequest()
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/polls/' + id
+	httpreqd.open('GET', start, true)
+	httpreqd.setRequestHeader('Content-Type', 'application/json')
+	httpreqd.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreqd.responseType = 'json'
+	httpreqd.send()
+	httpreqd.onreadystatechange = function() {
+		if (httpreqd.readyState == 4) {
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			var json = httpreqd.response
+			console.log(['Refresh vote', json])
+			if (!json) {
+				return false
+			}
+			var poll = pollParse(json, acct_id, json.emojis)
+			$(`#vote${target}`).html(poll)
+		}
+	}
 }
-function voteMastodonrefresh(acct_id, id) {
-    var datetype = localStorage.getItem("datetype");
-    if (!datetype) {
-        datetype = "absolute";
-    }
-    var httpreqd = new XMLHttpRequest();
-    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_" + acct_id + "_at");
-    var start = "https://" + domain + "/api/v1/polls/" + id;
-    httpreqd.open('GET', start, true);
-    httpreqd.setRequestHeader('Content-Type', 'application/json');
-    httpreqd.responseType = 'json';
-    httpreqd.send(JSON.stringify({ i: at, noteId: id }));
-    httpreqd.onreadystatechange = function () {
-        if (httpreqd.readyState == 4) {
-            var json = httpreqd.response;
-            console.log(["Refresh vote", json]);
-            if (!json) {
-                return false;
-            }
-            var poll = "";
-            var choices = json.options;
-            var myvote = lang.lang_parse_voted;
-            var result_hide = "";
-            Object.keys(choices).forEach(function (keyc) {
-                var choice = choices[keyc];
-                if (!json.voted) {
-                    votesel = 'voteSelMastodon(\'' + acct_id + '\',\'' + json.id + '\',' + keyc + ',' + json.multiple + ')';
-                }
-                poll = poll + '<div class="pointer vote vote_' + acct_id + '_' + json.id + '_' + keyc + '" onclick="' + votesel + '">' + escapeHTML(choice.title) + '<span class="vote_' + acct_id + '_' + json.id + '_result ' + result_hide + '">(' + choice.votes_count + ')</span></div>';
-            });
-            poll = poll + myvote + '<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
-                '"><i class="far fa-calendar-times"></i>' +
-                date(json.expires_at, datetype) + '</span>';
-            $('.vote_' + acct_id + '_' + json.id).html(poll)
-        }
-    }
-}

app/js/tl/speech.js

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

app/js/tl/src.js

@@ -1,195 +1,360 @@
 //検索
 //検索ボックストグル
 function searchMenu() {
-	$("#left-menu div").removeClass("active");
-	$("#searchMenu").addClass("active");
-	$(".menu-content").addClass("hide");
-	$("#src-box").removeClass("hide");
-	$('ul.tabs').tabs('select_tab', 'src-sta');
-	$("#src-contents").html("");
+	$('#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]);
-		//ハッシュタグ
-		if (json.hashtags[0]) {
-			var tags = "";
-			Object.keys(json.hashtags).forEach(function (key4) {
-				var tag = json.hashtags[key4];
-				if (mode) {
-					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
-						'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
+			Authorization: 'Bearer ' + at
+		}
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			src('v1')
+			return false
+		})
+		.then(function(json) {
+			console.log(['Search', json])
+			//ハッシュタグ
+			if (json.hashtags[0]) {
+				var tags = ''
+				Object.keys(json.hashtags).forEach(function(key4) {
+					var tag = json.hashtags[key4]
+					if (mode) {
+						tags =
+							tags +
+							`<a onclick="tl('tag','${tag}','${acct_id}','add')" class="pointer">
+								#${escapeHTML(tag)}
+							</a>
+							<br> `
+					} else {
+						tags = tags + graphDraw(tag, acct_id)
+					}
+				})
+				$('#src-contents').append('Tags<br>' + tags)
+			}
+			//トゥート
+			if (json.statuses[0]) {
+				var templete = parse(json.statuses, '', acct_id)
+				$('#src-contents').append('<br>Mentions<br>' + templete)
+			}
+			//アカウント
+			if (json.accounts[0]) {
+				var templete = userparse(json.accounts, '', acct_id)
+				if (!offset) {
+					$('#src-contents').append(
+						`<br>Accounts<div id="src-accts">
+							${templete}
+							</div><a onclick="src(false,'more')" class="pointer">more...</a>`
+					)
 				} else {
-					tags = tags + graphDraw(tag, acct_id);
+					$('#src-accts').append(templete)
 				}
-
-			});
-			$("#src-contents").append("Tags<br>" + tags);
-		}
-		//トゥート
-		if (json.statuses[0]) {
-			var templete = parse(json.statuses, '', acct_id);
-			$("#src-contents").append("<br>Mentions<br>" + templete);
-		}
-		//アカウント
-		if (json.accounts[0]) {
-			var templete = userparse(json.accounts, '', acct_id);
-			$("#src-contents").append("<br>Accounts<br>" + 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();
+	}
+	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;
-		for (var i = 0; i < json.length; i++) {
-			var toot = json[i]["_source"];
-			if (lastid != toot.uri) {
-				if (toot && toot.account) {
-					templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
-				}
+		}
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
 			}
-			var lastid = toot.uri;
-		}
-		if (!templete) {
-			templete = lang.lang_details_nodata;
-		} else {
-			templete = templete + '<div class="hide ts-marker" data-maxid="' + max_id + '"></div>';
-		}
-		$("#timeline_" + tlid).html(templete);
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(raw) {
+			var templete = ''
+			var json = raw.hits.hits
+			var max_id = raw['hits'].length
+			for (var i = 0; i < json.length; i++) {
+				var toot = json[i]['_source']
+				if (lastid != toot.uri) {
+					if (toot && toot.account) {
+						templete = templete + parse([toot], 'noauth', null, tlid, 0, [], 'tootsearch')
+					}
+				}
+				var lastid = toot.uri
+			}
+			if (!templete) {
+				templete = lang.lang_details_nodata
+			} else {
+				templete = templete + `<div class="hide ts-marker" data-maxid="${max_id}"></div>`
+			}
+			$('#timeline_' + tlid).html(templete)
 
-		jQuery("time.timeago").timeago();
-	});
+			jQuery('time.timeago').timeago()
+		})
 }
 function moreTs(tlid, q) {
-	var sid = $("#timeline_" + tlid + " .ts-marker").last().attr("data-maxid");
-	moreloading = true;
-	var start = "https://tootsearch.chotto.moe/api/v1/search?from=" + sid + "&sort=created_at%3Adesc&q=" + q
-	$("#notice_" + tlid).text("tootsearch(" + q + ")");
-	$("#notice_icon_" + tlid).text("search");
+	var sid = $('#timeline_' + tlid + ' .ts-marker')
+		.last()
+		.attr('data-maxid')
+	moreloading = true
+	var start =
+		'https://tootsearch.chotto.moe/api/v1/search?from=' + sid + '&sort=created_at%3Adesc&q=' + q
+	$('#notice_' + tlid).text('tootsearch(' + q + ')')
+	$('#notice_icon_' + tlid).text('search')
 	fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json'
-		},
-	}).then(function (response) {
-		return response.json();
-	}).catch(function (error) {
-		todo(error);
-		console.error(error);
-	}).then(function (raw) {
-		var templete = "";
-		var json = raw.hits.hits;
-		var max_id = raw["hits"].length;
-		for (var i = 0; i < json.length; i++) {
-			var toot = json[i]["_source"];
-			if (lastid != toot.uri) {
-				if (toot && toot.account) {
-					templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
-				}
+		}
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
 			}
-			var lastid = toot.uri;
-		}
-		if (!templete) {
-			templete = lang.lang_details_nodata;
-		} else {
-			templete = templete + '<div class="hide ts-marker" data-maxid="' + max_id + '"></div>';
-		}
-		$("#timeline_" + tlid).append(templete);
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(raw) {
+			var templete = ''
+			var json = raw.hits.hits
+			var max_id = raw['hits'].length
+			for (var i = 0; i < json.length; i++) {
+				var toot = json[i]['_source']
+				if (lastid != toot.uri) {
+					if (toot && toot.account) {
+						templete = templete + parse([toot], 'noauth', null, tlid, 0, [], 'tootsearch')
+					}
+				}
+				var lastid = toot.uri
+			}
+			if (!templete) {
+				templete = lang.lang_details_nodata
+			} else {
+				templete = templete + `<div class="hide ts-marker" data-maxid="${max_id}"></div>`
+			}
+			$('#timeline_' + tlid).append(templete)
 
-		jQuery("time.timeago").timeago();
-	});
+			jQuery('time.timeago').timeago()
+		})
 }
 function graphDraw(tag, acct_id) {
-	var tags = "";
-	var his = tag.history;
-	var max = Math.max.apply(null, [his[0].uses, his[1].uses, his[2].uses, his[3].uses, his[4].uses, his[5].uses, his[6].uses]);
-	var six = 50 - (his[6].uses / max * 50);
-	var five = 50 - (his[5].uses / max * 50);
-	var four = 50 - (his[4].uses / max * 50);
-	var three = 50 - (his[3].uses / max * 50);
-	var two = 50 - (his[2].uses / max * 50);
-	var one = 50 - (his[1].uses / max * 50);
-	var zero = 50 - (his[0].uses / max * 50);
-	if (max === 0) {
-		tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
-			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toot(s)&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
-			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
-	} else {
-		tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
-			'<g><path d="M0,' + six + ' L10,' + five + ' 20,' + four + ' 30,' + three + ' 40,' + two + ' 50,' + one + ' 60,' + zero + '" style="stroke: #9e9e9e; stroke-width: 1;fill: none;"></path></g>' +
-			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toot&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
-			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
-	}
-
-	return tags;
+	var tags = ''
+	var his = tag.history
+	return graphDrawCore(his, tag)
+}
+function graphDrawCore(his, tag) {
+	var max = Math.max.apply(null, [
+		his[0].uses,
+		his[1].uses,
+		his[2].uses,
+		his[3].uses,
+		his[4].uses,
+		his[5].uses,
+		his[6].uses
+	])
+	var six = 50 - (his[6].uses / max) * 50
+	var five = 50 - (his[5].uses / max) * 50
+	var four = 50 - (his[4].uses / max) * 50
+	var three = 50 - (his[3].uses / max) * 50
+	var two = 50 - (his[2].uses / max) * 50
+	var one = 50 - (his[1].uses / max) * 50
+	var zero = 50 - (his[0].uses / max) * 50
+	return `<div class="tagComp">
+				<div class="tagCompSvg">
+					<svg version="1.1" viewbox="0 0 60 50" width="60" height="50">
+						<g>
+							<path d="M0,${six} L10,${five} 20,${four} 30,${three} 40,${two} 50,${one} 60,${zero} 61,61 0,61" 
+							style="stroke: #0f8c0c;fill: rgba(13,113,19,.25); stroke-width: 1;">
+								</path>
+						</g>
+					</svg>
+				</div>
+				<div class="tagCompToot">
+					<span style="font-size:200%">${his[0].uses}</span>
+				</div>
+				<div class="tagCompToots">
+					toot
+				</div>
+				<div class="tagCompTag">
+					<a onclick="tl('tag','${escapeHTML(
+						tag.name
+					)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
+						#${escapeHTML(tag.name)}
+					</a>
+				</div>
+				<div class="tagCompUser">
+					${his[0].accounts}
+					${lang.lang_src_people}
+				</div>
+				</div>`
 }
 /*
 <svg version="1.1" viewbox="0 0 50 300" width="100%" height="50">
 	<path d="M0,0 L10,0 20,10 20,50" fill="#3F51B5"></path>
 </svg>
-*/
+*/
+function trend() {
+	console.log('get trend')
+	$('#src-contents').html('')
+	var acct_id = $('#src-acct-sel').val()
+	if (acct_id == 'tootsearch') {
+		return false
+	}
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/trends'
+	console.log(start)
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
+		}
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			var tags = ''
+			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) + "]").toggleClass("hide");
+	console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']')
+	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
 }
 //タグ追加
 function tagPin(tag) {
-    var tags = localStorage.getItem("tag");
-    if (!tags) {
-        var obj = [];
-    } else {
-        var obj = JSON.parse(tags);
-    }
-    var can;
-    Object.keys(obj).forEach(function (key) {
-        var tagT = obj[key];
-        if (tagT == tag) {
-            can = true;
-        } else {
-            can = false;
-        }
-    });
-    if (!can) {
-        obj.push(tag);
-    }
-    var json = JSON.stringify(obj);
-    localStorage.setItem("tag", json);
-    favTag();
+	var tags = localStorage.getItem('tag')
+	if (!tags) {
+		var obj = []
+	} else {
+		var obj = JSON.parse(tags)
+	}
+	var can
+	Object.keys(obj).forEach(function(key) {
+		var tagT = obj[key]
+		if (tagT == tag) {
+			can = true
+		} else {
+			can = false
+		}
+	})
+	if (!can) {
+		obj.push(tag)
+	}
+	var json = JSON.stringify(obj)
+	localStorage.setItem('tag', json)
+	favTag()
 }
 //タグ削除
 function tagRemove(key) {
-    var tags = localStorage.getItem("tag");
-    var obj = JSON.parse(tags);
-    obj.splice(key, 1);
-    var json = JSON.stringify(obj);
-    localStorage.setItem("tag", json);
-    favTag();
+	var tags = localStorage.getItem('tag')
+	var obj = JSON.parse(tags)
+	obj.splice(key, 1)
+	var json = JSON.stringify(obj)
+	localStorage.setItem('tag', json)
+	favTag()
 }
 function favTag() {
-    $("#taglist").html("");
-    var tagarr = localStorage.getItem("tag");
-    if (!tagarr) {
-        var obj = [];
-    } else {
-        var obj = JSON.parse(tagarr);
-    }
-    var tags = "";
-    var nowPT = localStorage.getItem("stable")
-    Object.keys(obj).forEach(function (key) {
-        var tag = obj[key];
-        if (nowPT != tag) {
-            console.log("stable tags:" + nowPT + "/" + tag);
-            var ptt = lang.lang_tags_realtime;
-            var nowon = "";
-        } else {
-            var ptt = lang.lang_tags_unrealtime;
-            var nowon = "(" + lang.lang_tags_realtime + ")";
-        }
-        tag = escapeHTML(tag);
-        tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a>' + nowon + '<span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a>　' +
-            '<a onclick="autoToot(\'' + tag + '\');" class="pointer" title="' + lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">' + ptt + '</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' + lang.lang_tags_tagunpin.replace("{{tag}}", '#' + tag) + '">' + lang.lang_del + '</a></span> ';
-    });
-    if (obj.length > 0) {
-        $("#taglist").append("My Tags:" + tags);
-    } else {
-        $("#taglist").append("");
-    }
+	$('#taglist').html('')
+	var tagarr = localStorage.getItem('tag')
+	if (!tagarr) {
+		var obj = []
+	} else {
+		var obj = JSON.parse(tagarr)
+	}
+	var tags = ''
+	var nowPT = localStorage.getItem('stable')
+	Object.keys(obj).forEach(function(key) {
+		var tag = obj[key]
+		if (nowPT != tag) {
+			console.log('stable tags:' + nowPT + '/' + tag)
+			var ptt = lang.lang_tags_realtime
+			var nowon = ''
+		} else {
+			var ptt = lang.lang_tags_unrealtime
+			var nowon = '(' + lang.lang_tags_realtime + ')'
+		}
+		tag = escapeHTML(tag)
+		tags =
+			tags +
+			`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
+			${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
+			<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}">
+				TL
+			</a>　
+			<a onclick="brInsert('#${tag}')" class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
+				Toot
+			</a>　
+			<a onclick="autoToot('${tag}');" class="pointer" title="${lang.lang_tags_always}${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
+				${ptt}
+			</a>　
+			<a onclick="tagRemove('${key}')" class="pointer" title="${lang.lang_tags_tagunpin.replace('{{tag}}', '#' + tag)}">
+				${lang.lang_del}
+			</a>
+			</span> `
+	})
+	if (obj.length > 0) {
+		$('#taglist').append('My Tags:' + tags)
+	} else {
+		$('#taglist').append('')
+	}
 }
 function trendTag() {
-    $(".trendtag").remove();
-    var domain = "imastodon.net"
-    var at = localStorage.getItem("acct_" + acct_id + "_at");
-    var start = "https://" + domain + "/api/v1/trend_tags"
-    fetch(start, {
-        method: 'GET',
-        headers: {
-            'content-type': 'application/json',
-            'Authorization': 'Bearer ' + at
-        },
-    }).then(function (response) {
-        return response.json();
-    }).catch(function (error) {
-        todo(error);
-        console.error(error);
-    }).then(function (json) {
-        if (json) {
-            var tags = "";
-            json = json.score;
-            Object.keys(json).forEach(function (tag) {
-                tag = escapeHTML(tag);
-                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span> ';
-            });
-            $("#taglist").append('<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags + '</div>');
-            trendintervalset()
-        } else {
-            $("#taglist").html("");
-        }
-    });
-
+	$('.trendtag').remove()
+	var domain = 'imastodon.net'
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/trend_tags'
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
+		}
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			if (json) {
+				var tags = ''
+				json = json.score
+				Object.keys(json).forEach(function(tag) {
+					tag = escapeHTML(tag)
+					tags =
+						tags +
+						`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
+						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
+						<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
+						<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">
+							Toot
+						</a>
+						</span> `
+				})
+				$('#taglist').append(
+					'<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' +
+						tags +
+						'</div>'
+				)
+				trendintervalset()
+			} else {
+				$('#taglist').html('')
+			}
+		})
 }
 
 function trendintervalset() {
-    setTimeout(trendTag, 6000000);
+	setTimeout(trendTag, 6000000)
 }
 function tagTL(a, b, c, d) {
-    var acct_id = $("#post-acct-sel").val();
-    tl(a, b, acct_id, d);
+	var acct_id = $('#post-acct-sel').val()
+	tl(a, b, acct_id, d)
 }
 function autoToot(tag) {
-    tag = escapeHTML(tag)
-    var nowPT = localStorage.getItem("stable")
-    if (nowPT == tag) {
-        localStorage.removeItem("stable");
-        M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
-    } else {
-        localStorage.setItem("stable", tag);
-        M.toast({ html: lang.lang_tags_tagwarn.replace("{{tag}}", tag).replace("{{tag}}", tag), displayLength: 3000 })
-        brInsert('#' + tag + " ")
-    }
-    favTag();
-}
+	tag = escapeHTML(tag)
+	var nowPT = localStorage.getItem('stable')
+	if (nowPT == tag) {
+		localStorage.removeItem('stable')
+		M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
+	} else {
+		localStorage.setItem('stable', tag)
+		M.toast({
+			html: lang.lang_tags_tagwarn.replace('{{tag}}', tag).replace('{{tag}}', tag),
+			displayLength: 3000
+		})
+		brInsert('#' + tag + ' ')
+	}
+	favTag()
+}
+//タグをフィーチャー
+function tagFeature(name, acct_id) {
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/featured_tags'
+	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);
-	$(document).ready(function () {
-		if (type == "image") {
-			$('#imagemodal').modal('open');
-			xhr = new XMLHttpRequest;
-			xhr.open('GET', murl, true);
-			xhr.addEventListener('progress', function (event) {
-				if (event.lengthComputable) {
-					var total = event.total;
-					var now = event.loaded;
-					var per = now / total * 100;
-					$("#imgprog").text(Math.floor(per));
-				}
-			}, false);
-			xhr.addEventListener('loadend', function (event) {
-				var total = event.total;
-				var now = event.loaded;
-				var per = now / total * 100;
-				$("#imgprog").text(Math.floor(per));
-			}, false);
-			xhr.send();
-			$('#imgmodal').attr('src', murl);
-			$('#imagewrap').dragScroll(); // ドラッグスクロール設定
-			$('#imgmodal').show();
-			$('#imagemodal').attr('data-key', key);
-			$('#imagemodal').attr('data-id', id);
-		} else if (type == "video" || type == "gifv") {
-			$('#video').attr('src', murl);
-			$('#videomodal').modal('open');
-			$('#imgmodal').show();
+	$('#imgprog').text(0)
+	$('#imgsec').text(0)
+	$('#imgmodal').hide()
+	$('#imgmodal').attr('src', '../../img/loading.svg')
+	var murl = $('#' + id + '-image-' + key).attr('data-url')
+	var ourl = $('#' + id + '-image-' + key).attr('data-original')
+	if (!ourl || ourl == 'null') {
+		ourl = murl
+	}
+	var type = $('#' + id + '-image-' + key).attr('data-type')
+	$('#imagemodal').attr('data-id', id)
+	$('#imagemodal').attr('data-acct', acct_id)
+	$('#imagemodal').attr('data-original', ourl)
+	$('#imagemodal').attr('data-image', murl)
+	//表示はリモートを使うか(どちらにしろコピーはオリジナル)
+	var remote_img = localStorage.getItem('remote_img')
+	if (remote_img == 'yes') {
+		murl = ourl
+	}
+	$(document).ready(function() {
+		if (type == 'image') {
+			$('#imagemodal').modal('open')
+			imageXhr(id, key, murl)
+			$('#imagewrap').dragScroll() // ドラッグスクロール設定
+			$('#imgmodal').show()
+			$('#imagemodal').attr('data-key', key)
+			$('#imagemodal').attr('data-id', id)
+		} else if (type == 'video' || type == 'gifv') {
+			$('#video').attr('src', murl)
+			$('#videomodal').modal('open')
+			$('#imgmodal').show()
 		}
-		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");
-		$(document).ready(function () {
-			if (type == "image") {
-				xhr = new XMLHttpRequest;
-				xhr.open('GET', murl, true);
-				xhr.responseType = "arraybuffer";
-				xhr.addEventListener('progress', function (event) {
-					if (event.lengthComputable) {
-						var total = event.total;
-						var now = event.loaded;
-						var per = now / total * 100;
-						$("#imgprog").text(Math.floor(per));
-					}
-				}, 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');
+		$('#imgprog').text(0)
+		$('#imgsec').text(0)
+		$('#imgmodal').attr('src', '../../img/loading.svg')
+		var type = $('#' + id + '-image-' + key).attr('data-type')
+		$(document).ready(function() {
+			if (type == 'image') {
+				imageXhr(id, key, murl)
+				$('#imagewrap').dragScroll() // ドラッグスクロール設定
+				$('#imagemodal').attr('data-key', key)
+				$('#imagemodal').attr('data-id', id)
+			} else if (type == 'video' || type == 'gifv') {
+				$('#video').attr('src', murl)
+				$('#videomodal').modal('open')
 			}
-			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 imageXhr(id, key, murl) {
+	var startTime = new Date()
+	xhr = new XMLHttpRequest()
+	xhr.open('GET', murl, true)
+	xhr.responseType = 'arraybuffer'
+	xhr.addEventListener(
+		'progress',
+		function(event) {
+			if (event.lengthComputable) {
+				var total = event.total
+				var now = event.loaded
+				var per = (now / total) * 100
+				$('#imgprog').text(Math.floor(per))
+			}
+		},
+		false
+	)
+	xhr.addEventListener(
+		'loadend',
+		function(event) {
+			var total = event.total
+			$('#imgbyte').text(Math.floor(total / 1024))
+			var now = event.loaded
+			var per = (now / total) * 100
+			$('#imgprog').text(Math.floor(per))
+		},
+		false
+	)
+	xhr.addEventListener(
+		'error',
+		function(event) {
+			$('#imgmodal').attr('src', murl)
+		},
+		false
+	)
+	xhr.onreadystatechange = function() {
+		if (this.readyState == 4 && this.status == 200) {
+			r = new FileReader()
+			r.readAsDataURL(this.response)
+			r.onload = function() {
+				var b64 = r.result
+				var element = new Image()
+				var width
+				element.onload = function() {
+					var width = element.naturalWidth
+					if(width < 650) {
+						width = 650;
+					}
+					var height = element.naturalHeight
+					var windowH = $(window).height()
+					var windowW = $(window).width()
+					$('#imagemodal').css('bottom', '0')
+					$('#imagemodal img').css('width', 'auto')
+					if (height < windowH) {
+						$('#imagemodal').css('height', height + 100 + 'px')
+						$('#imagemodal img').css('height',  height + 'px')
+						if (width > windowW * 0.8) {
+							$('#imagemodal').css('width', '80vw')
+							$('#imagemodal img').css('width', 'auto')
+							var heightS = ((windowW * 0.8) / width) * height
+							$('#imagemodal').css('height', heightS + 100 + 'px')
+						} else {
+							$('#imagemodal').css('width', width + 'px')
+						}
+					} 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 = 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 () {
-	$.fn.dragScroll = function () {
-		var target = this;
-		$(this).mousedown(function (event) {
-			$(this)
-				.data('down', true)
-				.data('x', event.clientX)
-				.data('y', event.clientY)
-				.data('scrollLeft', this.scrollLeft)
-				.data('scrollTop', this.scrollTop);
-			return false;
-		}).css({
-			'overflow': 'hidden', // スクロールバー非表示
-			'cursor': 'move'
-		});
+;(function() {
+	$.fn.dragScroll = function() {
+		var target = this
+		$(this)
+			.mousedown(function(event) {
+				$(this)
+					.data('down', true)
+					.data('x', event.clientX)
+					.data('y', event.clientY)
+					.data('scrollLeft', this.scrollLeft)
+					.data('scrollTop', this.scrollTop)
+				return false
+			})
+			.css({
+				overflow: 'hidden', // スクロールバー非表示
+				cursor: 'move'
+			})
 		// ウィンドウから外れてもイベント実行
-		$(document).mousemove(function (event) {
-			if ($(target).data('down') == true) {
-				// スクロール
-				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') -
-					event.clientX);
-				target.scrollTop($(target).data('scrollTop') + $(target).data('y') -
-					event.clientY);
-				return false; // 文字列選択を抑止
-			}
-		}).mouseup(function (event) {
-			$(target).data('down', false);
-		});
-		$(this).on('touchstart', function (event) {
-			$(this)
-				.data('down', true)
-				.data('x', getX(event))
-				.data('y', getY(event))
-				.data('scrollLeft', this.scrollLeft)
-				.data('scrollTop', this.scrollTop);
-			return false;
-		}).css({
-			'overflow': 'hidden', // スクロールバー非表示
-			'cursor': 'move'
-		}); //指が触れたか検知
-		$(this).on('touchmove', function (event) {
+		$(document)
+			.mousemove(function(event) {
+				if ($(target).data('down') == true) {
+					// スクロール
+					target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - event.clientX)
+					target.scrollTop($(target).data('scrollTop') + $(target).data('y') - event.clientY)
+					return false // 文字列選択を抑止
+				}
+			})
+			.mouseup(function(event) {
+				$(target).data('down', false)
+			})
+		$(this)
+			.on('touchstart', function(event) {
+				$(this)
+					.data('down', true)
+					.data('x', getX(event))
+					.data('y', getY(event))
+					.data('scrollLeft', this.scrollLeft)
+					.data('scrollTop', this.scrollTop)
+				return false
+			})
+			.css({
+				overflow: 'hidden', // スクロールバー非表示
+				cursor: 'move'
+			}) //指が触れたか検知
+		$(this).on('touchmove', function(event) {
 			if ($(target).data('down') === true) {
 				// スクロール
-				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') -
-					getX(event));
-				target.scrollTop($(target).data('scrollTop') + $(target).data('y') -
-					getY(event));
-				return false; // 文字列選択を抑止
-			} else { }
-		}); //指が動いたか検知
-		$(this).on('touchend', function (event) {
-			$(target).data('down', false);
-		});
+				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - getX(event))
+				target.scrollTop($(target).data('scrollTop') + $(target).data('y') - getY(event))
+				return false // 文字列選択を抑止
+			} else {
+			}
+		}) //指が動いたか検知
+		$(this).on('touchend', function(event) {
+			$(target).data('down', false)
+		})
 
-		return this;
+		return this
 	}
-})(jQuery);
+})(jQuery)
 
 function getX(event) {
-	return event.originalEvent.touches[0].pageX;
+	return event.originalEvent.touches[0].pageX
 }
 
 function getY(event) {
-	return event.originalEvent.touches[0].pageY;
+	return event.originalEvent.touches[0].pageY
 }
 //マウスホイールで拡大
-var element = document.getElementById("imagemodal");
-element.onmousewheel = function (e) {
-	var delta = e.wheelDelta;
+var element = document.getElementById('imagemodal')
+element.onmousewheel = function(e) {
+	var delta = e.wheelDelta
 	if (delta > 0) {
 		zoom(1.1)
 	} else {
@@ -263,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,144 @@
 /*ささやきボックス(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()
+	console.log('show' + localStorage.getItem('postbox-left'))
+	var left = localStorage.getItem('postbox-left')
 	if (left > $('body').width() - $('#post-box').width()) {
-		left = $('body').width() - $('#post-box').width();
+		left = $('body').width() - $('#post-box').width()
 	} else if (left < 0) {
-		left = 0;
+		left = 0
 	}
-	var top = localStorage.getItem("postbox-top");
+	var top = localStorage.getItem('postbox-top')
 	if (top > $('body').height() - $('#post-box').height()) {
-		top = $('body').height() - $('#post-box').height();
+		top = $('body').height() - $('#post-box').height()
 	} else if (top < 0) {
-		top = 0;
+		top = 0
 	}
-	$('#post-box').css("left", left + "px")
-	$('#post-box').css("top", top + "px")
-	$('#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')
 	}
 }
-$('#posttgl').click(function (e) {
-	if (!$('#post-box').hasClass("appear")) {
-		show();
-	} else {
-		hide();
-	}
-	$('.cvo').removeClass("selectedToot")
-	selectedColumn = 0
-	selectedToot = 0
-});
-
-$("#timeline-container,#group").click(function (e) {
-	if (localStorage.getItem("box") != "absolute") {
-		if ($('#post-box').hasClass("appear") && !localStorage.getItem("nohide")) {
-			hide();
+window.onload = initPostbox
+function initPostbox() {
+	$('#posttgl').click(function (e) {
+		if (!$('#post-box').hasClass('appear')) {
+			show()
+		} else {
+			hide()
 		}
-	}
-	$('.cvo').removeClass("selectedToot")
-	selectedColumn = 0
-	selectedToot = 0
-	localStorage.removeItem("nohide")
-});
-$('#textarea,#cw-text').focusout(function (e) {
-	localStorage.setItem("nohide", true)
-	var countup = function () {
-		localStorage.removeItem("nohide")
-	}
-	//setTimeout(remove, 100);
-	$('.cvo').removeClass("selectedToot")
-	selectedColumn = 0
-	selectedToot = 0
-});
+		$('.cvo').removeClass('selectedToot')
+		selectedColumn = 0
+		selectedToot = 0
+	})
+
+	$('#timeline-container,#group').click(function (e) {
+		if (localStorage.getItem('box') != 'absolute') {
+			if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
+				hide()
+			}
+		}
+		$('.cvo').removeClass('selectedToot')
+		selectedColumn = 0
+		selectedToot = 0
+		localStorage.removeItem('nohide')
+		srcBox('close')
+	})
+	$('#contextWrap').click(function (e) {
+		$('#contextWrap').addClass('hide')
+		$('.contextMenu').addClass('hide')
+		$('.act-icon').text('expand_more')
+	})
+	$('#textarea,#cw-text').focusout(function (e) {
+		localStorage.setItem('nohide', true)
+		var countup = function () {
+			localStorage.removeItem('nohide')
+		}
+		//setTimeout(remove, 100);
+		$('.cvo').removeClass('selectedToot')
+		selectedColumn = 0
+		selectedToot = 0
+	})
+}

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 (pool) {
-				$("#timeline_" + tlid).prepend(pool);
-				jQuery("time.timeago").timeago();
-				localStorage.removeItem("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)
+				}
+			} 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

@@ -1,5 +1,6 @@
 //ソートデータ読み込み
-function sortload() {
+function sortLoad () {
+	$("#sort").html("");
 	var col = localStorage.getItem("column");
 	if (col) {
 		var obj = JSON.parse(col);
@@ -32,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);
@@ -104,16 +105,16 @@ function sort() {
 	localStorage.setItem("column", json);
 	$("#sort").html("");
 	M.toast({ html: "Sorted", displayLength: 3000 })
-	sortload();
+	sortLoad();
 	parseColumn();
 	sortMenu()
 }
 //ソートボタントグル
 function sortMenu() {
-	$("#left-menu div").removeClass("active");
+	$("#left-menu a").removeClass("active");
 	$("#sortMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#sort-box").removeClass("hide");
 	$("#sort").html("");
-	sortload();
+	sortLoad();
 }

app/js/ui/spotify.js

@@ -1,205 +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"], "*")
-    } else {
-        auth = auth + "&state=code";
-        $("#spotify-code-show").removeClass("hide");
-        postMessage(["openUrl", auth], "*")
-    }
-
-
+	var auth = 'https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing'
+	var platform = localStorage.getItem('platform')
+	if (platform == 'win32') {
+		postMessage(['openUrl', auth], '*')
+		postMessage(['sendSinmpleIpc', 'quit'], '*')
+	} else {
+		auth = auth + '&state=code'
+		$('#spotify-code-show').removeClass('hide')
+		postMessage(['openUrl', auth], '*')
+	}
 }
 function spotifyAuth() {
-    var code = $("#spotify-code").val();
-    localStorage.setItem("spotify", "code");
-    localStorage.setItem("spotify-refresh", code);
-    $("#spotify-code-show").addClass("hide");
-    $("#spotify-enable").addClass("disabled");
-    $("#spotify-disable").removeClass("disabled");
+	var code = $('#spotify-code').val()
+	localStorage.setItem('spotify', 'code')
+	localStorage.setItem('spotify-refresh', code)
+	$('#spotify-code-show').addClass('hide')
+	$('#spotify-enable').addClass('disabled')
+	$('#spotify-disable').removeClass('disabled')
 }
 function spotifyDisconnect() {
-    localStorage.removeItem("spotify");
-    localStorage.removeItem("spotify-refresh");
-    checkSpotify();
+	localStorage.removeItem('spotify')
+	localStorage.removeItem('spotify-refresh')
+	checkSpotify()
 }
 function checkSpotify() {
-    if (localStorage.getItem("spotify")) {
-        $("#spotify-enable").addClass("disabled");
-        $("#spotify-disable").removeClass("disabled");
-    } else {
-        $("#spotify-enable").removeClass("disabled");
-        $("#spotify-disable").addClass("disabled");
-    }
-    var content = localStorage.getItem("np-temp");
-    if (!content || content == "" || content == "null") {
-        var content = "#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
-    }
-    $("#np-temp").val(content);
-    var flag = localStorage.getItem("artwork");
-    if (flag) {
-        $("#awk_yes").prop("checked", true);
-    } else {
-        $("#awk_no").prop("checked", true);
-    }
+	if (localStorage.getItem('spotify')) {
+		$('#spotify-enable').addClass('disabled')
+		$('#spotify-disable').removeClass('disabled')
+	} else {
+		$('#spotify-enable').removeClass('disabled')
+		$('#spotify-disable').addClass('disabled')
+	}
+	var content = localStorage.getItem('np-temp')
+	if (!content || content == '' || content == 'null') {
+		var content = '#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk'
+	}
+	$('#np-temp').val(content)
+	var flag = localStorage.getItem('artwork')
+	if (flag) {
+		$('#awk_yes').prop('checked', true)
+	} else {
+		$('#awk_no').prop('checked', true)
+	}
+	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");
-        M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
-    } else {
-        localStorage.removeItem("artwork");
-        M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
-    }
+	var awk = $('[name=awk]:checked').val()
+	if (awk == 'yes') {
+		localStorage.setItem('artwork', 'yes')
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
+	} else {
+		localStorage.removeItem('artwork')
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
+	}
+}
+function 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 (at) {
-            fetch(start, {
-                method: 'GET',
-                headers: {
-                    'content-type': 'application/json'
-                }
-            }).then(function (response) {
-                return response.json();
-            }).catch(function (error) {
-                todo(error);
-                console.error(error);
-            }).then(function (json) {
-                console.table(json);
-                if (json.length < 1) {
-                    return false;
-                }
-                var item = json.item;
-                var img = item.album.images[0].url;
-                var flag = localStorage.getItem("artwork");
-                if (flag) {
-                    postMessage(["bmpImage", [img, 0]], "*")
-                }
-                var content = localStorage.getItem("np-temp");
-                if (!content || content == "" || content == "null") {
-                    var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
-                }
-                var regExp = new RegExp("{song}", "g");
-                content = content.replace(regExp, item.name);
-                var regExp = new RegExp("{album}", "g");
-                content = content.replace(regExp, item.album.name);
-                var regExp = new RegExp("{artist}", "g");
-                content = content.replace(regExp, item.artists[0].name);
-                var regExp = new RegExp("{url}", "g");
-                content = content.replace(regExp, item.external_urls.spotify);
-                var regExp = new RegExp("{composer}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{hz}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{bitRate}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{lyricist}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{bpm}", "g");
-                content = content.replace(regExp, "");
-                var regExp = new RegExp("{genre}", "g");
-                content = content.replace(regExp, "");
-                $("#textarea").val(content);
-            });
-        } else {
-            Swal.fire({
-                type: 'info',
-                title: lang.lang_spotify_acct
-            })
-        }
-    } else if (mode == "itunes") {
-        postMessage(["itunes", ""], "*")
-    }
+	if (mode == 'spotify') {
+		var start = 'https://thedesk.top/now-playing?at=' + localStorage.getItem('spotify') + '&rt=' + localStorage.getItem('spotify-refresh')
+		var at = localStorage.getItem('spotify')
+		if (at) {
+			fetch(start, {
+				method: 'GET',
+				headers: {
+					'content-type': 'application/json',
+				},
+			})
+				.then(function (response) {
+					if (!response.ok) {
+						response.text().then(function (text) {
+							setLog(response.url, response.status, text)
+						})
+					}
+					return response.json()
+				})
+				.catch(function (error) {
+					todo(error)
+					setLog(start, 'JSON', error)
+					console.error(error)
+				})
+				.then(function (json) {
+					console.table(json)
+					if (json.length < 1) {
+						return false
+					}
+					var item = json.item
+					var img = item.album.images[0].url
+					var flag = localStorage.getItem('artwork')
+					if (flag) {
+						postMessage(['bmpImage', [img, 0]], '*')
+					}
+					var content = localStorage.getItem('np-temp')
+					if (!content || content == '' || content == 'null') {
+						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
+					}
+					var regExp = new RegExp('{song}', 'g')
+					content = content.replace(regExp, item.name)
+					var regExp = new RegExp('{album}', 'g')
+					content = content.replace(regExp, item.album.name)
+					var regExp = new RegExp('{artist}', 'g')
+					content = content.replace(regExp, item.artists[0].name)
+					var regExp = new RegExp('{url}', 'g')
+					content = content.replace(regExp, item.external_urls.spotify)
+					var regExp = new RegExp('{composer}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{hz}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{bitRate}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{lyricist}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{bpm}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{genre}', 'g')
+					content = content.replace(regExp, '')
+					$('#textarea').val(content)
+				})
+		} else {
+			Swal.fire({
+				type: 'info',
+				title: lang.lang_spotify_acct,
+			})
+		}
+	} else if (mode == 'itunes') {
+		postMessage(['itunes', ''], '*')
+	} 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}";
-    }
-    var flag = localStorage.getItem("artwork");
-    var platform = localStorage.getItem("platform");
-    if (platform == "win32") {
-        if (flag && arg.path) {
-            media(arg.path, "image/png", "new");
-        }
-    } else if (platform == "darwin") {
-        if (flag && arg.existsArtwork) {
-            media(arg.artworks[0].data, "image/png", "new");
-        }
-    }
-    var regExp = new RegExp("{song}", "g");
-    content = content.replace(regExp, arg.name);
-    var regExp = new RegExp("{album}", "g");
-    content = content.replace(regExp, arg.album);
-    var regExp = new RegExp("{artist}", "g");
-    content = content.replace(regExp, arg.artist);
-    var regExp = new RegExp("{url}", "g");
-    content = content.replace(regExp, "");
-    var regExp = new RegExp("{composer}", "g");
-    content = content.replace(regExp, arg.composer);
-    var regExp = new RegExp("{hz}", "g");
-    content = content.replace(regExp, arg.sampleRate / 1000 + "kHz");
-    var regExp = new RegExp("{lyricist}", "g");
-    content = content.replace(regExp, "");
-    var regExp = new RegExp("{bpm}", "g");
-    content = content.replace(regExp, "");
-    var regExp = new RegExp("{bitRate}", "g");
-    content = content.replace(regExp, arg.bitRate + "kbps");
-    var regExp = new RegExp("{genre}", "g");
-    content = content.replace(regExp, arg.genre);
-    $("#textarea").val(content);
+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')
+	var aaw = { aaw: '', album: '' }
+	if (platform == 'win32') {
+		if (flag && arg.path) {
+			media(arg.path, 'image/png', 'new')
+		}
+	} else if (platform == 'darwin') {
+		if (flag && arg.artwork) {
+			media(arg.artwork, 'image/png', 'new')
+		} else if (flag && localStorage.getItem('complete-artwork')) {
+			var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name
+			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')
+	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);
-    M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
-}
-function npprovider() {
-    var provd = $("[name=npp]:checked").val();
-    if (!provd) {
-        if (localStorage.getItem("np_provider")) {
-            $("[value=" + localStorage.getItem("np_provider") + "]").prop("checked", true);
-        } else {
-            $("[value=AIMP]").prop("checked", true);
-            localStorage.setItem("np_provider", "AIMP");
-        }
-    } else {
-        if (provd != localStorage.getItem("np_provider")) {
-            M.toast({ html: lang.lang_setting_npprovide.replace("{{set}}", provd), displayLength: 3000 })
-        }
-        localStorage.setItem("np_provider", provd);
-        postMessage(["itunes", ["set", provd]], "*")
-
-    }
+	var temp = $('#np-temp').val()
+	localStorage.setItem('np-temp', temp)
+	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
 }
 if (location.search) {
-    var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
-    var mode = m[1];
-    var codex = m[2];
-    if (mode == "spotify") {
-        var coder = codex.split(":");
-        localStorage.setItem("spotify", coder[0]);
-        localStorage.setItem("spotify-refresh", coder[1]);
-    } else {
-
-    }
-
+	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 }
 }
-$("#npbtn").click(function () {
-    nowplaying('spotify');
-});
-$("#npbtn").bind('contextmenu', function () {
-    nowplaying('itunes');
-    return false;
-});

app/js/ui/theme.js

@@ -1,28 +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')
 		}
 	}
-	$("html").removeClass("indigotheme");
-	$("html").removeClass("greentheme");
-	$("html").removeClass("browntheme");
-	$("html").removeClass("blacktheme");
-	$("html").removeClass("customtheme");
-	$("html").addClass(theme + "theme");
-	var font = localStorage.getItem("font");
+	var el = document.getElementsByTagName('html')[0]
+
+	el.classList.remove('indigotheme')
+	el.classList.remove('greentheme')
+	el.classList.remove('browntheme')
+	el.classList.remove('blacktheme')
+	el.classList.remove('bluetheme')
+	el.classList.remove('polartheme')
+	el.classList.remove('snowtheme')
+	el.classList.remove('customtheme')
+	el.classList.add(theme + 'theme')
+	var font = localStorage.getItem('font')
 	if (font) {
-		$("html").css("font-family", font);
+		font = font.replace(/"(.+)"/, '$1')
+		el.style.fontFamily = '"' + font + '"'
 	} else {
-		$("html").css("font-family", "");
+		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)'
 }
-themes();
+themes()