travis final

Wip (before ci)

.github/FUNDING.yml

@@ -0,0 +1,8 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: cutls
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+custom: https://www.pixiv.net/fanbox/creator/28105985

.gitignore

@@ -5,7 +5,6 @@
 TheDesk-*
 app/build
 build
-make.js
 app/.DS_Store
 .DS_Store
 .vs/*

.travis.yml

@@ -1,30 +1,47 @@
-os: windows
+os: 
+ - windows
+ - linux
+ - osx
 language: node_js
 node_js:
-- '9.9.0'
+- '10.15.2'
 script: node -v
 before_deploy:
-  - cd app
   - npm install electron-builder -g
+  - cd app
+  - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
   - npm install
-  - electron-builder --win --ia32
+  - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup-ia32.exe
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
-  - mv ../build/TheDesk*.exe ../TheDesk-ia32.exe
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
-  - electron-builder --win --x64
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then ls;else :;fi
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv thedesk-*.zip thedesk.zip;else :;fi
-  - mv ../build/TheDesk*.exe ../TheDesk.exe
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;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
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv TheDesk-setup.exe TheDesk-setup-ia32.exe;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv *$VERSION.exe TheDesk-ia32.exe;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../app;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win --x64 -p never;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then ls;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv ../build/TheDesk-setup.exe ../build/TheDesk-setup.exe;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv ../build/*$VERSION.exe ../build/TheDesk.exe;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../app;else :;fi
   - cd ../
-  - ls
+  - ls build
-after_deploy: ls
 deploy:
-  skip_cleanup: true
   provider: releases
+  # GitHub にリリースするための API KEY を暗号化した値
   api_key:
     secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
+  # Releases ページにアップロードするファイル
+  file_glob: true
   file:
-    - TheDesk.exe
+    - build/*
-    - TheDesk-setup.exe
+  skip_cleanup: true
-    - TheDesk-ia32.exe
-    - TheDesk-setup-ia32.exe
   on:
     repo: cutls/TheDesk
+    tags: true
+    all_branches: true

README.md

@@ -1,21 +1,26 @@
+<img src="https://thedesk.top/img/top.png" width="300" align="left">
+<img src="https://thedesk.top/img/desk.png" width="150" align="right">
+
 # TheDesk
  
 [![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)
-[![Server-up time](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com/)  
+[![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
+[![Download](https://flat.badgen.net/github/assets-dl/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)  
-オープンソースSNSマストドン/MisskeyのWindows/Linuxクライアント  
+オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)  
-Download:[TheDesk](https://thedesk.top)  
   
-Contact me(bug report...):GitHub Issues, mention to [Cutls@kirishima.cloud](https://kirishima.cloud/@Cutls) or toot with #Desk  
+Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)    
 
-バグレポートなど:GitHub Issuesや[Cutls@kirishima.cloud](https://kirishima.cloud/@Cutls)へのリプ,または#Deskでトゥートして下さい.  
+<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>  
+![Screenshots1](https://thedesk.top/img/scr1.png)  
 
-## License/ライセンス
+## License
 
 [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/)/アイコンは[クリエイティブ・コモンズ 表示-非営利-継承](https://creativecommons.org/licenses/by-nc-sa/4.0/)で提供されています。  
+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)  
 
 * [PNG](https://dl.thedesk.top/press/TheDesk.png)
@@ -23,25 +28,25 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
 * [ico](https://dl.thedesk.top/press/TheDesk.ico)
 * [icns](https://dl.thedesk.top/press/TheDesk.icns)
 
-## Terms of Use/利用規約
+The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
+
+## Terms of Use
 
 * [利用規約(Terms of Use(ja))](https://thedesk.top/tos.html)
 * [プライバシーポリシー(Privacy Policy(ja))](https://thedesk.top/priv.html)
 
-## Language/言語
+## Language
 
 * 日本語(Japanese)
-* English(英語)
+* English
 
-### Translation/翻訳
+### Translation
 
 Crowdin project is available! Visit: https://translate.thedesk.top
 
-Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.top  
+## Requirement
 
-## Requirement/環境
+* Electron 4.2 or above(install yourself)
-
-* Electron 3.0.10(install yourself)
 * electron-dl(in package.json)
 * Jimp(in package.json)
 * font-manager(in package.json)
@@ -52,24 +57,47 @@ Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.
 * sumchecker(in package.json)
 * Ability to read unformated files!(install yourself)
 
-## Contributors/コントリビューター
+## Contributors
 
-macOSビルダー  
+Build for macOS  
 
-* [とねぢ](https://minohdon.jp/@toneji)
+* [toneji](https://minohdon.jp/@toneji)
 
-Linuxビルダー  
+Build for Linux  
 
-* [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
+* [popn_ja](https://popon.pptdn.jp/@popn_ja)
 
-## Build/ビルド
+Fellow coder
 
-Misskey(misskey.xyz) application token is not in cutls/TheDesk  
+* [kPherox](https://www.kr-kp.com/)
-Misskey(misskey.xyz)のトークンは含まれておりません。  
+
-`git clone https://github.com/cutls/TheDesk`  
+## Build
-`npm install electron -g`  
+
-`cd TheDesk/app`  
+```sh
-`npm install`  
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+npm install
+npm install --only=dev
+```
+
+### electron-builder(Recommended)
+Use npm scripts.  
+
+```sh
+# Build for current platform
+npm run build
+
+# Select build target
+## Windows
+npm run build:win
+
+## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
+npm run build:all
+```
+
+Config is all on package.json  
+
+### electron-packager
 `npm install --save-dev electron-rebuild`  
   
 Linux/macOS  
@@ -78,33 +106,17 @@ Windows
 `.\node_modules\.bin\electron-rebuild.cmd`  
   
 To install Python 2.x and Visual C++ for Windows, before running `npm install --save-dev electron-rebuild`  
-WindowsでPython 2.xやVisualC++を一発でインストールできるツールもあります(`npm install --save-dev electron-rebuild`の前に)  
 `npm install --global windows-build-tools`  
 
-日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談)  
-
-### electron-packager
-
 Windows  
-`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=3.0.10 --icon=.\app\thedesk.ico --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite`  
 Linux  
-`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=3.0.10 --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.5 --overwrite`  
 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=3.0.10 --icon=./app/icon.icns --overwrite`  
+`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`  
-
-### electron-builder
-
-Config is all on package.json  
-ビルド設定はすべてpackage.jsonに記載しています。  
 
 ## 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.  
-Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  
-Issuesに書いてある問題についてはなるべく対処しますので、ぜひお知らせください。
-
-## See also/詳しく
-
-[TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)

README_ja.md

@@ -0,0 +1,128 @@
+<img src="https://thedesk.top/img/top.png" width="300" align="left">
+<img src="https://thedesk.top/img/desk.png" width="150" align="right">
+
+# TheDesk
+ 
+[![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)
+[![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
+[![Download](https://flat.badgen.net/github/assets-dl/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)  
+オープンソースSNSマストドン/MisskeyのPC向けクライアント  
+Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)    
+
+[Pixiv FANBOX](https://www.pixiv.net/fanbox/creator/28105985)
+
+![Screenshots1](https://thedesk.top/img/scr1.png)  
+
+## ライセンス
+
+[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)  
+
+* [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)
+
+標準の通知音は [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) で提供されています。
+
+## 利用規約
+
+* [利用規約](https://thedesk.top/tos.html)
+* [プライバシーポリシー](https://thedesk.top/priv.html)
+
+## 言語
+
+* 日本語
+* English(英語)
+
+### 翻訳
+  
+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!(自分で入れて)
+
+## 主なコントリビューター
+
+macOSビルダー  
+
+* [とねぢ](https://minohdon.jp/@toneji)
+
+Linuxビルダー  
+
+* [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
+
+iTunes NowPlayingにアルバムアートワークを付けてくれた人
+
+* [kPherox](https://www.kr-kp.com/)
+
+## ビルド
+
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+npm install
+npm install --only=dev
+```
+
+### electron-builder(推奨)
+npm scriptsを利用します
+
+```sh
+# 実行している環境向けにビルド
+npm run build
+
+# ターゲットを指定してビルド
+## Windows
+npm run build:win
+
+## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
+npm run build:all
+```
+
+ビルド設定はすべてpackage.jsonに記載しています。  
+
+### electron-packager(非推奨)
+`npm install --save-dev electron-rebuild`  
+  
+Linux/macOS  
+`./node_modules/.bin/electron-rebuild`  
+Windows  
+`.\node_modules\.bin\electron-rebuild.cmd`  
+  
+WindowsでPython 2.xやVisualC++を一発でインストールできるツールもあります(`npm install --save-dev electron-rebuild`の前に)  
+`npm install --global windows-build-tools`  
+  
+日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談)  
+
+Windows  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite`  
+Linux  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.5 --overwrite`  
+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`  
+
+## Pleromaのサポート
+
+Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  
+Issuesに書いてある問題についてはなるべく対処しますので、ぜひお知らせください。
+
+## 詳しく
+
+[TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)

app/about.html

@@ -1,5 +1,6 @@
 <!doctype html>
 <html lang="ja">
+
 <head>
     <title>TheDesk</title>
     <meta content="width=device-width,initial-scale=1.0" name="viewport">
@@ -15,9 +16,12 @@ body{
             -webkit-app-region: drag;
             cursor: move;
         }
-a,button{
+
+        a,
+        button {
             -webkit-app-region: no-drag;
         }
+
         .container {
             width: 100%;
             display: grid;
@@ -69,6 +73,7 @@ a,button{
         }
     </style>
 </head>
+
 <body class="center " style="overflow:hidden">
     <script type="text/javascript" src="./js/common/jquery.js"></script>
     <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
@@ -76,7 +81,7 @@ a,button{
     <img src="./img/desk.png" style="max-width:70%;">
     <h5>TheDesk</h5>
     <div class='container'>
-    <div class='area-name1'>バージョン</div>
+        <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>
@@ -87,23 +92,33 @@ a,button{
         <div class='area-name5'>Node.js</div>
         <div class='area-data5' id="node"></div>
     </div>
-  <div class="cp">Copyright &copy; TheDesk 2018 All rights reserved.<br><a href="https://thedesk.top" target="_blank">Web site</a></div>
+    <div class="cp">Copyright &copy; TheDesk 2018<br>
-<button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
+        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://pawoo.net/@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>
         $("#now").text(localStorage.getItem("ver"));
         var electron = require("electron");
         var remote = electron.remote;
-    //JSON.parse(fs.readFileSync(info_path, 'utf8'));
+        const shell = electron.shell;
-    console.log(process.versions);
+        $("#node").text(remote.process.version);
-    $("#node").text(process.version);
+        $("#chrome").text(remote.process.versions.chrome);
-    $("#chrome").text(process.versions.chrome);
+        $("#electron").text(remote.process.versions.electron);
-    $("#electron").text(process.versions.electron);
         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');
+            shell.openExternal(url);
+            return false;
+        });
     </script>
-<script type="text/javascript" src="./js/platform/end.js"></script>

app/adobe.html

@@ -1,5 +1,6 @@
 <!doctype html>
 <html lang="ja">
+
 <head>
   <title>Adobe Photo Editor - TheDesk</title>
   <meta content="width=device-width,initial-scale=1.0" name="viewport">
@@ -17,32 +18,38 @@
       padding: 24px 0;
       text-align: center;
     }
+
     #cb-drag p {
       font-weight: bold;
       text-align: center;
     }
+
     #cb-file {
       cursor: pointer;
     }
+
     #cb-display {
       margin-bottom: 0;
     }
+
     #cb-display p {
       margin-top: 8px;
       margin-bottom: 0;
       line-height: 1.4;
     }
+
     .cb-div {
       padding: 16px;
       margin-bottom: 8px;
     }
+
     .cb-image {
       cursor: pointer;
     }
-
   </style>
   <meta charset="utf-8">
 </head>
+
 <body id="mainView">
   <script type="text/javascript" src="./js/common/jquery.js"></script>
   <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
@@ -190,7 +197,6 @@ function launchEditor(id, src) {
       }
 
       function editPhoto() {
-  //console.log(this);
         var id = this.getAttribute("id");
         var src = this.getAttribute("src");
         launchEditor(id, src);
@@ -257,4 +263,5 @@ photoEditor.init();
   <script type="text/javascript" src="./js/ui/theme.js"></script>
   <script type="text/javascript" src="./js/platform/end.js"></script>
 </body>
+
 </html>

app/build.js

@@ -0,0 +1,112 @@
+const builder = require("electron-builder");
+const fs = require('fs');
+const os = process.platform;
+const Platform = builder.Platform
+const Arch = builder.Arch
+const targets = new Map();
+const archToType = new Map();
+const pref = {
+    productName: "TheDesk",
+    appId: "top.thedesk",
+    asarUnpack: [
+        "node_modules/itunes-nowplaying-mac"
+    ],
+    directories: {
+        output: "../build/"
+    },
+    win: {
+        icon: "build/thedesk.ico",
+        target: [
+            "nsis",
+            "portable",
+            "appx"
+        ]
+    },
+    appx: {
+        identityName: "53491Cutls.TheDesk",
+        applicationId: "Cutls.TheDesk",
+        publisherDisplayName: "Cutls",
+        publisher: "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+        languages: [
+            "JA-JP",
+            "EN-US"
+        ]
+    },
+    nsis: {
+        oneClick: false,
+        allowToChangeInstallationDirectory: true
+    },
+    linux: {
+        icon: "build/icons",
+        target: [
+            "zip",
+            "snap"
+        ],
+        category: "Network"
+    },
+    mac: {
+        target: [
+            "dmg",
+            "zip"
+        ]
+    },
+    electronDownload: {
+        version: "5.0.1"
+    },
+    electronVersion: "5.0.1"
+}
+const json = JSON.parse(fs.readFileSync("package.json", 'utf8'));
+const version = json.version;
+
+
+if (os == "win32") {
+    archToType.set(Arch.ia32, []);
+    targets.set(Platform.WINDOWS, archToType);
+} else if (os == "linux") {
+    archToType.set(Arch.x64, []);
+    archToType.set(Arch.ia32, []);
+    targets.set(Platform.LINUX, archToType);
+} else if (os == "darwin") {
+    archToType.set(Arch.x64, []);
+    targets.set(Platform.MAC, archToType);
+} else {
+    return false
+}
+builder.build({
+    targets: targets,
+    config: pref
+})
+    .then(() => {
+        console.log("Done on "+os)
+        if (os == "win32") {
+            console.log("Windows")
+            fs.renameSync('../build/TheDesk ' + version + '.exe', '../build/TheDesk-ia32.exe');
+            fs.renameSync('../build/TheDesk Setup ' + version + '.exe', '../build/TheDesk-setup-ia32.exe');
+            retry()
+        }else if (os == "linux") {
+            console.log("Linux")
+            fs.renameSync('../build/thedesk-' + version + '.zip', '../build/TheDesk.zip');
+            fs.renameSync('../build/TheDesk Setup ' + version + '.exe', '../build/TheDesk-setup-ia32.exe');
+        }
+    })
+    .catch((error) => {
+        // handle error
+    })
+function retry(){
+    console.log("Windows x64")
+    const targetsAlt = new Map();
+    const archToTypeAlt = new Map();
+    targetsAlt.set(Platform.WINDOWS, archToTypeAlt);
+    archToTypeAlt.set(Arch.x64, []);
+    builder.build({
+        targets: targetsAlt,
+        config: pref
+    })
+        .then(() => {
+            fs.renameSync('../build/TheDesk Setup ' + version + '.exe', '../build/TheDesk-setup.exe');
+            fs.renameSync('../build/TheDesk ' + version + '.exe', '../build/TheDesk.exe');
+        })
+        .catch((error) => {
+            // handle error
+        })
+}

app/css/about.css

@@ -1,2 +1,4 @@
 /*このソフトについてを押した時に読み込まれます*/
-body{font-family:Open Sans;}
+body {
+  font-family: Open Sans;
+}

app/css/font-awesome.css

@@ -5,9 +5,15 @@
 /* FONT PATH
  * -------------------------- */
 @font-face {
-  font-family: 'FontAwesome';
+  font-family: "FontAwesome";
-  src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
+  src: url("../fonts/fontawesome-webfont.eot?v=4.7.0");
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
+  src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0")
+      format("embedded-opentype"),
+    url("../fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"),
+    url("../fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"),
+    url("../fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"),
+    url("../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular")
+      format("svg");
   font-weight: normal;
   font-style: normal;
 }
@@ -60,9 +66,9 @@
   left: -1.85714286em;
 }
 .fa-border {
-  padding: .2em .25em .15em;
+  padding: 0.2em 0.25em 0.15em;
   border: solid 0.08em #eeeeee;
-  border-radius: .1em;
+  border-radius: 0.1em;
 }
 .fa-pull-left {
   float: left;
@@ -71,10 +77,10 @@
   float: right;
 }
 .fa.fa-pull-left {
-  margin-right: .3em;
+  margin-right: 0.3em;
 }
 .fa.fa-pull-right {
-  margin-left: .3em;
+  margin-left: 0.3em;
 }
 /* Deprecated as of 4.4.0 */
 .pull-right {
@@ -84,10 +90,10 @@
   float: left;
 }
 .fa.pull-left {
-  margin-right: .3em;
+  margin-right: 0.3em;
 }
 .fa.pull-right {
-  margin-left: .3em;
+  margin-left: 0.3em;
 }
 .fa-spin {
   -webkit-animation: fa-spin 2s infinite linear;

app/css/master.css

@@ -1,5 +1,6 @@
 /*共通CSS*/
-html,body{
+html,
+body {
   /*transform: translate3d(0,0,0);*/
   overflow: hidden;
   user-select: none;
@@ -9,6 +10,9 @@ html,body{
   background-color: var(--bg);
   color: var(--color);
 }
+body {
+  border: thin solid gray;
+}
 .btn {
   margin: 5px;
   text-transform: none;
@@ -27,6 +31,8 @@ option {
 }
 #mainView {
   padding: 10px;
+  overflow: scroll;
+  height: auto;
 }
 #message {
   display: none;
@@ -37,25 +43,27 @@ option {
   color: white;
   z-index: 9999;
 }
-#imagemodal, #videomodal {
+#imagemodal,
+#videomodal {
   display: none;
   max-width: 100vw;
   max-height: 100vh;
-  top:0;
-  background-color: var(--modal);
   position: fixed;
   z-index: 9;
 }
-#imagemodal, #videomodal, #tootmodal {
+#videomodal,
+#tootmodal {
   background-color: var(--modal);
 }
 #imagemodal .modal-content {
   overflow: hidden;
+  padding: 0;
 }
 #imagemodal .modal-footer {
   overflow-x: scroll;
   overflow-y: hidden;
 }
+
 #imagewrap {
   width: 100%;
   height: 100%;
@@ -67,7 +75,9 @@ option {
   min-width: 0 !important;
   margin-left: 5px !important;
 }
-.bbcode-pulse-loadings, .bbcode-pulse-loading, .fa-pulse {
+.bbcode-pulse-loadings,
+.bbcode-pulse-loading,
+.fa-pulse {
   display: inline-block;
   animation-duration: 3s;
   animation-fill-mode: both;
@@ -75,10 +85,13 @@ option {
   animation-name: pulse;
 }
 @keyframes pulse {
-  from, 50%, to {
+  from,
+  50%,
+  to {
     opacity: 1;
   }
-  25%, 75% {
+  25%,
+  75% {
     opacity: 0;
   }
 }
@@ -114,7 +127,8 @@ option {
   animation-iteration-count: infinite;
   animation-name: shake;
 }
-code:before, .pre:before {
+code:before,
+.pre:before {
   content: "Code";
   font-size: 1.8rem;
   line-height: 1em;
@@ -124,7 +138,8 @@ code:before, .pre:before {
   right: 0;
   top: 0;
 }
-code, pre {
+code,
+pre {
   color: white;
   display: block;
   border-left: 5px solid;
@@ -140,10 +155,12 @@ code, pre {
   border-bottom-right-radius: 10px;
   border-bottom-left-radius: 10px;
 }
-blockquote, .quote p {
+blockquote,
+.quote p {
   margin: 0;
 }
-blockquote, .quote {
+blockquote,
+.quote {
   color: black;
   background-color: #ddd;
   padding: 1em 1em 1em;
@@ -152,7 +169,8 @@ blockquote, .quote {
   border-bottom-right-radius: 10px;
   border-bottom-left-radius: 10px;
 }
-blockquote:before, .quote:before {
+blockquote:before,
+.quote:before {
   content: "Quote";
   font-size: 1.8rem;
   line-height: 1em;
@@ -217,7 +235,7 @@ blockquote:before, .quote:before {
   font-size: 2rem;
 }
 .radio {
-  font-family:'Baloo Bhai'
+  font-family: "Baloo Bhai";
 }
 #pip {
   z-index: 504;
@@ -247,7 +265,7 @@ blockquote:before, .quote:before {
   background-color: var(--modal);
 }
 #releasenote li {
-  list-style-type: disc
+  list-style-type: disc;
 }
 @media only screen and (min-width: 993px) {
   #toast-container {
@@ -269,7 +287,20 @@ blockquote:before, .quote:before {
     opacity: 1;
   }
 }
-.collapsible-header,.tabs{
+.hide-anime {
+  animation: hide 0.2s linear 0s;
+  display: none;
+}
+@keyframes hide {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+.collapsible-header,
+.tabs {
   background-color: var(--subcolor);
 }
 .modal-footer {
@@ -287,7 +318,100 @@ blockquote:before, .quote:before {
   border-color: var(--color);
   padding: 5px;
 }
-
+#pickers {
+  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;
+}
+#menu-wrapper {
+  margin-left: -5px;
+  display: flex;
+}
+#left-menu {
+  width: 170px;
+}
+#left-menu div {
+  padding-left: 5px;
+  width: 100%;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+}
+#left-menu div:hover {
+  background-color: var(--beforehover);
+}
+#left-menu span {
+  margin-left: 5px;
+}
+#left-menu div.active {
+  background-color: var(--emphasized);
+}
+#right-menu {
+  width: 380px;
+  max-height: 375px;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  padding: 5px;
+}
+#tltype {
+  display: flex;
+  flex-wrap: wrap;
+}
+#tltype .type {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  width: 170px;
+  height: 40px;
+  cursor: pointer;
+}
+#tltype .type:hover {
+  background-color: var(--beforehover);
+}
+#tltype .active {
+  background-color: var(--emphasized);
+}
+#tltype i {
+  font-size: 30px;
+}
+#tltype i.sub-icon {
+  font-size: 20px;
+  position: relative;
+  color: var(--beforehover);
+  left: -15px;
+}
+.drag-bar {
+  cursor: move;
+  text-align: center;
+  width: calc(100% + 10px);
+  border-radius: 5px;
+  background-color: var(--bg);
+  margin-left: -5px;
+  margin-right: -5px;
+  margin-top: -5px;
+  font-size: 16px;
+  padding: 4px;
+}
+#something-wrong {
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 
 /*スクロールバー*/
 ::-webkit-scrollbar {

app/css/pickr.css

@@ -0,0 +1,301 @@
+.pickr {
+  position: relative;
+  overflow: visible;
+  z-index: 1;
+}
+.pickr * {
+  box-sizing: border-box;
+}
+.pickr button,
+.pickr input {
+  outline: none;
+  border: none;
+}
+.pickr button:focus,
+.pickr input:focus {
+  box-shadow: 0 0 0 1px #f1f3f4, 0 0 0 3px currentColor;
+}
+.pickr .pcr-button {
+  position: relative;
+  height: 2em;
+  width: 2em;
+  padding: 0.5em;
+  border-radius: 0.15em;
+  cursor: pointer;
+  background: currentColor;
+  transition: all 0.3s;
+  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
+    Helvetica Neue, Arial, sans-serif;
+}
+.pickr .pcr-button:before {
+  background: url('data:image/svg+xml;utf8, <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="white" d="M1,0H2V1H1V0ZM0,1H1V2H0V1Z"/><path fill="gray" d="M0,0H1V1H0V0ZM1,1H2V2H1V1Z"/></svg>');
+  background-size: 0.5em;
+  border-radius: 0.15em;
+  z-index: -1;
+}
+.pickr .pcr-button:after,
+.pickr .pcr-button:before {
+  position: absolute;
+  content: "";
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.pickr .pcr-button:after {
+  background: url('data:image/svg+xml;utf8, <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" stroke="%2342445A" stroke-width="5px" stroke-linecap="round"><path d="M45,45L5,5"></path><path d="M45,5L5,45"></path></svg>')
+    no-repeat 50%;
+  background-size: 70%;
+  opacity: 0;
+}
+.pickr .pcr-button.clear {
+  background: hsla(0, 0%, 100%, 0.25);
+}
+.pickr .pcr-button.clear:after {
+  opacity: 1;
+}
+.pickr .pcr-button.clear:focus {
+  box-shadow: 0 0 0 1px #f1f3f4, 0 0 0 3px #75797e;
+}
+.pickr .pcr-button.disabled {
+  cursor: not-allowed;
+}
+.pcr-app {
+  margin-top: 10px;
+  display: flex;
+  flex-direction: column;
+  z-index: 10000;
+  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
+    Helvetica Neue, Arial, sans-serif;
+  box-shadow: 0 0.15em 1.5em 0 rgba(0, 0, 0, 0.1), 0 0 1em 0 rgba(0, 0, 0, 0.03);
+  top: 5px;
+  height: 15em;
+  width: 28.5em;
+  max-width: 95vw;
+  padding: 0.8em;
+  border-radius: 0.1em;
+  opacity: 0;
+  visibility: hidden;
+  transition: opacity 0.3s;
+}
+.pcr-app.visible {
+  visibility: visible;
+  opacity: 1;
+}
+.pcr-app .swatches {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 0.75em;
+}
+@supports (display: grid) {
+  .pcr-app .swatches {
+    display: grid;
+    align-items: center;
+    justify-content: space-around;
+    grid-template-columns: repeat(auto-fit, 1.75em);
+  }
+}
+.pcr-app .swatches > button {
+  position: relative;
+  width: 1.75em;
+  height: 1.75em;
+  border-radius: 0.15em;
+  cursor: pointer;
+  margin: 2.5px;
+  flex-shrink: 0;
+  justify-self: center;
+  transition: all 0.15s;
+  overflow: hidden;
+  background: transparent;
+  z-index: 1;
+}
+.pcr-app .swatches > button:before {
+  position: absolute;
+  content: "";
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: url('data:image/svg+xml;utf8, <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="white" d="M1,0H2V1H1V0ZM0,1H1V2H0V1Z"/><path fill="gray" d="M0,0H1V1H0V0ZM1,1H2V2H1V1Z"/></svg>');
+  background-size: 6px;
+  border-radius: 0.15em;
+  z-index: -1;
+}
+.pcr-app .swatches > button:after {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: currentColor;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  border-radius: 0.15em;
+  box-sizing: border-box;
+}
+.pcr-app .swatches > button:hover {
+  filter: brightness(1.05);
+}
+.pcr-app .pcr-interaction {
+  display: flex;
+  align-items: center;
+  margin: 0.75em -0.2em 0;
+}
+.pcr-app .pcr-interaction > * {
+  margin: 0 0.2em;
+}
+.pcr-app .pcr-interaction input {
+  letter-spacing: 0.07em;
+  font-size: 0.75em;
+  text-align: center;
+  cursor: pointer;
+  color: #75797e;
+  background: #f1f3f4;
+  border-radius: 0.15em;
+  transition: all 0.15s;
+  padding: 0.45em 0.5em;
+}
+.pcr-app .pcr-interaction input:hover {
+  filter: brightness(0.975);
+}
+.pcr-app .pcr-interaction input:focus {
+  box-shadow: 0 0 0 1px #f1f3f4, 0 0 0 3px rgba(66, 133, 244, 0.75);
+}
+.pcr-app .pcr-interaction .pcr-result {
+  color: #75797e;
+  text-align: left;
+  flex-grow: 1;
+  min-width: 1em;
+  transition: all 0.2s;
+  border-radius: 0.15em;
+  background: #f1f3f4;
+  cursor: text;
+}
+.pcr-app .pcr-interaction .pcr-result::selection {
+  background: #4285f4;
+  color: #fff;
+}
+.pcr-app .pcr-interaction .pcr-type.active {
+  color: #fff;
+  background: #4285f4;
+}
+.pcr-app .pcr-interaction .pcr-clear,
+.pcr-app .pcr-interaction .pcr-save {
+  width: auto;
+  color: #fff;
+}
+.pcr-app .pcr-interaction .pcr-clear:hover,
+.pcr-app .pcr-interaction .pcr-save:hover {
+  filter: brightness(0.925);
+}
+.pcr-app .pcr-interaction .pcr-save {
+  background: #4285f4;
+}
+.pcr-app .pcr-interaction .pcr-clear {
+  background: #f44250;
+}
+.pcr-app .pcr-interaction .pcr-clear:focus {
+  box-shadow: 0 0 0 1px #f1f3f4, 0 0 0 3px rgba(244, 66, 80, 0.75);
+}
+.pcr-app .pcr-selection {
+  display: flex;
+  justify-content: space-between;
+  flex-grow: 1;
+}
+.pcr-app .pcr-selection .pcr-picker {
+  position: absolute;
+  height: 18px;
+  width: 18px;
+  border: 2px solid #fff;
+  border-radius: 100%;
+  user-select: none;
+  cursor: -moz-grab;
+  cursor: -webkit-grabbing;
+}
+.pcr-app .pcr-selection .pcr-color-preview {
+  position: relative;
+  z-index: 1;
+  width: 2em;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin-right: 0.75em;
+}
+.pcr-app .pcr-selection .pcr-color-preview:before {
+  position: absolute;
+  content: "";
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: url('data:image/svg+xml;utf8, <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="white" d="M1,0H2V1H1V0ZM0,1H1V2H0V1Z"/><path fill="gray" d="M0,0H1V1H0V0ZM1,1H2V2H1V1Z"/></svg>');
+  background-size: 0.5em;
+  border-radius: 0.15em;
+  z-index: -1;
+}
+.pcr-app .pcr-selection .pcr-color-preview .pcr-last-color {
+  cursor: pointer;
+  transition: background-color 0.3s, box-shadow 0.3s;
+  border-radius: 0.15em 0.15em 0 0;
+  z-index: 2;
+}
+.pcr-app .pcr-selection .pcr-color-preview .pcr-current-color {
+  border-radius: 0 0 0.15em 0.15em;
+}
+.pcr-app .pcr-selection .pcr-color-preview .pcr-current-color,
+.pcr-app .pcr-selection .pcr-color-preview .pcr-last-color {
+  background: currentColor;
+  width: 100%;
+  height: 50%;
+}
+.pcr-app .pcr-selection .pcr-color-chooser,
+.pcr-app .pcr-selection .pcr-color-opacity,
+.pcr-app .pcr-selection .pcr-color-palette {
+  position: relative;
+  user-select: none;
+  display: flex;
+  flex-direction: column;
+}
+.pcr-app .pcr-selection .pcr-color-palette {
+  width: 100%;
+  z-index: 1;
+}
+.pcr-app .pcr-selection .pcr-color-palette .pcr-palette {
+  height: 100%;
+  border-radius: 0.15em;
+}
+.pcr-app .pcr-selection .pcr-color-palette .pcr-palette:before {
+  position: absolute;
+  content: "";
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: url('data:image/svg+xml;utf8, <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="white" d="M1,0H2V1H1V0ZM0,1H1V2H0V1Z"/><path fill="gray" d="M0,0H1V1H0V0ZM1,1H2V2H1V1Z"/></svg>');
+  background-size: 0.5em;
+  border-radius: 0.15em;
+  z-index: -1;
+}
+.pcr-app .pcr-selection .pcr-color-chooser,
+.pcr-app .pcr-selection .pcr-color-opacity {
+  margin-left: 0.75em;
+}
+.pcr-app .pcr-selection .pcr-color-chooser .pcr-picker,
+.pcr-app .pcr-selection .pcr-color-opacity .pcr-picker {
+  left: 50%;
+  transform: translateX(-50%);
+}
+.pcr-app .pcr-selection .pcr-color-chooser .pcr-slider,
+.pcr-app .pcr-selection .pcr-color-opacity .pcr-slider {
+  width: 8px;
+  height: 100%;
+  border-radius: 50em;
+}
+.pcr-app .pcr-selection .pcr-color-chooser .pcr-slider {
+  background: linear-gradient(180deg, red, #ff0, #0f0, #0ff, #00f, #f0f, red);
+}
+.pcr-app .pcr-selection .pcr-color-opacity .pcr-slider {
+  background: linear-gradient(180deg, transparent, #000),
+    url('data:image/svg+xml;utf8, <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="white" d="M1,0H2V1H1V0ZM0,1H1V2H0V1Z"/><path fill="gray" d="M0,0H1V1H0V0ZM1,1H2V2H1V1Z"/></svg>');
+  background-size: 100%, 50%;
+}

app/css/post.css

@@ -1,23 +1,25 @@
 /*トゥートボックス向けCSS*/
 #post-box {
+  display: none;
   position: fixed;
-  left: 78px;
+  left: calc(50vw - 150px);
-  bottom: -500px;
+  top: 50vh;
   background-color: var(--postbox);
   border: thin solid gray;
   z-index: 501;
-  width: 300px;
   min-width: 300px;
   max-width: 100%;
   padding: 5px;
+  border-radius: 5px;
 }
+
 .cancel {
   font-size: 0.5rem;
   color: gray;
   cursor: pointer;
   position: absolute;
-  width: 60px;
+  right: 2px;
-  right: 0px;
+  top: 4px;
 }
 .more-show {
   display: none;
@@ -41,7 +43,9 @@
 #sch-box input {
   width: auto;
 }
-.picker__close, .picker__today, .picker__clear {
+.picker__close,
+.picker__today,
+.picker__clear {
   color: #26a69a !important;
 }
 .cw {
@@ -51,21 +55,28 @@
   filter: blur(50px);
 }
 #emoji {
-  position: fixed;
+}
-  bottom: 40px;
+#suggest {
-  width: 300px;
+  max-height: 300px;
-  height: 380px;
+  overflow-y: scroll;
-  z-index: 502;
-  padding: 5px;
 }
 #emoji-list {
   width: 100%;
-  height: calc(100% - 130px);
+  height: 200px;
   overflow-y: scroll;
 }
 #preview-field {
   display: none;
 }
+.preview-img {
+  width: 50px;
+  max-height: 100px;
+}
+.pi-wrap {
+  display: inline-block;
+  width: 50px;
+  max-height: 100px;
+}
 #default-emoji a {
   color: white;
   margin-right: 2px;
@@ -82,12 +93,33 @@
   display: flex;
 }
 #toot-post-btn {
-  width:calc(100% - 10px); padding:0; margin-top:10px;
+  width: calc(100% - 10px);
+  padding: 0;
+  margin-top: 10px;
 }
 #toot-sec-btn {
-  width:30px; padding:0; margin-top:10px;
+  width: 30px;
+  padding: 0;
+  margin-top: 10px;
+}
+#left-side {
+  float: left;
+  width: 300px;
+}
+#right-side {
+  display: none;
+  float: left;
+  width: 300px;
+  padding: 5px;
+}
+#poll {
+}
+.poll-provider {
+  position: absolute;
+  height: calc(100% - 90px);
+  overflow-y: scroll;
+  top: 90px;
 }
-
 
 /*mini*/
 .mini-post .mize {

app/css/sort.css

@@ -1,7 +1,4 @@
 .drag-content {
-	width:300px;
-	max-width:100%;
-	height:300px;
   text-overflow: ellipsis;
   cursor: move;
   user-select: none;
@@ -10,32 +7,25 @@
   border-radius: 5px;
   color: var(--color);
   padding: 3px;
-	font-family:Open Sans;
+  display: grid;
-	font-size:20px;
+  grid-template-columns: 43px 1fr 60px;
-	flex-grow:1;
+  grid-template-areas: "sorticon sorttitle sorttitle" "sorticon sortacct sortaction";
-	text-align: center;
-	padding:10px;
 }
-#sort{
+.sorticon {
-	display:flex;
+  grid-area: sorticon;
-	flex-direction:row;
-	overflow-x:scroll;
-	display: flex;
-	width:100vw;
-  	
 }
-#sort-box{
+.sorticon i {
-	position:absolute;
+  font-size: 43px;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	width:100vw; 
-	height:calc(100vh - 40px);
-	background-color: rgba(0, 0, 0, 0.8);
-	z-index:10002;
 }
-#sort-box button{
+.sorttitle {
-	background-color: var(--notfbox);
+  margin-left: 5px;
-	color:var(--color);
+  grid-area: sorttitle;
+}
+.sortacct {
+  margin-left: 5px;
+  grid-area: sortacct;
+}
+.sortaction {
+  margin-left: 5px;
+  grid-area: sortaction;
 }

app/css/themes.css

@@ -15,11 +15,14 @@
   --postbox: white;
   --modalfooter: #fafafa;
 }
+#imagemodal {
+  background: url("../img/pixel.white.svg");
+}
 .blacktheme {
   --bg: #212121;
   --drag: rgba(0, 0, 0, 0.8);
   --color: white;
-    --beforehover:#e0e0e0;
+  --beforehover: #9e9e9e;
   --modal: black;
   --subcolor: #212121;
   --box: #424242;
@@ -32,11 +35,14 @@
   --postbox: #424242;
   --modalfooter: #212121;
 }
+.blacktheme #imagemodal {
+  background: url("../img/pixel.svg");
+}
 .indigotheme {
   --bg: #031833;
   --drag: rgba(0, 0, 0, 0.8);
   --color: white;
-    --beforehover:#e0e0e0;
+  --beforehover: #9e9e9e;
   --modal: #0d1351;
   --subcolor: #0d1351;
   --shared: #004d40;
@@ -49,11 +55,14 @@
   --postbox: #1a237e;
   --modalfooter: #031833;
 }
+.indigotheme #imagemodal {
+  background: url("../img/pixel.svg");
+}
 .browntheme {
   --bg: #261411;
   --drag: rgba(0, 0, 0, 0.8);
   --color: white;
-    --beforehover:#e0e0e0;
+  --beforehover: #9e9e9e;
   --modal: #261411;
   --subcolor: #4e342e;
   --shared: #004d40;
@@ -66,6 +75,9 @@
   --postbox: #4e342e;
   --modalfooter: #261411;
 }
+.browntheme #imagemodal {
+  background: url("../img/pixel.svg");
+}
 .greentheme {
   --bg: #c8e6c9;
   --drag: rgba(255, 255, 255, 0.8);
@@ -83,3 +95,6 @@
   --postbox: #a5d6a7;
   --modalfooter: #81c784;
 }
+.greentheme #imagemodal {
+  background: url("../img/pixel.white.svg");
+}

app/css/tl.css

@@ -1,14 +1,13 @@
 /*TL CSS(ただしBBCode pulse:master.css/spin:font-awesome*/
 #main {
-  display:flex;
   width: 100vw;
+  height: calc(100vh - 40px);
 }
 #timeline-container {
   overflow-x: scroll;
   overflow-y: hidden;
   display: flex;
-  height: calc(100vh - 40px);
+  height: 100%;
-  flex-grow:4;
 }
 #bottom {
   position: absolute;
@@ -86,9 +85,14 @@
   font-family: Open Sans;
   font-size: 15px;
 }
-@media screen and (max-width: 1344px) {
+@media screen and (max-width: 890px) {
-  .btnsgroup .grouptitle{ display: none; }
+  .btnsgroup .grouptitle {
-  #tips,#tips-menu{ display: none; }
+    display: none;
+  }
+  #tips,
+  #tips-menu {
+    display: none;
+  }
 }
 iframe {
   max-width: 100%;
@@ -108,29 +112,79 @@ iframe {
 .box {
   overflow: hidden;
   min-width: 300px;
-  height: 100vh;
   flex: 1;
-  border: thin solid gray;
+  border-top: none;
+  display: flex;
+  flex-direction: column;
+  margin-bottom: -10px;
 }
-.box .pin,#his-data .pin{
+.img_FTL {
+  display: none;
+}
+.bbcode_FTL {
+  display: none;
+}
+.marquee {
+  width: 100%;
+  padding: .5em 0;
+  overflow: hidden;
+  margin-bottom: 0;
+  position: relative;
+}
+.marquee .bbcode-marq-lateral {
+  margin: 0;
+  padding-left: 100%;
+  display: inline-block;
+  white-space: nowrap;
+  animation-name: marquee;
+  animation-timing-function: linear;
+  animation-duration: 10s;
+  animation-iteration-count: infinite;
+}
+@keyframes marquee {
+0% {
+  -webkit-transform: translate(0);
+  transform: translate(0);
+}
+99%, 100% {
+  -webkit-transform: translate(-100%);
+  transform: translate(-100%);
+}
+}
+.boxIn {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  border: thin solid gray;
+  overflow: hidden;
+}
+.box .pin,
+#his-data .pin {
   display: none;
 }
 .user {
   cursor: text;
   font-size: 1.1rem;
 }
-.emoji,.emoji-img{
+.emoji,
+.emoji-img {
   width: 15px;
 }
-.area-toot .emoji,.area-toot .emoji-img{
+.area-toot .emoji,
+.area-toot .emoji-img {
   width: 20px;
   vertical-align: middle;
-  margin: -3px 0 0;
+  margin: -1px 0;
 }
 .faicon_FTL {
   display: none;
 }
-.tl-box{ height:calc(100% - 40px); overflow-y:scroll; overflow-x:hidden }
+.tl-box {
+  position: relative;
+  flex: 1;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
 .additional {
   overflow-x: scroll;
   width: 100%;
@@ -138,6 +192,12 @@ iframe {
 .media-filter .nomedia {
   display: none;
 }
+.bt-filter .shared {
+  display: none;
+}
+.except-bt-filter .unshared {
+  display: none;
+}
 .cvo {
   user-select: text;
   padding-left: 5px;
@@ -147,9 +207,14 @@ iframe {
   width: 100%;
   display: grid;
   grid-template-columns: 43px 2fr 1fr;
-  grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'icon toot toot' 'vis additional additional' 'actions actions side';
+  grid-template-areas: "notice notice notice" "icon display_name display_name" "icon toot toot" "vis additional additional" "actions actions side";
 }
-.cvo h1,.cvo h2,.cvo h3,.cvo h4,.cvo h5,.cvo h6{
+.cvo h1,
+.cvo h2,
+.cvo h3,
+.cvo h4,
+.cvo h5,
+.cvo h6 {
   margin: 0;
 }
 
@@ -176,7 +241,7 @@ text-overflow: ellipsis;
   display: flex;
   justify-content: space-between;
   width: 100%;
-  flex-wrap:nowrap
+  flex-wrap: nowrap;
 }
 .flex-name {
   max-width: calc(100% - 60px);
@@ -201,6 +266,9 @@ grid-area: toot;
   cursor: text;
   user-select: auto;
   grid-area: additional;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 .area-actions {
@@ -223,6 +291,32 @@ grid-area: toot;
   margin: 2px;
   grid-area: side;
 }
+
+.quote-renote {
+  display: grid;
+  grid-template-columns: 43px 2fr 1fr;
+  grid-template-areas: "ricon ruser" "ricon rtext";
+  border: 1px solid;
+  margin-top: 3px;
+  padding: 1px;
+  border-radius: 3px;
+}
+.renote-icon {
+  grid-area: ricon;
+}
+.renote-icon img {
+  width: 43px;
+}
+.renote-user {
+  grid-area: ruser;
+}
+.renote-text {
+  grid-area: rtext;
+}
+
+.btn-flat {
+  color: var(--color);
+}
 .area-side i {
   margin-left: 10px;
 }
@@ -232,11 +326,16 @@ grid-area: toot;
 .action i {
   font-size: 1.2rem;
   margin-right: 2px;
+}
+.action .fa-quote-right {
+  margin-top: 2px;
+}
+.actct {
   color: var(--beforehover);
 }
-.action i:hover{
+.actct:hover {
   color: var(--color);
-  transition: 1s;
+  transition: 0.5s;
 }
 
 .gray {
@@ -286,6 +385,7 @@ grid-area: toot;
 p {
   margin: 0;
   margin-bottom: 0px;
+  line-height: 20px;
 }
 p:not(:last-child) {
   margin-bottom: 10px;
@@ -302,6 +402,7 @@ p:not(:last-child){
 .notice-box {
   top: 0;
   background-color: var(--notfbox);
+  filter: brightness(110%);
   position: relative;
   margin-right: 10px;
   width: 100%;
@@ -311,7 +412,7 @@ p:not(:last-child){
   display: grid;
   grid-template-columns: 40px 48px 1fr 24px;
   grid-template-rows: 30px 30px;
-  grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
+  grid-template-areas: "notice notice_name notice_name a2" "notice a1 sta a3" "notf-box notf-box notf-box notf-box";
 }
 .emp {
   font-weight: bold;
@@ -397,17 +498,15 @@ p:not(:last-child){
   border: thin solid gray;
   border-bottom: 2px solid white;
   grid-area: notf-box;
-  box-shadow:0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.3), 0px -10px 10px 0px rgba(0,0,0,0.3) inset;
+  box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14),
+    0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.3),
+    0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset;
 }
 #src-contents {
   min-height: 100px;
   max-height: 190px;
   overflow-y: scroll;
 }
-.u-url {
-  color: var(--color);
-  cursor: text;
-}
 .type-b {
   display: none;
 }
@@ -420,9 +519,6 @@ p:not(:last-child){
   bottom: 0px;
   right: 0px;
 }
-.btn-flat{
-  color:var(--color);
-}
 .toot a span.ellipsis:after {
   content: "...";
 }
@@ -441,22 +537,112 @@ p:not(:last-child){
 }
 .fa-2x > .emoji-img {
   width: 36px !important;
-  height: 36px!important
+  height: 36px !important;
 }
 .fa-3x > .emoji-img {
   width: 54px !important;
-  height: 54px!important
+  height: 54px !important;
 }
 .fa-4x > .emoji-img {
   width: 72px !important;
-  height: 72px!important
+  height: 72px !important;
 }
 .fa-5x > .emoji-img {
   width: 90px !important;
-  height: 90px!important
+  height: 90px !important;
 }
 #lists-user {
   overflow-y: scroll;
   overflow-x: hidden;
   max-height: 200px;
 }
+.votebtn {
+  border: 1px solid;
+  color: var(--bg);
+  background-color: var(--beforehover);
+  cursor: pointer;
+  width: 50px;
+  padding: 2px;
+  display: inline-block;
+  text-align: center;
+  margin-top: 5px;
+  border-radius: 10px;
+  transition-duration: 0.5s;
+}
+.votebtn:hover {
+  background-color: var(--color);
+}
+.jump {
+  display: inline-block;
+  animation: jump 0.75s linear infinite;
+}
+.img-link {
+  position: relative;
+  display: block;
+  margin-right: 1px;
+  float: left;
+}
+.nsfw-media {
+  position: absolute;
+  top: 0;
+  right: 0;
+  background-color: black;
+  color: white;
+}
+.img-link img {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+@keyframes jump {
+  0% {
+    transform: translateY(0);
+  }
+  25% {
+    transform: translateY(-16px);
+  }
+  50% {
+    transform: translateY(0);
+  }
+  75% {
+    transform: translateY(-8px);
+  }
+  100% {
+    transform: translateY(0);
+  }
+}
+@keyframes fadeInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+@keyframes fadeInLeft {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+.box-anime {
+  animation-duration: 1s;
+  animation-name: fadeInLeft;
+}
+
+.cvo-anime {
+  animation-duration: 0.1s;
+  animation-name: fadeInDown;
+}

app/css/userdata.css

@@ -1,7 +1,7 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
 #his-data {
   background-repeat: no-repeat;
-  background-image: url('../../loading.svg');
+  background-image: url("../../loading.svg");
   overflow-y: hidden;
 }
 #his-name {
@@ -42,12 +42,18 @@
   height: 1.5rem;
 }
 .his-field-title {
-  height:1.5rem; padding:0; background-color:#757575; text-align:center; 
+  height: 1.5rem;
+  padding: 0;
+  background-color: #757575;
+  text-align: center;
   padding: 5px;
   margin-bottom: 1px;
+  width: 30%;
 }
 .his-field-content {
-  height:1.5rem; padding:0; padding-left:5px;
+  height: 1.5rem;
+  padding: 0;
+  padding-left: 5px;
 }
 #his-data a span.ellipsis:after {
   content: "...";
@@ -66,7 +72,7 @@
 .tab-content {
   overflow-y: scroll;
   overflow-x: hidden;
-  height: calc(100% - 240px)
+  height: calc(100% - 240px);
 }
 .my-data-width {
   width: 10%;
@@ -74,11 +80,12 @@
 .active-back {
   background-color: var(--active);
 }
-#his-name .emojione,#his-name .emoji-img{
+#his-name .emojione,
+#his-name .emoji-img {
   width: 20px;
 }
 #his-plus-action .btn {
-  width:170px
+  width: 170px;
 }
 .custom-tabs {
   display: flex;
@@ -90,3 +97,12 @@
   color: #039be5;
   cursor: pointer;
 }
+#his-float-blocked {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 2rem;
+  width: 90%;
+  height: 100%;
+  position: absolute;
+}

app/dist/builder-effective-config.yaml

@@ -0,0 +1,4 @@
+directories:
+  output: dist
+  buildResources: build
+electronVersion: 1.4.13

app/img/pixel.svg

@@ -0,0 +1,11 @@
+<svg width="300" height="300" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <defs>
+  <pattern id="pp" x="0" y="0" width="30" height="30" patternUnits="userSpaceOnUse">
+   <rect x="0" y="0" width="15" height="15" fill="#616161" />
+   <rect x="0" y="15" width="15" height="15" fill="#000000" />
+   <rect x="15" y="15" width="15" height="15" fill="#616161" />
+   <rect x="15" y="0" width="15" height="15" fill="#000000" />
+  </pattern>
+ </defs>
+<rect width="300" height="300" fill="url(#pp)" />
+</svg>

app/img/pixel.white.svg

@@ -0,0 +1,11 @@
+<svg width="300" height="300" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <defs>
+  <pattern id="pp" x="0" y="0" width="30" height="30" patternUnits="userSpaceOnUse">
+   <rect x="0" y="0" width="15" height="15" fill="#e0e0e0" />
+   <rect x="0" y="15" width="15" height="15" fill="#ffffff" />
+   <rect x="15" y="15" width="15" height="15" fill="#e0e0e0" />
+   <rect x="15" y="0" width="15" height="15" fill="#ffffff" />
+  </pattern>
+ </defs>
+<rect width="300" height="300" fill="url(#pp)" />
+</svg>

app/index.start.html

@@ -1,5 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta http-equiv="refresh" content="0;URL='language.html?mode=redirect'" />
-</head>

app/js/common/blurhash.js

@@ -0,0 +1,119 @@
+var digitCharacters = [
+    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
+    "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
+    "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
+    "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d",
+    "e", "f", "g", "h", "i", "j", "k", "l", "m", "n",
+    "o", "p", "q", "r", "s", "t", "u", "v", "w", "x",
+    "y", "z", "#", "$", "%", "*", "+", ",", "-", ".",
+    ":", ";", "=", "?", "@", "[", "]", "^", "_", "{",
+    "|", "}", "~",
+];
+function decode83(str) {
+    var value = 0;
+    for (var i = 0; i < str.length; i++) {
+        var c = str[i];
+        var digit = digitCharacters.indexOf(c);
+        value = value * 83 + digit;
+    }
+    return value;
+}
+function linearTosRGB(value) {
+    var v = Math.max(0, Math.min(1, value));
+    if (v <= 0.0031308) {
+        return Math.round(v * 12.92 * 255 + 0.5);
+    }
+    else {
+        return Math.round((1.055 * Math.pow(v, 1 / 2.4) - 0.055) * 255 + 0.5);
+    }
+}
+function sRGBToLinear(value) {
+    var v = value / 255;
+    if (v <= 0.04045) {
+        return v / 12.92;
+    }
+    else {
+        return Math.pow((v + 0.055) / 1.055, 2.4);
+    }
+}
+function decodeDC(value) {
+    var intR = value >> 16;
+    var intG = (value >> 8) & 255;
+    var intB = value & 255;
+    return [sRGBToLinear(intR), sRGBToLinear(intG), sRGBToLinear(intB)];
+};
+function sign(n) { return (n < 0 ? -1 : 1); }
+function signPow(val, exp) { return sign(val) * Math.pow(Math.abs(val), exp); }
+function decodeDC2(value, maximumValue) {
+    var quantR = Math.floor(value / (19 * 19));
+    var quantG = Math.floor(value / 19) % 19;
+    var quantB = value % 19;
+    var rgb = [
+        signPow((quantR - 9) / 9, 2.0) * maximumValue,
+        signPow((quantG - 9) / 9, 2.0) * maximumValue,
+        signPow((quantB - 9) / 9, 2.0) * maximumValue,
+    ];
+    return rgb;
+};
+function decodeblur(blurhash, width, height, punch) {
+    punch = punch | 1;
+    if (blurhash.length < 6) {
+        console.error('too short blurhash');
+        return null;
+    }
+    var sizeFlag = decode83(blurhash[0]);
+    var numY = Math.floor(sizeFlag / 9) + 1;
+    var numX = (sizeFlag % 9) + 1;
+    var quantisedMaximumValue = decode83(blurhash[1]);
+    var maximumValue = (quantisedMaximumValue + 1) / 166;
+    if (blurhash.length !== 4 + 2 * numX * numY) {
+        console.error('blurhash length mismatch', blurhash.length, 4 + 2 * numX * numY);
+        return null;
+    }
+    var colors = new Array(numX * numY);
+    for (var i = 0; i < colors.length; i++) {
+        if (i === 0) {
+            var value = decode83(blurhash.substring(2, 6));
+            colors[i] = decodeDC(value);
+        }
+        else {
+            var value = decode83(blurhash.substring(4 + i * 2, 6 + i * 2));
+            colors[i] = decodeDC2(value, maximumValue * punch);
+        }
+    }
+    var bytesPerRow = width * 4;
+    var pixels = new Uint8ClampedArray(bytesPerRow * height);
+    for (var y = 0; y < height; y++) {
+        for (var x = 0; x < width; x++) {
+            var r = 0;
+            var g = 0;
+            var b = 0;
+            for (var j = 0; j < numY; j++) {
+                for (var i = 0; i < numX; i++) {
+                    var basis = Math.cos(Math.PI * x * i / width) * Math.cos(Math.PI * y * j / height);
+                    var color = colors[i + j * numX];
+                    r += color[0] * basis;
+                    g += color[1] * basis;
+                    b += color[2] * basis;
+                }
+            }
+            var intR = linearTosRGB(r);
+            var intG = linearTosRGB(g);
+            var intB = linearTosRGB(b);
+            pixels[4 * x + 0 + y * bytesPerRow] = intR;
+            pixels[4 * x + 1 + y * bytesPerRow] = intG;
+            pixels[4 * x + 2 + y * bytesPerRow] = intB;
+            pixels[4 * x + 3 + y * bytesPerRow] = 255; // alpha
+        }
+    }
+    return pixels;
+}
+function parseBlur(blur) {
+    var canvas = document.getElementById('canvas');
+    var ctx = canvas.getContext('2d');
+    var pixels = decodeblur(blur, 32, 32)
+    const imageData = new ImageData(pixels, 32, 32);
+
+    ctx.putImageData(imageData, 0, 0);
+    return canvas.toDataURL()
+}

app/js/common/keyshortcut.js

@@ -29,6 +29,13 @@ $(function($) {
 				return false;
 			}
 		}
+		//Alt+Enter:セカンダリー
+		if (event.metaKey || event.altKey && wv) {
+			if (e.keyCode === 13) {
+				sec();
+				return false;
+			}
+		}
 
 		//Shift+Space:Markdownゼロ幅スペース
 		if (event.shiftKey) {
@@ -85,6 +92,7 @@ $(function($) {
 			if (e.keyCode === 88) {
 				if (!$("#post-box").hasClass("appear")) {
 					show();
+					$('textarea').focus();
 				} else {
 					hide();
 				}

app/js/common/materialize.js

@@ -246,7 +246,8 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
             r.dequeue(a, t);
           }));
       });
-    }, r.fn = r.prototype = { init: function (e) {
+    }, r.fn = r.prototype = {
+      init: function (e) {
         if (e.nodeType) return this[0] = e, this; throw new Error("Not a DOM node.");
       }, offset: function () {
         var t = this[0].getBoundingClientRect ? this[0].getBoundingClientRect() : { top: 0, left: 0 }; return { top: t.top + (e.pageYOffset || document.scrollTop || 0) - (document.clientTop || 0), left: t.left + (e.pageXOffset || document.scrollLeft || 0) - (document.clientLeft || 0) };
@@ -259,7 +260,8 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
           e = e.apply(t),
           a = this.offset(),
           n = /^(?:body|html)$/i.test(e.nodeName) ? { top: 0, left: 0 } : r(e).offset(); return a.top -= parseFloat(t.style.marginTop) || 0, a.left -= parseFloat(t.style.marginLeft) || 0, e.style && (n.top += parseFloat(e.style.borderTopWidth) || 0, n.left += parseFloat(e.style.borderLeftWidth) || 0), { top: a.top - n.top, left: a.left - n.left };
-      } };var a = {};r.expando = "velocity" + new Date().getTime(), r.uuid = 0;for (var n = {}, o = n.hasOwnProperty, i = n.toString, s = "Boolean Number String Function Array Date RegExp Object Error".split(" "), l = 0; l < s.length; l++) {
+      }
+    }; var a = {}; r.expando = "velocity" + new Date().getTime(), r.uuid = 0; for (var n = {}, o = n.hasOwnProperty, i = n.toString, s = "Boolean Number String Function Array Date RegExp Object Error".split(" "), l = 0; l < s.length; l++) {
       n["[object " + s[l] + "]"] = s[l].toLowerCase();
     } r.fn.init.prototype = r.fn, e.Velocity = { Utilities: r };
   }
@@ -404,7 +406,8 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
             }, r);
         };
       }(),
-        m = { isString: function (e) {
+      m = {
+        isString: function (e) {
           return "string" == typeof e;
         }, isArray: Array.isArray || function (e) {
           return "[object Array]" === Object.prototype.toString.call(e);
@@ -422,12 +425,15 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
           for (var t in e) {
             return !1;
           } return !0;
-      } },
+        }
+      },
       y = !1; if (e.fn && e.fn.jquery ? (f = e, y = !0) : f = t.Velocity.Utilities, 8 >= d && !y) throw new Error("Velocity: IE8 and below require jQuery to be loaded before Velocity."); if (7 >= d) return void (jQuery.fn.velocity = jQuery.fn.animate); var h = 400,
         v = "swing",
-        b = { State: { isMobile: /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent), isAndroid: /Android/i.test(navigator.userAgent), isGingerbread: /Android 2\.3\.[3-7]/i.test(navigator.userAgent), isChrome: t.chrome, isFirefox: /Firefox/i.test(navigator.userAgent), prefixElement: r.createElement("div"), prefixMatches: {}, scrollAnchor: null, scrollPropertyLeft: null, scrollPropertyTop: null, isTicking: !1, calls: [] }, CSS: {}, Utilities: f, Redirects: {}, Easings: {}, Promise: t.Promise, defaults: { queue: "", duration: h, easing: v, begin: a, complete: a, progress: a, display: a, visibility: a, loop: !1, delay: !1, mobileHA: !0, _cacheValues: !0 }, init: function (e) {
+        b = {
+          State: { isMobile: /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent), isAndroid: /Android/i.test(navigator.userAgent), isGingerbread: /Android 2\.3\.[3-7]/i.test(navigator.userAgent), isChrome: t.chrome, isFirefox: /Firefox/i.test(navigator.userAgent), prefixElement: r.createElement("div"), prefixMatches: {}, scrollAnchor: null, scrollPropertyLeft: null, scrollPropertyTop: null, isTicking: !1, calls: [] }, CSS: {}, Utilities: f, Redirects: {}, Easings: {}, Promise: t.Promise, defaults: { queue: "", duration: h, easing: v, begin: a, complete: a, progress: a, display: a, visibility: a, loop: !1, delay: !1, mobileHA: !0, _cacheValues: !0 }, init: function (e) {
             f.data(e, "velocity", { isSVG: m.isSVG(e), isAnimating: !1, computedStyle: null, tweensContainer: null, rootPropertyValueCache: {}, transformCache: {} });
-      }, hook: null, mock: !1, version: { major: 1, minor: 2, patch: 2 }, debug: !1 };t.pageYOffset !== a ? (b.State.scrollAnchor = t, b.State.scrollPropertyLeft = "pageXOffset", b.State.scrollPropertyTop = "pageYOffset") : (b.State.scrollAnchor = r.documentElement || r.body.parentNode || r.body, b.State.scrollPropertyLeft = "scrollLeft", b.State.scrollPropertyTop = "scrollTop");var x = function () {
+          }, hook: null, mock: !1, version: { major: 1, minor: 2, patch: 2 }, debug: !1
+        }; t.pageYOffset !== a ? (b.State.scrollAnchor = t, b.State.scrollPropertyLeft = "pageXOffset", b.State.scrollPropertyTop = "pageYOffset") : (b.State.scrollAnchor = r.documentElement || r.body.parentNode || r.body, b.State.scrollPropertyLeft = "scrollLeft", b.State.scrollPropertyTop = "scrollTop"); var x = function () {
           function e(e) {
             return -e.tension * e.x - e.friction * e.v;
           } function t(t, r, a) {
@@ -451,15 +457,19 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                 return u[e * (u.length - 1) | 0];
               } : c;
           };
-    }();b.Easings = { linear: function (e) {
+        }(); b.Easings = {
+          linear: function (e) {
             return e;
           }, swing: function (e) {
             return .5 - Math.cos(e * Math.PI) / 2;
           }, spring: function (e) {
             return 1 - Math.cos(4.5 * e * Math.PI) * Math.exp(6 * -e);
-      } }, f.each([["ease", [.25, .1, .25, 1]], ["ease-in", [.42, 0, 1, 1]], ["ease-out", [0, 0, .58, 1]], ["ease-in-out", [.42, 0, .58, 1]], ["easeInSine", [.47, 0, .745, .715]], ["easeOutSine", [.39, .575, .565, 1]], ["easeInOutSine", [.445, .05, .55, .95]], ["easeInQuad", [.55, .085, .68, .53]], ["easeOutQuad", [.25, .46, .45, .94]], ["easeInOutQuad", [.455, .03, .515, .955]], ["easeInCubic", [.55, .055, .675, .19]], ["easeOutCubic", [.215, .61, .355, 1]], ["easeInOutCubic", [.645, .045, .355, 1]], ["easeInQuart", [.895, .03, .685, .22]], ["easeOutQuart", [.165, .84, .44, 1]], ["easeInOutQuart", [.77, 0, .175, 1]], ["easeInQuint", [.755, .05, .855, .06]], ["easeOutQuint", [.23, 1, .32, 1]], ["easeInOutQuint", [.86, 0, .07, 1]], ["easeInExpo", [.95, .05, .795, .035]], ["easeOutExpo", [.19, 1, .22, 1]], ["easeInOutExpo", [1, 0, 0, 1]], ["easeInCirc", [.6, .04, .98, .335]], ["easeOutCirc", [.075, .82, .165, 1]], ["easeInOutCirc", [.785, .135, .15, .86]]], function (e, t) {
+          }
+        }, f.each([["ease", [.25, .1, .25, 1]], ["ease-in", [.42, 0, 1, 1]], ["ease-out", [0, 0, .58, 1]], ["ease-in-out", [.42, 0, .58, 1]], ["easeInSine", [.47, 0, .745, .715]], ["easeOutSine", [.39, .575, .565, 1]], ["easeInOutSine", [.445, .05, .55, .95]], ["easeInQuad", [.55, .085, .68, .53]], ["easeOutQuad", [.25, .46, .45, .94]], ["easeInOutQuad", [.455, .03, .515, .955]], ["easeInCubic", [.55, .055, .675, .19]], ["easeOutCubic", [.215, .61, .355, 1]], ["easeInOutCubic", [.645, .045, .355, 1]], ["easeInQuart", [.895, .03, .685, .22]], ["easeOutQuart", [.165, .84, .44, 1]], ["easeInOutQuart", [.77, 0, .175, 1]], ["easeInQuint", [.755, .05, .855, .06]], ["easeOutQuint", [.23, 1, .32, 1]], ["easeInOutQuint", [.86, 0, .07, 1]], ["easeInExpo", [.95, .05, .795, .035]], ["easeOutExpo", [.19, 1, .22, 1]], ["easeInOutExpo", [1, 0, 0, 1]], ["easeInCirc", [.6, .04, .98, .335]], ["easeOutCirc", [.075, .82, .165, 1]], ["easeInOutCirc", [.785, .135, .15, .86]]], function (e, t) {
           b.Easings[t[0]] = l.apply(null, t[1]);
-    });var S = b.CSS = { RegEx: { isHex: /^#([A-f\d]{3}){1,2}$/i, valueUnwrap: /^[A-z]+\((.*)\)$/i, wrappedValueAlreadyExtracted: /[0-9.]+ [0-9.]+ [0-9.]+( [0-9.]+)?/, valueSplit: /([A-z]+\(.+\))|(([A-z0-9#-.]+?)(?=\s|$))/gi }, Lists: { colors: ["fill", "stroke", "stopColor", "color", "backgroundColor", "borderColor", "borderTopColor", "borderRightColor", "borderBottomColor", "borderLeftColor", "outlineColor"], transformsBase: ["translateX", "translateY", "scale", "scaleX", "scaleY", "skewX", "skewY", "rotateZ"], transforms3D: ["transformPerspective", "translateZ", "scaleZ", "rotateX", "rotateY"] }, Hooks: { templates: { textShadow: ["Color X Y Blur", "black 0px 0px 0px"], boxShadow: ["Color X Y Blur Spread", "black 0px 0px 0px 0px"], clip: ["Top Right Bottom Left", "0px 0px 0px 0px"], backgroundPosition: ["X Y", "0% 0%"], transformOrigin: ["X Y Z", "50% 50% 0px"], perspectiveOrigin: ["X Y", "50% 50%"] }, registered: {}, register: function () {
+        }); var S = b.CSS = {
+          RegEx: { isHex: /^#([A-f\d]{3}){1,2}$/i, valueUnwrap: /^[A-z]+\((.*)\)$/i, wrappedValueAlreadyExtracted: /[0-9.]+ [0-9.]+ [0-9.]+( [0-9.]+)?/, valueSplit: /([A-z]+\(.+\))|(([A-z0-9#-.]+?)(?=\s|$))/gi }, Lists: { colors: ["fill", "stroke", "stopColor", "color", "backgroundColor", "borderColor", "borderTopColor", "borderRightColor", "borderBottomColor", "borderLeftColor", "outlineColor"], transformsBase: ["translateX", "translateY", "scale", "scaleX", "scaleY", "skewX", "skewY", "rotateZ"], transforms3D: ["transformPerspective", "translateZ", "scaleZ", "rotateX", "rotateY"] }, Hooks: {
+            templates: { textShadow: ["Color X Y Blur", "black 0px 0px 0px"], boxShadow: ["Color X Y Blur Spread", "black 0px 0px 0px 0px"], clip: ["Top Right Bottom Left", "0px 0px 0px 0px"], backgroundPosition: ["X Y", "0% 0%"], transformOrigin: ["X Y Z", "50% 50% 0px"], perspectiveOrigin: ["X Y", "50% 50%"] }, registered: {}, register: function () {
               for (var e = 0; e < S.Lists.colors.length; e++) {
                 var t = "color" === S.Lists.colors[e] ? "0 0 0 1" : "255 255 255 1"; S.Hooks.templates[S.Lists.colors[e]] = ["Red Green Blue Alpha", t];
               } var r, a, n; if (d) for (r in S.Hooks.templates) {
@@ -486,54 +496,74 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                   i = a[0],
                   s = a[1]; return r = S.Hooks.cleanRootPropertyValue(i, r), n = r.toString().match(S.RegEx.valueSplit), n[s] = t, o = n.join(" ");
               } return r;
-        } }, Normalizations: { registered: { clip: function (e, t, r) {
+            }
-            switch (e) {case "name":
+          }, Normalizations: {
+            registered: {
+              clip: function (e, t, r) {
+                switch (e) {
+                  case "name":
                     return "clip"; case "extract":
                     var a; return S.RegEx.wrappedValueAlreadyExtracted.test(r) ? a = r : (a = r.toString().match(S.RegEx.valueUnwrap), a = a ? a[1].replace(/,(\s+)?/g, " ") : r), a; case "inject":
-                return "rect(" + r + ")";}
+                    return "rect(" + r + ")";
+                }
               }, blur: function (e, t, r) {
-            switch (e) {case "name":
+                switch (e) {
+                  case "name":
                     return b.State.isFirefox ? "filter" : "-webkit-filter"; case "extract":
                     var a = parseFloat(r); if (!a && 0 !== a) {
                       var n = r.toString().match(/blur\(([0-9]+[A-z]+)\)/i); a = n ? n[1] : 0;
                     } return a; case "inject":
-                return parseFloat(r) ? "blur(" + r + ")" : "none";}
+                    return parseFloat(r) ? "blur(" + r + ")" : "none";
+                }
               }, opacity: function (e, t, r) {
-            if (8 >= d) switch (e) {case "name":
+                if (8 >= d) switch (e) {
+                  case "name":
                     return "filter"; case "extract":
                     var a = r.toString().match(/alpha\(opacity=(.*)\)/i); return r = a ? a[1] / 100 : 1; case "inject":
-                return t.style.zoom = 1, parseFloat(r) >= 1 ? "" : "alpha(opacity=" + parseInt(100 * parseFloat(r), 10) + ")";} else switch (e) {case "name":
+                    return t.style.zoom = 1, parseFloat(r) >= 1 ? "" : "alpha(opacity=" + parseInt(100 * parseFloat(r), 10) + ")";
+                } else switch (e) {
+                  case "name":
                     return "opacity"; case "extract":
                     return r; case "inject":
-                return r;}
+                    return r;
-          } }, register: function () {
+                }
+              }
+            }, register: function () {
               9 >= d || b.State.isGingerbread || (S.Lists.transformsBase = S.Lists.transformsBase.concat(S.Lists.transforms3D)); for (var e = 0; e < S.Lists.transformsBase.length; e++) {
                 !function () {
                   var t = S.Lists.transformsBase[e]; S.Normalizations.registered[t] = function (e, r, n) {
-                switch (e) {case "name":
+                    switch (e) {
+                      case "name":
                         return "transform"; case "extract":
                         return i(r) === a || i(r).transformCache[t] === a ? /^scale/i.test(t) ? 1 : 0 : i(r).transformCache[t].replace(/[()]/g, ""); case "inject":
-                    var o = !1;switch (t.substr(0, t.length - 1)) {case "translate":
+                        var o = !1; switch (t.substr(0, t.length - 1)) {
+                          case "translate":
                             o = !/(%|px|em|rem|vw|vh|\d)$/i.test(n); break; case "scal": case "scale":
                             b.State.isAndroid && i(r).transformCache[t] === a && 1 > n && (n = 1), o = !/(\d)$/i.test(n); break; case "skew":
                             o = !/(deg|\d)$/i.test(n); break; case "rotate":
-                        o = !/(deg|\d)$/i.test(n);}return o || (i(r).transformCache[t] = "(" + n + ")"), i(r).transformCache[t];}
+                            o = !/(deg|\d)$/i.test(n);
+                        }return o || (i(r).transformCache[t] = "(" + n + ")"), i(r).transformCache[t];
+                    }
                   };
                 }();
               } for (var e = 0; e < S.Lists.colors.length; e++) {
                 !function () {
                   var t = S.Lists.colors[e]; S.Normalizations.registered[t] = function (e, r, n) {
-                switch (e) {case "name":
+                    switch (e) {
+                      case "name":
                         return t; case "extract":
                         var o; if (S.RegEx.wrappedValueAlreadyExtracted.test(n)) o = n; else {
                           var i,
                             s = { black: "rgb(0, 0, 0)", blue: "rgb(0, 0, 255)", gray: "rgb(128, 128, 128)", green: "rgb(0, 128, 0)", red: "rgb(255, 0, 0)", white: "rgb(255, 255, 255)" }; /^[A-z]+$/i.test(n) ? i = s[n] !== a ? s[n] : s.black : S.RegEx.isHex.test(n) ? i = "rgb(" + S.Values.hexToRgb(n).join(" ") + ")" : /^rgba?\(/i.test(n) || (i = s.black), o = (i || n).toString().match(S.RegEx.valueUnwrap)[1].replace(/,(\s+)?/g, " ");
                         } return 8 >= d || 3 !== o.split(" ").length || (o += " 1"), o; case "inject":
-                    return 8 >= d ? 4 === n.split(" ").length && (n = n.split(/\s+/).slice(0, 3).join(" ")) : 3 === n.split(" ").length && (n += " 1"), (8 >= d ? "rgb" : "rgba") + "(" + n.replace(/\s+/g, ",").replace(/\.(\d)+(?=,)/g, "") + ")";}
+                        return 8 >= d ? 4 === n.split(" ").length && (n = n.split(/\s+/).slice(0, 3).join(" ")) : 3 === n.split(" ").length && (n += " 1"), (8 >= d ? "rgb" : "rgba") + "(" + n.replace(/\s+/g, ",").replace(/\.(\d)+(?=,)/g, "") + ")";
+                    }
                   };
                 }();
               }
-        } }, Names: { camelCase: function (e) {
+            }
+          }, Names: {
+            camelCase: function (e) {
               return e.replace(/-(\w)/g, function (e, t) {
                 return t.toUpperCase();
               });
@@ -545,7 +575,9 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                   return e.toUpperCase();
                 }), m.isString(b.State.prefixElement.style[n])) return b.State.prefixMatches[e] = n, [n, !0];
               } return [e, !1];
-        } }, Values: { hexToRgb: function (e) {
+            }
+          }, Values: {
+            hexToRgb: function (e) {
               var t,
                 r = /^#?([a-f\d])([a-f\d])([a-f\d])$/i,
                 a = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i; return e = e.replace(r, function (e, t, r, a) {
@@ -563,7 +595,8 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
               e.classList ? e.classList.add(t) : e.className += (e.className.length ? " " : "") + t;
             }, removeClass: function (e, t) {
               e.classList ? e.classList.remove(t) : e.className = e.className.toString().replace(new RegExp("(^|\\s)" + t.split(" ").join("|") + "(\\s|$)", "gi"), " ");
-        } }, getPropertyValue: function (e, r, n, o) {
+            }
+          }, getPropertyValue: function (e, r, n, o) {
             function s(e, r) {
               function n() {
                 u && S.setPropertyValue(e, "display", "none");
@@ -613,7 +646,8 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                 return n = i(e).transformCache[t], "transformPerspective" === t ? (o = n, !0) : (9 === d && "rotateZ" === t && (t = "rotate"), void (r += t + n + " "));
               }), o && (r = "perspective" + o + " " + r);
             } S.setPropertyValue(e, "transform", r);
-      } };S.Hooks.register(), S.Normalizations.register(), b.hook = function (e, t, r) {
+          }
+        }; S.Hooks.register(), S.Normalizations.register(), b.hook = function (e, t, r) {
           var n = a; return e = o(e), f.each(e, function (e, o) {
             if (i(o) === a && b.init(o), r === a) n === a && (n = b.CSS.getPropertyValue(o, t)); else {
               var s = b.CSS.setPropertyValue(o, t, r); "transform" === s[0] && b.CSS.flushTransformCache(o), n = s;
@@ -685,18 +719,24 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                           D = !1; if (W = d(z, M), M = W[0], Y = W[1], W = d(z, q), q = W[0].replace(/^([+-\/*])=/, function (e, t) {
                             return D = t, "";
                           }), G = W[1], M = parseFloat(M) || 0, q = parseFloat(q) || 0, "%" === G && (/^(fontSize|lineHeight)$/.test(z) ? (q /= 100, G = "em") : /^scale/.test(z) ? (q /= 100, G = "") : /(Red|Green|Blue)$/i.test(z) && (q = q / 100 * 255, G = "")), /[\/*]/.test(D)) G = Y; else if (Y !== G && 0 !== M) if (0 === q) G = Y; else {
-                  n = n || h();var Q = /margin|padding|left|right|width|text|word|letter/i.test(z) || /X$/.test(z) || "x" === z ? "x" : "y";switch (Y) {case "%":
+                            n = n || h(); var Q = /margin|padding|left|right|width|text|word|letter/i.test(z) || /X$/.test(z) || "x" === z ? "x" : "y"; switch (Y) {
+                              case "%":
                                 M *= "x" === Q ? n.percentToPxWidth : n.percentToPxHeight; break; case "px":
                                 break; default:
-                      M *= n[Y + "ToPx"];}switch (G) {case "%":
+                                M *= n[Y + "ToPx"];
+                            }switch (G) {
+                              case "%":
                                 M *= 1 / ("x" === Q ? n.percentToPxWidth : n.percentToPxHeight); break; case "px":
                                 break; default:
-                      M *= 1 / n[G + "ToPx"];}
+                                M *= 1 / n[G + "ToPx"];
-                }switch (D) {case "+":
+                            }
+                          } switch (D) {
+                            case "+":
                               q = M + q; break; case "-":
                               q = M - q; break; case "*":
                               q = M * q; break; case "/":
-                    q = M / q;}l[z] = { rootPropertyValue: B, startValue: M, currentValue: M, endValue: q, unitType: G, easing: $ }, b.debug && console.log("tweensContainer (" + z + "): " + JSON.stringify(l[z]), o);
+                              q = M / q;
+                          }l[z] = { rootPropertyValue: B, startValue: M, currentValue: M, endValue: q, unitType: G, easing: $ }, b.debug && console.log("tweensContainer (" + z + "): " + JSON.stringify(l[z]), o);
                       } else b.debug && console.log("Skipping [" + I + "] due to a lack of browser support.");
                 } l.element = o;
               } l.element && (S.Values.addClass(o, "velocity-animating"), R.push(l), "" === s.queue && (i(o).tweensContainer = l, i(o).opts = s), i(o).isAnimating = !0, V === w - 1 ? (b.State.calls.push([R, g, s, null, k.resolver]), b.State.isTicking === !1 && (b.State.isTicking = !0, c())) : V++);
@@ -705,11 +745,13 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
               s = f.extend({}, b.defaults, v),
               l = {}; switch (i(o) === a && b.init(o), parseFloat(s.delay) && s.queue !== !1 && f.queue(o, s.queue, function (e) {
                 b.velocityQueueEntryFlag = !0, i(o).delayTimer = { setTimeout: setTimeout(e, parseFloat(s.delay)), next: e };
-        }), s.duration.toString().toLowerCase()) {case "fast":
+              }), s.duration.toString().toLowerCase()) {
+                case "fast":
                   s.duration = 200; break; case "normal":
                 s.duration = h; break; case "slow":
                 s.duration = 600; break; default:
-            s.duration = parseFloat(s.duration) || 1;}b.mock !== !1 && (b.mock === !0 ? s.duration = s.delay = 1 : (s.duration *= parseFloat(b.mock) || 1, s.delay *= parseFloat(b.mock) || 1)), s.easing = u(s.easing, s.duration), s.begin && !m.isFunction(s.begin) && (s.begin = null), s.progress && !m.isFunction(s.progress) && (s.progress = null), s.complete && !m.isFunction(s.complete) && (s.complete = null), s.display !== a && null !== s.display && (s.display = s.display.toString().toLowerCase(), "auto" === s.display && (s.display = b.CSS.Values.getDisplayType(o))), s.visibility !== a && null !== s.visibility && (s.visibility = s.visibility.toString().toLowerCase()), s.mobileHA = s.mobileHA && b.State.isMobile && !b.State.isGingerbread, s.queue === !1 ? s.delay ? setTimeout(e, s.delay) : e() : f.queue(o, s.queue, function (t, r) {
+                s.duration = parseFloat(s.duration) || 1;
+            }b.mock !== !1 && (b.mock === !0 ? s.duration = s.delay = 1 : (s.duration *= parseFloat(b.mock) || 1, s.delay *= parseFloat(b.mock) || 1)), s.easing = u(s.easing, s.duration), s.begin && !m.isFunction(s.begin) && (s.begin = null), s.progress && !m.isFunction(s.progress) && (s.progress = null), s.complete && !m.isFunction(s.complete) && (s.complete = null), s.display !== a && null !== s.display && (s.display = s.display.toString().toLowerCase(), "auto" === s.display && (s.display = b.CSS.Values.getDisplayType(o))), s.visibility !== a && null !== s.visibility && (s.visibility = s.visibility.toString().toLowerCase()), s.mobileHA = s.mobileHA && b.State.isMobile && !b.State.isGingerbread, s.queue === !1 ? s.delay ? setTimeout(e, s.delay) : e() : f.queue(o, s.queue, function (t, r) {
               return r === !0 ? (k.promise && k.resolver(g), !0) : (b.velocityQueueEntryFlag = !0, void e(t));
             }), "" !== s.queue && "fx" !== s.queue || "inprogress" === f.queue(o)[0] || f.dequeue(o);
           } var s,
@@ -726,7 +768,8 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                   }
                 } var k = { promise: null, resolver: null, rejecter: null }; s && b.Promise && (k.promise = new b.Promise(function (e, t) {
                   k.resolver = e, k.rejecter = t;
-        }));var A;switch (y) {case "scroll":
+                })); var A; switch (y) {
+                  case "scroll":
                     A = "scroll"; break; case "reverse":
                     A = "reverse"; break; case "finish": case "stop":
                     f.each(g, function (e, t) {
@@ -752,7 +795,8 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                             parseFloat(j.stagger) ? j.delay = H + parseFloat(j.stagger) * e : m.isFunction(j.stagger) && (j.delay = H + j.stagger.call(t, e, w)), j.drag && (j.duration = parseFloat(E) || (/^(callout|transition)/.test(y) ? 1e3 : h), j.duration = Math.max(j.duration * (j.backwards ? 1 - e / w : (e + 1) / w), .75 * j.duration, 200)), b.Redirects[y].call(t, t, j || {}, e, w, g, k.promise ? k : a);
                           }), e();
                       } var N = "Velocity: First argument (" + y + ") was not a property map, a known action, or a registered redirect. Aborting."; return k.promise ? k.rejecter(new Error(N)) : console.log(N), e();
-            }A = "start";}var L = { lastParent: null, lastPosition: null, lastFontSize: null, lastPercentToPxWidth: null, lastPercentToPxHeight: null, lastEmToPx: null, remToPx: null, vwToPx: null, vhToPx: null },
+                    } A = "start";
+                }var L = { lastParent: null, lastPosition: null, lastFontSize: null, lastPercentToPxWidth: null, lastPercentToPxHeight: null, lastEmToPx: null, remToPx: null, vwToPx: null, vhToPx: null },
                   R = []; f.each(g, function (e, t) {
                     m.isNode(t) && n.call(t);
                   }); var z,
@@ -1009,18 +1053,23 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
     Y = V | W,
     Z = X | Y,
     $ = ["x", "y"],
-      _ = ["clientX", "clientY"];ab.prototype = { handler: function () {}, init: function () {
+    _ = ["clientX", "clientY"]; ab.prototype = {
+      handler: function () { }, init: function () {
         this.evEl && t(this.element, this.evEl, this.domHandler), this.evTarget && t(this.target, this.evTarget, this.domHandler), this.evWin && t(E(this.element), this.evWin, this.domHandler);
       }, destroy: function () {
         this.evEl && u(this.element, this.evEl, this.domHandler), this.evTarget && u(this.target, this.evTarget, this.domHandler), this.evWin && u(E(this.element), this.evWin, this.domHandler);
-    } };var ob = { mousedown: O, mousemove: P, mouseup: Q },
+      }
+    }; var ob = { mousedown: O, mousemove: P, mouseup: Q },
       pb = "mousedown",
-      qb = "mousemove mouseup";p(rb, ab, { handler: function (a) {
+      qb = "mousemove mouseup"; p(rb, ab, {
+        handler: function (a) {
           var b = ob[a.type]; b & O && 0 === a.button && (this.pressed = !0), b & P && 1 !== a.which && (b = Q), this.pressed && this.allow && (b & Q && (this.pressed = !1), this.callback(this.manager, b, { pointers: [a], changedPointers: [a], pointerType: L, srcEvent: a }));
-    } });var sb = { pointerdown: O, pointermove: P, pointerup: Q, pointercancel: R, pointerout: R },
+        }
+      }); var sb = { pointerdown: O, pointermove: P, pointerup: Q, pointercancel: R, pointerout: R },
         tb = { 2: J, 3: K, 4: L, 5: M },
         ub = "pointerdown",
-      vb = "pointermove pointerup pointercancel";a.MSPointerEvent && (ub = "MSPointerDown", vb = "MSPointerMove MSPointerUp MSPointerCancel"), p(wb, ab, { handler: function (a) {
+        vb = "pointermove pointerup pointercancel"; a.MSPointerEvent && (ub = "MSPointerDown", vb = "MSPointerMove MSPointerUp MSPointerCancel"), p(wb, ab, {
+          handler: function (a) {
             var b = this.store,
               c = !1,
               d = a.type.toLowerCase().replace("ms", ""),
@@ -1028,29 +1077,37 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
               f = tb[a.pointerType] || a.pointerType,
               g = f == J,
               h = y(b, a.pointerId, "pointerId"); e & O && (0 === a.button || g) ? 0 > h && (b.push(a), h = b.length - 1) : e & (Q | R) && (c = !0), 0 > h || (b[h] = a, this.callback(this.manager, e, { pointers: b, changedPointers: [a], pointerType: f, srcEvent: a }), c && b.splice(h, 1));
-    } });var xb = { touchstart: O, touchmove: P, touchend: Q, touchcancel: R },
+          }
+        }); var xb = { touchstart: O, touchmove: P, touchend: Q, touchcancel: R },
           yb = "touchstart",
-      zb = "touchstart touchmove touchend touchcancel";p(Ab, ab, { handler: function (a) {
+          zb = "touchstart touchmove touchend touchcancel"; p(Ab, ab, {
+            handler: function (a) {
               var b = xb[a.type]; if (b === O && (this.started = !0), this.started) {
                 var c = Bb.call(this, a, b); b & (Q | R) && 0 === c[0].length - c[1].length && (this.started = !1), this.callback(this.manager, b, { pointers: c[0], changedPointers: c[1], pointerType: J, srcEvent: a });
               }
-    } });var Cb = { touchstart: O, touchmove: P, touchend: Q, touchcancel: R },
+            }
-      Db = "touchstart touchmove touchend touchcancel";p(Eb, ab, { handler: function (a) {
+          }); var Cb = { touchstart: O, touchmove: P, touchend: Q, touchcancel: R },
+            Db = "touchstart touchmove touchend touchcancel"; p(Eb, ab, {
+              handler: function (a) {
                 var b = Cb[a.type],
                   c = Fb.call(this, a, b); c && this.callback(this.manager, b, { pointers: c[0], changedPointers: c[1], pointerType: J, srcEvent: a });
-    } }), p(Gb, ab, { handler: function (a, b, c) {
+              }
+            }), p(Gb, ab, {
+              handler: function (a, b, c) {
                 var d = c.pointerType == J,
                   e = c.pointerType == L; if (d) this.mouse.allow = !1; else if (e && !this.mouse.allow) return; b & (Q | R) && (this.mouse.allow = !0), this.callback(a, b, c);
               }, destroy: function () {
                 this.touch.destroy(), this.mouse.destroy();
-    } });var Hb = B(f.style, "touchAction"),
+              }
+            }); var Hb = B(f.style, "touchAction"),
               Ib = Hb !== d,
               Jb = "compute",
               Kb = "auto",
               Lb = "manipulation",
               Mb = "none",
               Nb = "pan-x",
-      Ob = "pan-y";Pb.prototype = { set: function (a) {
+              Ob = "pan-y"; Pb.prototype = {
+                set: function (a) {
                   a == Jb && (a = this.compute()), Ib && (this.manager.element.style[Hb] = a), this.actions = a.toLowerCase().trim();
                 }, update: function () {
                   this.set(this.manager.options.touchAction);
@@ -1068,13 +1125,15 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                   }
                 }, preventSrc: function (a) {
                   this.manager.session.prevented = !0, a.preventDefault();
-    } };var Rb = 1,
+                }
+              }; var Rb = 1,
                 Sb = 2,
                 Tb = 4,
                 Ub = 8,
                 Vb = Ub,
                 Wb = 16,
-      Xb = 32;Yb.prototype = { defaults: {}, set: function (a) {
+                Xb = 32; Yb.prototype = {
+                  defaults: {}, set: function (a) {
                     return n(this.options, a), this.manager && this.manager.touchAction.update(), this;
                   }, recognizeWith: function (a) {
                     if (l(a, "recognizeWith", this)) return this; var b = this.simultaneous; return a = _b(a, this), b[a.id] || (b[a.id] = a, a.recognizeWith(this)), this;
@@ -1101,14 +1160,18 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                     } return !0;
                   }, recognize: function (a) {
                     var b = n({}, a); return r(this.options.enable, [this, b]) ? (this.state & (Vb | Wb | Xb) && (this.state = Rb), this.state = this.process(b), this.state & (Sb | Tb | Ub | Wb) && this.tryEmit(b), void 0) : (this.reset(), this.state = Xb, void 0);
-    }, process: function () {}, getTouchAction: function () {}, reset: function () {} }, p(ac, Yb, { defaults: { pointers: 1 }, attrTest: function (a) {
+                  }, process: function () { }, getTouchAction: function () { }, reset: function () { }
+                }, p(ac, Yb, {
+                  defaults: { pointers: 1 }, attrTest: function (a) {
                     var b = this.options.pointers; return 0 === b || a.pointers.length === b;
                   }, process: function (a) {
                     var b = this.state,
                       c = a.eventType,
                       d = b & (Sb | Tb),
                       e = this.attrTest(a); return d && (c & R || !e) ? b | Wb : d || e ? c & Q ? b | Ub : b & Sb ? b | Tb : Sb : Xb;
-    } }), p(bc, ac, { defaults: { event: "pan", threshold: 10, pointers: 1, direction: Z }, getTouchAction: function () {
+                  }
+                }), p(bc, ac, {
+                  defaults: { event: "pan", threshold: 10, pointers: 1, direction: Z }, getTouchAction: function () {
                     var a = this.options.direction,
                       b = []; return a & X && b.push(Ob), a & Y && b.push(Nb), b;
                   }, directionTest: function (a) {
@@ -1122,7 +1185,9 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                     return ac.prototype.attrTest.call(this, a) && (this.state & Sb || !(this.state & Sb) && this.directionTest(a));
                   }, emit: function (a) {
                     this.pX = a.deltaX, this.pY = a.deltaY; var b = $b(a.direction); b && this.manager.emit(this.options.event + b, a), this._super.emit.call(this, a);
-    } }), p(cc, ac, { defaults: { event: "pinch", threshold: 0, pointers: 2 }, getTouchAction: function () {
+                  }
+                }), p(cc, ac, {
+                  defaults: { event: "pinch", threshold: 0, pointers: 2 }, getTouchAction: function () {
                     return [Mb];
                   }, attrTest: function (a) {
                     return this._super.attrTest.call(this, a) && (Math.abs(a.scale - 1) > this.options.threshold || this.state & Sb);
@@ -1130,7 +1195,9 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                     if (this._super.emit.call(this, a), 1 !== a.scale) {
                       var b = a.scale < 1 ? "in" : "out"; this.manager.emit(this.options.event + b, a);
                     }
-    } }), p(dc, Yb, { defaults: { event: "press", pointers: 1, time: 500, threshold: 5 }, getTouchAction: function () {
+                  }
+                }), p(dc, Yb, {
+                  defaults: { event: "press", pointers: 1, time: 500, threshold: 5 }, getTouchAction: function () {
                     return [Kb];
                   }, process: function (a) {
                     var b = this.options,
@@ -1143,18 +1210,24 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                     clearTimeout(this._timer);
                   }, emit: function (a) {
                     this.state === Vb && (a && a.eventType & Q ? this.manager.emit(this.options.event + "up", a) : (this._input.timeStamp = j(), this.manager.emit(this.options.event, this._input)));
-    } }), p(ec, ac, { defaults: { event: "rotate", threshold: 0, pointers: 2 }, getTouchAction: function () {
+                  }
+                }), p(ec, ac, {
+                  defaults: { event: "rotate", threshold: 0, pointers: 2 }, getTouchAction: function () {
                     return [Mb];
                   }, attrTest: function (a) {
                     return this._super.attrTest.call(this, a) && (Math.abs(a.rotation) > this.options.threshold || this.state & Sb);
-    } }), p(fc, ac, { defaults: { event: "swipe", threshold: 10, velocity: .65, direction: X | Y, pointers: 1 }, getTouchAction: function () {
+                  }
+                }), p(fc, ac, {
+                  defaults: { event: "swipe", threshold: 10, velocity: .65, direction: X | Y, pointers: 1 }, getTouchAction: function () {
                     return bc.prototype.getTouchAction.call(this);
                   }, attrTest: function (a) {
                     var c,
                       b = this.options.direction; return b & (X | Y) ? c = a.velocity : b & X ? c = a.velocityX : b & Y && (c = a.velocityY), this._super.attrTest.call(this, a) && b & a.direction && a.distance > this.options.threshold && i(c) > this.options.velocity && a.eventType & Q;
                   }, emit: function (a) {
                     var b = $b(a.direction); b && this.manager.emit(this.options.event + b, a), this.manager.emit(this.options.event, a);
-    } }), p(gc, Yb, { defaults: { event: "tap", pointers: 1, taps: 1, interval: 300, time: 250, threshold: 2, posThreshold: 10 }, getTouchAction: function () {
+                  }
+                }), p(gc, Yb, {
+                  defaults: { event: "tap", pointers: 1, taps: 1, interval: 300, time: 250, threshold: 2, posThreshold: 10 }, getTouchAction: function () {
                     return [Lb];
                   }, process: function (a) {
                     var b = this.options,
@@ -1174,8 +1247,10 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                     clearTimeout(this._timer);
                   }, emit: function () {
                     this.state == Vb && (this._input.tapCount = this.count, this.manager.emit(this.options.event, this._input));
-    } }), hc.VERSION = "2.0.4", hc.defaults = { domEvents: !1, touchAction: Jb, enable: !0, inputTarget: null, inputClass: null, preset: [[ec, { enable: !1 }], [cc, { enable: !1 }, ["rotate"]], [fc, { direction: X }], [bc, { direction: X }, ["swipe"]], [gc], [gc, { event: "doubletap", taps: 2 }, ["tap"]], [dc]], cssProps: { userSelect: "default", touchSelect: "none", touchCallout: "none", contentZooming: "none", userDrag: "none", tapHighlightColor: "rgba(0,0,0,0)" } };var ic = 1,
+                  }
-      jc = 2;kc.prototype = { set: function (a) {
+                }), hc.VERSION = "2.0.4", hc.defaults = { domEvents: !1, touchAction: Jb, enable: !0, inputTarget: null, inputClass: null, preset: [[ec, { enable: !1 }], [cc, { enable: !1 }, ["rotate"]], [fc, { direction: X }], [bc, { direction: X }, ["swipe"]], [gc], [gc, { event: "doubletap", taps: 2 }, ["tap"]], [dc]], cssProps: { userSelect: "default", touchSelect: "none", touchCallout: "none", contentZooming: "none", userDrag: "none", tapHighlightColor: "rgba(0,0,0,0)" } }; var ic = 1,
+                  jc = 2; kc.prototype = {
+                    set: function (a) {
                       return n(this.options, a), a.touchAction && this.touchAction.update(), a.inputTarget && (this.input.destroy(), this.input.target = a.inputTarget, this.input.init()), this;
                     }, stop: function (a) {
                       this.session.stopped = a ? jc : ic;
@@ -1213,7 +1288,8 @@ jQuery.Velocity ? console.log("Velocity is already loaded. You may be needlessly
                       }
                     }, destroy: function () {
                       this.element && lc(this, !1), this.handlers = {}, this.session = {}, this.input.destroy(), this.element = null;
-    } }, n(hc, { INPUT_START: O, INPUT_MOVE: P, INPUT_END: Q, INPUT_CANCEL: R, STATE_POSSIBLE: Rb, STATE_BEGAN: Sb, STATE_CHANGED: Tb, STATE_ENDED: Ub, STATE_RECOGNIZED: Vb, STATE_CANCELLED: Wb, STATE_FAILED: Xb, DIRECTION_NONE: S, DIRECTION_LEFT: T, DIRECTION_RIGHT: U, DIRECTION_UP: V, DIRECTION_DOWN: W, DIRECTION_HORIZONTAL: X, DIRECTION_VERTICAL: Y, DIRECTION_ALL: Z, Manager: kc, Input: ab, TouchAction: Pb, TouchInput: Eb, MouseInput: rb, PointerEventInput: wb, TouchMouseInput: Gb, SingleTouchInput: Ab, Recognizer: Yb, AttrRecognizer: ac, Tap: gc, Pan: bc, Swipe: fc, Pinch: cc, Rotate: ec, Press: dc, on: t, off: u, each: m, merge: o, extend: n, inherit: p, bindFn: q, prefixed: B }), typeof define == g && define.amd ? define(function () {
+                    }
+                  }, n(hc, { INPUT_START: O, INPUT_MOVE: P, INPUT_END: Q, INPUT_CANCEL: R, STATE_POSSIBLE: Rb, STATE_BEGAN: Sb, STATE_CHANGED: Tb, STATE_ENDED: Ub, STATE_RECOGNIZED: Vb, STATE_CANCELLED: Wb, STATE_FAILED: Xb, DIRECTION_NONE: S, DIRECTION_LEFT: T, DIRECTION_RIGHT: U, DIRECTION_UP: V, DIRECTION_DOWN: W, DIRECTION_HORIZONTAL: X, DIRECTION_VERTICAL: Y, DIRECTION_ALL: Z, Manager: kc, Input: ab, TouchAction: Pb, TouchInput: Eb, MouseInput: rb, PointerEventInput: wb, TouchMouseInput: Gb, SingleTouchInput: Ab, Recognizer: Yb, AttrRecognizer: ac, Tap: gc, Pan: bc, Swipe: fc, Pinch: cc, Rotate: ec, Press: dc, on: t, off: u, each: m, merge: o, extend: n, inherit: p, bindFn: q, prefixed: B }), typeof define == g && define.amd ? define(function () {
                     return hc;
                   }) : "undefined" != typeof module && module.exports ? module.exports = hc : a[c] = hc;
 }(window, document, "Hammer");; (function (factory) {
@@ -1451,13 +1527,17 @@ if (Vel) {
           object.parent().removeClass('active');
         }
         if (object.parent().hasClass('active')) {
-          object.siblings('.collapsible-body').stop(true, false).slideDown({ duration: 350, easing: "easeOutQuart", queue: false, complete: function () {
+          object.siblings('.collapsible-body').stop(true, false).slideDown({
+            duration: 350, easing: "easeOutQuart", queue: false, complete: function () {
               $(this).css('height', '');
-            } });
+            }
+          });
         } else {
-          object.siblings('.collapsible-body').stop(true, false).slideUp({ duration: 350, easing: "easeOutQuart", queue: false, complete: function () {
+          object.siblings('.collapsible-body').stop(true, false).slideUp({
+            duration: 350, easing: "easeOutQuart", queue: false, complete: function () {
               $(this).css('height', '');
-            } });
+            }
+          });
         }
 
         $panel_headers.not(object).removeClass('active').parent().removeClass('active');
@@ -1486,13 +1566,17 @@ if (Vel) {
           object.parent().removeClass('active');
         }
         if (object.parent().hasClass('active')) {
-          object.siblings('.collapsible-body').stop(true, false).slideDown({ duration: 350, easing: "easeOutQuart", queue: false, complete: function () {
+          object.siblings('.collapsible-body').stop(true, false).slideDown({
+            duration: 350, easing: "easeOutQuart", queue: false, complete: function () {
               $(this).css('height', '');
-            } });
+            }
+          });
         } else {
-          object.siblings('.collapsible-body').stop(true, false).slideUp({ duration: 350, easing: "easeOutQuart", queue: false, complete: function () {
+          object.siblings('.collapsible-body').stop(true, false).slideUp({
+            duration: 350, easing: "easeOutQuart", queue: false, complete: function () {
               $(this).css('height', '');
-            } });
+            }
+          });
         }
       }
 
@@ -2376,7 +2460,8 @@ if (Vel) {
 
         // Animate image + set z-index
         if (origin.hasClass('responsive-img')) {
-          origin.velocity({ 'max-width': newWidth, 'width': originalWidth }, { duration: 0, queue: false,
+          origin.velocity({ 'max-width': newWidth, 'width': originalWidth }, {
+            duration: 0, queue: false,
             complete: function () {
               origin.css({ left: 0, top: 0 }).velocity({
                 height: newHeight,
@@ -2881,7 +2966,8 @@ if (Vel) {
       // Mouse In
       var started = false,
         timeoutRef;
-      origin.on({ 'mouseenter.tooltip': function (e) {
+      origin.on({
+        'mouseenter.tooltip': function (e) {
           var showTooltip = function () {
             setAttributes();
             started = true;
@@ -2994,7 +3080,8 @@ if (Vel) {
           setTimeout(function () {
             if (started !== true) {
               tooltipEl.velocity({
-                opacity: 0, translateY: 0, translateX: 0 }, { duration: 225, queue: false });
+                opacity: 0, translateY: 0, translateX: 0
+              }, { duration: 225, queue: false });
               backdrop.velocity({ opacity: 0, scaleX: 1, scaleY: 1 }, {
                 duration: 225,
                 queue: false,
@@ -3811,15 +3898,18 @@ if (Vel) {
             width: ''
           });
 
-          $('#sidenav-overlay').velocity({ opacity: 0 }, { duration: 200,
+          $('#sidenav-overlay').velocity({ opacity: 0 }, {
+            duration: 200,
             queue: false, easing: 'easeOutQuad',
             complete: function () {
               $(this).remove();
-            } });
+            }
+          });
           if (options.edge === 'left') {
             // Reset phantom div
             $dragTarget.css({ width: '', right: '', left: '0' });
-            menu.velocity({ 'translateX': '-100%' }, { duration: 200,
+            menu.velocity({ 'translateX': '-100%' }, {
+              duration: 200,
               queue: false,
               easing: 'easeOutCubic',
               complete: function () {
@@ -3834,7 +3924,8 @@ if (Vel) {
           } else {
             // Reset phantom div
             $dragTarget.css({ width: '', right: '0', left: '' });
-            menu.velocity({ 'translateX': '100%' }, { duration: 200,
+            menu.velocity({ 'translateX': '100%' }, {
+              duration: 200,
               queue: false,
               easing: 'easeOutCubic',
               complete: function () {
@@ -3983,7 +4074,8 @@ if (Vel) {
                   });
                   // Slide menu closed
                   menu.velocity({ 'translateX': [-1 * options.menuWidth - 10, leftPos] }, { duration: 200, queue: false, easing: 'easeOutQuad' });
-                  $overlay.velocity({ opacity: 0 }, { duration: 200, queue: false, easing: 'easeOutQuad',
+                  $overlay.velocity({ opacity: 0 }, {
+                    duration: 200, queue: false, easing: 'easeOutQuad',
                     complete: function () {
                       // Run 'onClose' when sidenav is closed via touch/swipe if applicable
                       if (typeof options.onClose === 'function') {
@@ -3991,7 +4083,8 @@ if (Vel) {
                       }
 
                       $(this).remove();
-                    } });
+                    }
+                  });
                   $dragTarget.css({ width: '10px', right: '', left: 0 });
                 }
               } else {
@@ -4013,7 +4106,8 @@ if (Vel) {
 
                   // Slide menu closed
                   menu.velocity({ 'translateX': [options.menuWidth + 10, rightPos] }, { duration: 200, queue: false, easing: 'easeOutQuad' });
-                  $overlay.velocity({ opacity: 0 }, { duration: 200, queue: false, easing: 'easeOutQuad',
+                  $overlay.velocity({ opacity: 0 }, {
+                    duration: 200, queue: false, easing: 'easeOutQuad',
                     complete: function () {
                       // Run 'onClose' when sidenav is closed via touch/swipe if applicable
                       if (typeof options.onClose === 'function') {
@@ -4021,7 +4115,8 @@ if (Vel) {
                       }
 
                       $(this).remove();
-                    } });
+                    }
+                  });
                   $dragTarget.css({ width: '10px', right: 0, left: '' });
                 }
               }
@@ -4059,7 +4154,8 @@ if (Vel) {
               menuOut = false;
               panning = false;
               removeMenu();
-              $overlay.velocity({ opacity: 0 }, { duration: 300, queue: false, easing: 'easeOutQuad',
+              $overlay.velocity({ opacity: 0 }, {
+                duration: 300, queue: false, easing: 'easeOutQuad',
                 complete: function () {
                   $(this).remove();
                 }
@@ -4068,7 +4164,8 @@ if (Vel) {
 
             // Append body
             $('body').append($overlay);
-            $overlay.velocity({ opacity: 1 }, { duration: 300, queue: false, easing: 'easeOutQuad',
+            $overlay.velocity({ opacity: 1 }, {
+              duration: 300, queue: false, easing: 'easeOutQuad',
               complete: function () {
                 menuOut = true;
                 panning = false;
@@ -5198,10 +5295,12 @@ if (Vel) {
             $caption = $active.find('.caption');
 
             $active.removeClass('active');
-            $active.velocity({ opacity: 0 }, { duration: options.transition, queue: false, easing: 'easeOutQuad',
+            $active.velocity({ opacity: 0 }, {
+              duration: options.transition, queue: false, easing: 'easeOutQuad',
               complete: function () {
                 $slides.not('.active').velocity({ opacity: 0, translateX: 0, translateY: 0 }, { duration: 0, queue: false });
-              } });
+              }
+            });
             captionTransition($caption, options.transition);
 
             // Update indicators
@@ -5321,7 +5420,8 @@ if (Vel) {
 
             $curr_slide = $slider.find('.active');
             if (Math.abs(velocityX) > Math.abs(velocityY)) {
-              $curr_slide.velocity({ translateX: x
+              $curr_slide.velocity({
+                translateX: x
               }, { duration: 50, queue: false, easing: 'easeOutQuad' });
             }
 
@@ -5341,7 +5441,8 @@ if (Vel) {
               if (next_slide.length === 0) {
                 next_slide = $slides.first();
               }
-              next_slide.velocity({ opacity: 1
+              next_slide.velocity({
+                opacity: 1
               }, { duration: 300, queue: false, easing: 'easeOutQuad' });
             }
             if (swipeRight) {
@@ -5349,7 +5450,8 @@ if (Vel) {
               if (next_slide.length === 0) {
                 next_slide = $slides.last();
               }
-              next_slide.velocity({ opacity: 1
+              next_slide.velocity({
+                opacity: 1
               }, { duration: 300, queue: false, easing: 'easeOutQuad' });
             }
           }
@@ -5362,20 +5464,25 @@ if (Vel) {
 
             if (!swipeRight && !swipeLeft || $slides.length <= 1) {
               // Return to original spot
-              $curr_slide.velocity({ translateX: 0
+              $curr_slide.velocity({
+                translateX: 0
               }, { duration: 300, queue: false, easing: 'easeOutQuad' });
             } else if (swipeLeft) {
               moveToSlide(curr_index + 1);
-              $curr_slide.velocity({ translateX: -1 * $this.innerWidth() }, { duration: 300, queue: false, easing: 'easeOutQuad',
+              $curr_slide.velocity({ translateX: -1 * $this.innerWidth() }, {
+                duration: 300, queue: false, easing: 'easeOutQuad',
                 complete: function () {
                   $curr_slide.velocity({ opacity: 0, translateX: 0 }, { duration: 0, queue: false });
-                } });
+                }
+              });
             } else if (swipeRight) {
               moveToSlide(curr_index - 1);
-              $curr_slide.velocity({ translateX: $this.innerWidth() }, { duration: 300, queue: false, easing: 'easeOutQuad',
+              $curr_slide.velocity({ translateX: $this.innerWidth() }, {
+                duration: 300, queue: false, easing: 'easeOutQuad',
                 complete: function () {
                   $curr_slide.velocity({ opacity: 0, translateX: 0 }, { duration: 0, queue: false });
-                } });
+                }
+              });
             }
             swipeLeft = false;
             swipeRight = false;
@@ -6195,7 +6302,8 @@ if (Vel) {
           var x = e.gesture.deltaX;
           var velocityX = e.gesture.velocityX;
 
-          $this.velocity({ translateX: x
+          $this.velocity({
+            translateX: x
           }, { duration: 50, queue: false, easing: 'easeOutQuad' });
 
           // Swipe Left
@@ -6225,18 +6333,23 @@ if (Vel) {
               fullWidth = -1 * $this.innerWidth();
             }
 
-            $this.velocity({ translateX: fullWidth
+            $this.velocity({
-            }, { duration: 100, queue: false, easing: 'easeOutQuad', complete: function () {
+              translateX: fullWidth
+            }, {
+              duration: 100, queue: false, easing: 'easeOutQuad', complete: function () {
                 $this.css('border', 'none');
-                $this.velocity({ height: 0, padding: 0
+                $this.velocity({
-                }, { duration: 200, queue: false, easing: 'easeOutQuad', complete: function () {
+                  height: 0, padding: 0
+                }, {
+                  duration: 200, queue: false, easing: 'easeOutQuad', complete: function () {
                     $this.remove();
                   }
                   });
               }
               });
           } else {
-            $this.velocity({ translateX: 0
+            $this.velocity({
+              translateX: 0
             }, { duration: 100, queue: false, easing: 'easeOutQuad' });
           }
           swipeLeft = false;

app/js/common/sha256.js

@@ -1,33 +1,96 @@
-/*
+var sha256 = function sha256(ascii) {
- A JavaScript implementation of the SHA family of hashes, as
+	function rightRotate(value, amount) {
- defined in FIPS PUB 180-4 and FIPS PUB 202, as well as the corresponding
+		return (value >>> amount) | (value << (32 - amount));
- HMAC implementation as defined in FIPS PUB 198a
+	};
 
- Copyright 2008-2018 Brian Turek, 1998-2009 Paul Johnston & Contributors
+	var mathPow = Math.pow;
- Distributed under the BSD License
+	var maxWord = mathPow(2, 32);
- See http://caligatio.github.com/jsSHA/ for more information
+	var lengthProperty = 'length'
-*/
+	var i, j; // Used as a counter across the whole file
-'use strict';(function(I){function w(c,a,d){var l=0,b=[],g=0,f,n,k,e,h,q,y,p,m=!1,t=[],r=[],u,z=!1;d=d||{};f=d.encoding||"UTF8";u=d.numRounds||1;if(u!==parseInt(u,10)||1>u)throw Error("numRounds must a integer >= 1");if(0===c.lastIndexOf("SHA-",0))if(q=function(b,a){return A(b,a,c)},y=function(b,a,l,f){var g,e;if("SHA-224"===c||"SHA-256"===c)g=(a+65>>>9<<4)+15,e=16;else throw Error("Unexpected error in SHA-2 implementation");for(;b.length<=g;)b.push(0);b[a>>>5]|=128<<24-a%32;a=a+l;b[g]=a&4294967295;
+	var result = ''
-b[g-1]=a/4294967296|0;l=b.length;for(a=0;a<l;a+=e)f=A(b.slice(a,a+e),f,c);if("SHA-224"===c)b=[f[0],f[1],f[2],f[3],f[4],f[5],f[6]];else if("SHA-256"===c)b=f;else throw Error("Unexpected error in SHA-2 implementation");return b},p=function(b){return b.slice()},"SHA-224"===c)h=512,e=224;else if("SHA-256"===c)h=512,e=256;else throw Error("Chosen SHA variant is not supported");else throw Error("Chosen SHA variant is not supported");k=B(a,f);n=x(c);this.setHMACKey=function(b,a,g){var e;if(!0===m)throw Error("HMAC key already set");
+
-if(!0===z)throw Error("Cannot set HMAC key after calling update");f=(g||{}).encoding||"UTF8";a=B(a,f)(b);b=a.binLen;a=a.value;e=h>>>3;g=e/4-1;if(e<b/8){for(a=y(a,b,0,x(c));a.length<=g;)a.push(0);a[g]&=4294967040}else if(e>b/8){for(;a.length<=g;)a.push(0);a[g]&=4294967040}for(b=0;b<=g;b+=1)t[b]=a[b]^909522486,r[b]=a[b]^1549556828;n=q(t,n);l=h;m=!0};this.update=function(a){var c,f,e,d=0,p=h>>>5;c=k(a,b,g);a=c.binLen;f=c.value;c=a>>>5;for(e=0;e<c;e+=p)d+h<=a&&(n=q(f.slice(e,e+p),n),d+=h);l+=d;b=f.slice(d>>>
+	var words = [];
-5);g=a%h;z=!0};this.getHash=function(a,f){var d,h,k,q;if(!0===m)throw Error("Cannot call getHash after setting HMAC key");k=C(f);switch(a){case "HEX":d=function(a){return D(a,e,k)};break;case "B64":d=function(a){return E(a,e,k)};break;case "BYTES":d=function(a){return F(a,e)};break;case "ARRAYBUFFER":try{h=new ArrayBuffer(0)}catch(v){throw Error("ARRAYBUFFER not supported by this environment");}d=function(a){return G(a,e)};break;default:throw Error("format must be HEX, B64, BYTES, or ARRAYBUFFER");
+	var asciiBitLength = ascii[lengthProperty] * 8;
-}q=y(b.slice(),g,l,p(n));for(h=1;h<u;h+=1)q=y(q,e,0,x(c));return d(q)};this.getHMAC=function(a,f){var d,k,t,u;if(!1===m)throw Error("Cannot call getHMAC without first setting HMAC key");t=C(f);switch(a){case "HEX":d=function(a){return D(a,e,t)};break;case "B64":d=function(a){return E(a,e,t)};break;case "BYTES":d=function(a){return F(a,e)};break;case "ARRAYBUFFER":try{d=new ArrayBuffer(0)}catch(v){throw Error("ARRAYBUFFER not supported by this environment");}d=function(a){return G(a,e)};break;default:throw Error("outputFormat must be HEX, B64, BYTES, or ARRAYBUFFER");
+
-}k=y(b.slice(),g,l,p(n));u=q(r,x(c));u=y(k,e,h,u);return d(u)}}function m(){}function D(c,a,d){var l="";a/=8;var b,g;for(b=0;b<a;b+=1)g=c[b>>>2]>>>8*(3+b%4*-1),l+="0123456789abcdef".charAt(g>>>4&15)+"0123456789abcdef".charAt(g&15);return d.outputUpper?l.toUpperCase():l}function E(c,a,d){var l="",b=a/8,g,f,n;for(g=0;g<b;g+=3)for(f=g+1<b?c[g+1>>>2]:0,n=g+2<b?c[g+2>>>2]:0,n=(c[g>>>2]>>>8*(3+g%4*-1)&255)<<16|(f>>>8*(3+(g+1)%4*-1)&255)<<8|n>>>8*(3+(g+2)%4*-1)&255,f=0;4>f;f+=1)8*g+6*f<=a?l+="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(n>>>
+	//* caching results is optional - remove/add slash from front of this line to toggle
-6*(3-f)&63):l+=d.b64Pad;return l}function F(c,a){var d="",l=a/8,b,g;for(b=0;b<l;b+=1)g=c[b>>>2]>>>8*(3+b%4*-1)&255,d+=String.fromCharCode(g);return d}function G(c,a){var d=a/8,l,b=new ArrayBuffer(d),g;g=new Uint8Array(b);for(l=0;l<d;l+=1)g[l]=c[l>>>2]>>>8*(3+l%4*-1)&255;return b}function C(c){var a={outputUpper:!1,b64Pad:"=",shakeLen:-1};c=c||{};a.outputUpper=c.outputUpper||!1;!0===c.hasOwnProperty("b64Pad")&&(a.b64Pad=c.b64Pad);if("boolean"!==typeof a.outputUpper)throw Error("Invalid outputUpper formatting option");
+	// Initial hash value: first 32 bits of the fractional parts of the square roots of the first 8 primes
-if("string"!==typeof a.b64Pad)throw Error("Invalid b64Pad formatting option");return a}function B(c,a){var d;switch(a){case "UTF8":case "UTF16BE":case "UTF16LE":break;default:throw Error("encoding must be UTF8, UTF16BE, or UTF16LE");}switch(c){case "HEX":d=function(a,b,c){var f=a.length,d,k,e,h,q;if(0!==f%2)throw Error("String of HEX type must be in byte increments");b=b||[0];c=c||0;q=c>>>3;for(d=0;d<f;d+=2){k=parseInt(a.substr(d,2),16);if(isNaN(k))throw Error("String of HEX type contains invalid characters");
+	// (we actually calculate the first 64, but extra values are just ignored)
-h=(d>>>1)+q;for(e=h>>>2;b.length<=e;)b.push(0);b[e]|=k<<8*(3+h%4*-1)}return{value:b,binLen:4*f+c}};break;case "TEXT":d=function(c,b,d){var f,n,k=0,e,h,q,m,p,r;b=b||[0];d=d||0;q=d>>>3;if("UTF8"===a)for(r=3,e=0;e<c.length;e+=1)for(f=c.charCodeAt(e),n=[],128>f?n.push(f):2048>f?(n.push(192|f>>>6),n.push(128|f&63)):55296>f||57344<=f?n.push(224|f>>>12,128|f>>>6&63,128|f&63):(e+=1,f=65536+((f&1023)<<10|c.charCodeAt(e)&1023),n.push(240|f>>>18,128|f>>>12&63,128|f>>>6&63,128|f&63)),h=0;h<n.length;h+=1){p=k+
+	var hash = sha256.h = sha256.h || [];
-q;for(m=p>>>2;b.length<=m;)b.push(0);b[m]|=n[h]<<8*(r+p%4*-1);k+=1}else if("UTF16BE"===a||"UTF16LE"===a)for(r=2,n="UTF16LE"===a&&!0||"UTF16LE"!==a&&!1,e=0;e<c.length;e+=1){f=c.charCodeAt(e);!0===n&&(h=f&255,f=h<<8|f>>>8);p=k+q;for(m=p>>>2;b.length<=m;)b.push(0);b[m]|=f<<8*(r+p%4*-1);k+=2}return{value:b,binLen:8*k+d}};break;case "B64":d=function(a,b,c){var f=0,d,k,e,h,q,m,p;if(-1===a.search(/^[a-zA-Z0-9=+\/]+$/))throw Error("Invalid character in base-64 string");k=a.indexOf("=");a=a.replace(/\=/g,
+	// Round constants: first 32 bits of the fractional parts of the cube roots of the first 64 primes
-"");if(-1!==k&&k<a.length)throw Error("Invalid '=' found in base-64 string");b=b||[0];c=c||0;m=c>>>3;for(k=0;k<a.length;k+=4){q=a.substr(k,4);for(e=h=0;e<q.length;e+=1)d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(q[e]),h|=d<<18-6*e;for(e=0;e<q.length-1;e+=1){p=f+m;for(d=p>>>2;b.length<=d;)b.push(0);b[d]|=(h>>>16-8*e&255)<<8*(3+p%4*-1);f+=1}}return{value:b,binLen:8*f+c}};break;case "BYTES":d=function(a,b,c){var d,n,k,e,h;b=b||[0];c=c||0;k=c>>>3;for(n=0;n<a.length;n+=
+	var k = sha256.k = sha256.k || [];
-1)d=a.charCodeAt(n),h=n+k,e=h>>>2,b.length<=e&&b.push(0),b[e]|=d<<8*(3+h%4*-1);return{value:b,binLen:8*a.length+c}};break;case "ARRAYBUFFER":try{d=new ArrayBuffer(0)}catch(l){throw Error("ARRAYBUFFER not supported by this environment");}d=function(a,b,c){var d,n,k,e,h;b=b||[0];c=c||0;n=c>>>3;h=new Uint8Array(a);for(d=0;d<a.byteLength;d+=1)e=d+n,k=e>>>2,b.length<=k&&b.push(0),b[k]|=h[d]<<8*(3+e%4*-1);return{value:b,binLen:8*a.byteLength+c}};break;default:throw Error("format must be HEX, TEXT, B64, BYTES, or ARRAYBUFFER");
+	var primeCounter = k[lengthProperty];
-}return d}function r(c,a){return c>>>a|c<<32-a}function J(c,a,d){return c&a^~c&d}function K(c,a,d){return c&a^c&d^a&d}function L(c){return r(c,2)^r(c,13)^r(c,22)}function M(c){return r(c,6)^r(c,11)^r(c,25)}function N(c){return r(c,7)^r(c,18)^c>>>3}function O(c){return r(c,17)^r(c,19)^c>>>10}function P(c,a){var d=(c&65535)+(a&65535);return((c>>>16)+(a>>>16)+(d>>>16)&65535)<<16|d&65535}function Q(c,a,d,l){var b=(c&65535)+(a&65535)+(d&65535)+(l&65535);return((c>>>16)+(a>>>16)+(d>>>16)+(l>>>16)+(b>>>
+	/*/
-16)&65535)<<16|b&65535}function R(c,a,d,l,b){var g=(c&65535)+(a&65535)+(d&65535)+(l&65535)+(b&65535);return((c>>>16)+(a>>>16)+(d>>>16)+(l>>>16)+(b>>>16)+(g>>>16)&65535)<<16|g&65535}function x(c){var a=[],d;if(0===c.lastIndexOf("SHA-",0))switch(a=[3238371032,914150663,812702999,4144912697,4290775857,1750603025,1694076839,3204075428],d=[1779033703,3144134277,1013904242,2773480762,1359893119,2600822924,528734635,1541459225],c){case "SHA-224":break;case "SHA-256":a=d;break;case "SHA-384":a=[new m,new m,
+	var hash = [], k = [];
-new m,new m,new m,new m,new m,new m];break;case "SHA-512":a=[new m,new m,new m,new m,new m,new m,new m,new m];break;default:throw Error("Unknown SHA variant");}else throw Error("No SHA variants supported");return a}function A(c,a,d){var l,b,g,f,n,k,e,h,m,r,p,w,t,x,u,z,A,B,C,D,E,F,v=[],G;if("SHA-224"===d||"SHA-256"===d)r=64,w=1,F=Number,t=P,x=Q,u=R,z=N,A=O,B=L,C=M,E=K,D=J,G=H;else throw Error("Unexpected error in SHA-2 implementation");d=a[0];l=a[1];b=a[2];g=a[3];f=a[4];n=a[5];k=a[6];e=a[7];for(p=
+	var primeCounter = 0;
-0;p<r;p+=1)16>p?(m=p*w,h=c.length<=m?0:c[m],m=c.length<=m+1?0:c[m+1],v[p]=new F(h,m)):v[p]=x(A(v[p-2]),v[p-7],z(v[p-15]),v[p-16]),h=u(e,C(f),D(f,n,k),G[p],v[p]),m=t(B(d),E(d,l,b)),e=k,k=n,n=f,f=t(g,h),g=b,b=l,l=d,d=t(h,m);a[0]=t(d,a[0]);a[1]=t(l,a[1]);a[2]=t(b,a[2]);a[3]=t(g,a[3]);a[4]=t(f,a[4]);a[5]=t(n,a[5]);a[6]=t(k,a[6]);a[7]=t(e,a[7]);return a}var H;H=[1116352408,1899447441,3049323471,3921009573,961987163,1508970993,2453635748,2870763221,3624381080,310598401,607225278,1426881987,1925078388,2162078206,
+	//*/
-2614888103,3248222580,3835390401,4022224774,264347078,604807628,770255983,1249150122,1555081692,1996064986,2554220882,2821834349,2952996808,3210313671,3336571891,3584528711,113926993,338241895,666307205,773529912,1294757372,1396182291,1695183700,1986661051,2177026350,2456956037,2730485921,2820302411,3259730800,3345764771,3516065817,3600352804,4094571909,275423344,430227734,506948616,659060556,883997877,958139571,1322822218,1537002063,1747873779,1955562222,2024104815,2227730452,2361852424,2428436474,
+
-2756734187,3204031479,3329325298];"function"===typeof define&&define.amd?define(function(){return w}):"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(module.exports=w),exports=w):I.jsSHA=w})(this);
+	var isComposite = {};
-function sha256(token){
+	for (var candidate = 2; primeCounter < 64; candidate++) {
-    var shaObj = new jsSHA("SHA-256", "TEXT");
+		if (!isComposite[candidate]) {
-    shaObj.update(token);
+			for (i = 0; i < 313; i += candidate) {
-    var hash = shaObj.getHash("HEX");
+				isComposite[i] = candidate;
-    return hash;
 			}
+			hash[primeCounter] = (mathPow(candidate, .5) * maxWord) | 0;
+			k[primeCounter++] = (mathPow(candidate, 1 / 3) * maxWord) | 0;
+		}
+	}
+
+	ascii += '\x80' // Append Ƈ' bit (plus zero padding)
+	while (ascii[lengthProperty] % 64 - 56) ascii += '\x00' // More zero padding
+	for (i = 0; i < ascii[lengthProperty]; i++) {
+		j = ascii.charCodeAt(i);
+		if (j >> 8) return; // ASCII check: only accept characters in range 0-255
+		words[i >> 2] |= j << ((3 - i) % 4) * 8;
+	}
+	words[words[lengthProperty]] = ((asciiBitLength / maxWord) | 0);
+	words[words[lengthProperty]] = (asciiBitLength)
+
+	// process each chunk
+	for (j = 0; j < words[lengthProperty];) {
+		var w = words.slice(j, j += 16); // The message is expanded into 64 words as part of the iteration
+		var oldHash = hash;
+		// This is now the undefinedworking hash", often labelled as variables a...g
+		// (we have to truncate as well, otherwise extra entries at the end accumulate
+		hash = hash.slice(0, 8);
+
+		for (i = 0; i < 64; i++) {
+			var i2 = i + j;
+			// Expand the message into 64 words
+			// Used below if 
+			var w15 = w[i - 15], w2 = w[i - 2];
+
+			// Iterate
+			var a = hash[0], e = hash[4];
+			var temp1 = hash[7]
+				+ (rightRotate(e, 6) ^ rightRotate(e, 11) ^ rightRotate(e, 25)) // S1
+				+ ((e & hash[5]) ^ ((~e) & hash[6])) // ch
+				+ k[i]
+				// Expand the message schedule if needed
+				+ (w[i] = (i < 16) ? w[i] : (
+					w[i - 16]
+					+ (rightRotate(w15, 7) ^ rightRotate(w15, 18) ^ (w15 >>> 3)) // s0
+					+ w[i - 7]
+					+ (rightRotate(w2, 17) ^ rightRotate(w2, 19) ^ (w2 >>> 10)) // s1
+				) | 0
+				);
+			// This is only used once, so *could* be moved below, but it only saves 4 bytes and makes things unreadble
+			var temp2 = (rightRotate(a, 2) ^ rightRotate(a, 13) ^ rightRotate(a, 22)) // S0
+				+ ((a & hash[1]) ^ (a & hash[2]) ^ (hash[1] & hash[2])); // maj
+
+			hash = [(temp1 + temp2) | 0].concat(hash); // We don't bother trimming off the extra ones, they're harmless as long as we're truncating when we do the slice()
+			hash[4] = (hash[4] + temp1) | 0;
+		}
+
+		for (i = 0; i < 8; i++) {
+			hash[i] = (hash[i] + oldHash[i]) | 0;
+		}
+	}
+
+	for (i = 0; i < 8; i++) {
+		for (j = 3; j + 1; j--) {
+			var b = (hash[i] >> (j * 8)) & 255;
+			result += ((b < 16) ? 0 : '') + b.toString(16);
+		}
+	}
+	return result;
+};

app/js/common/version.js

@@ -1,8 +1,9 @@
 //バージョンチェッカー
-function verck(ver,winstore) {
+function verck(ver) {
+	console.log("%c Welcome😊", "color: red;font-size:200%;")
 	if (localStorage.getItem("ver") != ver) {
 		localStorage.setItem("ver", ver);
-		console.log("Thank you for your update");
+		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
 		$(document).ready(function () {
 			$('#releasenote').modal('open');
 			verp = ver.replace('(', '');
@@ -12,11 +13,83 @@ function verck(ver,winstore) {
 			verp = verp.replace(']', '');
 			verp = verp.replace(')', '');
 			verp = verp.replace(' ', '_');
-			console.log(verp);
+			console.log("%c " + verp, "color: red;font-size:200%;");
+			if (lang.language == "ja") {
 				$("#release-" + verp).show();
-		  });
+			} else {
+				$("#release-en").show();
 			}
 
+		});
+	}
+	var electron = require("electron");
+	var remote = electron.remote;
+	var dialog = remote.dialog;
+	var platform = remote.process.platform;
+	console.log("Your platform:"+remote.process.platform)
+	if (platform == "win32") {
+		const options = {
+			type: 'info',
+			title: "Select your platform",
+			message: lang.lang_version_platform,
+			buttons: [lang.lang_no, lang.lang_yesno]
+		}
+		if (!localStorage.getItem("winstore")) {
+
+			dialog.showMessageBox(options, function (arg) {
+				if (arg == 1) {
+					localStorage.setItem("winstore", "winstore")
+				} else {
+					localStorage.setItem("winstore", "localinstall")
+				}
+			});
+		}
+	} else if (platform == "linux") {
+		if (localStorage.getItem("winstore") == "unix") {
+			localStorage.removeItem("winstore")
+		}
+		if (!localStorage.getItem("winstore")) {
+			const options = {
+				type: 'info',
+				title: "Select your platform",
+				message: lang.lang_version_platform_linux,
+				buttons: [lang.lang_no, lang.lang_yesno]
+			}
+			dialog.showMessageBox(options, function (arg) {
+				if (arg == 1) {
+					localStorage.setItem("winstore", "snapcraft")
+				} else {
+					localStorage.setItem("winstore", "localinstall")
+				}
+			});
+		}
+	} else if (platform == "darwin") {
+		if (localStorage.getItem("winstore") == "unix") {
+			localStorage.removeItem("winstore")
+		}
+		if (!localStorage.getItem("winstore")) {
+			const options = {
+				type: 'info',
+				title: "Select your platform",
+				message: lang.lang_version_platform_mac,
+				buttons: [lang.lang_no, lang.lang_yesno]
+			}
+			dialog.showMessageBox(options, function (arg) {
+				if (arg == 1) {
+					localStorage.setItem("winstore", "brewcask")
+				} else {
+					localStorage.setItem("winstore", "localinstall")
+				}
+			});
+		}
+	} else {
+		localStorage.setItem("winstore", "unix")
+	}
+	if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
+		var winstore = true;
+	} else {
+		var winstore = false;
+	}
 	var l = 5;
 	// 生成する文字列に含める文字セット
 	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
@@ -34,7 +107,7 @@ function verck(ver,winstore) {
 		todo(error);
 		console.error(error);
 	}).then(function (mess) {
-		console.log(mess);
+		console.table(mess);
 		if (mess) {
 			var electron = require("electron");
 			var remote = electron.remote;
@@ -46,7 +119,7 @@ function verck(ver,winstore) {
 			}
 			if (newest == ver) {
 				todo(lang.lang_version_usever.replace("{{ver}}", mess.desk));
-				//betaかWInstoreならアプデチェックしない
+				//betaかWinstoreならアプデチェックしない
 			} else if (ver.indexOf("beta") != -1 || winstore) {
 
 			} else {
@@ -56,6 +129,7 @@ function verck(ver,winstore) {
 						var ipc = electron.ipcRenderer;
 						ipc.send('update', "true");
 					} else {
+						console.warn(lang.lang_version_skipver);
 						todo(lang.lang_version_skipver);
 					}
 				} else {
@@ -68,9 +142,7 @@ function verck(ver,winstore) {
 	if (!localStorage.getItem("last-notice-id")) {
 		localStorage.setItem("last-notice-id", 0)
 	}
-	console.log(localStorage.getItem("last-notice-id"))
 	var start = "https://thedesk.top/notice?since_id=" + localStorage.getItem("last-notice-id");
-	console.log(start);
 	fetch(start, {
 		method: 'GET'
 	}).then(function (response) {
@@ -79,7 +151,6 @@ function verck(ver,winstore) {
 		todo(error);
 		console.error(error);
 	}).then(function (mess) {
-		console.log(mess.length);
 		if (mess.length < 1) {
 			return false;
 		} else {
@@ -91,8 +162,8 @@ function verck(ver,winstore) {
 					break;
 				} else {
 					var show = true;
-				if(obj.Toot!=""){
+					if (obj.toot != "") {
-					var toot='<button class="btn-flat toast-action" onclick="detEx(\''+obj.Toot+'\',\'main\')">Show</button>';
+						var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + '\',\'main\')">Show</button>';
 					} else {
 						var toot = "";
 					}
@@ -117,26 +188,25 @@ function verck(ver,winstore) {
 						}
 					}
 					if (show) {
-					Materialize.toast(obj.Text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+						Materialize.toast(escapeHTML(obj.Text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', 86400);
 					}
 				}
 
 			}
 		}
 	});
+}
+var infostreaming = false;
+function infowebsocket() {
 	infows = new WebSocket("wss://thedesk.top/ws/");
 	infows.onopen = function (mess) {
-		console.log(tlid + ":Connect Streaming Info:");
+		console.log([tlid, ":Connect Streaming Info:", mess]);
-		console.log(mess);
+		infostreaming = true;
 	}
 	infows.onmessage = function (mess) {
-		console.log(":Receive Streaming:");
+		console.log([tlid, ":Receive Streaming:", JSON.parse(mess.data)]);
-		console.log(JSON.parse(mess.data));
 		var obj = JSON.parse(mess.data);
 		if (obj.type != "counter") {
-		if(obj.id*1<=localStorage.getItem("last-notice-id")){
-			
-		}else{
 			localStorage.setItem("last-notice-id", obj.id)
 			var show = true;
 			if (obj.toot != "") {
@@ -165,19 +235,41 @@ function verck(ver,winstore) {
 				}
 			}
 			if (show) {
-				Materialize.toast(obj.text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+				Materialize.toast(escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', 86400);
-			}
 			}
 		} else {
 			$("#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();
+	}
+}, 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();
+	} else {
+		$("#release-en").show();
+	}
+}

app/js/emoji/default-emoji.js

@@ -20,8 +20,7 @@ if(lang=="ja"){
         place: "場所",
         symbol: "記号"
     };
-    var lang_defaultemojis_text="{{cat}}の絵文字";
+} else {
-}else if(lang=="en"){
     var defaultemojiname = {
         activity: "Activities",
         flag: "Flags",
@@ -32,7 +31,6 @@ if(lang=="ja"){
         place: "Places",
         symbol: "Symbols"
     };
-    var lang_defaultemojis_text="Emojis of {{cat}}";
 }
 
 function defaultEmoji(target) {
@@ -43,7 +41,7 @@ function defaultEmoji(target){
         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_defaultemojis_text.replace("{{cat}}" ,defaultemojiname[target]));
+    $("#now-emoji").text(lang.lang_defaultemojis_text.replace("{{cat}}", defaultemojiname[target]));
     $(".emoji-control").addClass("hide");
 }
 function customEmoji() {
@@ -55,7 +53,12 @@ function defEmoji(target){
     var emojiraw = newpack.filter(function (item, index) {
         if (item.short_name == target) return true;
     });
-    emoji=twemoji.convert.fromCodePoint(emojiraw[0].unified);
+    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();
@@ -66,7 +69,6 @@ function defEmoji(target){
     } else {
         newt = emoji + now;
     }
-        console.log(emoji);
     $("#textarea").val(newt);
     $("#textarea").focus();
     var selin = $("#textarea").prop('selectionStart');
@@ -77,7 +79,6 @@ function defEmoji(target){
 }
 function faicon() {
     var json = faicons;
-    console.log(json);
     var emojis = "";
     Object.keys(json).forEach(function (key) {
         var emoji = json[key];

app/js/lang/lang.en.js

@@ -21,6 +21,9 @@ var lang={
     //common/version.js
     "lang_version_usever": "No update is found({{ver}})",
     "lang_version_skipver": "Update was ignored.",
+    "lang_version_platform": "Was this software installed at Microsoft Store? When select 'yes', any update was ignored.",
+    "lang_version_platform_linux": "Was this software installed at Snapcraft(snapd)? When select 'yes', any update was ignored.",
+    "lang_version_platform_mac": "Was this software installed at Homebrew Cask? When select 'yes', any update was ignored.",
     //login
     //login/login.js
     "lang_login_noauth": "Show TL of unlogined accounts",
@@ -39,9 +42,11 @@ var lang={
     //post/emoji.js
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
+    "lang_defaultemojis_text": "Emojis about {{cat}}",
     //post/img.js
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
+    "lang_postimg_delete": "Delete this image.",
     //post/post.js
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
@@ -86,6 +91,7 @@ var lang={
     "lang_list_users": "Users list",
     "lang_list_nouser": "No users in this list.",
     "lang_list_add": "Add to the list",
+    "lang_list_add_misskey": "(perhaps this user has been listed)",
     "lang_list_remove": "Remove from the list",
     //tl/notification.js
     "lang_notf_new": " new notifications",
@@ -98,7 +104,8 @@ var lang={
     "lang_tags_always": "Always toots with ",
     "lang_tags_realtime": "Tag-stream toot",
     "lang_tags_tagunpin": "Unpin {{tag}}",
-    "lang_tags_tagwarn":"When you toot without {{tag}}, tag-streaming mode will be off.",
+    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_tagwarn": "Auto complete {{tag}}, if toot without {{tag}}",
     //tl/tl.js
     "lang_tl_media": "Media",
     "lang_tl_reconnect": "Reconnect to streaming API",
@@ -117,6 +124,12 @@ var lang={
     "lang_layout_dm": "Direct Message",
     "lang_layout_webviewmode": "Prefer WebView",
     "lang_excluded": "Excluded type of notification",
+    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_leftFold": "Stack to the left",
+    "lang_layout_leftUnfold": "Dock on the right",
+    //ui/sort.js
+    "lang_sort_gothis": "Go to this column",
+    "lang_sort_remthis": "Delete this column",
     //ui/spotify.js
     "lang_spotify_img": "Attach an album artwork",
     "lang_spotify_imgno": "Not attach an album artwork",
@@ -128,6 +141,7 @@ var lang={
     "lang_hisdata_frcwarn": "Unfollow accounts will be shown.",
     "lang_hisdata_taketime": "It will take 30s ~ several minutes",
     "lang_hisdata_notonmisskey": "Misskey is unable to request.",
+    "lang_hisdata_key": "This user is proofed by {{set}}",
     //userdata/showOnTL.js
     "lang_showontl_movetxt": "This account was moved",
     "lang_showontl_movebtn": "Continue on the new account",
@@ -136,11 +150,13 @@ var lang={
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
+    "lang_showontl_verified": "This website is verified by owner at ",
     //parse
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
     "lang_parse_btedsimple": " boosted",
+    "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
     "lang_parse_fulltext": "Full size text:",
@@ -172,6 +188,14 @@ var lang={
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
+    "lang_parse_voted": "Voted",
+    "lang_parse_vote": "Vote",
+    "lang_parse_unvoted": "Show the result without voting",
+    "lang_parse_endedvote": "Expired",
+    "lang_parse_thread": "Show thread",
+    "lang_parse_unknown": "Attached file",
+    "lang_parse_nsfw": "NSFW media",
+    "lang_parse_notffilter":"Show this user's notifications",
     //misskey
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
@@ -202,12 +226,14 @@ var lang={
     "lang_setting_selt": "Auto fold:{{set1}} lines and above, {{set2}} letters and above",
     "lang_setting_autocw": "Auto CW:{{set1}} lines and above, {{set2}} letters and above",
     "lang_setting_width": "Minimam width:{{set}}",
+    "lang_setting_fixwidth": "TweetDeck fixed width:{{set}}px",
     "lang_setting_img": "After posting an image:{{set}}",
     "lang_setting_font": "Fonts:{{set}}",
     "lang_setting_default": "default font",
     "lang_setting_size": "Font size:{{set}}px",
     "lang_setting_imgheight": "Image height:{{set}}px",
     "lang_setting_ticker": "#InstanceTicker:{{set}}px",
+    "lang_setting_animation": "Animation: {{set}}",
     "lang_setting_tag": "Tag TL:{{set}}",
     "lang_setting_boxConfirm": "Post box:{{set}}",
     "lang_setting_ul": "Native locale:{{set}}",

app/js/lang/lang.ja.js

@@ -1,7 +1,6 @@
 //commonError
 var lang = {
     "language": "ja",
-    //commonError
     "lang_toot": "トゥート",
     "lang_there": "あり",
     "lang_nothing": "なし",
@@ -22,6 +21,9 @@ var lang={
     //common/version.js
     "lang_version_usever": "お使いのバージョン{{ver}}は最新です。",
     "lang_version_skipver": "アップデートはスキップされました。",
+    "lang_version_platform": "このソフトウェアはMicrosoft Storeからダウンロードされましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
+    "lang_version_platform_linux": "このソフトウェアはSnapcraft(snapd)からインストールしましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
+    "lang_version_platform_mac": "このソフトウェアはHomebrew Caskからインストールしましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
     //login
     //login/login.js
     "lang_login_noauth": "認証せずに見る",
@@ -40,9 +42,11 @@ var lang={
     //post/emoji.js
     "lang_emoji_get": "絵文字リストを取得",
     "lang_emoji_custom": "カスタム絵文字",
+    "lang_defaultemojis_text": "{{cat}}の絵文字",
     //post/img.js
     "lang_postimg_previewdis": "プレビューできません。",
     "lang_postimg_aftupload": "アップロード後はアカウントを切り替えられません。",
+    "lang_postimg_delete": "この画像を削除します",
     //post/post.js
     "lang_post_tagTL": "デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。",
     "lang_post_tagVis": "公開範囲が「公開」以外だと、タグTLに表示されません。(一部インスタンスを除く)",
@@ -87,6 +91,7 @@ var lang={
     "lang_list_users": "ユーザー一覧",
     "lang_list_nouser": "ユーザーはいません",
     "lang_list_add": "リストに追加",
+    "lang_list_add_misskey": "(重複追加の可能性があります)",
     "lang_list_remove": "リストから削除",
     //tl/notification.js
     "lang_notf_new": "件の新しい通知",
@@ -99,10 +104,13 @@ var lang={
     "lang_tags_always": "常に",
     "lang_tags_realtime": "実況",
     "lang_tags_tagunpin": "{{tag}}をよく使うタグから削除",
-    "lang_tags_tagwarn":"次に{{tag}}なしでトゥートするまで全てのトゥートに{{tag}}が付与されます。",
+    "lang_tags_unrealtime": "実況解除",
+    "lang_tags_tagwarn": "{{tag}}がない場合自動で補完されます。",
     //tl/tl.js
     "lang_tl_media": "メディア",
     "lang_tl_reconnect": "Streamingに再接続しました",
+    //ui/img.js
+    "lang_img_DLDone": "ダウンロード先:",
     //ui/layout.js
     "lang_layout_gotop": "一番上へ。アイコンが赤のときはストリーミングに接続できていません。F5等で再読込をお試し下さい。",
     "lang_layout_thisacct": "このアカウントの{{notf}}",
@@ -118,6 +126,12 @@ var lang={
     "lang_layout_dm": "ダイレクトメッセージ",
     "lang_layout_webviewmode": "WebView優先",
     "lang_excluded": "除外する通知",
+    "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTのみ)",
+    "lang_layout_leftFold": "左へ重ねる",
+    "lang_layout_leftUnfold": "右へ出す",
+    //ui/sort.js
+    "lang_sort_gothis": "このカラムへ",
+    "lang_sort_remthis": "このカラムを削除",
     //ui/spotify.js
     "lang_spotify_img": "アルバムアートワークを添付します。",
     "lang_spotify_imgno": "アルバムアートワークを添付しません。",
@@ -129,6 +143,7 @@ var lang={
     "lang_hisdata_frcwarn": "非フォローだけど絡みがある時に表示されます。",
     "lang_hisdata_taketime": "30秒から数分かかります",
     "lang_hisdata_notonmisskey": "このシステムはMisskeyにはありません。",
+    "lang_hisdata_key": "このユーザーの信頼性は{{set}}によって示されています",
     //userdata/showOnTL.js
     "lang_showontl_movetxt": "このアカウントは移行しています",
     "lang_showontl_movebtn": "移行先を見る",
@@ -137,11 +152,13 @@ var lang={
     "lang_showontl_notf": "通知",
     "lang_showontl_domain": "ドメイン",
     "lang_showontl_listwarn": "リストに追加するためにはフォローが必要です。",
+    "lang_showontl_verified": "このユーザーの所持するWebサイトであると証明されています。",
     //parse
     "lang_parse_mentioned": "が返信しました",
     "lang_parse_faved": "がお気に入り登録しました",
     "lang_parse_bted": "がブーストしました",
     "lang_parse_btedsimple": "がブースト",
+    "lang_parse_polled": "のアンケート",
     "lang_parse_notftime": "通知された時間",
     "lang_parse_cwshow": "見る",
     "lang_parse_fulltext": "以下全文",
@@ -173,6 +190,14 @@ var lang={
     "lang_parse_clientemp": "強調表示/解除",
     "lang_parse_clientmute": "ミュート",
     "lang_parse_mute": "ミュートします。設定から解除できます。",
+    "lang_parse_voted": "投票済みです",
+    "lang_parse_vote": "投票",
+    "lang_parse_unvoted": "結果だけ見る",
+    "lang_parse_endedvote": "終了済み",
+    "lang_parse_thread": "会話を表示",
+    "lang_parse_unknown": "添付ファイル",
+    "lang_parse_nsfw": "閲覧注意",
+    "lang_parse_notffilter":"このユーザーの通知のみを表示",
     //misskey
     "lang_misskeyparse_renote": "再投稿",
     "lang_misskeyparse_renoteqt": "引用",
@@ -203,12 +228,14 @@ var lang={
     "lang_setting_selt": "{{set1}}行以上または{{set2}}文字以上でテキストを隠します。",
     "lang_setting_autocw": "{{set1}}行以上または{{set2}}文字以上で警告を表示します。",
     "lang_setting_width": "横幅最低を{{set}}pxに設定しました。",
+    "lang_setting_fixwidth": "TweetDeckの横幅を{{set}}pxに設定しました。",
     "lang_setting_img": "画像投稿後の設定を「{{set}}」に設定しました。",
     "lang_setting_font": "フォントを{{set}}に設定しました。",
     "lang_setting_default": "デフォルト",
     "lang_setting_size": "フォントサイズを{{set}}pxに設定しました。",
     "lang_setting_imgheight": "画像高さを{{set}}pxに設定しました。",
     "lang_setting_ticker": "#InstanceTicker使用を{{set}}に設定しました。",
+    "lang_setting_animation": "アニメーションを{{set}}に設定しました。",
     "lang_setting_tag": "タグの取得範囲を「{{set}}」に設定しました。",
     "lang_setting_boxConfirm": "投稿ボックスを{{set}}",
     "lang_setting_ul": "独自ロケール設定を{{set}}に設定しました。",

app/js/lang/lang.ps.js

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

app/js/lang/parse.lang.js

@@ -1,189 +0,0 @@
-var lang_parse_mentioned={
-    "ja":"が返信しました",
-    "en":" replied to you" 
-}
-var lang_parse_faved={
-    "ja":"がお気に入り登録しました",
-    "en":" favourited your toot" 
-}
-var lang_parse_bted={
-    "ja":"がブーストしました",
-    "en":" boosted your toot" 
-}
-var lang_parse_btedsimple={
-    "ja":"がブースト",
-    "en":" boosted" 
-}
-var lang_parse_notftime={
-    "ja":"通知された時間",
-    "en":"Actioned at"
-}
-var lang_parse_cwshow={
-    "ja":"見る",
-    "en":"Show"
-}
-var lang_parse_fulltext={
-    "ja":"以下全文",
-    "en":"Full size text:"
-}
-var lang_parse_autofold={
-    "ja":"自動折り畳み",
-    "en":"Auto folded"
-}
-var lang_parse_more={
-    "ja":"続き...",
-    "en":"More"
-}
-var lang_parse_url={
-    "ja":"URL解析",
-    "en":"URL Analyzer"
-}
-var lang_parse_tagTL={
-    "ja":"{{tag}}のタイムライン",
-    "en":"Timeline of {{tag}}"
-}
-var lang_parse_tagtoot={
-    "ja":"{{tag}}でトゥート",
-    "en":"Toot with {{tag}}"
-}
-var lang_parse_tagpin={
-    "ja":"{{tag}}をよく使うタグへ",
-    "en":"Pin {{tag}}"
-}
-var lang_parse_public={
-    "ja":"公開",
-    "en":"Public"
-}
-var lang_parse_unlisted={
-    "ja":"未収載",
-    "en":"Unlisted"
-}
-var lang_parse_private={
-    "ja":"非公開",
-    "en":"Private"
-}
-var lang_parse_direct={
-    "ja":"ダイレクト",
-    "en":"Direct"
-}
-var lang_parse_clickcopy={
-    "ja":"クリックして本文をコピー",
-    "en":"Click to copy text of this toot"
-}
-var lang_parse_clickcopyurl={
-    "ja":"クリックしてトゥートURLをコピー",
-    "en":"Click to copy URL of this toot"
-}
-var lang_parse_trans={
-    "ja":"このトゥートを日本語に翻訳",
-    "en":"Translate to Japanese"
-}
-var lang_parse_replyto={
-    "ja":"このトゥートに返信",
-    "en":"Reply to this toot"
-}
-var lang_parse_bt={
-    "ja":"このトゥートをブースト",
-    "en":"Boost this toot"
-}
-var lang_parse_fav={
-    "ja":"このトゥートをお気に入り登録",
-    "en":"Favourite this toot"
-}
-var lang_parse_quote={
-    "ja":"このトゥートを引用",
-    "en":"Quote this toot"
-}
-var lang_parse_del={
-    "ja":"このトゥートを削除",
-    "en":"Delete this toot"
-}
-var lang_parse_pin={
-    "ja":"このトゥートをピン留め",
-    "en":"Pin this toot"
-}
-var lang_parse_det={
-    "ja":"詳細(メインアカウント経由)",
-    "en":"Details via your main account."
-}
-var lang_parse_redraft={
-    "ja":"このトゥートを削除して再編集",
-    "en":"Delete & re-draft"
-}
-var lang_parse_followed={
-    "ja":"フォローされました。",
-    "en":"Followed you"
-}
-var lang_parse_clientop={
-    "ja":"クライアント処理",
-    "en":"Operation of this client"
-}
-var lang_parse_clienttxt={
-    "ja":"に対する処理を選択してください。",
-    "en":" will be"
-}
-var lang_parse_clientno={
-    "ja":"何もしない",
-    "en":"done nothing"
-}
-var lang_parse_clientemp={
-    "ja":"強調表示/解除",
-    "en":"emphasized(/not emphasized)"
-}
-var lang_parse_clientmute={
-    "ja":"ミュート",
-    "en":"muted"
-}
-var lang_parse_mute={
-    "ja":"ミュートします。設定から解除できます。",
-    "en":" will be muted. You can remove on preferences."
-}
-//misskey
-var lang_misskeyparse_renote={
-    "ja":"再投稿",
-    "en":"Repost"
-}
-var lang_misskeyparse_renoteqt={
-    "ja":"引用",
-    "en":"Renote"
-}
-var lang_misskeyparse_reaction={
-    "ja":"リアクション",
-    "en":"Reaction"
-}
-var lang_misskeyparse_tagnostr={
-    "ja":"タグTLはストリーミング非対応です。",
-    "en":"No streaming API on Tag TLs"
-}
-var lang_misskeyparse_listnostr={
-    "ja":"リストTLはストリーミング非対応です。",
-    "en":"No streaming API on List TLs"
-}
-var lang_misskeyparse_home={
-    "ja":"ホーム",
-    "en":"Home"
-}
-var lang_misskeyparse_followers={
-    "ja":"フォロワー",
-    "en":"Follower"
-}
-var lang_misskeyparse_specified={
-    "ja":"ユーザー指定",
-    "en":"Specified User"
-}
-var lang_misskeyparse_qt={
-    "ja":"MisskeyのRenote(引用モード)中:Ctrl+Shift+Cでクリア",
-    "en":"Misskey renote(quote) mode:Ctrl+Shift+Enter to clear"
-}
-var lang_misskeyparse_renoted={
-    "ja":"がRepost",
-    "en":" renoted your following post."
-}
-var lang_misskeyparse_quoted={
-    "ja":"が引用",
-    "en":" quoted your following post."
-}
-var lang_misskeyparse_reaction={
-    "ja":"がリアクション",
-    "en":" reacted your following post."
-}

app/js/lang/setting.lang.js

@@ -1,152 +0,0 @@
-var lang_setting_time={
-    "ja":"時間設定を{{set}}に設定しました。",
-    "en":"Time format:{{set}}"
-}
-var lang_setting_theme={
-    "ja":"テーマ設定を{{set}}に設定しました。",
-    "en":"Theme:{{set}}"
-}
-var lang_setting_nsfw={
-    "ja":"画像表示設定を{{set}}に設定しました。",
-    "en":"NSFW:{{set}}"
-}
-var lang_setting_cw={
-    "ja":"テキスト表示設定を{{set}}に設定しました。",
-    "en":"CW:{{set}}"
-}
-var lang_setting_cwtext={
-    "ja":"デフォルトの警告文を「{{set}}」に設定しました。",
-    "en":"Default CW text:{{set}}"
-}
-var lang_setting_cws={
-    "ja":"標準でCW:{{set}}",
-    "en":"Always CW on:{{set}}"
-}
-var lang_setting_rp={
-    "ja":"リプライ数表示:{{set}}",
-    "en":"Reply counter:{{set}}"
-}
-var lang_setting_vis={
-    "ja":"デフォルトの公開設定を{{set}}に設定しました。",
-    "en":"Default visibility:{{set}}"
-}
-var lang_setting_popup={
-    "ja":"ポップアップお知らせを{{set}}に設定しました。",
-    "en":"Popup notification:{{set}}"
-}
-var lang_setting_off={
-    "ja":"オフ",
-    "en":"Off"
-}
-var lang_setting_s={
-    "ja":"秒",
-    "en":"s"
-}
-var lang_setting_box={
-    "ja":"デフォルトでのボックスの挙動を{{set}}に設定しました。",
-    "en":"Default toot box action:{{set}}"
-}
-var lang_setting_gif={
-    "ja":"アイコンアニメーション再生を{{set}}に設定しました。",
-    "en":"GIF:{{set}}"
-}
-var lang_setting_selt={
-    "ja":"{{set1}}行以上または{{set2}}文字以上でテキストを隠します。",
-    "en":"Auto fold:{{set1}} lines and above, {{set2}} letters and above"
-}
-var lang_setting_autocw={
-    "ja":"{{set1}}行以上または{{set2}}文字以上で警告を表示します。",
-    "en":"Auto CW:{{set1}} lines and above, {{set2}} letters and above"
-}
-var lang_setting_width={
-    "ja":"横幅最低を{{set}}pxに設定しました。",
-    "en":"Minimam width:{{set}}"
-}
-var lang_setting_img={
-    "ja":"画像投稿後の設定を「{{set}}」に設定しました。",
-    "en":"After posting an image:{{set}}"
-}
-var lang_setting_font={
-    "ja":"フォントを{{set}}に設定しました。",
-    "en":"Fonts:{{set}}"
-}
-var lang_setting_default={
-    "ja":"デフォルト",
-    "en":"default font"
-}
-var lang_setting_size={
-    "ja":"フォントサイズを{{set}}pxに設定しました。",
-    "en":"Font size:{{set}}px"
-}
-var lang_setting_imgheight={
-    "ja":"画像高さを{{set}}pxに設定しました。",
-    "en":"Image height:{{set}}px"
-}
-var lang_setting_ticker={
-    "ja":"#InstanceTicker使用を{{set}}に設定しました。",
-    "en":"#InstanceTicker:{{set}}px"
-}
-var lang_setting_tag={
-    "ja":"タグの取得範囲を「{{set}}」に設定しました。",
-    "en":"Tag TL:{{set}}"
-}
-var lang_setting_box={
-    "ja":"投稿ボックスを{{set}}",
-    "en":"Post box:{{set}}"
-}
-var lang_setting_ul={
-    "ja":"独自ロケール設定を{{set}}に設定しました。",
-    "en":"Native locale:{{set}}"
-}
-var lang_setting_notf={
-    "ja":"ネイティブ通知を{{set}}に設定しました。",
-    "en":"Native notification:{{set}}"
-}
-var lang_setting_quote={
-    "ja":"引用形式を{{set}}に設定しました。",
-    "en":"Quote format:{{set}}"
-}
-var lang_setting_via={
-    "ja":"via表示を{{set}}に設定しました。",
-    "en":"Via:{{set}}"
-}
-var lang_setting_mov={
-    "ja":"アクションボタン非表示を{{set}}に設定しました。",
-    "en":"Action buttons hiding:{{set}}"
-}
-var lang_setting_setasread={
-    "ja":"通知カラム存在時新着非表示を{{set}}に設定しました。",
-    "en":"Notification markers:{{set}}"
-}
-var lang_setting_main={
-    "ja":"起動時・投稿時のアカウントを{{set}}に設定しました。",
-    "en":"Default account:{{set}}"
-}
-var lang_setting_sec={
-    "ja":"セカンダリートゥートボタン:{{set}}",
-    "en":"Secondary toot button:{{set}}"
-}
-var lang_setting_ksref={
-    "ja":"キーボードショートカットが更新されました。",
-    "en":"Keyboard shortcuts are refreshed."
-}
-var lang_setting_nomuting={
-    "ja":"ミュートしているクライアントはありません。",
-    "en":"No client is muted."
-}
-var lang_setting_notftest={
-    "ja":"通知テスト",
-    "en":" Notification test "
-}
-var lang_setting_notftestprof={
-    "ja":"アイコンはあなたのアカウントのものです。",
-    "en":"Your icon is shown."
-}
-var lang_setting_exportwarn={
-    "ja":"重要なデータのみエクスポートされます。エクスポートされたデータは外部に公開しないでください。全ての認証データが含まれています。",
-    "en":"Only important data will be exported. You must keep this data secure."
-}
-var lang_setting_importwarn={
-    "ja":"全てのデータがリセットされます。",
-    "en":"All data will be deleted."
-}

app/js/login/instance.js

@@ -8,17 +8,17 @@ var idata={
 	"kirishima.cloud_glitch": "enabled",
 	"kirishima.cloud_public": "パブリックタイムライン",
 	"minohdon.jp": "instance",
-	"minohdon.jp_name":"箕面丼",
+	"minohdon.jp_name": "箕面どん",
 	"minohdon.jp_letters": "500",
 	"minohdon.jp_bbcode": "disabled",
 	"minohdon.jp_markdown": "disabled",
 	"minohdon.jp_glitch": "disabled",
 	"knzk.me": "instance",
-	"knzk.me_name":"神崎丼",
+	"knzk.me_name": "Knzk",
 	"knzk.me_letters": "5000",
 	"knzk.me_bbcode": "disabled",
 	"knzk.me_markdown": "disabled",
-	"knzk.me_glitch":"enabled",
+	"knzk.me_glitch": "disabled",
 	"mastodos.com": "instance",
 	"mastodos.com_name": "マストどす",
 	"mastodos.com_letters": "500",
@@ -32,7 +32,7 @@ var idata={
 	"dev.kirishima.cloud_markdown": "enabled",
 	"dev.kirishima.cloud_glitch": "enabled",
 	"mstdn.y-zu.org": "instance",
-	"mstdn.y-zu.org_name":"Yづドン!(502 BadGateway)",
+	"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",
@@ -84,20 +84,14 @@ var idata={
 	"itabashi.0j0.jp_bbcode": "disabled",
 	"itabashi.0j0.jp_markdown": "disabled",
 	"itabashi.0j0.jp_glitch": "disabled",
-	"theboss.tech":"instance",
-	"theboss.tech_name":"theboss.tech",
-	"theboss.tech_letters":"1000",
-	"theboss.tech_bbcode":"disabled",
-	"theboss.tech_markdown":"disabled",
-	"theboss.tech_glitch":"disabled",
 	"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",
-	"misskey.xyz":"instance",
+	"misskey.xyz": "misskey",
-	"misskey.xyz_name":"Misskey",
+	"misskey.xyz_name": "misskey.xyz",
 	"misskey.xyz_letters": "1000",
 	"misskey.xyz_bbcode": "disabled",
 	"misskey.xyz_markdown": "enabled",
@@ -105,6 +99,28 @@ var idata={
 	"misskey.xyz_post": "Post",
 	"misskey.xyz_fav": " reacted your post.",
 	"misskey.xyz_bt": " reposted your post.",
+	"misskey.dev": "misskey",
+	"misskey.dev_name": "misskey.dev",
+	"misskey.dev_letters": "1024",
+	"misskey.dev_bbcode": "disabled",
+	"misskey.dev_markdown": "enabled",
+	"misskey.dev_public": "Global",
+	"misskey.dev_post": "Post",
+	"misskey.dev_fav": " reacted your post.",
+	"misskey.dev_bt": " reposted your post.",
+	"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",
+	"best-friends.chat": "instance",
+	"best-friends.chat_name": "Best Friends",
+	"best-friends.chat_letters": "500",
+	"best-friends.chat_bbcode": "disabled",
+	"best-friends.chat_markdown": "disabled",
+	"best-friends.chat_glitch": "disabled",
 };
 
 localStorage.setItem("instance", JSON.stringify(idata));

app/js/login/login.js

@@ -5,31 +5,15 @@
 localStorage.removeItem("kirishima")
 localStorage.removeItem("imas")
 localStorage.removeItem("image");
+localStorage.removeItem("stable")
 localStorage.setItem("mode_misskey.xyz", "misskey")
 function ck() {
 	var main = localStorage.getItem("main");
 	if (!main) {
 		localStorage.setItem("main", 0)
 	}
-	var domain = localStorage.getItem("domain_0");
+	var domainz = localStorage.getItem("domain_0");
 	var at = localStorage.getItem("acct_0_at");
-	var oldat = localStorage.getItem(domain + "_at");
-	if(oldat){
-		console.log("Move to New Account Management System")
-		var multi = localStorage.getItem("multi");
-		if (!multi) {
-			var acctlen=1;
-		} else {
-			var obj = JSON.parse(multi);
-			var acctlen=obj.length;
-		}
-		for(i=0;acctlen>i;i++){
-			var domain = localStorage.getItem("domain_"+i);
-			var oldat = localStorage.getItem(domain + "_at");
-			var newat = localStorage.setItem("acct_"+ i + "_at",oldat);
-			localStorage.removeItem(domain + "_at");
-		}
-	}
 	//コード受信
 	if (location.search) {
 		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
@@ -41,30 +25,28 @@ function ck() {
 		}
 	}
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
+	if (!multi || multi == "[]") {
-		var obj = [];
+		location.href = "acct.html?mode=first&code=true"
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
 	} else {
 		var obj = JSON.parse(multi);
-	}
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key];
 			if (acct.domain) {
 				refresh(key, true)
 			}
 		});
-	console.log(obj);
 		if (obj[0].domain) {
 			$("#tl").show();
 			ticker();
 			multiSelector();
-	} else {
+			verck(ver);
-		$("#tl").show();
+			$("#something-wrong img").attr("src", "../../img/thinkingdesk.png")
-		$("#post-box").hide();
+		}
 	}
 }
 ck();
+
+
 //ログインポップアップ
 function login(url) {
 	if ($('#linux:checked').val() == "on") {
@@ -77,7 +59,7 @@ function login(url) {
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		scopes: 'read write follow',
 		client_name: "TheDesk(PC)",
@@ -85,9 +67,8 @@ function login(url) {
 		website: "https://thedesk.top"
 	}));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(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";
@@ -96,9 +77,7 @@ function login(url) {
 			localStorage.setItem("client_secret", json["client_secret"]);
 			$("#auth").show();
 			$("#masara").hide();
-		const {
+			const { shell } = require('electron');
-  			shell
-  		} = require('electron');
 
 			shell.openExternal(auth);
 
@@ -183,7 +162,6 @@ function getdata() {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
 			Materialize.toast(lang.lang_fatalerroroccured + "Error:" + json.error,
@@ -205,7 +183,6 @@ function getdata() {
 			vis: json["source"]["privacy"]
 		}];
 		var json = JSON.stringify(obj);
-		console.log(obj);
 		localStorage.setItem("multi", json);
 		localStorage.setItem("name_" + acct_id, json["display_name"]);
 		localStorage.setItem("user_" + acct_id, json["acct"]);
@@ -233,7 +210,6 @@ function getdataAdv(domain, at) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
 			Materialize.toast(lang.lang_fatalerroroccured + "Error:" + json.error,
@@ -267,7 +243,6 @@ function getdataAdv(domain, at) {
 		localStorage.setItem("user_" + target, json["acct"]);
 		localStorage.setItem("user-id_" + target, json["id"]);
 		localStorage.setItem("prof_" + target, avatar);
-		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
 		location.href = "index.html";
@@ -282,7 +257,6 @@ function refresh(target,loadskip) {
 	}
 	var start = "https://" + obj[target].domain +
 		"/api/v1/accounts/verify_credentials";
-		console.log(start);
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -295,7 +269,6 @@ function refresh(target,loadskip) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
 			Materialize.toast(lang.lang_fatalerroroccured + "Error:" + json.error,
@@ -319,8 +292,6 @@ function refresh(target,loadskip) {
 		localStorage.setItem("name_" + target, json["display_name"]);
 		localStorage.setItem("user_" + target, json["acct"]);
 		localStorage.setItem("user-id_" + target, json["id"]);
-		console.log("user-id_" + target+":"+json["id"])
-		console.log(localStorage.getItem("user-id_"+target));
 		localStorage.setItem("prof_" + target, avatar);
 		localStorage.setItem("follow_" + target, json["following_count"]);
 		obj[target] = ref;
@@ -344,7 +315,7 @@ function ckdb(acct_id) {
 	localStorage.removeItem("post_" + acct_id);
 	localStorage.removeItem("fav_" + acct_id);
 	localStorage.removeItem("bt_" + acct_id);
-	localStorage.removeItem("follow_" + acct_id);
+	localStorage.removeItem("followlocale_" + acct_id);
 	if (domain == "kirishima.cloud") {
 		localStorage.setItem("kirishima", "true");
 		$("#ranking-btn").show();
@@ -380,7 +351,6 @@ function ckdb(acct_id) {
 			localStorage.removeItem("bb_" + acct_id);
 		}
 		if (json[domain + "_home"]) {
-				console.log("unique name:"+json[domain + "_home"]);
 			localStorage.setItem("home_" + acct_id, json[domain + "_home"]);
 		}
 		if (json[domain + "_local"]) {
@@ -402,7 +372,7 @@ function ckdb(acct_id) {
 			localStorage.setItem("bt_" + acct_id, json[domain + "_bt"]);
 		}
 		if (json[domain + "_follow"]) {
-				localStorage.setItem("follow_" + acct_id, json[domain + "_follow"]);
+			localStorage.setItem("followlocale_" + acct_id, json[domain + "_follow"]);
 		}
 	}
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
@@ -417,8 +387,8 @@ function ckdb(acct_id) {
 		}).catch(function (error) {
 			console.error(error);
 		}).then(function (json) {
-			console.log(json);
 			if (json.error) {
+				console.error(json.error);
 				return;
 			}
 			if (json) {
@@ -452,9 +422,13 @@ function multiSelector() {
 		var last = localStorage.getItem("main");
 	} else if (localStorage.getItem("last-use")) {
 		var last = localStorage.getItem("last-use");
-	}else{
+		if (last == "webview" || last == "noauth") {
-		var last=0;
+			last = "0";
 		}
+	} else {
+		var last = "0";
+	}
+	last = last + "";
 	var sel;
 	if (obj.length < 1) {
 		$("#src-acct-sel").html('<option value="tootsearch">Tootsearch</option>');
@@ -463,7 +437,7 @@ function multiSelector() {
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key];
 			var list = key * 1 + 1;
-		if (key == last) {
+			if (key+"" === last) {
 				sel = "selected";
 				var domain = acct.domain;
 				localStorage.setItem("domain_" + key, domain);
@@ -482,12 +456,10 @@ function multiSelector() {
 				}
 				var profimg = acct.prof;
 				localStorage.setItem("prof_" + key, profimg);
-			console.log(profimg);
 				if (!profimg) {
 					profimg = "../../img/missing.svg";
 				}
 				$("#acct-sel-prof").attr("src", profimg);
-			console.log(domain);
 				if (domain) {
 					var cc = "(" + domain + ")";
 				} else {
@@ -523,7 +495,7 @@ function multiSelector() {
 		$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
 	}
 	$('select').material_select('update');
-	parseColumn();
+	parseColumn(true);
 }
 
 //バージョンエンコ

app/js/login/manager.js

@@ -2,6 +2,15 @@
 //最初に読むやつ
 function load() {
 	$("#acct-list").html("");
+	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 == "first" && codex == "true") {
+			$("body").addClass("first")
+		} else {
+		}
+	}
 	var prof = localStorage.getItem("prof");
 	$(".my-prof").attr("src", prof);
 	var name = localStorage.getItem("name");
@@ -23,7 +32,7 @@ function load() {
 		}
 	}
 
-	console.log(obj);
+	console.table(obj);
 	var templete;
 	Object.keys(obj).forEach(function (key) {
 		var acct = obj[key];
@@ -57,14 +66,8 @@ function load() {
 		localStorage.setItem("acct", 0);
 		var acctN = 0;
 	}
-	var electron = require("electron");
+	//全部チェックアリでいいと思うの
-          var remote=electron.remote;
-          var platform=remote.process.platform;
-	    if(platform=="win32"){
-			$("#linux").prop("checked", false);
-        }else{
 	$("#linux").prop("checked", true);
-		}
 
 }
 //最初に読む
@@ -96,7 +99,6 @@ function data(domain) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (!json.error) {
 			$("#ins-name").text(json.name);
 			$("#ins-upd").text(date(json.checked_at, 'full'));
@@ -107,6 +109,8 @@ function data(domain) {
 			$("#ins-per").text(json.uptime * 100);
 			$("#ins-user").text(json.users);
 			$("#ins-ver").text(json.version);
+		} else {
+			console.error(json.error);
 		}
 	});
 	var start = "https://" + domain + "/api/v1/instance";
@@ -121,7 +125,6 @@ function data(domain) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (!json.error) {
 			$("#ins-title").text(json.title);
 			$("#ins-desc").html(json.description);
@@ -132,6 +135,8 @@ function data(domain) {
 			$("#ins-prof").attr('src', json.thumbnail);
 			$("#ins-admin").text(escapeHTML(json.contact_account.display_name) + "(" + json.contact_account.acct + ")");
 			$("#ins-admin").attr("href", "index.html?mode=user&code=" + json.contact_account.username + "@" + domain);
+		} else {
+			console.error(json.error);
 		}
 	});
 }
@@ -147,7 +152,6 @@ function multiDel(target) {
 			//公開範囲(差分のみ)
 			if (key >= target) {
 				var oldvis = localStorage.getItem("vis-memory-" + key);
-				console.log(oldvis);
 				if (oldvis) {
 					localStorage.setItem("vis-memory-" + nk, oldvis);
 				}
@@ -172,7 +176,6 @@ function multiDel(target) {
 		});
 		//とりあえず消す
 		obj.splice(target, 1);
-		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
 		load();
@@ -213,7 +216,6 @@ function multiDel2(target) {
 		Object.keys(obj).forEach(function (key) {
 			if (key >= target) {
 				var oldvis = localStorage.getItem("vis-memory-" + key);
-			console.log(oldvis);
 				if (oldvis) {
 					var nk = key - 1;
 					localStorage.setItem("vis-memory-" + nk, oldvis);
@@ -262,6 +264,10 @@ function support() {
 			templete = '<a onclick="login(\'' + key +
 				'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
 			$("#support").append(templete);
+		} else if (instance == "misskey") {
+			templete = '<a onclick="misskeyLogin(\'' + key +
+				'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
+			$("#support").append(templete);
 		}
 	});
 }
@@ -270,7 +276,7 @@ function support() {
 function login(url) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
-	if($('#misskey:checked').val()=="on" || url=="misskey.xyz"){
+	if ($('#misskey:checked').val() == "on") {
 		$("#misskey").prop("checked", true);
 		misskeyLogin(url);
 		return;
@@ -280,13 +286,12 @@ function login(url) {
 	} else {
 		var red = 'thedesk://manager';
 	}
-	console.log(red);
 	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.responseType = "json";
 	httpreq.send(JSON.stringify({
 		scopes: 'read write follow',
 		client_name: "TheDesk(PC)",
@@ -294,9 +299,8 @@ function login(url) {
 		website: "https://thedesk.top"
 	}));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
 			localStorage.setItem("msky", "false");
 			var auth = "https://" + url + "/oauth/authorize?client_id=" + json[
 				"client_id"] + "&client_secret=" + json["client_secret"] +
@@ -326,45 +330,83 @@ function misskeyLogin(url) {
 	if (!url) {
 		var url = $("#misskey-url").val();
 	}
-	var multi = localStorage.getItem("multi");
+	var start = "https://" + url + "/api/app/create";
-	var obj = JSON.parse(multi);
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.responseType = "json";
+	localStorage.setItem("msky", "true");
+	httpreq.send(JSON.stringify({
+		name: "TheDesk(PC)",
+		description: "Mastodon client for PC",
+		permission: [
+			"account-read",
+			"account-write",
+			"account/read",
+			"account/write",
+			"drive-read",
+			"drive-write",
+			"favorite-read",
+			"favorite-write",
+			"favorites-read",
+			"following-read",
+			"following-write",
+			"messaging-read",
+			"messaging-write",
+			"note-read",
+			"note-write",
+			"notification-read",
+			"notification-write",
+			"reaction-read",
+			"reaction-write",
+			"vote-read",
+			"vote-write",
+			"read:account",
+			"write:account",
+			"read:drive",
+			"write:drive",
+			"read:blocks",
+			"write:blocks",
+			"read:favorites",
+			"write:favorites",
+			"read:following",
+			"write:following",
+			"read:messaging",
+			"write:messaging",
+			"read:mutes",
+			"write:mutes",
+			"write:notes",
+			"read:notifications",
+			"write:notifications",
+			"read:reactions",
+			"write:reactions",
+			"write:votes"
+		]
+	}));
+	httpreq.onreadystatechange = function () {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response;
+			misskeyAuth(url, json.secret)
+		}
+	}
+
+
+}
+function misskeyAuth(url, mkc) {
 	var start = "https://" + url + "/api/auth/session/generate";
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
-	localStorage.setItem("msky","true");
-	if(url=="misskey.xyz" && misskeytoken){
-		var mkc=misskeytoken;
-		localStorage.setItem("mkc",mkc)
-	}else{
-		var mkc=$("#misskey-key").val();
-		localStorage.setItem("mkc",mkc)
-		if(!mkc){
-			$("#misskeylogin").show();
-			$("#misskey-url").val(url);
-			if(confirm(lang.lang_manager_godev)){
-				const {
-					shell
-				} = require('electron');
-				console.log("https://"+url+"/dev")
-				shell.openExternal("https://"+url+"/dev");
-				shell.openExternal("https://thedesk.top/how-to-login-misskey.html");
-			}
 
-			return false;
+	localStorage.setItem("mkc", mkc)
-		}else{
+	localStorage.setItem("msky", "true");
-			$("#misskeylogin").hide();
-			$("#misskey-url").val("");
-		}
-	}
 	httpreq.send(JSON.stringify({
 		appSecret: mkc
 	}));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
 			const {
 				shell
 			} = require('electron');
@@ -375,11 +417,8 @@ function misskeyLogin(url) {
 			$("#misskey").prop("checked", false);
 			localStorage.setItem("domain_tmp", url);
 			shell.openExternal(json.url);
-			var electron = require("electron");
 		}
 	}
-	
-
 }
 
 //テキストボックスにURL入れた
@@ -401,22 +440,20 @@ function code(code) {
 	}
 	var url = localStorage.getItem("domain_tmp");
 	localStorage.removeItem("domain_tmp");
-	console.log(localStorage.getItem("msky"));
 	if (localStorage.getItem("msky") == "true") {
 		var start = "https://" + url + "/api/auth/session/userkey";
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({
 			token: code,
 			appSecret: localStorage.getItem("mkc")
 		}));
 		httpreq.onreadystatechange = function () {
-			if (httpreq.readyState == 4) {
+			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
 				var i = sha256(json.accessToken + localStorage.getItem("mkc"));
-				console.log(json);
 				var avatar = json["user"]["avatarUrl"];
 				var priv = "public";
 				var add = {
@@ -438,10 +475,11 @@ function code(code) {
 				localStorage.setItem("user_" + target, json["user"]["username"]);
 				localStorage.setItem("user-id_" + target, json["user"]["id"]);
 				localStorage.setItem("prof_" + target, avatar);
-				console.log(obj);
 				var json = JSON.stringify(obj);
 				localStorage.setItem("multi", json);
-
+				if ($("body").hasClass("first")) {
+					location.href = "index.html"
+				}
 				load();
 				return;
 			}
@@ -454,7 +492,7 @@ function code(code) {
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({
 			grant_type: "authorization_code",
 			redirect_uri: "https://thedesk.top/hello.html",
@@ -463,9 +501,8 @@ function code(code) {
 			code: code
 		}));
 		httpreq.onreadystatechange = function () {
-			if (httpreq.readyState == 4) {
+			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
-				console.log(json);
 				if (json["access_token"]) {
 					$("#auth").hide();
 					$("#add").show();
@@ -491,10 +528,9 @@ function getdata(domain, at) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
+			Materialize.toast(lang.lang_fatalerroroccured + "Error:" + escapeHTML(json.error),
 				5000);
 			return;
 		}
@@ -526,9 +562,11 @@ function getdata(domain, at) {
 		localStorage.setItem("user_" + target, json["acct"]);
 		localStorage.setItem("user-id_" + target, json["id"]);
 		localStorage.setItem("prof_" + target, avatar);
-		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
+		if ($("body").hasClass("first")) {
+			location.href = "index.html"
+		}
 		load();
 	});
 }
@@ -543,7 +581,6 @@ function refresh(target) {
 	}
 	var start = "https://" + obj[target].domain +
 		"/api/v1/accounts/verify_credentials";
-		console.log(start);
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -556,7 +593,6 @@ function refresh(target) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
 			Materialize.toast(lang.lang_fatalerroroccured + "Error:" + json.error,
@@ -580,8 +616,6 @@ function refresh(target) {
 		localStorage.setItem("name_" + target, json["display_name"]);
 		localStorage.setItem("user_" + target, json["acct"]);
 		localStorage.setItem("user-id_" + target, json["id"]);
-		console.log("user-id_" + target+":"+json["id"])
-		console.log(localStorage.getItem("user-id_"+target));
 		localStorage.setItem("prof_" + target, avatar);
 		obj[target] = ref;
 		var json = JSON.stringify(obj);
@@ -595,15 +629,14 @@ function misskeyRefresh(obj,target,url){
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-		httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		username: obj[target].user,
 		i: localStorage.getItem("at")
 	}));
 	httpreq.onreadystatechange = function () {
-			if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-				console.log(json);
 			return;
 			var avatar = json["user"]["avatarURL"];
 			var priv = "public";
@@ -624,7 +657,6 @@ function misskeyRefresh(obj,target,url){
 			localStorage.setItem("user_" + target, json["user"]["username"]);
 			localStorage.setItem("user-id_" + target, json["user"]["id"]);
 			localStorage.setItem("prof_" + target, avatar);
-				console.log(obj);
 			var json = JSON.stringify(obj);
 			localStorage.setItem("multi", json);
 			load();
@@ -645,7 +677,6 @@ function multisel() {
 	var templete;
 	var last = localStorage.getItem("main");
 	var sel;
-	console.log(obj.length)
 	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>');
@@ -759,16 +790,16 @@ input.addEventListener("focus", function() {
 					todo(error);
 					console.error(error);
 				}).then(function (json) {
-					console.log(json);
 					if (!json.error) {
-
 						var urls = "Suggest:";
 						Object.keys(json.instances).forEach(function (key) {
 							var url = json.instances[key];
 							urls = urls + '　<a onclick="login(\'' + url.name +
-								'\')" class="pointer">' + url.name + '</a>  ';
+								'\')" class="pointer">' + escapeHTML(url.name) + '</a>  ';
 						});
 						$("#ins-suggest").html(urls);
+					} else {
+						console.error(json.error);
 					}
 				});
 			}

app/js/platform/end.js

@@ -19,9 +19,8 @@
 		//メンションっぽかったら
 		var ats = [];
 		ats = url.match(
-				/https:\/\/([-a-zA-Z0-9@.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
+			/https:\/\/([-a-zA-Z0-9.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
 		);
-		console.log(toot);
 		if (toot) {
 			if (toot[1]) {
 				var acct_id = $a.parent().attr("data-acct");
@@ -35,13 +34,16 @@
 
 		} else if (tags) {
 			if (tags[2]) {
-				tagShow(tags[2]);
+				var acct_id = $a.parent().attr("data-acct");
-				Materialize.toast('<a class="btn-flat toast-action" href="detEx(\''+url+'\')">Open in browser</a>', 86400);
+				if (!acct_id) {
+					acct_id = 0;
+				}
+				tl('tag', decodeURI(tags[2]), acct_id, 'add')
 			}
 		} else if (ats) {
-			console.log(ats);
 			if (ats[2]) {
-				if(ats[1]!="quesdon.rinsuki.net"){
+				//Quesdon判定
+				if (!~ats[2].indexOf("@")) {
 					udgEx(ats[2] + "@" + ats[1], "main");
 					return false
 				} else {
@@ -58,9 +60,7 @@
 			//hrefがhttp/httpsならブラウザで
 			if (urls) {
 				if (urls[0]) {
-			const {
+					const { shell } = require('electron');
-				shell
-			} = require('electron');
 					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";
@@ -79,40 +79,6 @@
 });
 
 //よく使うライブラリ
-  /*マルチバイト用切り出し*/
-  $.isSurrogatePear = function(upper, lower) {
-  	return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <=
-  		0xDFFF;
-  };
-  $.mb_strlen = function(str) {
-  	var ret = 0;
-  	for (var i = 0; i < str.length; i++, ret++) {
-  		var upper = str.charCodeAt(i);
-  		var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
-  		if ($.isSurrogatePear(upper, lower)) {
-  			i++;
-  		}
-  	}
-  	return ret;
-  };
-  $.mb_substr = function(str, begin, end) {
-  	var ret = '';
-  	for (var i = 0, len = 0; i < str.length; i++, len++) {
-  		var upper = str.charCodeAt(i);
-  		var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
-  		var s = '';
-  		if ($.isSurrogatePear(upper, lower)) {
-  			i++;
-  			s = String.fromCharCode(upper, lower);
-  		} else {
-  			s = String.fromCharCode(upper);
-  		}
-  		if (begin <= len && len < end) {
-  			ret += s;
-  		}
-  	}
-  	return ret;
-  };
 
 //コピー
 function execCopy(string) {
@@ -131,7 +97,7 @@ function nano(){
 function progshow(e) {
 	if (e.lengthComputable) {
 		var percent = e.loaded / e.total;
-	  console.log(percent * 100);
+		console.log("Progress: " + percent * 100);
 		$("#imgsel").hide();
 		if (percent < 1) {
 			$("#imgup").text(Math.floor(percent * 100) + "%");
@@ -173,3 +139,27 @@ function opendev(){
 	  });
 	  */
 }
+
+var webviewDom = document.getElementById('webview');
+const {
+	shell
+} = require('electron');
+webviewDom.addEventListener('new-window', function (e) {
+	shell.openExternal(e.url);
+});
+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);
+}

app/js/platform/first.js

@@ -32,6 +32,13 @@ function nl2br(str) {
 	str = str.replace(/(\n|\r)/g, "<br />");
 	return str;
 }
+function br2nl(str) {
+	if (!str) {
+		return "";
+	}
+	str = str.replace(/<br \/>/g, "\r\n");
+	return str;
+}
 function formattime(date) {
 	var str = date.getFullYear() + "-";
 	if (date.getMonth() + 1 < 10) {
@@ -55,7 +62,7 @@ function formattime(date){
 	} else {
 		str = str + date.getMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
 function formattimeutc(date) {
 	var str = date.getUTCFullYear() + "-";
@@ -80,5 +87,110 @@ function formattimeutc(date){
 	} else {
 		str = str + date.getUTCMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
+var electron = require("electron");
+var ipc = electron.ipcRenderer;
+ipc.send('custom-css-request', "");
+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)
+})
+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)
+})
+function makeCID() {
+	return randomStr(8) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(12);
+}
+function randomStr(l) {
+	// 生成する文字列に含める文字セット
+	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
+	var cl = c.length;
+	var r = "";
+	for (var i = 0; i < l; i++) {
+		r += c[Math.floor(Math.random() * cl)];
+	}
+	return r;
+}
+function rgbToHex(color) {
+	// HEXに変換したものを代入する変数
+	var hex = '';
+
+	// 第1引数がHEXのとき変換処理は必要ないのでそのままreturn
+	// IE8の場合はjQueryのcss()関数でHEXを返すので除外
+	if (color.match(/^#[a-f\d]{3}$|^#[a-f\d]{6}$/i)) {
+		return color;
+	}
+
+	// 正規表現
+	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)
+			];
+
+		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];
+			}
+			hex += rgb[i];
+		}
+
+		return hex;
+	}
+
+	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++;
+		}
+	}
+	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;
+};
+localStorage.removeItem("errors");

app/js/platform/nano.js

@@ -14,7 +14,6 @@ function tl(data) {
 	$("#notice_nano").text(cap(type, data) + " TL(" + localStorage.getItem(
 		"user_" + acct_id) + "@" + domain + ")");
 	var start = "https://" + domain + "/api/v1/timelines/" + com(type, data);
-	console.log(start);
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -46,17 +45,12 @@ var websocket=[];
 		var start = "wss://" + domain +
 			"/api/v1/streaming/?stream=hashtag&tag=" + data + "&access_token=" + at;
 	}
-	console.log(start);
 	var wsid = websocket.length;
 	websocket[wsid] = new WebSocket(start);
 	websocket[wsid].onopen = function (mess) {
-		console.log(tlid + ":Connect Streaming API:" + type);
-		console.log(mess);
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocket[wsid].onmessage = function (mess) {
-		console.log(tlid + ":Receive Streaming API:");
-		console.log(websocket[wsid]);
 		var typeA = JSON.parse(mess.data).event;
 		if (typeA == "delete") {
 			var obj = JSON.parse(mess.data).payload;
@@ -64,12 +58,11 @@ var websocket=[];
 			$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
 		} else if (typeA == "update") {
 			var obj = JSON.parse(JSON.parse(mess.data).payload);
-			console.log(obj);
 			var templete = parse([obj], '', acct_id, tlid);
 			$("#timeline_nano").html(templete);
 		}
 		websocket[wsid].onclose = function (mess) {
-			console.log("Close Streaming API:" + type);
+			console.error("Close Streaming API:" + type);
 		}
 	}
 	websocket[wsid].onerror = function (error) {

app/js/post/bb-md.js

@@ -290,10 +290,10 @@ function preview(){
 		for (let l = 0; l < li.length; l++) {
 			var u = li[l].match(/^1\. (.+)$/);
 			var listUl = '<li>' + u[1] + '</li>';
-		if(l == 0){
+			if (l === 0) {
 				listUl = '<ol>' + listUl;
 			}
-		if(l==li.length-1){
+			if (l === li.length - 1) {
 				listUl = listUl + '</ol>';
 			}
 			var bb = bb.replace(new RegExp(li[l], ""), listUl);

app/js/post/emoji.js

@@ -4,39 +4,41 @@ $("#emoji-before").addClass("disabled");
 $("#emoji-next").addClass("disabled");
 
 //絵文字ボタンのトグル
-function emojiToggle() {
+function emojiToggle(reaction) {
 	var acct_id = $("#post-acct-sel").val();
 	var selin = $("#textarea").prop('selectionStart');
 	if (!selin) {
 		selin = 0;
 	}
 	localStorage.setItem("cursor", selin);
+
 	if ($("#emoji").hasClass("hide")) {
-		if($("#bottom").hasClass("reverse")){
-			$('#emoji').css("left",$('#post-box').offset().left-295+"px");
-		}else{
-			$('#emoji').css("left",$('#post-box').offset().left+295+"px");
-		}
 		$("#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);
 		} else {
-			emojiList('home');
+			emojiList('home', reaction);
 		}
 	} else {
+		$("#poll").addClass("hide")
 		$("#emoji").addClass("hide")
+		$("#suggest").html("");
+		$("#right-side").hide()
 	}
 
 
 }
 
 //絵文字リスト挿入
-function emojiGet(parse) {
+function emojiGet(parse, started) {
-	$('#emoji-list').html('Loading...');
+	$('#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',
@@ -50,7 +52,7 @@ function emojiGet(parse) {
 			console.error(error);
 		}).then(function (json) {
 			if (parse == "true") {
-			$('#emoji-list').html('Parsing...');
+				$('#emoji-list').text('Parsing...');
 				//絵文字をマストドン公式と同順にソート
 				json.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
@@ -62,14 +64,67 @@ function emojiGet(parse) {
 				localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
 			}
 			localStorage.setItem("emojiseek", 0);
+			if (!started) {
 				emojiList('home')
+			}
 		});
+	} else {
+		var start = "https://" + domain + "/api/meta";
+		fetch(start, {
+			method: 'POST',
+			headers: {
+				'content-type': 'application/json'
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json.enableEmojiReaction) {
+				localStorage.setItem("emojiReaction_" + acct_id, "true");
+			} else {
+				localStorage.setItem("emojiReaction_" + acct_id, "disabled");
+			}
+			var emojis = json.emojis;
+			var md = [];
+			Object.keys(emojis).forEach(function (key) {
+				var emoji = emojis[key];
+				md.push({
+					"shortcode": emoji.name,
+					"url": emoji.url
+				})
+			});
+			if (parse == "true") {
+				$('#emoji-list').text('Parsing...');
+				//絵文字をマストドン公式と同順にソート
+				md.sort(function (a, b) {
+					if (a.shortcode < b.shortcode) return -1;
+					if (a.shortcode > b.shortcode) return 1;
+					return 0;
+				});
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+			} else {
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+			}
+			localStorage.setItem("emojiseek", 0);
+			if (!started) {
+				emojiList('home')
+			}
+		});
+	}
 }
 
 //リストの描画
-function emojiList(target) {
+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")
+		clear()
+		hide();
+		return false;
+	}
 	var start = localStorage.getItem("emojiseek");
 	if (target == "next") {
 		var start = start * 1 + 127;
@@ -91,7 +146,7 @@ function emojiList(target) {
 	var page = Math.ceil(num / 126);
 	$("#emoji-sum").text(page);
 	var ct = Math.ceil(start / 126);
-	if (ct == 0) {
+	if (ct === 0) {
 		var ct = 1;
 		$("#emoji-before").addClass("disabled");
 	} else {
@@ -102,9 +157,15 @@ function emojiList(target) {
 	for (i = start; i < start + 126; 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>';
+			} else {
 				html = html + '<a onclick="emojiInsert(\':' + emoji.shortcode +
 					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
 			}
+
+		}
 	}
 	$("#emoji-list").html(html);
 }
@@ -113,14 +174,18 @@ function emojiList(target) {
 function emojiInsert(code, del) {
 	var now = $("#textarea").val();
 	var selin = localStorage.getItem("cursor");
-	console.log(selin);
+	if (localStorage.getItem("emoji-zero-width") == "yes") {
+		var brank = "​";
+	} else {
+		var brank = " ";
+	}
 	var now = $("#textarea").val();
 	if (selin > 0) {
 		var before = now.substr(0, selin);
 		var after = now.substr(selin, now.length);
-		newt = before + " "+ code+" " + after;
+		newt = before + brank + code + brank + after;
 	} else {
-		newt = code+" ";
+		newt = code + brank;
 	}
 	if (!del) {
 		$("#textarea").val(newt);
@@ -128,7 +193,7 @@ function emojiInsert(code, del) {
 	} else {
 		var regExp = new RegExp(del, "g");
 		var now = now.replace(regExp, "");
-		$("#textarea").val(now + " " + code);
+		$("#textarea").val(now + brank + code);
 	}
 
 	$("#textarea").focus();

app/js/post/img.js

@@ -36,7 +36,7 @@ $("#drag").on('dragleave', function(e) {
 
 //複数アップ
 function pimg(files) {
-	console.log(files);
+	console.table(files);
 	for (i = 0; i < files.length; i++) {
 		var dot = files[i].path.match(/\.(.+)$/)[1];
 		if (dot == "bmp" || dot == "BMP") {
@@ -95,7 +95,6 @@ function media(b64, type, no) {
 	localStorage.setItem("image", "busy");
 	todo("Image Upload...");
 	var media = toBlob(b64, type);
-	console.log(media);
 	var fd = new FormData();
 	fd.append('file', media);
 	var acct_id = $("#post-acct-sel").val();
@@ -106,7 +105,7 @@ function media(b64, type, no) {
 		var start = "https://" + domain + "/api/drive/files/create";
 		httpreq.open('POST', start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		if ($("#nsfw").hasClass("nsfw-avail")) {
 			var nsfw = true;
 		} else {
@@ -121,17 +120,16 @@ function media(b64, type, no) {
 		var start = "https://" + domain + "/api/v1/media";
 		httpreq.open('POST', start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
 		httpreq.send(fd);
 	}
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
 			var img = localStorage.getItem("img");
 			if (json.type.indexOf("image") != -1) {
-				var html = '<img src="' + json[previewer] + '" style="width:50px; max-height:100px;">';
+				var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';
 				$('#preview').append(html);
 			} else {
 				$('#preview').append(lang.lang_postimg_previewdis);
@@ -182,23 +180,20 @@ function toBlob(base64, type) {
 //画像を貼り付けたら…
 var element = document.querySelector("#textarea");
 element.addEventListener("paste", function (e) {
-	console.log(e)
+	if (!e.clipboardData || !e.clipboardData.items) {
-    // 画像の場合
+		return true;
-    // e.clipboardData.types.length == 0
+	}
-    // かつ
+	// DataTransferItemList に画像が含まれいない場合は終了する
-    // e.clipboardData.types[0] == "Files"
+	var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'));
-    // となっているので、それ以外を弾く
+	if (imageItems.length == 0) {
-    if (!e.clipboardData 
+		console.warn("it is not image")
-            || !e.clipboardData.types
-            || (e.clipboardData.types.length != 1)
-            || (e.clipboardData.types[0] != "Files")) {
-				console.log("not image")
 		return true;
 	}
 
 	// ファイルとして得る
-    // (なぜかgetAsStringでは上手くいかなかった)
+	// DataTransferItem の kind は file なので getAsString ではなく getAsFile を呼ぶ
-    var imageFile = e.clipboardData.items[0].getAsFile();
+	var imageFile = imageItems[0].getAsFile();
+	var imageType = imageItems[0].type;
 
 	// FileReaderで読み込む
 	var fr = new FileReader();
@@ -209,7 +204,8 @@ element.addEventListener("paste", function(e){
 		if (mediav) {
 			var i = mediav.split(",").length;
 		}
-		media(base64, "image/png", i)
+		// DataTransferItem の type に mime tipes があるのでそれを使う
+		media(base64, imageType, i)
 	};
 	fr.readAsDataURL(imageFile);
 
@@ -223,3 +219,18 @@ function adobe(){
 ipc.on('adobeagree', function (event, arg) {
 	localStorage.setItem("adobeagree", arg);
 });
+function deleteImage(key) {
+	if (!confirm(lang.lang_postimg_delete)) {
+		return false;
+	}
+	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;
+		}
+	}
+	$("#media").val(arr.join(","));
+	$('#preview [data-media=' + key + ']').remove();
+}

app/js/post/misskeystatus.js

@@ -1,7 +1,7 @@
 //Renpost
 function renote(id, acct_id, remote) {
     if ($("#pub_" + id).hasClass("rted")) {
-		return
+        return false;
     }
     var domain = localStorage.getItem("domain_" + acct_id);
     var at = localStorage.getItem("acct_" + acct_id + "_at");
@@ -12,12 +12,12 @@ function renote(id, acct_id, remote) {
     var httpreq = new XMLHttpRequest();
     httpreq.open('POST', start, true);
     httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = 'json';
+    httpreq.responseType = "json";
     httpreq.send(JSON.stringify({ i: at, renoteId: id }));
     httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+        if (httpreq.readyState === 4) {
             var json = httpreq.response;
-            console.log(json);
+            console.log(["Success: renote", json]);
             $("[toot-id=" + id + "]").addClass("rted");
             $(".rt_" + id).toggleClass("teal-text");
         }
@@ -58,17 +58,17 @@ function reactiontoggle(id,acct_id,tlid){
     var httpreq = new XMLHttpRequest();
     httpreq.open('POST', start, true);
     httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = 'json';
+    httpreq.responseType = "json";
     httpreq.send(JSON.stringify({ i: at, noteId: id }));
     httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+        if (httpreq.readyState === 4) {
             var json = httpreq.response;
-            console.log(json);
+            console.log(["Success: reaction", json]);
-            if(json.reactionCounts){
+            if (json.reactions) {
-                var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
+                var reactions = ["like", "love", "laugh", "hmm", "surprise", "congrats", "angry", "confused", "pudding", "rip"];
                 for (var i = 0; i < reactions.length; i++) {
-                    if(json.reactionCounts[reactions[i]]){
+                    if (json.reactions[reactions[i]]) {
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[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)
@@ -77,7 +77,7 @@ function reactiontoggle(id,acct_id,tlid){
                         } else {
                             $("#pub_" + id + " .re-" + reactions[i]).removeClass("hide")
                         }
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
+                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
                     }
                 }
                 $("#pub_" + id + " .reactions").removeClass("hide");
@@ -94,6 +94,20 @@ function reactiontoggle(id,acct_id,tlid){
             }
         }
     }
+    $("#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').material_select();
+    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);
@@ -107,7 +121,6 @@ function reactRefresh(acct_id,id){
         method: "POST",
         body: JSON.stringify(req),
     }
-    console.log(req)
     fetch(start, i,
     ).then(function (response) {
         return response.json();
@@ -119,29 +132,40 @@ function reactRefresh(acct_id,id){
             return false;
         }
         var poll = "";
-        console.log(json);
+        if (json.error) {
+            $("[toot-id=" + id + "]").hide();
+            $("[toot-id=" + id + "]").remove();
+        } else {
             reactRefreshCore(json)
+        }
     });
 }
 function reactRefreshCore(json) {
     var id = json.id;
-    if(json.reactionCounts){
+    if (json.reactions) {
-        var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
         $("#pub_" + id + " .reactions").removeClass("hide")
-        for(var i=0;i<reactions.length;i++){
+        var regExp = new RegExp(":", "g");
-            if(json.reactionCounts[reactions[i]]){
+        Object.keys(json.reactions).forEach(function (keye) {
-                console.log(json.reactionCounts[reactions[i]])
+            keyeClass = keye.replace(regExp, '');
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
+            if (json.reactions[keye]) {
-                $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+                $("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
+                $("#pub_" + id + " .re-" + keyeClass).removeClass("hide")
             } else {
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(0)
+                $("#pub_" + id + " .re-" + keyeClass + "ct").text(0)
                 if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
-                    $("#pub_" + id +" .re-"+reactions[i]).addClass("hide")
+                    $("#pub_" + id + " .re-" + keyeClass).addClass("hide")
-                }
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
                 }
+                $("#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();
 }
 function reaction(mode, id, acct_id, tlid) {
     var domain = localStorage.getItem("domain_" + acct_id);
@@ -158,10 +182,10 @@ function reaction(mode,id,acct_id,tlid){
     var httpreq = new XMLHttpRequest();
     httpreq.open('POST', start, true);
     httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = 'json';
+    httpreq.responseType = "json";
     httpreq.send(JSON.stringify({ i: at, noteId: id, reaction: mode }));
     httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+        if (httpreq.readyState === 4) {
             $(".fav_" + id).toggleClass("yellow-text");
         }
     }
@@ -177,7 +201,7 @@ function vote(acct_id,id,to){
     var httpreq = new XMLHttpRequest();
     httpreq.open('POST', start, true);
     httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = 'json';
+    httpreq.responseType = "json";
     httpreq.send(JSON.stringify({ i: at, noteId: id, choice: to }));
     httpreq.onreadystatechange = function () {
         voterefresh(acct_id, id)
@@ -208,7 +232,7 @@ function voterefresh(acct_id,id){
                     } else {
                         var myvote = "";
                     }
-                    poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
+                    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

@@ -11,7 +11,7 @@ function sec(){
 }
 function post(mode, postvis) {
 	if ($("#toot-post-btn").prop("disabled")) {
-		return
+		return false;
 	}
 	var str = $("#textarea").val();
 	var acct_id = $("#post-acct-sel").val();
@@ -45,6 +45,7 @@ function post(mode,postvis) {
 	} 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 electron = require("electron");
 			var remote = electron.remote;
@@ -57,18 +58,19 @@ function post(mode,postvis) {
 				buttons: [lang.lang_post_btn1, lang.lang_post_btn2, lang.lang_post_btn3]
 			}
 			dialog.showMessageBox(options, function (arg) {
-			if(arg==1){
+				if (arg === 1) {
 					$("#cw-text").show();
 					$("#cw").addClass("yellow-text");
 					$("#cw").addClass("cw-avail");
 					$("#cw-text").val(plus);
 					post("pass");
-			}else if(arg==2){
+				} else if (arg === 2) {
 					post("pass");
 				}
 			})
 			return false;
 		}
+	}
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
 		misskeyPost();
 		return;
@@ -78,6 +80,9 @@ function post(mode,postvis) {
 	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
 	}
@@ -106,6 +111,7 @@ function post(mode,postvis) {
 		toot.status = str + "👁️";
 	}
 	//ここに非公開・未収載タグについてwarn
+	if (domain != "kirishima.cloud" && domain != "imastodon.net") {
 		if (~str.indexOf("#")) {
 			if (vis == "local" || vis == "unlisted" || vis == "direct" || vis == "private") {
 				if (!confirm(lang.lang_post_tagVis)) {
@@ -113,6 +119,7 @@ function post(mode,postvis) {
 				}
 			}
 		}
+	}
 	if ($("#cw").hasClass("cw-avail")) {
 		var spo = $("#cw-text").val();
 		cw();
@@ -122,25 +129,51 @@ function post(mode,postvis) {
 	}
 	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 = "";
 	}
+	if ($("#poll-sel").val() == "mastodon-poll") {
+		var options = [];
+		$(".mastodon-choice").map(function () {
+			var choice = $(this).val();
+			if (choice != "") {
+				options.push(choice);
+			}
+		});
+		if ($("#poll-multiple:checked").val() == "1") {
+			var mul = true;
+		} else {
+			var mul = false;
+		}
+		if ($("#poll-until:checked").val() == "1") {
+			var htt = true;
+		} else {
+			var htt = false;
+		}
+		var exin = pollCalc();
+		if (!exin) {
+			todc("Error: Poll expires_in param")
+		}
+		toot.poll = {
+			options: options,
+			expires_in: exin,
+			multiple: mul,
+			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.responseType = "json";
 	httpreq.send(JSON.stringify(toot));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
-			if(str.indexOf(localStorage.getItem("stable"))==-1){
-				localStorage.removeItem("stable")
-			}
 			var json = httpreq.response;
-			console.log(json);
 			var box = localStorage.getItem("box");
 			if (box == "yes" || !box) {
 				$("#textarea").blur();
@@ -204,15 +237,15 @@ function misskeyPost(){
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify(toot));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			if (str.indexOf(localStorage.getItem("stable")) == -1) {
 				localStorage.removeItem("stable")
 			}
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: toot", json]);
 			var box = localStorage.getItem("box");
 			if (box == "yes") {
 				hide();
@@ -231,7 +264,7 @@ function misskeyPost(){
 function clear() {
 	$("#textarea").val("");
 	if (localStorage.getItem("stable")) {
-		$("#textarea").val(localStorage.getItem("stable"));
+		$("#textarea").val("#" + localStorage.getItem("stable") + " ")
 	}
 	$("#textarea").attr("placeholder", lang.lang_toot);
 	$("#reply").val("");
@@ -263,9 +296,19 @@ function clear() {
 	$("#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"));
 	}
 	$('select').material_select();
+	$("#left-side").show();
+	$("#default-emoji").show();
+	$("#unreact").show();
+	$("#addreact").addClass("hide");
 }

app/js/post/secure.js

@@ -49,7 +49,6 @@ function vis(set){
 }
 function loadVis() {
 	var vist = localStorage.getItem("vis");
-		console.log(vist);
 	if (!vist) {
 		vis("public");
 	} else {
@@ -60,7 +59,7 @@ function loadVis(){
 				memory = "public";
 			}
 			vis(memory);
-			} else if(vist == "server") {
+		} else if (vist == "useapi") {
 			var acct_id = $("#post-acct-sel").val();
 			var multi = localStorage.getItem("multi");
 			var obj = JSON.parse(multi);
@@ -123,7 +122,6 @@ function schedule(){
 
 		$("#sch-box").show();
 		$("#sch-date").val(formattime(date));
-		console.log(formattime(date));
 		$("#sch-box").addClass("sch-avail");
 	}
 }

app/js/post/status.js

@@ -13,10 +13,10 @@ function fav(id, acct_id, remote) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
 	httpreq.onreadystatechange = function () {
-        if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			if (remote != "remote") {
 				//APIのふぁぼカウントがおかしい
@@ -63,12 +63,12 @@ function rt(id, acct_id, remote) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: boost", json]);
 			if (remote != "remote") {
 				$("[toot-id=" + id + "] .fav_ct").text(json.favourites_count);
 				if (!json.reblog) {
@@ -128,17 +128,16 @@ function follow(acct_id,remote) {
 		var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
 		var ent = {}
 	}
-	console.log(ent);
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify(ent));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: folllow", json]);
 			if ($("#his-data").hasClass("following")) {
 				$("#his-data").removeClass("following");
 				$("#his-follow-btn").text(lang.lang_status_follow);
@@ -168,10 +167,10 @@ function block(acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			if ($("#his-data").hasClass("blocking")) {
 				$("#his-data").removeClass("blocking");
 				$("#his-block-btn").text(lang.lang_status_block);
@@ -210,10 +209,10 @@ function mute(acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(rq);
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			if ($("#his-data").hasClass("muting")) {
 				$("#his-data").removeClass("muting");
 				$("#his-mute-btn").text(lang.lang_status_mute);
@@ -234,19 +233,21 @@ function del(id, acct_id) {
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({ i: at, noteId: id }));
+		$("[toot-id=" + id + "]").hide();
+		$("[toot-id=" + id + "]").remove();
 	} else {
 		var start = "https://" + domain + "/api/v1/statuses/" + id;
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('DELETE', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
 		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send();
 	}
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 		}
 	}
 }
@@ -264,7 +265,7 @@ function redraft(id, acct_id){
 		$("[toot-id=" + id + "] img.toot-img").each(function (i, elem) {
 			if (i < ct) {
 				var url = $(elem).attr("src");
-				console.log(url);
+				console.log("Play back image data:" + url);
 				$('#preview').append('<img src="' + url + '" style="width:50px; max-height:100px;">');
 			}
 		});
@@ -300,12 +301,12 @@ function pin(id, acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: pinned", json]);
 			if ($("[toot-id=" + id + "]").hasClass("pined")) {
 				$("[toot-id=" + id + "]").removeClass("pined");
 				$(".pin_" + id).removeClass("blue-text");
@@ -326,12 +327,12 @@ function request(id, flag, acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: request", "type:" + flag, json]);
 			showReq();
 		}
 	}
@@ -349,12 +350,12 @@ function domainblock(add, flag, acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: domain block", json]);
 			showDom();
 		}
 	}
@@ -369,7 +370,6 @@ function empUser(){
 	var usr = localStorage.getItem("user_emp");
 	var obj = JSON.parse(usr);
 	var id = $("#his-acct").attr("fullname");
-	console.log(id);
 	if (!obj) {
 		var obj = [];
 		obj.push(id);
@@ -406,12 +406,11 @@ function pinUser(){
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
 			if ($("#his-end-btn").hasClass("endorsed")) {
 				$("#his-end-btn").removeClass("endorsed")
 				$("#his-end-btn").text(lang.lang_status_endorse)

app/js/post/suggest.js

@@ -13,6 +13,13 @@ input.addEventListener("focus", function() {
 	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) {
@@ -32,34 +39,36 @@ input.addEventListener("focus", function() {
 						}
 					}
 				}
-				
+				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(localStorage.getItem("imas")){
+			if (tag && tag[1]) {
-				//セルフNP
-				var cpnp = new_val.match(/^(?!.*http)\/\/(\S{1,})/);
-			}else{
-				var cpnp=[];
-			}
-			if (cpnp && cpnp[1]) {
-				var q = cpnp[1];
-				cgNPs(q);
-			} else if (tag && tag[1]) {
 				var q = tag[1];
 			} else if (acct && acct[1]) {
 				var q = acct[1];
 			} else {
-				//$("#suggest").html("");
+				$("#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/v1/search?q=" + q
 			if (suggest != oldSuggest) {
-				console.log(suggest)
+				console.log("Try to get suggest at " + suggest)
 				fetch(suggest, {
 					method: 'GET',
 					headers: {
@@ -72,24 +81,38 @@ input.addEventListener("focus", function() {
 					todo(error);
 					console.error(error);
 				}).then(function (json) {
-					if (json.hashtags[0] && tag[1]) {
+					if (json.hashtags[0] && tag) {
+						if (tag[1]) {
 							var tags = "";
 							Object.keys(json.hashtags).forEach(function (key4) {
 								var tag = json.hashtags[key4];
+								if (tag != q) {
 									tags = tags + '<a onclick="tagInsert(\'#' + tag + '\',\'#' + q +
-								'\')" class="pointer">#' + tag + '</a>  ';
+										'\')" class="pointer">#' + tag + '</a><br>';
+								}
 							});
-						$("#suggest").html("Tags:" + tags);
+							$("#right-side").show()
+							$("#suggest").html("Tags:<br>" + tags);
+							$("#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>  ';
+									'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
+							}
 						});
-						$("#suggest").html("@:" + accts);
+						$("#right-side").show()
+						$("#suggest").html(accts);
+						$("#poll").addClass("hide")
+						$("#emoji").addClass("hide")
 					} else {
-						$("#suggest").html("Not Found");
+						if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
+							$("#right-side").hide()
+						}
 					}
 				});
 			}
@@ -121,12 +144,15 @@ function tagInsert(code, del) {
 	}
 	$("#textarea").val(newt);
 	$("#textarea").focus();
+	if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
+		$("#right-side").hide()
+	}
 	$("#suggest").html("");
 }
 function cgNPs(q) {
 	suggest = "https://cg.toot.app/api/v1/search/light?q=" + q
 	if (suggest != oldSuggest) {
-				console.log(suggest)
+		console.log("Try to get suggest at " + suggest)
 		fetch(suggest, {
 			method: 'GET',
 			headers: {
@@ -138,12 +164,11 @@ function cgNPs(q){
 			todo(error);
 			console.error(error);
 		}).then(function (json) {
-					console.log(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">' + json[key4] + '</a>  ';
+					tags = tags + '<a onclick="cgNP(\'' + json[key4] + '\')" class="pointer">' + escapeHTML(json[key4]) + '</a>  ';
 				});
 				$("#suggest").html("Cinderella NowPlaying:" + tags);
 			} else {

app/js/post/use-txtbox.js

@@ -1,10 +1,17 @@
 /*リプライ*/
-function re(id,at,acct_id,mode){
+function re(id, ats_cm, acct_id, mode) {
+	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);
+		}
+	}
 	$("#rec").text(lang.lang_yesno);
 	$("#post-acct-sel").val(acct_id);
 	$("#post-acct-sel").prop("disabled", true);
@@ -32,6 +39,9 @@ function qt(id,acct_id,at,url){
 	if (!qt) {
 		var qt = "simple";
 	}
+	if (qt == "nothing") {
+		return false;
+	}
 	if (qt == "simple") {
 		show();
 		$("#textarea").val("\n" + url);

app/js/tl/card.js

@@ -4,9 +4,9 @@ function additional(acct_id, tlid) {
 	//メンション系
 	//$(".mention").attr("href", "");
 
-	$(".mention").addClass("parsed");
+	$("#timeline-container .mention").addClass("parsed");
 
-	$(".hashtag").each(function(i, elem) {
+	$("#timeline-container .hashtag").each(function (i, elem) {
 		var tags = $(this).attr("href").match(
 			/https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
 		);
@@ -17,8 +17,6 @@ function additional(acct_id, tlid) {
 			}
 
 		}
-		
-		
 	});
 
 	//トゥートサムネ
@@ -34,6 +32,7 @@ function additional(acct_id, tlid) {
 				);
 			}
 		} else {
+			text = ""
 			var urls = []
 		}
 
@@ -64,8 +63,8 @@ function additional(acct_id, tlid) {
 				}).then(function (json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
+							"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
-							json.description + "</span>");
+							escapeHTML(json.description) + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
 					}
@@ -81,9 +80,8 @@ function additional(acct_id, tlid) {
 		var dom = $(this);
 		var start = "./js/emoji/emoji-map.json";
 		var xmlHttpRequest = new XMLHttpRequest();
-	 xmlHttpRequest.onreadystatechange = function()
+		xmlHttpRequest.onreadystatechange = function () {
-	 {
+			if (this.readyState === 4 && this.status === 200) {
-		 if( this.readyState == 4 && this.status == 200 ) {
 				if (this.response) {
 					var json = this.response;
 					var emojis = json.emojis;
@@ -149,8 +147,8 @@ function additionalIndv(tlid, acct_id, id) {
 			}).then(function (json) {
 				if (json.title) {
 					$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
+						"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
-							json.description + "</span>");
+						escapeHTML(json.description) + "</span>");
 					$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 					$("[toot-id=" + id + "]").addClass("parsed");
 				}
@@ -171,9 +169,7 @@ function additionalIndv(tlid, acct_id, id) {
 				todo(error);
 				console.error(error);
 			}).then(function (json) {
-					console.log(json);
 				//このリンク鳥やんけ、ってとき
-					console.log(json.provider_name);
 				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">';
@@ -244,7 +240,6 @@ function mov(id,tlid,type){
 	} else {
 		var tlide = "[tlid=" + tlid + "]";
 	}
-	console.log(tlid)
 	var mouseover = localStorage.getItem("mouseover");
 	if (!mouseover) {
 		mouseover = "";

app/js/tl/datails.js

@@ -1,6 +1,11 @@
 //トゥートの詳細
-function details(id, acct_id, tlid) {
+function details(id, acct_id, tlid, mode) {
-	$(".toot-reset").html(lang.lang_details_nodata);
+	if (mode == "dm") {
+		$(".dm-hide").hide();
+	} else {
+		$(".dm-hide").show();
+	}
+	$(".toot-reset").html('<span class="no-data">' + lang.lang_details_nodata + '</span>');
 	var html = $("#timeline_" + tlid + " [toot-id=" + id + "]").html();
 	$("#toot-this").html(html);
 	$('#tootmodal').modal('open');
@@ -35,7 +40,7 @@ function details(id, acct_id, tlid) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
+		console.log(["Toot data:", json]);
 		if (!$("#timeline_" + tlid + " #pub_" + id).length) {
 			var html = parse([json], '', acct_id);
 			$("#toot-this").html(html);
@@ -78,13 +83,17 @@ function details(id, acct_id, tlid) {
 			$("#tootmodal").attr("data-user", scn);
 		}
 		context(id, acct_id);
+		var dom = null;
 		if (!local) {
-			var dom=scn.replace(/.+@/g,'');
+			dom = scn.replace(/.+@/g, '');
 		} else {
-			var dom=domain;
+			dom = domain;
 		}
 		beforeToot(id, acct_id, dom);
 		userToot(id, acct_id, uid);
+		afterToot(id, acct_id, dom);
+		afterUserToot(id, acct_id, uid);
+		afterFTLToot(id, acct_id, dom);
 		faved(id, acct_id);
 		rted(id, acct_id);
 		if ($("#toot-this div").hasClass("cvo")) {
@@ -93,7 +102,7 @@ function details(id, acct_id, tlid) {
 			$("#toot-this").addClass("cvo");
 		}
 		if (!$("#activator").hasClass("active")) {
-			$('#det-col').collapsible('open', 1);
+			$('#det-col').collapsible('open', 4);
 		}
 
 	});
@@ -148,6 +157,9 @@ function replyTL(id, acct_id) {
 			}
 		} else {
 			var templete = parse([json], '', acct_id, "", "", mute);
+			if (templete != "") {
+				$("#toot-reply .no-data").hide();
+			}
 			$("#toot-reply").prepend(templete);
 			$("#toot-reply .hide").html(lang.lang_details_filtered);
 			$("#toot-reply .by_filter").css("display", "block");
@@ -196,7 +208,6 @@ function context(id, acct_id) {
 	}).then(function (json) {
 		if (localStorage.getItem("mode_" + domain) == "misskey") {
 			json.reverse();
-			console.log(json);
 			var templete = misskeyParse(json, '', acct_id, "", "", []);
 			$("#toot-reply").html(templete);
 			$("#toot-reply .hide").html(lang.lang_details_filtered);
@@ -210,6 +221,9 @@ function context(id, acct_id) {
 				var mute = [];
 			}
 			var templete = parse(json.descendants, '', acct_id, "", "", mute);
+			if (templete != "") {
+				$("#toot-after .no-data").hide();
+			}
 			$("#toot-after").html(templete);
 			$("#toot-after .hide").html(lang.lang_details_filtered);
 			$("#toot-after .by_filter").css("display", "block");
@@ -261,6 +275,9 @@ function beforeToot(id, acct_id, domain) {
 			console.error(error);
 		}).then(function (json) {
 			var templete = parse(json, 'noauth', acct_id);
+			if (templete != "") {
+				$("#toot-before .no-data").hide();
+			}
 			$("#toot-before").html(templete);
 			jQuery("time.timeago").timeago();
 		});
@@ -308,12 +325,90 @@ function userToot(id, acct_id, user) {
 			console.error(error);
 		}).then(function (json) {
 			var templete = parse(json, '', acct_id);
+			if (templete != "") {
+				$("#user-before .no-data").hide();
+			}
 			$("#user-before").html(templete);
 			jQuery("time.timeago").timeago();
 		});
 	}
 
 }
+//後のLTL
+function afterToot(id, acct_id, domain) {
+	//var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain +
+		"/api/v1/timelines/public?local=true&min_id=" + id;
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var templete = parse(json, 'noauth', acct_id);
+		if (templete != "") {
+			$("#ltl-after .no-data").hide();
+		}
+		$("#ltl-after").html(templete);
+		jQuery("time.timeago").timeago();
+	});
+}
+//後のUTL
+function afterUserToot(id, acct_id, user) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses?min_id=" + id;
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var templete = parse(json, '', acct_id);
+		if (templete != "") {
+			$("#user-after .no-data").hide();
+		}
+		$("#user-after").html(templete);
+		jQuery("time.timeago").timeago();
+	});
+}
+//後のFTL
+function afterFTLToot(id, acct_id, domain) {
+	//var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain +
+		"/api/v1/timelines/public?min_id=" + id;
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var templete = parse(json, 'noauth', acct_id);
+		if (templete != "") {
+			$("#ftl-after .no-data").hide();
+		}
+		$("#ftl-after").html(templete);
+		jQuery("time.timeago").timeago();
+	});
+}
 
 //ふぁぼ一覧
 function faved(id, acct_id) {
@@ -334,6 +429,9 @@ function faved(id, acct_id) {
 		console.error(error);
 	}).then(function (json) {
 		var templete = userparse(json, '', acct_id);
+		if (templete != "") {
+			$("#toot-fav .no-data").hide();
+		}
 		$("#toot-fav").html(templete);
 	});
 }
@@ -383,7 +481,7 @@ function staCopy(id){
 	html = html.replace(/<br\s?\/?>/, "\n");
 	html = html.replace(/<p>/, "\n");
 	html = html.replace(/<\/p>/, "\n");
-	console.log(html);
+	console.log("Copy it:\n" + html);
 	html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, "$1");
 	html = $.strip_tags(html);
 	if (execCopy(html)) {
@@ -391,64 +489,8 @@ function staCopy(id){
 	}
 
 }
-//魚拓
-function shot(){
-	var title=$("#tootmodal").attr("data-id");
-	var off = $('#toot-this').offset();
-	var w=$("#toot-this").width()+50;
-	var h=$("#toot-this").height()+50;
-	var electron = require("electron");
-	const fs = require("fs");
-	const os = require('os')
-	const shell = electron.shell;
-	const path = require('path')
-	var ipc = electron.ipcRenderer;
-	let options = {
-        types: ['screen'],
-        thumbnailSize: {
-            width: window.parent.screen.width,
-            height: window.parent.screen.height
-          }
-	}
-	const desktopCapturer = electron.desktopCapturer;
-	desktopCapturer.getSources(options, function(error, sources) {
-		if (error) return console.log(error)
-
-		sources.forEach(function(source) {
-			if (source.name === 'Screen 1' || source.name === 'TheDesk') {
-                var durl=source.thumbnail.toDataURL();
-                var b64 = durl.match(
-                    /data:image\/png;base64,(.+)/
-                );
-                const screenshotPath = path.join(os.tmpdir(), 'screenshot.png');
-                const savePath = path.join(os.tmpdir(), 'screenshot.png');
-					var ipc = electron.ipcRenderer;
-					if(localStorage.getItem("savefolder")){
-						var save=localStorage.getItem("savefolder");
-					}else{
-						var save="";
-					}
-                    ipc.send('shot', ['file://' + screenshotPath,w,h,b64[1],title,off.top+50,off.left,save]);
-                    if($("#toot-this .img-parsed").length>0){
-                        for(i=0;i<$("#toot-this .img-parsed").length;i++){
-							var url=$("#toot-this .img-parsed").eq(i).attr("data-url");
-							if(localStorage.getItem("savefolder")){
-								var save=localStorage.getItem("savefolder");
-							}else{
-								var save="";
-							}
-                            ipc.send('shot-img-dl', [url,title+"_img"+i+".png",save]);
-                        }
-                    }
-                    return;
-					const message = `Saved screenshot to: ${screenshotPath}`
-					//screenshotMsg.textContent = message
-			}
-		})
-	})
-}
 //翻訳
-function trans(tar){
+function trans(tar, to) {
 	var html = $("#toot-this .toot").html();
 	if (html.match(/^<p>(.+)<\/p>$/)) {
 		html = html.match(/^<p>(.+)<\/p>$/)[1];
@@ -457,18 +499,21 @@ function trans(tar){
 	html = html.replace(/<p>/g, "\n");
 	html = html.replace(/<\/p>/g, "\n");
 	html = $.strip_tags(html);
+	if (~tar.indexOf("zh")) {
+		tar = "zh";
+	}
 	$("#toot-this .additional").text("Loading...(Powered by Google Translate)");
-	var exec='https://script.google.com/macros/s/AKfycbz0ETqcUxwNlw961GjErNb7vr_X18N2s1AS5Xu5nFTbYXcdcRM/exec?text='+encodeURIComponent(html)+'&source='+tar+'&target=ja'
+	var exec = 'https://script.google.com/macros/s/AKfycbxhwW5tjjop9Irg-y1zr_WsXlCKEzwWG6KuoOt_vVRDfEbRv0c/exec?format=json&text=' + encodeURIComponent(html) + '&source=' + tar + '&target=' + to
-	console.log(exec);
+	console.log("Try to translate from " + tar + " to " + to + " at " + exec);
 	fetch(exec, {
 		method: 'GET',
 	}).then(function (response) {
-		return response.text();
+		return response.json();
 	}).catch(function (error) {
 		todo(error);
 		console.error(error);
 	}).then(function (text) {
-		$("#toot-this .additional").html('<span class="gray">'+text+'</span>');
+		$("#toot-this .additional").html('<span class="gray">' + text.text + '</span>');
 	});
 }
 //ブラウザで開く

app/js/tl/date.js

@@ -15,10 +15,11 @@ function date(str, datetype) {
 		} else {
 			var min = date.getMinutes();
 		}
+		var sec = null;
 		if (date.getSeconds() < 10) {
-			var sec = "0" + date.getSeconds();
+			sec = "0" + date.getSeconds();
 		} else {
-			var sec = date.getSeconds();
+			sec = date.getSeconds();
 		}
 		if (datetype == "full") {
 			var ret = date.getFullYear() + "/" + month + "/" + date.getDate() + "/ " +
@@ -56,10 +57,11 @@ function date(str, datetype) {
 //特殊フォーマット(インスタンス情報で利用)
 function crat(str) {
 	var date = new Date(str);
+	var mnt = null;
 	if (date.getMonth() < 9) {
-		var mnt="0"+(date.getMonth()+1);
+		mnt = "0" + (date.getMonth() + 1);
 	} else {
-		var mnt=date.getMonth()+1;
+		mnt = date.getMonth() + 1;
 	}
 	if (date.getDate() < 10) {
 		var dat = "0" + date.getDate();

app/js/tl/dm.js

@@ -0,0 +1,522 @@
+//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',
+		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);
+	});
+
+}
+function dmmore(tlid) {
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	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 start = "https://" + domain + "/api/v1/conversations?max_id=" + sid;
+	var type = "dm";
+	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 = '<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 = '';
+	if (obj[0]) {
+		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';
+	if (actb) {
+		var actb = actb.split(',');
+		var disp = {};
+		for (var k = 0; k < actb.length; k++) {
+			if (k < 4) {
+				var tp = "type-a";
+			} else {
+				var tp = "type-b";
+			}
+			disp[actb[k]] = tp;
+		}
+	}
+	var datetype = localStorage.getItem("datetype");
+	var nsfwtype = localStorage.getItem("nsfw");
+	var sent = localStorage.getItem("sentence");
+	var ltr = localStorage.getItem("letters");
+	var gif = localStorage.getItem("gif");
+	var imh = localStorage.getItem("img-height");
+	//独自ロケール
+	var locale = localStorage.getItem("locale");
+	if (locale == "yes") {
+		var locale = false;
+	}
+	//ネイティブ通知
+	var native = localStorage.getItem("nativenotf");
+	if (!native) {
+		native = "yes";
+	}
+	//クライアント強調
+	var emp = localStorage.getItem("client_emp");
+	if (emp) {
+		var emp = JSON.parse(emp);
+	}
+	//クライアントミュート
+	var mute = localStorage.getItem("client_mute");
+	if (mute) {
+		var mute = JSON.parse(mute);
+	}
+	//ユーザー強調
+	var useremp = localStorage.getItem("user_emp");
+	if (useremp) {
+		var useremp = JSON.parse(useremp);
+	}
+	//ワード強調
+	var wordemp = localStorage.getItem("word_emp");
+	if (wordemp) {
+		var wordemp = JSON.parse(wordemp);
+	}
+	//ワードミュート
+	var wordmute = localStorage.getItem("word_mute");
+	if (wordmute) {
+		var wordmute = JSON.parse(wordmute);
+		wordmute = wordmute.concat(mutefilter);
+	} else {
+		wordmute = mutefilter;
+	}
+	//Ticker
+	var tickerck = localStorage.getItem("ticker_ok");
+	if (tickerck) {
+		var ticker = true;
+	} else {
+		var ticker = false;
+	}
+	//Cards
+	var card = localStorage.getItem("card_" + tlid);
+
+	if (!sent) {
+		var sent = 500;
+	}
+	if (!ltr) {
+		var ltr = 500;
+	}
+	if (!nsfwtype || nsfwtype == "yes") {
+		var nsfw = "ok";
+	} else {
+		var nsfw;
+	}
+	var cwtype = localStorage.getItem("cw");
+	if (!cwtype || cwtype == "yes") {
+		var cw = "ok";
+	} else {
+		var cw;
+	}
+	if (!datetype) {
+		datetype = "absolute";
+	}
+	if (!gif) {
+		var gif = "yes";
+	}
+	if (!imh) {
+		var imh = "200";
+	}
+	if (!emp) {
+		var emp = [];
+	}
+	if (!mute) {
+		var mute = [];
+	}
+	if (!useremp) {
+		var useremp = [];
+	}
+	if (!wordemp) {
+		var wordemp = [];
+	}
+	if (!wordmute) {
+		var wordmute = [];
+	}
+	//via通知
+	var viashow = localStorage.getItem("viashow");
+	if (!viashow) {
+		viashow = "via-hide";
+	}
+	if (viashow == "hide") {
+		viashow = "via-hide";
+	}
+	//認証なしTL
+	if (mix == "noauth") {
+		var noauth = "hide";
+		var antinoauth = "";
+	} else {
+		var noauth = "";
+		var antinoauth = "hide";
+	}
+	//マウスオーバーのみ
+	var mouseover = localStorage.getItem("mouseover");
+	if (!mouseover) {
+		mouseover = "";
+	} else if (mouseover == "yes" || mouseover == "click") {
+		mouseover = "hide";
+	} else if (mouseover == "no") {
+		mouseover = "";
+	}
+	var local = [];
+	var times = [];
+	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);
+		if (toot.account.emojis) {
+			var actemojick = toot.account.emojis[0];
+		} else {
+			var actemojick = false;
+		}
+		//絵文字があれば
+		if (actemojick) {
+			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 regExp = new RegExp(":" + shortcode + ":", "g");
+				dis_name = dis_name.replace(regExp, emoji_url);
+
+			});
+		}
+		var noticeavatar = "";
+		var if_notf = "";
+		var uniqueid = toot.id;
+		var notice = "";
+		var boostback = "";
+		//ユーザー強調
+		if (toot.account.username != toot.account.acct) {
+			var fullname = toot.account.acct;
+		} else {
+			var domain = localStorage.getItem("domain_" + acct_id);
+			var fullname = toot.account.acct + "@" + domain;
+		}
+		if (useremp) {
+			Object.keys(useremp).forEach(function (key10) {
+				var user = useremp[key10];
+				if (user == fullname) {
+					boostback = "emphasized";
+				}
+			});
+		}
+		var id = toot.id;
+		var home = "";
+		if (toot.account.locked) {
+			var locked = ' <i class="fas fa-lock red-text"></i>';
+		} else {
+			var locked = "";
+		}
+		if (!toot.application) {
+			var via = '';
+			viashow = "hide";
+		} else {
+			var via = escapeHTML(toot.application.name);
+			//強調チェック
+			Object.keys(emp).forEach(function (key6) {
+				var cli = emp[key6];
+				if (cli == via) {
+					boostback = "emphasized";
+				}
+			});
+			//ミュートチェック
+			Object.keys(mute).forEach(function (key7) {
+				var cli = mute[key7];
+				if (cli == via) {
+					boostback = "hide";
+				}
+			});
+		}
+		if (mix == "pinned") {
+			boostback = "emphasized";
+		}
+		if (toot.spoiler_text && cw) {
+			var content = toot.content;
+			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>';
+		} 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; }
+			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 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>';
+			} else {
+				var content = toot.content;
+				var spoil = escapeHTML(toot.spoiler_text);
+				var spoiler = "";
+				var spoiler_show = "";
+			}
+		}
+		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>';
+		} else {
+			var analyze = '';
+		}
+		var viewer = "";
+		var hasmedia = "";
+		var youtube = "";
+		if (toot.emojis) {
+			var emojick = toot.emojis[0];
+		} else {
+			var emojick = false;
+		}
+		//絵文字があれば
+		if (emojick) {
+			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 regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
+		}
+		//ニコフレ絵文字
+		if (toot.profile_emojis) {
+			var nicoemojick = toot.profile_emojis[0];
+		} else {
+			var nicoemojick = false;
+		}
+		//絵文字があれば
+		if (nicoemojick) {
+			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 regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
+		}
+		//デフォ絵文字
+		content = twemoji.parse(content);
+		if (dis_name) {
+			dis_name = twemoji.parse(dis_name);
+		}
+		if (spoil) {
+			spoil = twemoji.parse(spoil);
+		}
+		var mediack = toot.media_attachments[0];
+		//メディアがあれば
+		var media_ids = "";
+		if (mediack) {
+			hasmedia = "hasmedia";
+			var cwdt = 100 / toot.media_attachments.length;
+			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"
+				} else {
+					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>';
+			});
+			media_ids = media_ids.slice(0, -1);
+		} else {
+			viewer = "";
+			hasmedia = "nomedia";
+		}
+		var menck = toot.mentions[0];
+		var mentions = "";
+		//メンションであれば
+		if (menck) {
+			mentions = "";
+			Object.keys(toot.mentions).forEach(function (key3) {
+				var mention = toot.mentions[key3];
+				mentions = mentions + '<a onclick="udg(\'' + mention.id + '\',' +
+					acct_id + ')" class="pointer">@' + mention.acct + '</a> ';
+			});
+			mentions = '<div style="float:right">' + mentions + '</div>';
+		}
+		var tagck = toot.tags[0];
+		var tags = "";
+		//タグであれば
+		if (tagck) {
+			Object.keys(toot.tags).forEach(function (key4) {
+				var tag = toot.tags[key4];
+				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ':<a onclick="tl(\'tag\',\'' + tag.name + '\',' + acct_id +
+					',\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag.name) + '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag.name) + '">Toot</a>　' +
+					'<a onclick="tagPin(\'' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag.name) + '">Pin</a></span> ';
+			});
+			tags = '<div style="float:right">' + tags + '</div>';
+		}
+		//アニメ再生
+		if (gif == "yes") {
+			var avatar = toot.account.avatar;
+		} else {
+			var avatar = toot.account.avatar_static;
+		}
+		//ワードミュート
+		if (wordmute) {
+			Object.keys(wordmute).forEach(function (key8) {
+				var worde = wordmute[key8];
+				if (worde) {
+					if (worde.tag) {
+						var word = worde.tag;
+					} else {
+						var word = worde
+					}
+					var regExp = new RegExp(word, "g");
+					if ($.strip_tags(content).match(regExp)) {
+						boostback = "hide by_filter";
+					}
+				}
+			});
+		}
+		//ワード強調
+		if (wordemp) {
+			Object.keys(wordemp).forEach(function (key9) {
+				var word = wordemp[key9];
+				if (word) {
+					var word = word.tag;
+					var regExp = new RegExp(word, "g");
+					content = content.replace(regExp, '<span class="emp">' + escapeHTML(word) + "</span>");
+				}
+			});
+		}
+		//日本語じゃない
+		if (toot.language != "ja") {
+			var trans = '<div class="action pin"><a onclick="trans(\'' + toot.language + '\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_trans + '"><i class="material-icons">g_translate</i></a></div>';
+		} else {
+			var trans = "";
+		}
+		if (toot.favourited) {
+			var if_fav = " yellow-text";
+			var fav_app = "faved";
+		} else {
+			var if_fav = "";
+			var fav_app = "";
+		}
+		//Cards
+		if (!card && toot.card) {
+			var cards = toot.card;
+			if (cards.provider_name == "Twitter") {
+				if (cards.image) {
+					var twiImg = '<br><img src="' + cards.image + '">';
+				} else {
+					var twiImg = '';
+				}
+				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>";
+			}
+			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")
+			if (tickerdata) {
+				var tickerdata = JSON.parse(tickerdata);
+
+				var thisdomain = toot.account.acct.split("@");
+				if (thisdomain.length > 1) {
+					thisdomain = thisdomain[1];
+				}
+				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>';
+						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>';
+	});
+	return templete;
+}

app/js/tl/filter.js

@@ -14,6 +14,29 @@ function mediaToggle(tlid) {
 		$("#timeline_" + tlid).addClass("media-filter")
 	}
 }
+//各TL上方のBT[BTOnly/BTExc/Off]
+function ebtToggle(tlid) {
+	var ebt = localStorage.getItem("ebt_" + tlid);
+	if (ebt == "true") {
+		localStorage.setItem("ebt_" + tlid, "but");
+		$("#sta-bt-" + tlid).text("BT Only");
+		$("#sta-bt-" + tlid).css("color", '#ff9800');
+		$("#timeline_" + tlid).addClass("except-bt-filter")
+		$("#timeline_" + tlid).removeClass("bt-filter")
+	} else if (ebt == "but") {
+		localStorage.removeItem("ebt_" + tlid);
+		$("#sta-bt-" + tlid).text("Off");
+		$("#sta-bt-" + tlid).css("color", 'red');
+		$("#timeline_" + tlid).removeClass("bt-filter")
+		$("#timeline_" + tlid).removeClass("except-bt-filter")
+	} 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")
+	}
+}
 //各TL上方のMedia[On/Off]をチェック
 function mediaCheck(tlid) {
 	var media = localStorage.getItem("media_" + tlid);
@@ -27,6 +50,26 @@ function mediaCheck(tlid) {
 		$("#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")
+	} else {
+		$("#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);
@@ -58,17 +101,11 @@ function delreset(tlid){
 
 }
 /*ワードフィルター機能*/
-function filterToggle(){
+function filterMenu() {
-    if ($("#filter-box").hasClass("hide")) {
+	$("#left-menu div").removeClass("active");
+	$("#filterMenu").addClass("active");
+	$(".menu-content").addClass("hide");
 	$("#filter-box").removeClass("hide");
-        $("#filter-box").addClass("show");
-		$("#filter-box").css("bottom","40px");
-		$("#filter-box").css("left",$('#filter-tgl').offset().left-$('#filter-box').width()/2+"px");
-		//フィルターロード
-	} else {
-        $("#filter-box").removeClass("show");
-		$("#filter-box").addClass("hide")
-	}
 }
 function filter() {
 	$("#filtered-words").html("");
@@ -77,7 +114,6 @@ function filter(){
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/filters"
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -90,25 +126,29 @@ function filter(){
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(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_edit[lang]+'</a>/<a onclick="filterDel(' + filterword.id + ',' + acct_id +
+					'\')" class="pointer">' + lang.lang_edit + '</a>/<a onclick="filterDel(' + filterword.id + ',' + acct_id +
-					')" class="pointer">'+lang_del[lang]+'</a><br> ';
+					')" class="pointer">' + lang.lang_del + '</a><br> ';
 			});
 			if (filters == "") {
-				filters=lang_filter_nodata[lang]+"<br>";
+				filters = lang.lang_filter_nodata + "<br>";
 			}
 			$("#filtered-words").html(filters);
 		} else {
-            $("#filtered-words").html(lang_filter_nodata[lang]);
+			$("#filtered-words").html(lang_filter_nodata);
 		}
 	});
 }
+function filterTime(day, hour, 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();
@@ -125,9 +165,8 @@ function makeNewFilter(){
 	if ($("#conv_filter:checked").val()) {
 		cont.push("thread");
 	}
-	console.log(cont);
 	if (!cont.length) {
-		$("#filtered-words").html('Error:'+lang_filter_errordegree[lang]);
+		$("#filtered-words").html('Error:' + lang.lang_filter_errordegree);
 	}
 	var exc = $("#except_filter:checked").val();
 	var who = $("#wholeword_filter:checked").val();
@@ -149,7 +188,7 @@ function makeNewFilter(){
 	httpreq.open(method, start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		phrase: phr,
 		context: cont,
@@ -158,7 +197,7 @@ function makeNewFilter(){
 		expires_in: time
 	}));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			filter();
 			filterUpdate(acct_id)
@@ -172,7 +211,7 @@ function makeNewFilter(){
 			$("#days_filter").val("0");
 			$("#hours_filter").val("0");
 			$("#mins_filter").val("0");
-			$("#add-filter-btn").text(lang_add[lang]);
+			$("#add-filter-btn").text(lang.lang_add);
 			$("#filter-edit-id").val("")
 		}
 	}
@@ -188,12 +227,11 @@ function filterEdit(id,acct_id){
 	$("#days_filter").val("0");
 	$("#hours_filter").val("0");
 	$("#mins_filter").val("0");
-	$("#add-filter-btn").text(lang_edit[lang]);
+	$("#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
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -206,7 +244,6 @@ function filterEdit(id,acct_id){
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json) {
 			var now = new Date();
 			now = now.getTime();
@@ -240,10 +277,10 @@ function filterDel(id,acct_id){
 	httpreq.open("DELETE", start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			filter();
 			filterUpdate(acct_id)
@@ -255,7 +292,6 @@ function getFilter(acct_id){
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
 		var start = "https://" + domain + "/api/v1/filters"
-	console.log(start)
 		fetch(start, {
 			method: 'GET',
 			headers: {
@@ -299,7 +335,6 @@ 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"
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -351,39 +386,37 @@ function filterUpdateInternal(json,type){
 */
 //通知フィルター
 function exclude(key) {
-	var excludetxt="";
+	var excludetxt = localStorage.getItem("exclude-" + key);
 	if ($('#exc-reply-' + key + ':checked').val()) {
 		excludetxt = "?exclude_types[]=mention"
-		var reply=true
-	}else{
-		var reply=false;
 	}
 	if ($('#exc-fav-' + key + ':checked').val()) {
-		if(reply){
+		if (!excludetxt || excludetxt !="") {
 			excludetxt = excludetxt + "&exclude_types[]=favourite"
 		} else {
 			excludetxt = "?exclude_types[]=favourite"
 		}
-		var fav=true
-	}else{
-		var fav=false;
 	}
 	if ($('#exc-bt-' + key + ':checked').val()) {
-		if(reply || fav){
+		if (!excludetxt || excludetxt !="") {
 			excludetxt = excludetxt + "&exclude_types[]=reblog"
 		} else {
 			excludetxt = "?exclude_types[]=reblog"
 		}
-		var bt=true
-	}else{
-		var bt=false;
 	}
 	if ($('#exc-follow-' + key + ':checked').val()) {
-		if(reply || bt || fav){
+		if (!excludetxt || excludetxt !="") {
 			excludetxt = excludetxt + "&exclude_types[]=follow"
 		} else {
 			excludetxt = "?exclude_types[]=follow"
 		}
+	}
+	if ($('#exc-poll-' + key + ':checked').val()) {
+		if (!excludetxt || excludetxt !="") {
+			excludetxt = excludetxt + "&exclude_types[]=poll"
+		} else {
+			excludetxt = "?exclude_types[]=poll"
+		}
 	} else {
 	}
 	localStorage.setItem("exclude-" + key, excludetxt)
@@ -400,3 +433,25 @@ function excludeCk(key,target){
 		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){
+	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();
+}

app/js/tl/list.js

@@ -1,14 +1,10 @@
-function listToggle(){
+function listMenu() {
-    if ($("#list-box").hasClass("hide")) {
+	$("#left-menu div").removeClass("active");
+	$("#listMenu").addClass("active");
+	$(".menu-content").addClass("hide");
 	$("#list-box").removeClass("hide");
-        $("#list-box").addClass("show");
+	$('ul.tabs').tabs('select_tab', 'src-sta');
-		$("#list-box").css("bottom","40px");
+	$("#src-contents").html("");
-		$("#list-box").css("left",$('#list-tgl').offset().left-$('#list-box').width()/2+"px");
-		//リストロード
-	} else {
-        $("#list-box").removeClass("show");
-		$("#list-box").addClass("hide")
-	}
 }
 
 
@@ -17,8 +13,33 @@ function list(){
 	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);
+			}
+		});
+	} else {
 		var start = "https://" + domain + "/api/v1/lists"
-	console.log(start)
 		fetch(start, {
 			method: 'GET',
 			headers: {
@@ -35,8 +56,8 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function (key) {
 					var list = json[key];
-				lists = lists + list.title+':<a onclick="listShow(' + list.id + ',\'' + list.title + '\',\'' + acct_id +
+					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_show + '</a>/<a onclick="listUser(\'' + list.id + '\',' + acct_id +
 						')" class="pointer">' + lang.lang_list_users + '</a><br>';
 				});
 				$("#lists").html(lists);
@@ -45,28 +66,47 @@ function list(){
 			}
 		});
 	}
+}
 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"
-	console.log(start)
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
 		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({
 			title: text
 		}));
 		httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
 				list();
 				$("#list-add").val("")
 			}
 		}
+	} else {
+		var start = "https://" + domain + "/api/users/lists/create"
+		var httpreq = new XMLHttpRequest();
+		httpreq.open('POST', start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		httpreq.responseType = "json";
+		httpreq.send(JSON.stringify({
+			i: at,
+			title: text
+		}));
+		httpreq.onreadystatechange = function () {
+			if (httpreq.readyState === 4) {
+				var json = httpreq.response;
+				list();
+				$("#list-add").val("")
+			}
+		}
+	}
 }
 function listShow(id, title, acct_id) {
 	localStorage.setItem("list_" + id + "_" + acct_id, title);
@@ -76,7 +116,6 @@ 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"
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -104,8 +143,8 @@ function listUser(id,acct_id){
 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"
-	console.log(start)
 		fetch(start, {
 			method: 'GET',
 			headers: {
@@ -122,7 +161,7 @@ function hisList(user,acct_id){
 				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 +
+					lists = lists + '<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
 						'\')" class="pointer">' + escapeHTML(list.title) + '</a><br> ';
 				});
 				$("#his-lists-a").html(lists);
@@ -131,7 +170,6 @@ function hisList(user,acct_id){
 			}
 		});
 		var start = "https://" + domain + "/api/v1/accounts/" + user + "/lists"
-	console.log(start)
 		fetch(start, {
 			method: 'GET',
 			headers: {
@@ -148,30 +186,67 @@ function hisList(user,acct_id){
 				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 +
+					lists = lists + '<a onclick="listRemove(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
-					'\')" class="pointer">'+list.title+'</a><br> ';
+						'\')" 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"
+		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("");
+	}
 }
 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 i = {
+			i: at,
+			listId: id,
+			userId: user
+		}
+	} else {
 		var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
-	console.log(start)
+		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.responseType = "json";
-	httpreq.send(JSON.stringify({
+	httpreq.send(JSON.stringify(i));
-		account_ids: [user]
-	}));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			hisList(user, acct_id)
 		}
@@ -180,18 +255,29 @@ function listAdd(id,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 method = 'POST'
+		var i = {
+			i: at,
+			listId: id,
+			userId: user
+		}
+	} else {
 		var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
-	console.log(start)
+		var method = 'DELETE'
+		var i = {
+			account_ids: [user]
+		}
+	}
 	var httpreq = new XMLHttpRequest();
-	httpreq.open('DELETE', start, true);
+	httpreq.open(method, start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
-	httpreq.send(JSON.stringify({
+	httpreq.send(JSON.stringify(i));
-		account_ids: [user]
-	}));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			hisList(user, acct_id)
 		}

app/js/tl/misskeyparse.js

@@ -160,6 +160,17 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		} else {
 			disname = "";
 		}
+		//絵文字があれば
+		if (toot.user.emojis) {
+			Object.keys(toot.user.emojis).forEach(function (key5) {
+				var emoji = toot.user.emojis[key5];
+				var shortcode = emoji.name;
+				var emoji_url = '<img draggable="false" 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);
+			});
+		}
 		if (mix == "notf") {
 			if (gif == "yes") {
 				noticeavatar = toot.user.avatarUrl;
@@ -173,14 +184,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				'"></a>';
 			if (toot.type == "reply") {
 				var what = lang.lang_parse_mentioned;
-				var icon = '<i class="big-text fa fa-share teal-text"></i>';
+				var icon = '<i class="big-text fas fa-share teal-text"></i>';
 				noticeavatar = "";
 			} else if (toot.type == "renote") {
 				var what = lang.lang_misskeyparse_renoted;
-				var icon = '<i class="big-text fa fa-retweet light-blue-text"></i>';
+				var icon = '<i class="big-text fas fa-retweet light-blue-text"></i>';
 			} else if (toot.type == "quote") {
 				var what = lang.lang_misskeyparse_quoted;
-				var icon = '<i class="big-text fa fa-quote-right orange-text"></i>';
+				var icon = '<i class="big-text fas fa-quote-right orange-text"></i>';
 			} else if (toot.type == "reaction") {
 				var what = lang.lang_misskeyparse_reacted;
 				var reactions = {
@@ -192,29 +203,29 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					"congrats": "🎉",
 					"amgry": "💢",
 					"confused": "😥",
-					"pudding":"🍮"
+					"rip": "😇"
 				}
 				var icon = reactions[toot.reaction];
-				var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
+				var emojisData = JSON.parse(localStorage.getItem("emoji_" + acct_id));
-                for(var i=0;i<reactions.length;i++){
+				if (!icon) {
-                    if(toot.note.reactionCounts[reactions[i]]){
+					if (emojisData) {
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
+						var num = emojisData.length;
-                        $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+						var ehtml = "";
-                    }else{
+						for (i = 0; i < num; i++) {
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(0)
+							var emoji = emojisData[i];
-                        if($("#pub_" + id +" .reactions").hasClass("fullreact")){
+							if (":" + emoji.shortcode + ":" == toot.reaction) {
-                            $("#pub_" + id +" .re-"+reactions[i]).addClass("hide")
+								if (emoji) {
-                        }else{
+									icon = '<img src="' + emoji.url + '" style="width:1rem">';
-                            $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+								}
+							}
 						}
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
 					}
 				}
 			} else {
 				var icon = '<i class="big-text material-icons indigo-text" style="font-size:17px">info</i>';
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.createdAt,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '(' + lang.lang_parse_notftime + ')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 					datetype) +
 				'</span>' + icon + '<a onclick="udg(\'' + toot.user.username +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
@@ -250,19 +261,19 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					var ipc = electron.ipcRenderer;
 					var os = electron.remote.process.platform;
 					var options = {
-						body: toot.account.display_name+"(" + toot.account.acct +")"+what+"\n\n"+$.strip_tagstemp(toot.status.content),
+						body: toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
-						icon: toot.account.avatar
+						icon: toot.user.avatarUrl
 					};
 					if (os == "darwin") {
 						var n = new Notification('TheDesk:' + domain, options);
 					} else {
 						ipc.send('native-notf', [
 							'TheDesk:' + domain,
-							toot.account.display_name+"(" + toot.account.acct +")"+what+"\n\n"+$.strip_tagstemp(toot.status.content),
+							toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
-							toot.account.avatar,
+							toot.user.avatarUrl,
 							"toot",
 							acct_id,
-							toot.status.id
+							toot.note.id
 						]);
 					}
 				}
@@ -274,18 +285,20 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			}
 			var if_notf = 'data-notfIndv="' + acct_id + "_" + toot.id + '"';
 			var toot = toot.note;
-			var dis_name=escapeHTMLtemp(toot.user.name);
+			var dis_name = escapeHTML(toot.user.name);
 		} else {
 			var if_notf = "";
 			if (toot.renote) {
 				var rebtxt = lang.lang_parse_btedsimple;
 				var rticon = "fa-retweet light-blue-text";
-				var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username +
+				var notice = '<i class="big-text fas ' + rticon + '"></i>' + dis_name + "(@" + toot.user.username +
 					")<br>";
 				var boostback = "shared";
 				var uniqueid = toot.id;
+				if (!toot.text) {
 					var toot = toot.renote;
-				var dis_name=escapeHTMLtemp(toot.user.name);
+				}
+				var dis_name = escapeHTML(toot.user.name);
 				var uniqueid = toot.id;
 				var actemojick = false
 			} else {
@@ -328,10 +341,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			if (toot.viaMobile) {
 				var via = '<span style="font-style: italic;">Mobile</span>';
 			} else {
-                var via = '<span style="font-style: italic;">Unknown</span>';
+				var via = '';
+				viashow = "via-hide";
 			}
 		} else {
-			var via = toot.app.name;
+			var via = escapeHTML(toot.app.name);
+			if (!toot.app.name) {
+				viashow = "via-hide";
+			}
 			//強調チェック
 			Object.keys(emp).forEach(function (key6) {
 				var cli = emp[key6];
@@ -348,7 +365,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 		}
 		if ((toot.cw || toot.cw == "") && cw) {
-			var content = toot.text;
+			var content = escapeHTML(toot.text);
 			var spoil = escapeHTMLtemp(toot.cw);
 			var spoiler = "cw cw_hide_" + toot.id;
 			var api_spoil = "gray";
@@ -403,17 +420,35 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			content = content.replace(/`(.+)`/gi, '<code>$1</code>')
 			content = content.replace(/(http(s)?:\/\/[\x21-\x7e]+)/gi, '<a href="$1" target="_blank">$1</a>')
 			content = content.replace(/\(\(\((.+)\)\)\)/gi, '<span class="shake">$1</span>')
-			content=content.replace(/<motion>(.+)<\/motion>/gi, '<span class="shake">$1</span>')
+			content = content.replace(/&lt;motion&gt;(.+)&lt;\/motion&gt;/gi, '<span class="shake">$1</span>')
 			content = content.replace(/\*\*\*([^*]+)\*\*\*/gi, '<span class="shake" style="font-size:200%">$1</span>')
 			content = content.replace(/\*\*([^*]+)\*\*/gi, '<b>$1</b>')
 			content = content.replace(/^(.+)\s(検索|search)$/gmi, '<div class="input-field"><i class="material-icons prefix">search</i><input type="text" style="width:calc( 60% - 80px);" name="q" value="$1" id="srcbox_' + toot.id + '"><label for="src" data-trans="src" class="">検索</label><button class="btn waves-effect indigo" style="width:40%;" data-trans-i="src" onclick="goGoogle(\'' + toot.id + '\')">検索</button></div>')
 			content = content.replace(/\[(.+)\]\(<a href="(http(s)?:\/\/[\x21-\x7e]+)".+\)/gi, '<a href="$2" target="_blank">$1</a>');
-			
+			content = content.replace(/&lt;center&gt;/gi, '<div class="center">')
+			content = content.replace(/&lt;\/center&gt;/gi, '</div>')
+			content = content.replace(/&lt;flip&gt;(.+)&lt;\/flip&gt;/gi, '<span class="fa fa-flip-horizontal">$1</span>')
+			content = content.replace(/&lt;small&gt;(.+)&lt;\/small&gt;/gi, '<small>$1</small>')
+			content = content.replace(/&lt;i&gt;(.+)&lt;\/i&gt;/gi, '<i>$1</i>')
+			content = content.replace(/&lt;spin&gt;(.+)&lt;\/spin&gt;/gi, '<span class="fa fa-spin">$1</span>')
+			content = content.replace(/\*\*(.+)\*\*/gi, '<b>$1</b>')
+			content = content.replace(/&lt;jump&gt;(.+)&lt;\/jump&gt;/gi, '<span class="jump">$1</jump>')
 			content = twemoji.parse(content);
 		} else {
 			content = "";
 		}
-		
+		//絵文字があれば
+		if (emojick) {
+			Object.keys(toot.emojis).forEach(function (key5) {
+				var emoji = toot.emojis[key5];
+				var shortcode = emoji.name;
+				var emoji_url = '<img draggable="false" 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);
+			});
+		}
 		if (dis_name) {
 			dis_name = twemoji.parse(dis_name);
 		} else {
@@ -482,7 +517,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			mentions = '<div style="float:right"><a onclick="udg(\'' + menck.user.id + '\',' +
 				acct_id + ')" class="pointer">@' + menck.user.username + '</a></div>';
 		}
-		var tagck = toot.tags[0];
+		var tagck = toot.tags;
 		var tags = "";
 		//タグであれば
 		if (tagck) {
@@ -586,7 +621,7 @@ function misskeyParse(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;"> '+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;
 				}
 			}
@@ -602,79 +637,122 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				} else {
 					var myvote = "";
 				}
-				poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+toot.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
+				poll = poll + '<div class="pointer vote" onclick="vote(\'' + acct_id + '\',\'' + toot.id + '\',' + choice.id + ')">' + escapeHTML(choice.text) + '(' + choice.votes + '' + myvote + ')</div>';
 			});
 			poll = '<div class="vote_' + toot.id + '">' + poll + '</div>';
 		}
+		//引用Renote
+		if (toot.renote) {
+			poll = poll + '<div class="quote-renote"><div class="renote-icon"><a onclick="udg(\'' + toot.renote.user.id +
+				'\',' + acct_id + ');" user="' + toot.renote.user.username + '" class="udg"><img src="' + toot.renote.user.avatarUrl + '"></a></div><div class="renote-user">' + escapeHTML(toot.renote.user.name) + '</div><div class="renote-text">' + escapeHTML(toot.renote.text) + '</div></div>'
+		}
+		if (localStorage.getItem("emojiReaction_" + acct_id) == "disabled") {
+			var freeReact = "hide";
+		} else {
+			var freeReact = "";
+		}
 		//Reactions
-        if(toot.reactionCounts){
+		var addReact = "";
-        if(toot.reactionCounts.like){
+		if (toot.reactions) {
-            var like=toot.reactionCounts.like;
+			Object.keys(toot.reactions).forEach(function (keye) {
+				var thisReact = toot.reactions[keye];
+				if (keye == "like") { var defaultEmoji = true; }
+				else if (keye == "love") { var defaultEmoji = true; }
+				else if (keye == "laugh") { var defaultEmoji = true; }
+				else if (keye == "hmm") { var defaultEmoji = true; }
+				else if (keye == "surprise") { var defaultEmoji = true; }
+				else if (keye == "congrats") { var defaultEmoji = true; }
+				else if (keye == "angry") { var defaultEmoji = true; }
+				else if (keye == "confused") { var defaultEmoji = true; }
+				else if (keye == "star") { var defaultEmoji = true; }
+				else {
+					var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
+					if (obj) {
+						var num = obj.length;
+						var ehtml = "";
+						for (i = 0; i < num; i++) {
+							var emoji = obj[i];
+							if (":" + emoji.shortcode + ":" == keye) {
+								if (emoji) {
+									addReact = addReact + '<span class="reaction"><a onclick="reaction(\'' + keye + '\',\'' + toot.id + '\',' + acct_id +
+										',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;"><img src="' + emoji.url + '" style="width:13px;"></a><span class="re-' + emoji.shortcode + 'ct">' + thisReact +
+										'</span></span>';
+								}
+							}
+						}
+					}
+				}
+			});
+			if (toot.reactions.like) {
+				var like = toot.reactions.like;
 				var likehide = "";
 			} else {
 				var like = 0;
 				var likehide = "hide";
 			}
-        if(toot.reactionCounts.love){
+			if (toot.reactions.love) {
-            var love=toot.reactionCounts.love;
+				var love = toot.reactions.love;
 				var lovehide = "";
 			} else {
 				var love = 0;
 				var lovehide = "hide";
 			}
-        if(toot.reactionCounts.laugh){
+			if (toot.reactions.laugh) {
-            var laugh=toot.reactionCounts.laugh;
+				var laugh = toot.reactions.laugh;
 				var laughhide = "";
 			} else {
 				var laugh = 0;
 				var laughhide = "hide";
 			}
-        if(toot.reactionCounts.hmm){
+			if (toot.reactions.hmm) {
-            var hmm=toot.reactionCounts.hmm;
+				var hmm = toot.reactions.hmm;
 				var hmmhide = "";
 			} else {
 				var hmm = 0;
 				var hmmhide = "hide";
 			}
-        if(toot.reactionCounts.surprise){
+			if (toot.reactions.surprise) {
-            var surprise=toot.reactionCounts.surprise;
+				var surprise = toot.reactions.surprise;
 				var suphide = "";
 			} else {
 				var suphide = "hide";
 				var surprise = 0;
 			}
-        if(toot.reactionCounts.congrats){
+			if (toot.reactions.congrats) {
-            var congrats=toot.reactionCounts.congrats;
+				var congrats = toot.reactions.congrats;
 				var conghide = "";
 			} else {
 				var congrats = 0;
 				var conghide = "hide";
 			}
-        if(toot.reactionCounts.angry){
+			if (toot.reactions.angry) {
-            var angry=toot.reactionCounts.angry;
+				var angry = toot.reactions.angry;
 				var anghide = "";
 			} else {
 				var angry = 0;
 				var anghide = "hide";
 			}
-        if(toot.reactionCounts.confused){
+			if (toot.reactions.confused) {
 				var confhide = "";
-            var confused=toot.reactionCounts.confused;
+				var confused = toot.reactions.confused;
 			} else {
 				var confused = 0;
 				var confhide = "hide";
 			}
-        if(toot.reactionCounts.pudding){
+			if (toot.reactions.rip) {
-            var pudding=toot.reactionCounts.pudding;
+				var riphide = "";
-            var pudhide="";
+				var rip = toot.reactions.rip;
 			} else {
-            var pudding=0;
+				var rip = 0;
-            var pudhide="hide";
+				var riphide = "hide";
 			}
 			var fullhide = "";
 		} else {
 			var like = 0; var love = 0; var laugh = 0; var hmm = 0; var surprise = 0; var congrats = 0; var angry = 0; var confused = 0; var pudding = 0;
-            var likehide="hide";var lovehide="hide";var laughhide="hide";var hmmhide="hide";var suphide="hide";var conghide="hide";var anghide="hide";var confhide="hide";var pudhide="hide";
+			var likehide = "hide"; var lovehide = "hide"; var laughhide = "hide"; var hmmhide = "hide"; var suphide = "hide"; var conghide = "hide"; var anghide = "hide"; var confhide = "hide"; var riphide = "hide"
+			var fullhide = "hide";
+		}
+		if (!addReact && likehide == "hide" && lovehide == "hide" && laughhide == "hide" && hmmhide == "hide" && suphide == "hide" && conghide == "hide" && anghide == "hide" && confhide == "hide" && riphide == "hide") {
 			var fullhide = "hide";
 		}
 		if (toot.myReaction) {
@@ -687,6 +765,11 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			content = '<span class="gray">This post has no content. It may be media-only, private or deleted.</span>';
 		}
 		var trans = "";
+		if (toot.user.emojis) {
+			var actemojick = toot.user.emojis[0];
+		} else {
+			var actemojick = false;
+		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + '  ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[
 				key].created_at, 'unix') + '" ' + if_notf + ' onmouseover="mov(\'' + toot.id + '\',\'' + tlid + '\',\'mv\')" onclick="mov(\'' + toot.id + '\',\'' + tlid + '\',\'cl\')" onmouseout="resetmv(\'mv\')" reacted="' + reacted + '">' +
@@ -703,7 +786,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.user.username + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'https://' + domain + "/notes/" +
 			toot.id + '\');" title="' + date(toot.createdAt, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'(' + lang.lang_parse_clickcopyurl + ')"><i class="far fa-clock"></i>' +
 			date(toot.createdAt, datetype) + '</span>' +
 			'</div></div>' +
 			'<div class="area-toot">' + tickerdom + '<span class="toot ' + spoiler + '">' + content +
@@ -728,9 +811,11 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">' + twemoji.parse("💢") + '</a><span class="re-angryct">' + angry +
 			'</span></span><span class="' + confhide + ' reaction re-confused"><a onclick="reaction(\'confused\',\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">' + twemoji.parse("😥") + '</a><span class="re-confusedct">' + confused +
-            '</span></span><span class="'+pudhide+' reaction re-pudding"><a onclick="reaction(\'pudding\',\'' + toot.id + '\',' + acct_id +
+			'</span></span><span class="' + riphide + ' reaction re-confused"><a onclick="reaction(\'confused\',\'' + toot.id + '\',' + acct_id +
-            ',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">'+twemoji.parse("🍮")+'</a><span class="re-puddingct">'+pudding+
+			',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">' + twemoji.parse("😇") + '</a><span class="re-confusedct">' + rip +
-			'</span></div>'+poll + mentions + tags + '</div>' +
+			'</span></span>' + addReact +
+			'<i class="material-icons pointer hide freeReact ' + freeReact + '" style="font-size:1.0rem; padding-left:5px;position: relative;top: 3px;" onclick="reactioncustom(\'' + acct_id + '\',\'' + id + '\')">add_box</i></div>'
+			+ poll + mentions + tags + '</div>' +
 			'<div class="area-vis"></div>' +
 			'<div class="area-actions ' + mouseover + '">' +
 			'<div class="action">' + vis + '</div>' +
@@ -738,23 +823,23 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'<div class="action ' + disp["re"] + ' ' + noauth + '"><a onclick="misskeyreply(\'' + toot.id +
 			'\',\'' + acct_id + '\',' +
 			acct_id + ',\'' + visen +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i></a></div>' +
 			'<div class="action ' + can_rt + ' ' + disp["rt"] + ' ' + noauth + '"><a onclick="renote(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_misskeyparse_renote + '"><i class="text-darken-3 fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' +
 			'<div class="action ' + can_rt + ' ' + disp["qt"] + ' ' + noauth + '"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id +
-			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_misskeyparse_renoteqt + '"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
 			'<div class="action ' + disp["fav"] + ' ' + noauth + '"><a onclick="reactiontoggle(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fa text-darken-3 fa-plus' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_misskeyparse_reaction + '"><i class="fas text-darken-3 fa-plus' +
 			if_fav + ' fav_' + toot.id + '"></i></div>' +
 			'<div class="' + if_mine + ' action ' + disp["del"] + ' ' + noauth + '"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_del + '"><i class="fas fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin ' + disp["pin"] + ' ' + noauth + '"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + '"></i></a></div>' 
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_pin + '"><i class="fas fa-map-pin pin_' + toot.id + '"></i></a></div>'
 			+ '<div class="' + if_mine + ' action ' + disp["red"] + ' ' + noauth + '"><a onclick="redraft(\'' + toot.id + '\',' +
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_redraft + '"><i class="material-icons">redo</i></a></div>' + trans +
@@ -772,15 +857,23 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 
 //オブジェクトパーサー(ユーザーデータ)
 function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
+	console.log(["Parse them ", obj])
 	if (popup > 0 || popup == -1) {
 
 	} else {
+		if (obj.users) {
 			var obj = obj.users;
 		}
+	}
 	var templete = '';
 	var datetype = localStorage.getItem("datetype");
 	Object.keys(obj).forEach(function (key) {
 		var toot = obj[key];
+		if (toot.followee) {
+			toot = toot.followee
+		} else if (toot.follower) {
+			toot = toot.follower
+		}
 		var locked = "";
 		if (auth) {
 			var auth = '<i class="material-icons gray pointer" onclick="misskeyRequest(\'' +
@@ -791,7 +884,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,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '(' + lang.lang_parse_notftime + ')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 					datetype) +
 				'</span>' + ftxt + '<br>';
 			var toot = toot.user;
@@ -835,7 +928,17 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 			var dis_name = escapeHTMLtemp(toot.name);
 			dis_name = twemoji.parse(dis_name);
 		} else {
-				var dis_name=toot.name;
+			var dis_name = toot.username;
+		}
+		if (toot.followersCount) {
+			var ferct = toot.followersCount
+		} else {
+			var ferct = "unknown"
+		}
+		if (toot.followingCount) {
+			var fingct = toot.followingCount
+		} else {
+			var fingct = "unknown"
 		}
 		templete = templete +
 			'<div class="cvo" style="padding-top:5px;" user-id="' + toot.id + '"><div class="area-notice">' +
@@ -851,8 +954,8 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 			'</div>' +
 			'</div>' +
 			'<div style="justify-content:space-around" class="area-toot"> <div class="cbadge" style="width:100px;">Follows:' +
-			toot.followingCount +
+			fingct +
-			'</div><div class="cbadge" style="width:100px;">Followers:' + toot.followersCount +
+			'</div><div class="cbadge" style="width:100px;">Followers:' + ferct +
 			'</div>' +
 			'</div>' +
 			'</div>' +
@@ -870,3 +973,100 @@ function goGoogle(id){
 
 	shell.openExternal(url);
 }
+var misskeyws = []
+var misskeywsstate = []
+function connectMisskey(acct_id) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "wss://" + domain +
+		"/streaming?i=" + at;
+	var wsid = misskeyws.length;
+	localStorage.setItem("misskey_wss_" + acct_id, wsid);
+	misskeyws[wsid] = new WebSocket(start);
+	misskeyws[wsid].onopen = function (mess) {
+		console.table({ "tlid": tlid, "type": "Connect Streaming API", "domain": domain, "message": [mess] })
+		misskeywsstate[wsid] = true
+		//$("#notice_icon_" + tlid).removeClass("red-text");
+		var send = '{"type":"connect","body":{"channel":"main","id":"notf:' + acct_id + '"}}'
+		misskeyws[wsid].send(send)
+	}
+	misskeyws[wsid].onmessage = function (mess) {
+		console.log([domain + ":Receive Streaming API:", data]);
+		var data = JSON.parse(mess.data)
+		var obj = data.body.body
+
+		if (data.body.id.indexOf("notf:") !== -1) {
+			var obj = JSON.parse(mess.data).body;
+			console.log(obj);
+			var popup = localStorage.getItem("popup");
+			if (!popup) {
+				popup = 0;
+			}
+			if (JSON.parse(mess.data).body.type != "follow") {
+
+				templete = misskeyParse([obj.body], 'notf', acct_id, 'notf', popup);
+			} else {
+				templete = misskeyUserparse([obj.body], 'notf', acct_id, 'notf', popup);
+			}
+			if (JSON.parse(mess.data).body.type == "reaction") {
+				console.log("reaction refresh")
+				reactRefresh(acct_id, obj.body.note.id)
+			}
+			if (!$("div[data-notfIndv=" + acct_id + "_" + obj.body.id + "]").length) {
+				$("div[data-notf=" + acct_id + "]").prepend(templete);
+				$("div[data-const=notf_" + acct_id + "]").prepend(templete);
+			}
+			jQuery("time.timeago").timeago();
+		} else if (data.body.type == "note") {
+			var tlid = data.body.id * 1
+			var multi = localStorage.getItem("column");
+			var col = JSON.parse(multi)[tlid];
+			if (localStorage.getItem("voice_" + tlid)) {
+				var voice = true;
+			} else {
+				var voice = false;
+			}
+			if (voice) {
+				say(obj.text)
+			}
+			var templete = misskeyParse([obj], col.type, acct_id, tlid, "", mute);
+			misskeyws[wsid].send(JSON.stringify({
+				type: 'sn',
+				body: {
+					id: obj.id
+				}
+			}))
+			var pool = localStorage.getItem("pool_" + tlid);
+			if (pool) {
+				pool = templete + pool;
+			} else {
+				pool = templete
+			}
+			localStorage.setItem("pool_" + tlid, pool);
+			scrollck();
+			jQuery("time.timeago").timeago();
+		} else if (data.type == "noteUpdated") {
+			if (data.body.type == "reacted") {
+				reactRefresh(acct_id, data.body.id)
+			} else if (data.body.type == "deleted") {
+				$("#pub_" + data.body.id).hide();
+				$("#pub_" + data.body.id).remove();
+			}
+
+		}
+	}
+	misskeyws[wsid].onerror = function (error) {
+		console.error("Error closing " + tlid);
+		console.error(error);
+		misskeywsstate[wsid] = false
+		connectMisskey(acct_id)
+		return false;
+	};
+	misskeyws[wsid].onclose = function () {
+		console.warn("Closing " + tlid);
+		misskeywsstate[wsid] = false
+		connectMisskey(acct_id)
+		return false;
+	};
+
+}

app/js/tl/mix.js

@@ -1,6 +1,5 @@
 //Integrated TL
 function mixtl(acct_id, tlid, type, delc, voice) {
-	console.log(delc);
 	localStorage.removeItem("morelock")
 	localStorage.setItem("now", type);
 	todo("Integrated TL Loading...(Local)");
@@ -54,13 +53,12 @@ function mixtl(acct_id, tlid, type,delc,voice) {
 							var mute = [];
 						}
 						if (type == "integrated") {
-							templete = templete+parse([timeline[key]], '', acct_id, tlid, "", mute);
+							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);
+								templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "plus");
 							}
 						}
-                        
 					}
 				}
 
@@ -95,19 +93,18 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 	websocketLocal[wslid] = new WebSocket(startLocal);
 	websocketHome[wshid].onopen = function (mess) {
 		localStorage.setItem("wssH_" + tlid, wshid);
-		console.log("Connect Streaming API(Integrated:Home)");
+		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.log("Connect Streaming API(Integrated:Local)");
+		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)");
+		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") {
 			if (delc == "true") {
@@ -124,7 +121,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 				if (voice) {
 					say(obj.content)
 				}
-				var templete = parse([obj], type, acct_id, tlid,"",mute);
+				var templete = parse([obj], type, acct_id, tlid, "", mute, "mix");
 				var pool = localStorage.getItem("pool_" + tlid);
 				if (pool) {
 					pool = templete + pool;
@@ -144,10 +141,8 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 		}
 	}
 	websocketHome[wshid].onmessage = function (mess) {
-		console.log("Receive Streaming API:(Integrated:Home)");
+		console.log(["Receive Streaming API:(Integrated:Home)", obj]);
-
 		var obj = JSON.parse(JSON.parse(mess.data).payload);
-		console.log(obj);
 		var type = JSON.parse(mess.data).event;
 		if (type == "delete") {
 			if (del > 10) {
@@ -168,7 +163,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 				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);
+					var templete = parse([obj], '', acct_id, tlid, "", mute, "mix");
 				} else {
 					var templete = "";
 				}
@@ -177,7 +172,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 				if (voice) {
 					say(obj.content)
 				}
-				var templete = parse([obj], type, acct_id, tlid,"",mute);
+				var templete = parse([obj], type, acct_id, tlid, "", mute, "mix");
 				var pool = localStorage.getItem("pool_" + tlid);
 				if (pool) {
 					pool = templete + pool;
@@ -196,40 +191,57 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 		}
 	}
 	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.error('WebSocketLocal Closing by error:' + tlid);
+		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.error('WebSocketHome Closing by error:' + tlid);
+		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");
 			}
+		}
 
 	};
 
@@ -240,6 +252,7 @@ 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");
@@ -291,10 +304,10 @@ function mixmore(tlid,type) {
 							var mute = [];
 						}
 						if (type == "integrated") {
-							templete = templete+parse([timeline[key]], '', acct_id, tlid,"",mute);
+							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);
+								templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
 							}
 						}
 					}
@@ -303,9 +316,9 @@ function mixmore(tlid,type) {
 			});
 
 			$("#timeline_" + tlid).append(templete);
-            mixre(acct_id, tlid);
 			additional(acct_id, tlid);
 			jQuery("time.timeago").timeago();
+			moreloading = false;
 			todc();
 		});
 	});

app/js/tl/notification.js

@@ -15,18 +15,15 @@ function notfColumn(acct_id, tlid, sys){
 		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";
-		var i={
+		httpreq.open("POST", start, true);
-			method: 'POST',
+		httpreq.setRequestHeader('Content-Type', 'application/json');
-			headers: {
+		var body = JSON.stringify({
-				'content-type': 'application/json',
-			},
-			body:JSON.stringify({
 			i: at
-			})
+		});
-		}
 	} else {
 		var misskey = false;
 		if (localStorage.getItem("exclude-" + tlid)) {
@@ -35,21 +32,21 @@ function notfColumn(acct_id, tlid, sys){
 			var exc = "";
 		}
 		var start = "https://" + domain + "/api/v1/notifications" + exc;
-		var i={
+		httpreq.open("GET", start, true);
-			method: 'GET',
+		httpreq.setRequestHeader('Content-Type', 'application/json');
-			headers: {
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-				'content-type': 'application/json',
+		var body = "";
-				'Authorization': 'Bearer ' + at
-			},
 	}
+
+	httpreq.responseType = "json";
+	httpreq.send(body);
+	httpreq.onreadystatechange = function () {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response;
+			var max_id = httpreq.getResponseHeader("link");
+			if (max_id) {
+				max_id = max_id.match(/[?&]{1}max_id=([0-9]+)/)[1]
 			}
-	fetch(start, i).then(function(response) {
-		console.log(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);
@@ -65,13 +62,13 @@ function notfColumn(acct_id, tlid, sys){
 						var ipc = electron.ipcRenderer;
 						var os = electron.remote.process.platform;
 						var options = {
-						body: ct+lang_notf_new[lang],
+							body: ct + lang.lang_notf_new,
 							icon: localStorage.getItem("prof_" + acct_id)
 						};
 						if (os == "darwin") {
 							var n = new Notification('TheDesk:' + domain, options);
 						} else {
-						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
+							ipc.send('native-notf', ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]);
 						}
 
 					}
@@ -82,26 +79,28 @@ function notfColumn(acct_id, tlid, sys){
 					}
 					if (obj.type != "follow") {
 						if (misskey) {
-					templete = templete+misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
+							templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute);
 						} else {
-					templete = templete+parse([obj], 'notf', acct_id, 'notf', -1, mute);
+							templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute);
 						}
 					} else {
 						if (misskey) {
-					templete = templete+misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
+							templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute);
 						} else {
-					templete = templete+userparse([obj.account], 'notf', acct_id, 'notf', -1);
+							templete = templete + userparse([obj.account], 'notf', acct_id, tlid, -1);
 						}
 
 					}
 				});
+				templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>';
 				$("#timeline_" + tlid).html(templete);
 				$("#landing_" + tlid).hide();
 				jQuery("time.timeago").timeago();
 			}
 			$("#notf-box").addClass("fetched");
 			todc();
-	});
+		}
+	}
 	if (!misskey) {
 		if (localStorage.getItem("streaming_" + acct_id)) {
 			var wss = localStorage.getItem("streaming_" + acct_id)
@@ -115,72 +114,6 @@ function notfColumn(acct_id, tlid, sys){
 			at;
 	}
 
-	console.log(start);
-	var wsid = websocketNotf.length;
-	websocketNotf[acct_id] = new WebSocket(start);
-	console.log(websocketNotf);
-	websocketNotf[acct_id].onopen = function(mess) {
-		console.log("Connect Streaming API(Notf):");
-		console.log(mess);
-		$("i[data-notf=" + acct_id +"]").removeClass("red-text");
-
-	}
-	websocketNotf[acct_id].onmessage = function(mess) {
-		console.log("Receive Streaming API(Notf):"+acct_id);
-		var popup = localStorage.getItem("popup");
-			if (!popup) {
-				popup = 0;
-			}
-			console.log(domain)
-		if(misskey){
-			console.log("misskey")
-			console.log(JSON.parse(mess.data));
-			if (JSON.parse(mess.data).type == "notification") {
-				var obj = JSON.parse(mess.data).body;
-				console.log(obj);
-				if(obj.type!="follow"){
-					
-					templete = misskeyParse([obj], 'notf', acct_id, 'notf', popup);
-				}else{
-					templete = misskeyUserparse([obj], 'notf', acct_id, 'notf', popup);
-				}
-				if(obj.type=="reaction"){
-					console.log("refresh")
-					reactRefresh(acct_id,obj.note.id)
-				}
-				if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-					$("div[data-notf=" + acct_id +"]").prepend(templete);
-				}
-				jQuery("time.timeago").timeago();
-			}else if(JSON.parse(mess.data).type == "note-updated"){
-				var obj = JSON.parse(mess.data).body.note;
-				reactRefreshCore(obj)
-			}
-		}else{
-		var obj = JSON.parse(JSON.parse(mess.data).payload);
-		console.log(obj);
-		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);
-			}
-			if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-				$(".tl[data-notf=" + acct_id +"]").prepend(templete);
-			}
-			jQuery("time.timeago").timeago();
-		} else if (type == "delete") {
-			$("[toot-id=" + obj + "]").hide();
-			$("[toot-id=" + obj + "]").remove();
-		}
-		}
-	}
-	websocketNotf[acct_id].onerror = function(error) {
-		console.error('WebSocket Error ' + error);
-	};
 }
 function notfCommon(acct_id, tlid, sys) {
 	todo("Notifications Loading...");
@@ -214,7 +147,7 @@ function notfCommon(acct_id, tlid, sys) {
 		}
 	}
 	fetch(start, i).then(function (response) {
-		console.log(response.headers.get('link'));
+		console.log("header to get param:" + response.headers.get('link'));
 		return response.json();
 	}).catch(function (error) {
 		todo(error);
@@ -235,13 +168,13 @@ function notfCommon(acct_id, tlid, sys) {
 					var ipc = electron.ipcRenderer;
 					var os = electron.remote.process.platform;
 					var options = {
-						body: ct+lang_notf_new[lang],
+						body: ct + lang.lang_notf_new,
 						icon: localStorage.getItem("prof_" + acct_id)
 					};
 					if (os == "darwin") {
 						var n = new Notification('TheDesk:' + domain, options);
 					} else {
-						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
+						ipc.send('native-notf', ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]);
 					}
 
 				}
@@ -271,7 +204,11 @@ function notfCommon(acct_id, tlid, sys) {
 		}
 		$("#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)
@@ -280,55 +217,21 @@ function notfCommon(acct_id, tlid, sys) {
 		}
 		var start = wss + "/api/v1/streaming/?stream=user&access_token=" +
 			at;
-	}else{
-		var start = "wss://" + domain + "/?i=" +
-		at;
-	}
 
-	console.log(start);
 		var wsid = websocketNotf.length;
 		websocketNotf[acct_id] = new WebSocket(start);
-	console.log(websocketNotf);
 		websocketNotf[acct_id].onopen = function (mess) {
-		console.log("Connect Streaming API(Notf):");
+			console.table({ "acct_id": acct_id, "type": "Connect Streaming API(Notf)", "domain": domain, "message": [mess] })
-		console.log(mess);
 			$("i[data-notf=" + acct_id + "]").removeClass("red-text");
 
 		}
 		websocketNotf[acct_id].onmessage = function (mess) {
-		console.log("Receive Streaming API(Notf):"+acct_id);
+			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;
 			}
-			console.log(domain)
-		if(misskey){
-			console.log("misskey")
-			console.log(JSON.parse(mess.data));
-			if (JSON.parse(mess.data).type == "notification") {
-				var obj = JSON.parse(mess.data).body;
-				console.log(obj);
-				if(obj.type!="follow"){
-					
-					templete = misskeyParse([obj], 'notf', acct_id, 'notf', popup);
-				}else{
-					templete = misskeyUserparse([obj], 'notf', acct_id, 'notf', popup);
-				}
-				if(obj.type=="reaction"){
-					console.log("refresh")
-					reactRefresh(acct_id,obj.note.id)
-				}
-				if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-					$("div[data-notf=" + acct_id +"]").prepend(templete);
-				}
-				jQuery("time.timeago").timeago();
-			}else if(JSON.parse(mess.data).type == "note-updated"){
-				var obj = JSON.parse(mess.data).body.note;
-				reactRefreshCore(obj)
-			}
-		}else{
 			var obj = JSON.parse(JSON.parse(mess.data).payload);
-		console.log(obj);
 			var type = JSON.parse(mess.data).event;
 			if (type == "notification") {
 				var templete = "";
@@ -340,6 +243,7 @@ function notfCommon(acct_id, tlid, sys) {
 				}
 				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") {
@@ -347,13 +251,15 @@ function notfCommon(acct_id, tlid, sys) {
 				$("[toot-id=" + obj + "]").remove();
 			}
 		}
-	}
 		websocketNotf[acct_id].onerror = function (error) {
 			console.error('WebSocket Error ' + error);
+			notfWS(misskey, acct_id, tlid, domain, at)
 		};
 	}
+}
 //一定のスクロールで発火
 function notfmore(tlid) {
+	console.log({ "status": "kicked", "status": moreloading });
 	var multi = localStorage.getItem("column");
 	var obj = JSON.parse(multi);
 	var acct_id = obj[tlid].domain;
@@ -362,71 +268,78 @@ function notfmore(tlid) {
 	} else {
 		var data;
 	}
-	var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");
+	var sid = $("#timeline_" + tlid + " .notif-marker").last().attr("data-maxid");
-	console.log(sid);
-	if (localStorage.getItem("morelock") != sid) {
-		localStorage.setItem("morelock", sid);
-		localStorage.setItem("now", type);
-		todo("Notfication TL MoreLoading");
-		var domain = localStorage.getItem("domain_" + acct_id);
 	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";
-				var i={
+			httpreq.open(POST, start, true);
-					method: 'POST',
+			httpreq.setRequestHeader('Content-Type', 'application/json');
-					headers: {
+			var body = JSON.stringify({
-						'content-type': 'application/json',
-					},
-					body:JSON.stringify({
 				i: at,
-						untilId:sid
+				untilID: sid
-					})
+			});
-				}
 		} else {
 			var misskey = false;
-				var start = "https://" + domain + "/api/v1/notifications"+
+			if (localStorage.getItem("exclude-" + tlid)) {
-					"max_id=" + sid;
+				var exc = localStorage.getItem("exclude-" + tlid) + "&max_id=" + sid;
-				var i={
-					method: 'GET',
-					headers: {
-						'content-type': 'application/json',
-						'Authorization': 'Bearer ' + at
-					},
-				}
-			}
-		fetch(start, i,
-		).then(function(response) {
-			return response.json();
-		}).catch(function(error) {
-			todo(error);
-			console.error(error);
-		}).then(function(json) {
-			var templete="";
-			Object.keys(json).forEach(function(key) {
-				var obj = json[key];
-				if(obj.type!="follow"){
-					if(misskey){
-						templete = templete+misskeyParse([obj.note], '', acct_id, tlid, -1);
 			} else {
-						templete = templete+parse([obj], '', acct_id, tlid, -1);
+				var exc = "?max_id=" + sid;
-					}
-				}else{
-					if(misskey){
-						templete = templete+misskeyUserparse([obj], '', acct_id, tlid, -1);
-					}else{
-						templete = templete+userparse([obj.account], '', acct_id, tlid, -1);
 			}
+			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 () {
+			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);
-			additional(acct_id, tlid);
+					$("#landing_" + tlid).hide();
 					jQuery("time.timeago").timeago();
-			localStorage.removeItem("morelock")
+				}
+				$("#notf-box").addClass("fetched");
 				todc();
-		});
+			}
+		}
 	}
 }
 
@@ -473,25 +386,12 @@ function notfCanceler(acct){
 	$(".notf-icon_" + acct).removeClass("red-text");
 }
 function allNotfRead() {
-	console.log(localStorage.getItem("notf-fav_2"));
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
+	if (multi) {
-		var obj = [{
-			at: localStorage.getItem("acct_0_at"),
-			name: localStorage.getItem("name_0"),
-			domain: localStorage.getItem("domain_0"),
-			user: localStorage.getItem("user_0"),
-			prof: localStorage.getItem("prof_0"),
-			id: localStorage.getItem("user-id_0")
-		}];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
 		var obj = JSON.parse(multi);
-	}
 		Object.keys(obj).forEach(function (key) {
-		console.log(key);
 			notfCanceler(key)
 		});
 	}
+}
 allNotfRead()

app/js/tl/parse.js

@@ -1,14 +1,13 @@
 //オブジェクトパーサー(トゥート)
-function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
+function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	var templete = '';
 	if (obj[0]) {
-		if(tlid==1){
+		if (tlid === 1) {
-			console.log("testalive:"+"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';
 	if (actb) {
 		var actb = actb.split(',');
@@ -22,12 +21,26 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			disp[actb[k]] = tp;
 		}
 	}
+	var qt = localStorage.getItem("quote");
+	if (qt == "nothing" || !qt) {
+		var qtClass = "hide";
+	} else {
+		var qtClass = "";
+	}
 	var datetype = localStorage.getItem("datetype");
 	var nsfwtype = localStorage.getItem("nsfw");
 	var sent = localStorage.getItem("sentence");
 	var ltr = localStorage.getItem("letters");
 	var gif = localStorage.getItem("gif");
 	var imh = localStorage.getItem("img-height");
+	if (!imh) {
+		imh = 200;
+	}
+	if (imh == "full") {
+		imh = "auto";
+	} else {
+		imh = imh + "px";
+	}
 	//独自ロケール
 	var locale = localStorage.getItem("locale");
 	if (locale == "yes") {
@@ -73,12 +86,18 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	} else {
 		var ticker = false;
 	}
+	//Animation
+	var anime = localStorage.getItem("animation");
+	if (anime == "yes" || !anime) {
+		var animecss = "cvo-anime";
+	} else {
+		var animecss = "";
+	}
 	//Cards
 	var card = localStorage.getItem("card_" + tlid);
 
-	
 	if (!sent) {
-		var sent = 500;
+		sent = 500;
 	}
 	if (!ltr) {
 		var ltr = 500;
@@ -134,6 +153,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		var noauth = "";
 		var antinoauth = "hide";
 	}
+	//DMTL
+	if (type == "dm") {
+		var dmHide = "hide";
+		var antidmHide = "";
+	} else {
+		var dmHide = "";
+		var antidmHide = "hide";
+	}
+
+
 	//マウスオーバーのみ
 	var mouseover = localStorage.getItem("mouseover");
 	if (!mouseover) {
@@ -152,6 +181,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	var times = [];
 	Object.keys(obj).forEach(function (key) {
 		var toot = obj[key];
+		if (type == "dm") {
+			var dmid = toot.id;
+			toot = toot.last_status;
+		}
 		var dis_name = escapeHTML(toot.account.display_name);
 		if (toot.account.emojis) {
 			var actemojick = toot.account.emojis[0];
@@ -163,7 +196,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			Object.keys(toot.account.emojis).forEach(function (key5) {
 				var emoji = toot.account.emojis[key5];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url +
+				var emoji_url = '<img draggable="false" 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);
@@ -179,7 +212,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			}
 			noticeavatar = '<a onclick="udg(\'' + toot.account.id +
 				'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
-			'<img src="' + noticeavatar +
+				'<img draggable="false" src="' + noticeavatar +
 				'" width="20" class="notf-icon prof-img" user="' + toot.account.acct +
 				'"></a>';
 			if (toot.type == "mention") {
@@ -198,11 +231,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				if (!locale && localStorage.getItem("fav_" + acct_id)) {
 					what = localStorage.getItem("fav_" + acct_id);
 				}
+			} else if (toot.type == "poll") {
+				var what = lang.lang_parse_polled;
+				var icon = "fa-tasks  purple-text";
 			}
-			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at,
+			var noticetext = '<i class="fas fa-filter pointer big-text" onclick="notfFilter(\'' + toot.account.id +
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,
+			'\',\'' + tlid + '\');" title="' + lang.lang_parse_notffilter + '"></i><span class="cbadge cbadge-hover"title="' + date(toot.created_at,
+				'absolute') + '(' + lang.lang_parse_notftime + ')"><i class="far fa-clock"></i>' + date(toot.created_at,
 					datetype) +
-			'</span><i class="big-text fa '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
+				'</span><i class="big-text fas ' + icon + '"></i><a onclick="udg(\'' + toot.account.id +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
 				"(@" + toot.account.acct +
 				")</a>";
@@ -215,16 +252,28 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						$(".notf-reply_" + acct_id).text(replyct * 1 - (-1));
 						localStorage.setItem("notf-reply_" + acct_id, replyct * 1 - (-1))
 						$(".notf-reply_" + acct_id).removeClass("hide")
+						var sound = localStorage.getItem("replySound");
+						if (sound == "default") {
+							var file = "../../source/notif3.wav"
+						}
 					} else if (toot.type == "reblog") {
 						var btct = localStorage.getItem("notf-bt_" + acct_id)
 						$(".notf-bt_" + acct_id).text(btct * 1 - (-1));
 						localStorage.setItem("notf-bt_" + acct_id, btct * 1 - (-1))
 						$(".notf-bt_" + acct_id).removeClass("hide")
+						var sound = localStorage.getItem("btSound");
+						if (sound == "default") {
+							var file = "../../source/notif2.wav"
+						}
 					} else if (toot.type == "favourite") {
 						var favct = localStorage.getItem("notf-fav_" + acct_id)
 						$(".notf-fav_" + acct_id).text(favct * 1 - (-1));
 						localStorage.setItem("notf-fav_" + acct_id, favct * 1 - (-1))
 						$(".notf-fav_" + acct_id).removeClass("hide")
+						var sound = localStorage.getItem("favSound");
+						if (sound == "default") {
+							var file = "../../source/notif.wav"
+						}
 					}
 				}
 
@@ -232,6 +281,23 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				if (popup > 0) {
 					Materialize.toast("[" + domain + "]" + escapeHTML(toot.account.display_name) + what, popup * 1000);
 				}
+				//通知音
+				if (sound == "c1") {
+					var file = localStorage.getItem("custom1");
+				} else if (sound == "c2") {
+					var file = localStorage.getItem("custom2");
+				} else if (sound == "c3") {
+					var file = localStorage.getItem("custom3");
+				} else if (sound == "c4") {
+					var file = localStorage.getItem("custom4");
+				}
+				if (file) {
+					request = new XMLHttpRequest();
+					request.open("GET", file, true);
+					request.responseType = "arraybuffer";
+					request.onload = playSound;
+					request.send();
+				}
 				if (native == "yes") {
 					var electron = require("electron");
 					var ipc = electron.ipcRenderer;
@@ -288,7 +354,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 				noticeavatar = '<a onclick="udg(\'' + toot.account.id +
 					'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
-				'<img src="' + noticeavatar +
+					'<img draggable="false" src="' + noticeavatar +
 					'" width="20" class="notf-icon prof-img" user="' + toot.account.acct +
 					'"></a>';
 				var rebtxt = lang.lang_parse_btedsimple;
@@ -298,7 +364,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				} else if (localStorage.getItem("domain_" + acct_id) == "mstdn.osaka" && !locale) {
 					rebtxt = "がしばいた";
 				}
-				var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
+				var notice = '<i class="big-text fas ' + rticon + '"></i>' + dis_name + "(@" + toot.account.acct +
 					")<br>";
 				var boostback = "shared";
 				var uniqueid = toot.id;
@@ -315,7 +381,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					Object.keys(toot.account.emojis).forEach(function (key5) {
 						var emoji = toot.account.emojis[key5];
 						var shortcode = emoji.shortcode;
-					var emoji_url = '<img src="' + emoji.url +
+						var emoji_url = '<img draggable="false" 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);
@@ -324,7 +390,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			} else {
 				var uniqueid = toot.id;
 				var notice = "";
-				var boostback = "";
+				var boostback = "unshared";
 				//ユーザー強調
 				if (toot.account.username != toot.account.acct) {
 					var fullname = toot.account.acct;
@@ -351,7 +417,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var divider = '<div class="divider"></div>';
 		}
 		if (toot.account.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
@@ -359,7 +425,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var via = '';
 			viashow = "hide";
 		} else {
-			var via = toot.application.name;
+			var via = escapeHTML(toot.application.name);
 			//強調チェック
 			Object.keys(emp).forEach(function (key6) {
 				var cli = emp[key6];
@@ -416,6 +482,40 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		var viewer = "";
 		var hasmedia = "";
 		var youtube = "";
+		//Poll
+		var poll = "";
+		if (toot.poll) {
+			var choices = toot.poll.options;
+			if (toot.poll.voted) {
+				var myvote = lang.lang_parse_voted;
+				var result_hide = "";
+			} else {
+				var myvote = '<a onclick="voteMastodon(\'' + acct_id + '\',\'' + toot.poll.id + '\')" class="votebtn">' + lang.lang_parse_vote + '</a><br>';
+				if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
+					myvote = myvote + '<a onclick="showResult(\'' + acct_id + '\',\'' + toot.poll.id + '\')" class="pointer">' + lang.lang_parse_unvoted + "</a>";
+				}
+				var result_hide = "hide";
+			}
+			if (toot.poll.expired) {
+				var ended = lang.lang_parse_endedvote;
+			} else {
+				var ended = date(toot.poll.expires_at, datetype);
+			}
+			Object.keys(choices).forEach(function (keyc) {
+				var choice = choices[keyc];
+				if (!toot.poll.voted && !toot.poll.expired) {
+					var votesel = 'voteSelMastodon(\'' + acct_id + '\',\'' + toot.poll.id + '\',' + keyc + ',' + toot.poll.multiple + ')';
+					var voteclass = "pointer waves-effect waves-light";
+				} else {
+					var votesel = "";
+					var voteclass = "";
+				}
+				poll = poll + '<div class="' + voteclass + ' vote vote_' + acct_id + '_' + toot.poll.id + '_' + keyc + '" onclick="' + votesel + '">' + escapeHTML(choice.title) + '<span class="vote_' + acct_id + '_' + toot.poll.id + '_result ' + result_hide + '">(' + choice.votes_count + ')</span></div>';
+			});
+			poll = '<div class="vote_' + acct_id + '_' + toot.poll.id + '">' + poll + myvote + '<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
+				'"><i class="far fa-calendar-times"></i>' +
+				ended + '</span></div>';
+		}
 		if (toot.emojis) {
 			var emojick = toot.emojis[0];
 		} else {
@@ -426,11 +526,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			Object.keys(toot.emojis).forEach(function (key5) {
 				var emoji = toot.emojis[key5];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url +
+				var emoji_url = '<img draggable="false" 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);
+				poll = poll.replace(regExp, emoji_url);
 			});
 		}
 		//ニコフレ絵文字
@@ -439,16 +540,17 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		} else {
 			var nicoemojick = false;
 		}
-		//絵文字があれば
+		//絵文字があれば(nico)
 		if (nicoemojick) {
 			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 +
+				var emoji_url = '<img draggable="false" 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);
+				poll = poll.replace(regExp, emoji_url);
 			});
 		}
 		//デフォ絵文字
@@ -465,6 +567,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if (notice) {
 			notice = twemoji.parse(notice);
 		}
+		if (poll) {
+			poll = twemoji.parse(poll);
+		}
 		var mediack = toot.media_attachments[0];
 		//メディアがあれば
 		var media_ids = "";
@@ -476,16 +581,39 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				var purl = media.preview_url;
 				media_ids = media_ids + media.id + ",";
 				var url = media.url;
+				var nsfwmes = ""
 				if (toot.sensitive && nsfw) {
 					var sense = "sensitive"
-				} else {
+					var blur = media.blurhash
+					if (blur) {
+						nsfwmes = '<div class="nsfw-media">' + lang.lang_parse_nsfw + '</div>'
+						purl = parseBlur(blur)
 						var sense = ""
 					}
+				} else {
+					var sense = ""
+					var blur = null
+				}
+				if (media.pleroma) {
+					if (media.pleroma.mime_type.indexOf("video") !== -1) {
+						viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',' +
+							acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
+							'" data-type="video" class="img-parsed"><video src="' +
+							purl + '" class="' + sense +
+							' toot-img pointer" style="max-width:100%;"></a></span>';
+					}
+				} else {
+					if (media.type == "unknown") {
+						viewer = viewer + '<a href="' + media.remote_url + '" title="' + media.remote_url + '">[' + lang.lang_parse_unknown + ']</a> '
+					} else {
 						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="' +
+							'" data-type="' + media.type + '" class="img-parsed img-link" style="width:calc(' + cwdt + '% - 1px); height:' + imh + ';"><img draggable="false" src="' +
 							purl + '" class="' + sense +
-					' toot-img pointer" style="width:' + cwdt + '%; height:'+imh+'px;"></a></span>';
+							' toot-img pointer">' + nsfwmes + '</a>';
+					}
+				}
+
 			});
 			media_ids = media_ids.slice(0, -1);
 		} else {
@@ -497,12 +625,27 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		//メンションであれば
 		if (menck) {
 			mentions = "";
+			var to_mention = [];
 			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> ';
+				//自分は除外
+				//自インスタンスかどうかを確認し、IDの一致
+				if (mention.acct == mention.username && mention.id == localStorage.getItem("user-id_" + acct_id)) {
+					//自分
+				} else {
+					//そのトゥの人NG
+					if (toot.account.acct != mention.acct) {
+						to_mention.push(mention.acct);
+					}
+				}
+
 			});
+			to_mention.push(toot.account.acct);
 			mentions = '<div style="float:right">' + mentions + '</div>';
+		} else {
+			var to_mention = [toot.account.acct];
 		}
 		var tagck = toot.tags[0];
 		var tags = "";
@@ -608,8 +751,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 		}
 		//日本語じゃない
-		if(toot.language!="ja"){
+		if (toot.language != lang.language && toot.language) {
-			var trans='<div class="action pin"><a onclick="trans(\''+toot.language+'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_trans+'"><i class="material-icons">g_translate</i></a></div>';
+			var trans = '<div class="action pin"><a onclick="trans(\'' + toot.language + '\',\'' + lang.language + '\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_trans + '"><i class="material-icons">g_translate</i></a></div>';
 		} else {
 			var trans = "";
 		}
@@ -618,7 +761,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var cards = toot.card;
 			if (cards.provider_name == "Twitter") {
 				if (cards.image) {
-					var twiImg='<br><img src="'+cards.image+'">';
+					var twiImg = '<br><img draggable="false" src="' + cards.image + '">';
 				} else {
 					var twiImg = '';
 				}
@@ -631,11 +774,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			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=JSON.parse(localStorage.getItem("ticker"));
+			var tickerdata = localStorage.getItem("ticker")
+			if (tickerdata) {
+				var tickerdata = JSON.parse(tickerdata);
 
 				var thisdomain = toot.account.acct.split("@");
 				if (thisdomain.length > 1) {
@@ -644,20 +790,25 @@ function parse(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;"> '+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 draggable="false" src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + '</span></div>';
 						break;
 					}
 				}
 			}
+		}
+		//Quote
+		if (toot.quote) {
+			poll = poll + '<div class="quote-renote"><div class="renote-icon"><img src="' + toot.quote.account.avatar + '"></div><div class="renote-user">' + escapeHTML(toot.quote.account.display_name) + '</div><div class="renote-text">' + toot.quote.content + '</div></div>'
+		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
-			' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
+			' ' + hasmedia + ' ' + animecss + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[
 				key].created_at, 'unix') + '" ' + if_notf + ' onmouseover="mov(\'' + toot.id + '\',\'' + tlid + '\',\'mv\')" onclick="mov(\'' + toot.id + '\',\'' + tlid + '\',\'cl\')" onmouseout="resetmv(\'mv\')">' +
 			'<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 +
+			'<img draggable="false" 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">' +
@@ -666,13 +817,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			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="fa fa-clock-o"></i>' +
+			'(' + lang.lang_parse_clickcopyurl + ')"><i class="far fa-clock"></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>' +
+			'</span>' + poll +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
 			'</span>' +
@@ -681,30 +832,31 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'<div class="area-actions ' + mouseover + '">' +
 			'<div class="action">' + vis + '</div>' +
 			'<div class="action ' + antinoauth + '"><a onclick="detEx(\'' + toot.url + '\',\'main\')" class="waves-effect waves-dark details" style="padding:0">' + lang.lang_parse_det + '</a></div>' +
+			'<div class="action ' + antidmHide + '"><a onclick="details(\'' + toot.id + '\',' + acct_id + ',\'' + tlid + '\',\'normal\')" class="waves-effect waves-dark details" style="padding:0">' + lang.lang_parse_thread + '</a></div>' +
 			'<div class="action ' + disp["re"] + ' ' + noauth + '"><a onclick="re(\'' + toot.id +
-			'\',\'' + toot.account.acct + '\',' +
+			'\',\'' + to_mention + '\',' +
 			acct_id + ',\'' + visen +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i><span class="rep_ct">' + replyct +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i><span class="rep_ct">' + replyct +
 			'</a></span></a></div>' +
 			'<div class="action ' + can_rt + ' ' + disp["rt"] + ' ' + noauth + '"><a onclick="rt(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="text-darken-3 fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_bt + '"><i class="fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count +
 			'</span></a></div>' +
-			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
+			'<div class="action ' + can_rt + ' ' + disp["qt"] + ' ' + noauth + ' ' + qtClass + '"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
 			',\'' + toot.account.acct + '\',\'' + toot.url +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_quote + '"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
 			'<div class="action ' + disp["fav"] + ' ' + noauth + '"><a onclick="fav(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fa text-darken-3 fa-star' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_fav + '"><i class="fas text-darken-3 fa-star' +
 			if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count +
 			'</a></span></div>' +
 			'<div class="' + if_mine + ' action ' + disp["del"] + ' ' + noauth + '"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_del + '"><i class="fas fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin ' + disp["pin"] + ' ' + noauth + '"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_pin + '"><i class="fas fa-map-pin pin_' + toot.id + ' ' + if_pin + '"></i></a></div>'
 			+ '<div class="' + if_mine + ' action ' + disp["red"] + ' ' + noauth + '"><a onclick="redraft(\'' + toot.id + '\',' +
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_redraft + '"><i class="material-icons">redo</i></a></div>' + trans +
@@ -713,7 +865,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'</span>' +
 			'</div><div class="area-side ' + mouseover + '"><div class="action ' + if_mine + ' ' + noauth + '"><a onclick="toggleAction(\'' + toot.id + '\',\'' + tlid + '\',\'' + acct_id + '\')" class="waves-effect waves-dark btn-flat" style="padding:0"><i class="text-darken-3 material-icons act-icon">expand_more</i></a></div>' +
 			'<div class="action ' + noauth + '"><a onclick="details(\'' + toot.id + '\',' + acct_id +
-			',\''+tlid+'\')" class="waves-effect waves-dark btn-flat details" style="padding:0"><i class="text-darken-3 material-icons">more_vert</i></a></div>' +
+			',\'' + tlid + '\',\'normal\')" class="waves-effect waves-dark btn-flat details ' + dmHide + '" style="padding:0"><i class="text-darken-3 material-icons">more_vert</i></a></div>' +
 			'</div></div>' +
 			'</div></div>';
 	});
@@ -735,6 +887,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	var datetype = localStorage.getItem("datetype");
 	Object.keys(obj).forEach(function (key) {
 		var toot = obj[key];
+		console.log(["Parsing", toot])
 		if (!toot.username) {
 			var raw = toot;
 			toot = toot.account;
@@ -743,19 +896,20 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			var notf = false;
 		}
 		if (toot.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
-		if (auth) {
+		if (auth == "request") {
-			var auth = '<i class="material-icons gray pointer" onclick="request(\'' +
+			var authhtml = '<i class="material-icons gray pointer" onclick="request(\'' +
-				toot.id + '\',\'authorize\',' + acct_id + ')">person_add</i>';
+				toot.id + '\',\'authorize\',' + acct_id + ')" title="Accept">person_add</i>　<i class="material-icons gray pointer" onclick="request(\'' +
+				toot.id + '\',\'reject\',' + acct_id + ')" title="Reject">person_add_disabled</i>';
 		} else {
-			var auth = "";
+			var authhtml = "";
 		}
 		var ftxt = lang.lang_parse_followed;
-		if(!locale && localStorage.getItem("follow_" + acct_id)){
+		if (!locale && localStorage.getItem("followlocale_" + acct_id)) {
-			ftxt = localStorage.getItem("follow_" + acct_id);
+			ftxt = localStorage.getItem("followlocale_" + acct_id);
 		}
 		if (popup > 0 || popup == -1 || notf) {
 			var notftext = ftxt + '<br>';
@@ -812,7 +966,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			Object.keys(toot.emojis).forEach(function (key5) {
 				var emoji = toot.emojis[key5];
 				var shortcode = emoji.shortcode;
-			var emoji_url = '<img src="' + emoji.url +
+				var emoji_url = '<img draggable="false" 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);
@@ -832,18 +986,18 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			notftext +
 			'</div><div class="area-icon"><a onclick="udg(\'' + toot.id + '\',' +
 			acct_id + ');" user="' + toot.acct + '" class="udg">' +
-			'<img src="' + avatar + '" width="40" class="prof-img" user="' + toot
+			'<img draggable="false" src="' + avatar + '" width="40" class="prof-img" user="' + toot
 				.acct + '"></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;user-select:auto; cursor:text;"> @' +
-			toot.acct + locked + auth +'</span>' +
+			toot.acct + locked + '</span>' +
 			'</div>' +
 			'</div>' +
 			'<div style="justify-content:space-around" class="area-toot"> <div class="cbadge" style="width:100px;">Follows:' +
 			toot.following_count +
 			'</div><div class="cbadge" style="width:100px;">Followers:' + toot.followers_count +
-			'</div>' +
+			'</div>' + authhtml +
 			'</div>' +
 			'</div>' +
 			'</div>';
@@ -855,7 +1009,6 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 function client(name) {
 	if (name != "Unknown") {
 		//聞く
-	localStorage.removeItem("client_mute");
 		var electron = require("electron");
 		var remote = electron.remote;
 		var dialog = remote.dialog;
@@ -866,13 +1019,13 @@ function client(name) {
 			buttons: [lang.lang_parse_clientno, lang.lang_parse_clientemp, lang.lang_parse_clientmute]
 		}
 		dialog.showMessageBox(options, function (arg) {
-		if(arg==1){
+			if (arg === 1) {
 				var cli = localStorage.getItem("client_emp");
 				var obj = JSON.parse(cli);
 				if (!obj) {
 					var obj = [];
 					obj.push(name);
-				Materialize.toast(name+lang.lang_status_emphas, 2000);
+					Materialize.toast(escapeHTML(name) + lang.lang_status_emphas, 2000);
 				} else {
 					var can;
 					Object.keys(obj).forEach(function (key) {
@@ -882,28 +1035,28 @@ function client(name) {
 						} else {
 							can = true;
 							obj.splice(key, 1);
-					Materialize.toast(name+lang.lang_status_unemphas, 2000);
+							Materialize.toast(escapeHTML(name) + lang.lang_status_unemphas, 2000);
 						}
 					});
 					if (!can) {
 						obj.push(name);
-				Materialize.toast(name+lang.lang_status_emphas, 2000);
+						Materialize.toast(escapeHTML(name) + lang.lang_status_emphas, 2000);
 					} else {
 
 					}
 				}
 				var json = JSON.stringify(obj);
 				localStorage.setItem("client_emp", json);
-		}else if(arg==2){
+			} else if (arg === 2) {
 				var cli = localStorage.getItem("client_mute");
 				var obj = JSON.parse(cli);
 				if (!obj) {
-				var obj=[];
+					obj = [];
 				}
 				obj.push(name);
 				var json = JSON.stringify(obj);
 				localStorage.setItem("client_mute", json);
-			Materialize.toast(name+lang.lang_parse_mute, 2000);
+				Materialize.toast(escapeHTML(name) + lang.lang_parse_mute, 2000);
 			} else {
 				return;
 			}

app/js/tl/poll.js

@@ -0,0 +1,118 @@
+//アンケートのトグル
+function pollToggle() {
+    if ($("#poll").hasClass("hide")) {
+        $("#right-side").show()
+        $("#poll").removeClass("hide")
+    } else {
+        $("#right-side").hide()
+        $("#emoji").addClass("hide")
+        $("#poll").addClass("hide")
+    }
+}
+function pollProviderCk() {
+    $(".poll-provider").addClass("hide");
+    $("#" + $("#poll-sel").val()).removeClass("hide");
+}
+/*
+function pollAddtime(num){
+    var last=$("#expires_in").val();
+    last=last*1-(num*-1);
+    $("#expires_in").val(last);
+    pollCalc();
+}
+*/
+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;
+
+}
+//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 voteMastodon(acct_id, id) {
+    var choice = [];
+    $('.vote_' + acct_id + '_' + id + ' div').each(function (i, elem) {
+        if ($(this).hasClass("sel")) {
+            choice.push(i + "");
+        }
+    });
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_" + acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/polls/" + id + "/votes";
+    if (localStorage.getItem("mode_" + domain) == "misskey") {
+        return false;
+    }
+    var httpreq = new XMLHttpRequest();
+    httpreq.open('POST', start, true);
+    httpreq.setRequestHeader('Content-Type', 'application/json');
+    httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+    httpreq.responseType = "json";
+    httpreq.send(JSON.stringify({ choices: choice }));
+    httpreq.onreadystatechange = function () {
+        voteMastodonrefresh(acct_id, id)
+    }
+}
+function showResult(acct_id, id) {
+    $('.vote_' + acct_id + '_' + id + '_result').toggleClass("hide")
+}
+function voteMastodonrefresh(acct_id, id) {
+    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

@@ -33,7 +33,6 @@ $repeat  = setInterval(function() {
             var obj = JSON.parse(voice);
             if (obj[0]) {
                 $synthes.text = obj[0];
-                console.log($synthes);
                 speechSynthesis.speak($synthes);
                 obj.splice(0, 1);
                 var json = JSON.stringify(obj);

app/js/tl/src.js

@@ -1,10 +1,10 @@
 //検索
 //検索ボックストグル
-function srcToggle() {
+function searchMenu() {
-	$("#src-box").toggleClass("hide");
+	$("#left-menu div").removeClass("active");
-	$("#src-box").toggleClass("show");
+	$("#searchMenu").addClass("active");
-	$("#src-box").css("bottom","40px");
+	$(".menu-content").addClass("hide");
-	$("#src-box").css("left",$('#src-tgl').offset().left-$('#src-box').width()/2+"px");
+	$("#src-box").removeClass("hide");
 	$('ul.tabs').tabs('select_tab', 'src-sta');
 	$("#src-contents").html("");
 }
@@ -15,7 +15,7 @@ function src(mode) {
 	var q = $("#src").val();
 	var acct_id = $("#src-acct-sel").val();
 	if (acct_id == "tootsearch") {
-		tootsearch(q);
+		tsAdd(q)
 		return false;
 	}
 	localStorage.setItem("last-use", acct_id);
@@ -31,7 +31,7 @@ function src(mode) {
 	} else {
 		var start = "https://" + domain + "/api/v1/search?q=" + q
 	}
-	console.log(start)
+	console.log("Try to search at " + start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -44,7 +44,7 @@ function src(mode) {
 		src("v1")
 		return false;
 	}).then(function (json) {
-		console.log(json);
+		console.log(["Search", json]);
 		//ハッシュタグ
 		if (json.hashtags[0]) {
 			var tags = "";
@@ -52,7 +52,7 @@ function src(mode) {
 				var tag = json.hashtags[key4];
 				if (mode) {
 					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
-					'\',\'add\')" class="pointer">#' + tag + '</a><br> ';
+						'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
 				} else {
 					tags = tags + graphDraw(tag);
 				}
@@ -73,9 +73,25 @@ function src(mode) {
 		jQuery("time.timeago").timeago();
 	});
 }
-function tootsearch(q){
+function tsAdd(q) {
+	var add = {
+		domain: acct_id,
+		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();
+}
+function tootsearch(tlid, q) {
 	var start = "https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=" + q
-	console.log(start)
+	console.log("Toot srrach at " + start)
+	$("#notice_" + tlid).text("tootsearch(" + q + ")");
+	$("#notice_icon_" + tlid).text("search");
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -89,25 +105,68 @@ function tootsearch(q){
 	}).then(function (raw) {
 		var templete = "";
 		var json = raw.hits.hits;
-			console.log(json);
+		var max_id = raw["hits"].length;
-			Object.keys(json).forEach(function(key5) {
+		for (var i = 0; i < json.length; i++) {
-				var toot = json[key5]["_source"];
+			var toot = json[i]["_source"];
-				console.log(toot);
+			if (lastid != toot.uri) {
 				if (toot && toot.account) {
-					templete = templete+parse([toot],'noauth');
+					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>';
 		}
-			$("#src-contents").html("Tootsearch("+lang.lang_src_ts+")<br>" + templete);
+		$("#timeline_" + tlid).html(templete);
+
+		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");
+	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")
+				}
+			}
+			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();
 	});
 }
 function graphDraw(tag) {
 	var tags = "";
 	var his = tag.history;
-		console.log(his);
 	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);
@@ -116,15 +175,15 @@ function graphDraw(tag){
 	var two = 50 - (his[2].uses / max * 50);
 	var one = 50 - (his[1].uses / max * 50);
 	var zero = 50 - (his[0].uses / max * 50);
-		if(max==0){
+	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>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
+			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
-			'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+			'\',\'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>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
+			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
-				'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
 	}
 
 	return tags;

app/js/tl/tag.js

@@ -54,10 +54,20 @@ function favTag(){
         var obj = JSON.parse(tagarr);
     }
     var tags = "";
+    var nowPT = localStorage.getItem("stable")
     Object.keys(obj).forEach(function (key) {
         var tag = obj[key];
-        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="' +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>　'+
+        if (nowPT != tag) {
-            '<a onclick="autoToot(\'#' + tag + ' \');brInsert(\'#' + tag + ' \')" class="pointer" title="'+lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">'+lang.lang_tags_realtime+'</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' +lang.lang_tags_tagunpin.replace("{{tag}}" ,'#'+tag)+ '">'+lang.lang_del+'</a></span> ';
+            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);
@@ -70,7 +80,6 @@ function trendTag(){
     var domain = "imastodon.net"
     var at = localStorage.getItem("acct_" + acct_id + "_at");
     var start = "https://" + domain + "/api/v1/trend_tags"
-	console.log(start)
     fetch(start, {
         method: 'GET',
         headers: {
@@ -87,6 +96,7 @@ function trendTag(){
             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>');
@@ -106,6 +116,15 @@ function tagTL(a,b,c,d){
     tl(a, b, acct_id, d);
 }
 function autoToot(tag) {
+    tag = escapeHTML(tag)
+    var nowPT = localStorage.getItem("stable")
+    if (nowPT == tag) {
+        localStorage.removeItem("stable");
+        Materialize.toast(lang.lang_tags_unrealtime, 3000);
+    } else {
         localStorage.setItem("stable", tag);
-    Materialize.toast(lang.lang_tags_tagwarn +replace("{{tag}}" ,tag).replace("{{tag}}" ,tag),3000);
+        Materialize.toast(lang.lang_tags_tagwarn.replace("{{tag}}", tag).replace("{{tag}}", tag), 3000);
+        brInsert('#' + tag + " ")
+    }
+    favTag();
 }

app/js/tl/tl.js

@@ -1,4 +1,5 @@
 //TL取得
+moreloading = false;
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	scrollevent();
 	localStorage.removeItem("morelock");
@@ -6,7 +7,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	var domain = localStorage.getItem("domain_" + acct_id);
 	//タグとかの場合はカラム追加して描画
 	if (tlid == "add") {
-		console.log("add");
+		console.log("add new column");
 		var newtab = $(".box").length;
 		var add = {
 			domain: acct_id,
@@ -17,7 +18,6 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var obj = JSON.parse(multi);
 		localStorage.setItem("card_" + obj.length, "true");
 		obj.push(add);
-		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("column", json);
 		parseColumn();
@@ -52,7 +52,14 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 			"user_" + acct_id) + "@" + domain + ")");
 		$("#notice_icon_" + tlid).text("notifications");
 		return;
-	}
+	}/*else if (type == "dm") {
+		//DMなら飛ばす
+		dm(acct_id, tlid, "plus",delc,voice);
+		$("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem(
+			"user_" + acct_id) + "@" + domain + ")");
+			$("#notice_icon_" + tlid).text("mail_outline");
+		return;
+	}*/
 	localStorage.setItem("now", type);
 	todo(cap(type) + " TL Loading...");
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
@@ -80,6 +87,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		if (type != "noauth") {
 			req.i = at;
 		}
+
 		if (type == "local-media" || type == "pub-media") {
 			req.mediaOnly = true;
 		}
@@ -104,7 +112,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 				url = url + "local=true";
 			}
 		}
+		if (type == "dm") {
+			var start = "https://" + domain + "/api/v1/conversations";
+		} else {
 			var start = "https://" + domain + "/api/v1/timelines/" + url;
+		}
 		var method = "GET";
 		var i = {
 			method: method,
@@ -112,14 +124,14 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		};
 	}
 
-	console.log(start);
+	console.log(["Try to get timeline of " + tlid, start])
 	fetch(start, i).then(function (response) {
 		return response.json();
 	}).catch(function (error) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json)
+		console.log(["Result of getting timeline of " + tlid, json])
 		$("#landing_" + tlid).hide();
 		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
 			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
@@ -129,7 +141,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		if (misskey) {
 			var templete = misskeyParse(json, type, acct_id, tlid, "", mute);
 		} else {
-			var templete = parse(json, type, acct_id, tlid, "", mute);
+			var templete = parse(json, type, acct_id, tlid, "", mute, type);
 			localStorage.setItem("lastobj_" + tlid, json[0].id)
 		}
 		$("#timeline_" + tlid).html(templete);
@@ -151,32 +163,14 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 	localStorage.setItem("now", type);
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
 		var misskey = true;
-		if (type == "home") {
+		var key = localStorage.getItem("misskey_wss_" + acct_id)
-			var start = "wss://" + domain +
+		var send = '{"type":"connect","body":{"channel":"' + typePs(type) + '","id":"' + tlid + '"}}'
-				"/?i=" + at;
+		var mskyset = setInterval(function () {
-		} else if (type == "pub") {
+			if (misskeywsstate[key]) {
-			var start = "wss://" + domain +
+				misskeyws[key].send(send)
-				"/global-timeline?i=" + at;
+				clearInterval(mskyset)
-		} else if (type == "pub-media") {
-			var start = "wss://" + domain +
-			"/global-timeline?i=" + at;
-		} else if (type == "local") {
-			var start = "wss://" + domain +
-			"/local-timeline?i=" + at;
-		} else if (type == "local-media") {
-			var start = "wss://" + domain +
-			"/local-timeline?i=" + at;
-		} else if (type == "mix") {
-			var start = "wss://" + domain +
-			"/hybrid-timeline?i=" + at;
-		} else if (type == "tag") {
-			Materialize.toast(lang_misskeyparse_tagnostr[lang], 1000);
-		} else if (type == "noauth") {
-			var start = "wss://" + acct_id +
-			"/local-timeline?i=" + at;
-		} else if (type=="list"){
-			Materialize.toast(lang_misskeyparse_listnostr[lang], 1000);
 			}
+		}, 100);
 	} else {
 		var misskey = false;
 		if (localStorage.getItem("streaming_" + acct_id)) {
@@ -218,20 +212,15 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			var start = wss +
 				"/api/v1/streaming/?stream=direct&access_token=" + at;
 		}
-	}
-	
-	console.log(start);
 		var wsid = websocket.length;
 		localStorage.setItem("wss_" + tlid, wsid);
 		websocket[wsid] = new WebSocket(start);
 		websocket[wsid].onopen = function (mess) {
-		console.log(tlid + ":Connect Streaming API:" + type);
+			console.table({ "tlid": tlid, "type": "Connect Streaming API" + type, "domain": domain, "message": [mess] })
-		console.log(mess);
 			$("#notice_icon_" + tlid).removeClass("red-text");
 		}
 		websocket[wsid].onmessage = function (mess) {
-		console.log(tlid + ":Receive Streaming API:");
+			console.log([tlid + ":Receive Streaming API:", JSON.parse(mess.data)]);
-		console.log(JSON.parse(mess.data));
 			if (misskey) {
 				if (JSON.parse(mess.data).type == "note") {
 					var obj = JSON.parse(mess.data).body;
@@ -274,13 +263,12 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				} else if (typeA == "update" || typeA == "conversation") {
 					localStorage.removeItem("delete");
 					var obj = JSON.parse(JSON.parse(mess.data).payload);
-				console.log(obj);
 					if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
 						if (voice) {
 							say(obj.content)
 						}
-					var templete = parse([obj], type, acct_id, tlid,"",mute);
+						var templete = parse([obj], type, acct_id, tlid, "", mute, type);
-					if ($("timeline_box_"+tlid+"_box .tl-box").scrollTop() == 0) {
+						if ($("timeline_box_" + tlid + "_box .tl-box").scrollTop() === 0) {
 							$("#timeline_" + tlid).prepend(templete);
 						} else {
 							var pool = localStorage.getItem("pool_" + tlid);
@@ -322,8 +310,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			return false;
 		};
 		websocket[wsid].onclose = function () {
-		console.error("Closing");
+			console.warn("Closing " + tlid);
-		console.error(tlid);
 			if (mode == "error") {
 				$("#notice_icon_" + tlid).addClass("red-text");
 				todo('WebSocket Closed');
@@ -336,7 +323,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			}
 			return false;
 		};
-
+	}
 }
 
 //一定のスクロールで発火
@@ -359,8 +346,7 @@ function moreload(type, tlid) {
 		var data = obj[tlid].data;
 	}
 	var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
-	if (sid && localStorage.getItem("morelock") != sid) {
+	if (sid && !moreloading) {
-		localStorage.setItem("morelock", sid);
 		if (type == "mix" && localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct_id)) != "misskey") {
 			mixmore(tlid, "integrated");
 			return;
@@ -370,7 +356,12 @@ function moreload(type, tlid) {
 		} else if (type == "notf") {
 			notfmore(tlid);
 			return;
+		} else if (type == "tootsearch") {
+			var data = obj[tlid].data;
+			moreTs(tlid, data);
+			return;
 		}
+		moreloading = true;
 		localStorage.setItem("now", type);
 		todo(cap(type) + " TL MoreLoading");
 		if (type != "noauth") {
@@ -418,6 +409,116 @@ function moreload(type, tlid) {
 			var misskey = false;
 			var start = "https://" + domain + "/api/v1/timelines/" + com(type, data) +
 				"max_id=" + sid;
+			if (type == "dm") {
+				var start = "https://" + domain + "/api/v1/conversations?" +
+					"max_id=" + sid;
+			}
+			var method = "GET";
+			var i = {
+				method: method,
+				headers: hdr
+			};
+		}
+		fetch(start, i).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (misskey) {
+				var templete = misskeyParse(json, '', acct_id, tlid, "", mute);
+			} else {
+				var templete = parse(json, '', acct_id, tlid, "", mute, type);
+			}
+			$("#timeline_" + tlid).append(templete);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			moreloading = false;
+			todc();
+		});
+	}
+}
+//TL差分取得
+function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
+	console.log("Get diff of TL" + tlid)
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	var acct_id = obj[tlid].domain;
+	if (!type) {
+		var type = obj[tlid].type;
+	} else {
+		var data;
+	}
+	if (type == "tag") {
+		var data = obj[tlid].data;
+		var tag = localStorage.getItem("tag-range");
+		if (tag == "local") {
+			data = data + "&local=true";
+		}
+	} else if (type == "list") {
+		var data = obj[tlid].data;
+	}
+	var sid = $("#timeline_" + tlid + " .cvo").first().attr("unique-id");
+	if (sid && !moreloading) {
+		if (type == "mix" && localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct_id)) != "misskey") {
+			return;
+		} else if (type == "plus" && localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct_id)) != "misskey") {
+			return;
+		} else if (type == "notf") {
+			return;
+		}
+		moreloading = true;
+		localStorage.setItem("now", type);
+		todo(cap(type) + " TL MoreLoading");
+		if (type != "noauth") {
+			var at = localStorage.getItem("acct_" + acct_id + "_at");
+			var hdr = {
+				'content-type': 'application/json',
+				'Authorization': 'Bearer ' + at
+			};
+			var domain = localStorage.getItem("domain_" + acct_id);
+		} else {
+			var hdr = {
+				'content-type': 'application/json'
+			};
+			domain = acct_id;
+		}
+		if (localStorage.getItem("mode_" + domain) == "misskey") {
+			var misskey = true;
+			hdr = {
+				'content-type': 'application/json'
+			};
+			var url = misskeycom(type, data);
+			var start = "https://" + domain + "/api/notes/" + url;
+			var method = "POST";
+			var req = {};
+			if (type != "noauth") {
+				req.i = at;
+			}
+			if (type == "local-media" || type == "pub-media") {
+				req.mediaOnly = true;
+			}
+			if (type == "tag") {
+				req.tag = data;
+			}
+			if (type == "list") {
+				req.listId = data;
+			}
+			req.sinceId = sid;
+			req.limit = 20;
+			var i = {
+				method: method,
+				headers: hdr,
+				body: JSON.stringify(req),
+			}
+		} else {
+			var misskey = false;
+			var start = "https://" + domain + "/api/v1/timelines/" + com(type, data) +
+				"since_id=" + sid;
+			if (type == "dm") {
+				var start = "https://" + domain + "/api/v1/conversations?" +
+					"since_id=" + sid;
+			}
 			var method = "GET";
 			var i = {
 				method: method,
@@ -432,31 +533,36 @@ function moreload(type, tlid) {
 			todo(error);
 			console.error(error);
 		}).then(function (json) {
+			console.log(["Result diff of TL" + tlid, json]);
 			if (misskey) {
 				var templete = misskeyParse(json, '', acct_id, tlid, "", mute);
 			} else {
-				var templete = parse(json, '', acct_id, tlid,"",mute);
+				var templete = parse(json, '', acct_id, tlid, "", mute, type);
 			}
-			$("#timeline_" + tlid).append(templete);
+			$("#timeline_" + tlid).prepend(templete);
 			additional(acct_id, tlid);
 			jQuery("time.timeago").timeago();
-			localStorage.removeItem("morelock")
+			moreloading = false;
 			todc();
 		});
 	}
 }
+//TL再取得
+function reloadTL(type, data, acct_id, key, delc, voice) {
+	tl(type, data, acct_id, key, delc, voice, "");
+}
 
 //WebSocket切断
 function tlCloser() {
 	Object.keys(websocket).forEach(function (tlid) {
 		if (websocketOld[tlid]) {
 			websocketOld[tlid].close();
-			console.log("Close Streaming API: Old" + tlid);
+			console.log("%c Close Streaming API: Old" + tlid, "color:blue");
 		}
 		if (websocket[0]) {
 			console.log(websocket[0]);
 			websocket[tlid].close();
-			console.log("Close Streaming API:" + tlid);
+			console.log("%c Close Streaming API:" + tlid, "color:blue");
 		}
 
 	});
@@ -464,7 +570,7 @@ function tlCloser() {
 	Object.keys(websocketHome).forEach(function (tlid) {
 		if (websocketHome[tlid]) {
 			websocketHome[tlid].close();
-			console.log("Close Streaming API:MixHome" + tlid);
+			console.log("%c Close Streaming API:Integrated Home" + tlid, "color:blue");
 		}
 
 	});
@@ -472,7 +578,7 @@ function tlCloser() {
 	Object.keys(websocketLocal).forEach(function (tlid) {
 		if (websocketLocal[tlid]) {
 			websocketLocal[tlid].close();
-			console.log("Close Streaming API:MixLocal" + tlid);
+			console.log("%c Close Streaming API:Integrated Local" + tlid, "color:blue");
 		}
 
 	});
@@ -480,11 +586,17 @@ function tlCloser() {
 	Object.keys(websocketNotf).forEach(function (tlid) {
 		if (websocketNotf[tlid]) {
 			websocketNotf[tlid].close();
-			console.log("Close Streaming API:Notf" + tlid);
+			console.log("%c Close Streaming API:Notf" + tlid, "color:blue");
 		}
 
 	});
-	websocketNotf = [];
+	Object.keys(misskeyws).forEach(function (tlid) {
+		if (misskeyws[tlid]) {
+			misskeyws[tlid].close();
+			console.log("%c Close Streaming API:Misskey" + tlid, "color:blue");
+		}
+	});
+	misskeyws = {}
 }
 
 //TLのタイトル
@@ -525,7 +637,7 @@ function cap(type, data, acct_id) {
 			var response = "Federated TL(Media)";
 		}
 	} else if (type == "tag") {
-		var response= "#" + data
+		var response = "#" + escapeHTML(data)
 	} else if (type == "list") {
 		var ltitle = localStorage.getItem("list_" + data + "_" + acct_id);
 		var response = "List(" + ltitle + ")"
@@ -549,6 +661,8 @@ function cap(type, data, acct_id) {
 		var response = "Local+"
 	} else if (type == "webview") {
 		var response = "Twitter"
+	} else if (type == "tootsearch") {
+		var response = "tootsearch(" + escapeHTML(data) + ")";
 	}
 	return response;
 }
@@ -569,10 +683,28 @@ function com(type, data) {
 		return "tag/" + data + "?"
 	} else if (type == "list") {
 		return "list/" + data + "?"
-	}else if (type="dm") {
+	} else if (type == "dm") {
 		return "direct?"
 	}
 }
+//Misskey
+function typePs(type) {
+	if (type == "home") {
+		return "homeTimeline"
+	} else if (type == "local" || type == "noauth") {
+		return "localTimeline"
+	} else if (type == "local-media") {
+		return "localTimeline"
+	} else if (type == "pub") {
+		return "globalTimeline"
+	} else if (type == "mix") {
+		return "hybridTimeline"
+	} else if (type == "tag") {
+		return "hashtag"
+	} else if (type == "list") {
+		return "userList"
+	}
+}
 function misskeycom(type, data) {
 	if (type == "home") {
 		return "timeline"
@@ -596,22 +728,35 @@ function misskeycom(type, data) {
 //TLのアイコン
 function icon(type) {
 	if (type == "home") {
-		return "home"
+		var response = "home";
-	} else if (type == "local" || type == "noauth" || type == "local-media") {
+	} else if (type == "local") {
-		return "people_outline"
+		var response = "people_outline";
-	} else if (type == "pub" || type == "pub-media") {
+	} else if (type == "local-media") {
-		return "language"
+		var response = "people_outline";
+	} else if (type == "pub") {
+		var response = "language";
+	} else if (type == "pub-media") {
+		var response = "language";
 	} else if (type == "tag") {
-		return "search"
+		var response = "whatshot";
 	} else if (type == "list") {
-		return "view_headline"
+		var response = "view_headline";
-	}else if (type == "list") {
+	} else if (type == "notf") {
-		return "subject"
+		var response = "notifications";
+	} else if (type == "noauth") {
+		var response = "people_outline";
 	} else if (type == "dm") {
-		return "mail"
+		var response = "mail_outline";
 	} else if (type == "mix") {
-		return "share"
+		var response = "merge_type";
+	} else if (type == "plus") {
+		var response = "merge_type";
+	} else if (type == "webview") {
+		var response = "language";
+	} else if (type == "tootsearch") {
+		var response = "search";
 	}
+	return response;
 }
 function strAlive() {
 	var date = new Date();
@@ -637,8 +782,8 @@ function strAliveInt(){
 	setTimeout(strAlive, 10000);
 }
 function reconnector(tlid, type, acct_id, data, mode) {
-	console.log("Reconnector:"+mode)
+	console.log("%c Reconnector:" + mode + "(timeline" + tlid + ")", "color:pink")
-	if(type=="mix" || type=="plus"){
+	if (type == "mix" || type == "integrated" || type == "plus") {
 		if (localStorage.getItem("voice_" + tlid)) {
 			var voice = true;
 		} else {
@@ -651,10 +796,11 @@ function reconnector(tlid,type,acct_id,data,mode){
 		}
 		var wssh = localStorage.getItem("wssH_" + tlid);
 		websocketHome[wssh].close();
-		var wssh=localStorage.getItem("wssL_" + tlid);
+		var wssl = localStorage.getItem("wssL_" + tlid);
 		websocketLocal[wssl].close();
 		mixre(acct_id, tlid, type, mute, "", voice, mode);
 	} else if (type == "notf") {
+		notfColumn(acct_id, tlid, "")
 	} else {
 		var wss = localStorage.getItem("wss_" + tlid);
 		websocket[wss].close();
@@ -672,5 +818,4 @@ function reconnector(tlid,type,acct_id,data,mode){
 	}
 	Materialize.toast(lang.lang_tl_reconnect, 2000);
 }
-
 strAliveInt()

app/js/ui/img.js

@@ -10,6 +10,7 @@ function imgv(id, key, acct_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) {
@@ -29,7 +30,6 @@ function imgv(id, key, acct_id) {
 			xhr.send();
 			$('#imgmodal').attr('src', murl);
 			$('#imagewrap').dragScroll(); // ドラッグスクロール設定
-			$('#imagemodal').modal('open');
 			$('#imgmodal').show();
 			$('#imagemodal').attr('data-key', key);
 			$('#imagemodal').attr('data-id', id);
@@ -45,61 +45,30 @@ function imgv(id, key, acct_id) {
 			var height = element.naturalHeight;
 			var windowH = $(window).height();
 			var windowW = $(window).width();
-			//小さい画像
+			$("#imagemodal").css("bottom", "0")
-			if(width<(windowW - 50) && height<(windowH-1000)){
+			$("#imagemodal img").css("width", "auto")
-				$("#imgmodal").css('height',height+"px");
+			if (height < windowH) {
-				$("#imgmodal").css('width',width+"px");
+				$("#imagemodal").css("height", height + 60 + "px")
-				$("#imagewrap").css('height',height+"px");
+				$("#imagemodal img").css("height", "100%")
-				$("#imagemodal").css('height',height+100+"px");
+				if (width > windowW * 0.8) {
-				$("#imagewrap").css('width',width+"px");
+					$("#imagemodal").css("width", "80vw")
-				$("#imagemodal").css('width',width+"px");
+					$("#imagemodal img").css("width", "100%")
-				$("#imagemodal").css('margin-top',(windowH /2) - (height / 2) +"px");
+					var heightS = windowW * 0.8 / width * height;
+					$("#imagemodal").css("height", heightS + 60 + "px")
 				} else {
-				$("#imagemodal").css('margin-top',0);
+					$("#imagemodal").css("width", width + "px")
-				var aspect = width/height;
-				if (aspect < 2.8 && aspect > 0.3){
-					//moderate
-					if(windowW > windowH){
-						//画面が横長(縦幅基準)
-						$("#imgmodal").css('height',windowH/1.2-70+"px");
-						var imgW = (windowH/1.2-70)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH/1.2-60+"px");
-						$("#imagemodal").css('height',windowH/1.2+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
-					}else{
-						//画面が縦長・正方形(横幅基準)
-						$("#imgmodal").css('width',windowW/1.2-30+"px");
-						var imgH = (windowW/1.2-30)/width*height;
-						$("#imgmodal").css('height',imgH+"px");
-						$("#imagewrap").css('width',windowW/1.2+"px");
-						$("#imagemodal").css('width',windowW/1.2+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
 				}
 			} else {
-					//極端な画像
+				$("#imagemodal img").css("width", "auto")
-					if(height > width){
+				var widthS = windowH / height * width;
-						//縦長
+				if (widthS < windowW) {
-						$("#imgmodal").css('height',windowH-60+"px");
+					$("#imagemodal").css("width", widthS + "px")
-						var imgW = (windowH-50)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH-50+"px");
-						$("#imagemodal").css('height',windowH+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
 				} else {
-						//横長・正方形
+					$("#imagemodal").css("width", "100vw")
-						$("#imgmodal").css('width',windowW-30+"px");
-						var imgH = (windowW-50)/width*height;
-						$("#imgmodal").css('height',imgH+"px");
-						$("#imagewrap").css('width',windowW+"px");
-						$("#imagemodal").css('width',windowW+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
-					}
 				}
+
+				$("#imagemodal").css("height", "100vh")
+				$("#imagemodal img").css("height", "calc(100vh - 60px)")
 			}
 
 		}
@@ -165,70 +134,38 @@ function imgCont(type) {
 				var height = element.naturalHeight;
 				var windowH = $(window).height();
 				var windowW = $(window).width();
-			//小さい画像
+				$("#imagemodal").css("bottom", "0")
-			if(width<(windowW - 50) && height<(windowH-1000)){
+				$("#imagemodal img").css("width", "auto")
-				$("#imgmodal").css('height',height+"px");
+				if (height < windowH) {
-				$("#imgmodal").css('width',width+"px");
+					$("#imagemodal").css("height", height + 60 + "px")
-				$("#imagewrap").css('height',height+"px");
+					$("#imagemodal img").css("height", "100%")
-				$("#imagemodal").css('height',height+100+"px");
+					if (width > windowW * 0.8) {
-				$("#imagewrap").css('width',width+"px");
+						$("#imagemodal").css("width", "80vw")
-				$("#imagemodal").css('width',width+"px");
+						$("#imagemodal img").css("width", "100%")
-				$("#imagemodal").css('margin-top',(windowH /2) - (height / 2) +"px");
+						var heightS = windowW * 0.8 / width * height;
+						$("#imagemodal").css("height", heightS + 60 + "px")
 					} else {
-				$("#imagemodal").css('margin-top',0);
+						$("#imagemodal").css("width", width + "px")
-				var aspect = width/height;
-				if (aspect < 2.8 && aspect > 0.3){
-					//moderate
-					if(windowW > windowH){
-						//画面が横長(縦幅基準)
-						$("#imgmodal").css('height',windowH/1.2-70+"px");
-						var imgW = (windowH/1.2-70)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH/1.2-60+"px");
-						$("#imagemodal").css('height',windowH/1.2+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
-					}else{
-						//画面が縦長・正方形(横幅基準)
-						$("#imgmodal").css('width',windowW/1.2-30+"px");
-						var imgH = (windowW/1.2-30)/width*height;
-						$("#imgmodal").css('height',imgH+"px");
-						$("#imagewrap").css('width',windowW/1.2+"px");
-						$("#imagemodal").css('width',windowW/1.2+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
 					}
 				} else {
-					//極端な画像
+					$("#imagemodal img").css("width", "auto")
-					if(height > width){
+					var widthS = windowH / height * width;
-						//縦長
+					if (widthS < windowW) {
-						$("#imgmodal").css('height',windowH-60+"px");
+						$("#imagemodal").css("width", widthS + "px")
-						var imgW = (windowH-50)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH-50+"px");
-						$("#imagemodal").css('height',windowH+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
 					} else {
-						//横長・正方形
+						$("#imagemodal").css("width", "100vw")
-						$("#imgmodal").css('width',windowW-30+"px");
+					}
-						var imgH = (windowW-50)/width*height;
+
-						$("#imgmodal").css('height',imgH+"px");
+					$("#imagemodal").css("height", "100vh")
-						$("#imagewrap").css('width',windowW+"px");
+					$("#imagemodal img").css("height", "calc(100vh - 60px)")
-						$("#imagemodal").css('width',windowW+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
 				}
 			}
-			}
+			if ($("#" + id + "-image-" + (key * 1 + 1)).length === 0) {
-		}
-		if ($("#" + id + "-image-" + (key * 1 + 1)).length == 0) {
 				$("#image-next").prop("disabled", true);
 			} else {
 				$("#image-next").prop("disabled", false);
 			}
-		console.log("#" + id + "-image-" + (key * 1 - 1));
+			if ($("#" + id + "-image-" + (key * 1 - 1)).length === 0) {
-		if ($("#" + id + "-image-" + (key * 1 - 1)).length == 0) {
 				$("#image-prev").prop("disabled", true);
 			} else {
 				$("#image-prev").prop("disabled", false);
@@ -289,9 +226,8 @@ function zoom(z) {
 			'cursor': 'move'
 		}); //指が触れたか検知
 		$(this).on('touchmove', function (event) {
-			if ($(target).data('down') == true) {
+			if ($(target).data('down') === true) {
 				// スクロール
-				console.log($(target).data('x'));
 				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') -
 					getX(event));
 				target.scrollTop($(target).data('scrollTop') + $(target).data('y') -
@@ -344,9 +280,13 @@ function dlImg(){
 	}
 	ipc.send('general-dl', [url, save, false]);
 	ipc.on('general-dl-prog', function (event, arg) {
-		console.log(arg);
+		console.log("Progress: " + arg);
 	})
 	ipc.on('general-dl-message', function (event, arg) {
-		console.log(arg);
+		var argC = arg.replace(/\\/g, "\\\\") + "\\\\.";
+		Materialize.toast(lang.lang_img_DLDone + arg + '<button class="btn-flat toast-action" onclick="openFinder(\'' + argC + '\')">Show</button>', 5000);
 	})
 }
+function openFinder(dir) {
+	ipc.send('open-finder', dir);
+}

app/js/ui/layout.js

@@ -7,29 +7,36 @@ var websocketLocal = [];
 var websocketNotf = [];
 
 //カラム追加ボックストグル
-function addToggle() {
+function addColumnMenu() {
-	$("#add-box").toggleClass("hide");
+	$("#left-menu div").removeClass("active");
+	$("#addColumnMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+	$("#add-box").removeClass("hide");
 	addselCk()
-	$("#add-box").css("bottom","40px");
-	$("#add-box").css("left",$('#add-tgl').offset().left-$('#add-box').width()/2+"px");
-	$("#add-box").toggleClass("show");
 }
+$('.type').click(function () {
+	$(".type").removeClass("active");
+	$(this).addClass("active");
+	$("#type-sel").val($(this).attr("data-type"))
+})
 //最初、カラム変更時に発火
-function parseColumn() {
+function parseColumn(dontclose) {
-	console.log("parse");
+	console.log("%c Parse column", "color:red;font-size:125%");
 	var size = localStorage.getItem("size");
 	if (size) {
 		$("#timeline-container").css("font-size", size + "px");
 		$(".toot-reset").css("font-size", size + "px");
 		$(".cont-series").css("font-size", size + "px");
 	}
+	if (localStorage.getItem("menu-done")) {
+		$("#fukidashi").addClass("hide")
+	}
+	if (!dontclose) {
 		tlCloser();
+	}
+
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
+	if (multi) {
-		var obj = [];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
 		var obj = JSON.parse(multi);
 
 		var templete;
@@ -45,14 +52,19 @@ function parseColumn() {
 			ckdb(key);
 			//フィルターデータ読もう
 			getFilter(key);
+			var domain = localStorage.getItem("domain_" + key);
+			if (localStorage.getItem("mode_" + domain) == "misskey") {
+				localStorage.removeItem("misskey_wss_" + key)
+				connectMisskey(key)
+			}
 		});
 	}
 	var acctlist = obj;
-	console.log(obj);
+	console.table(obj);
-	var xed=localStorage.getItem("xed");
+	/*var xed=localStorage.getItem("xed");
 	if(xed){
 		xpand();
-	}
+	}*/
 	var col = localStorage.getItem("column");
 	if (!col) {
 		var obj = [{
@@ -67,7 +79,9 @@ function parseColumn() {
 	if ($("#timeline-container").length) {
 		$("#timeline-container").html("");
 	}
-	Object.keys(obj).forEach(function(key) {
+	var basekey = 0;
+	for (var key = 0; key < obj.length; key++) {
+		var next = key + 1;
 		var acct = obj[key];
 		if (acct.type == "notf") {
 			var notf_attr = ' data-notf=' + acct.domain;
@@ -103,10 +117,10 @@ function parseColumn() {
 				icnsert = ' style="color: #' + ichex + '" ';
 			}
 		}
-		console.log(acct.domain);
+		console.log(acct);
 		if (acctlist[acct.domain]) {
 			if (acctlist[acct.domain].background != "def") {
-				insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background;
+				insert = insert + " border-bottom:medium solid #" + acctlist[acct.domain].background + ";";
 			}
 		}
 		if (acct.type == "notf" && localStorage.getItem("setasread") == "no") {
@@ -115,21 +129,80 @@ function parseColumn() {
 			localStorage.removeItem("hasNotfC_" + acct.domain);
 		}
 		if (acct.type == "webview") {
-			var html =webview("https://tweetdeck.twitter.com",key,insert,icnsert);
+			if (localStorage.getItem("fixwidth")) {
-			$("#timeline-container").append(html);
+				var fixwidth = localStorage.getItem("fixwidth");
+				var css = " min-width:" + fixwidth + "px;"
 			} else {
+				var css = "";
+			}
+			var html = webviewParse("https://tweetdeck.twitter.com", key, insert, icnsert, css);
+			$("#timeline-container").append(html);
+		} else if (acct.type == "tootsearch") {
+			if (!acct.left_fold) {
+				basekey = key;
+			}
+			var width = localStorage.getItem("width");
+			if (width) {
+				var css = " min-width:" + width + "px;"
+			}
+			var anime = localStorage.getItem("animation");
+			if (anime == "yes" || !anime) {
+				var animecss = "box-anime";
+			} else {
+				var animecss = "";
+			}
+			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.data);
+		} else {
+			var width = localStorage.getItem("width");
+			if (width) {
+				var css = " min-width:" + width + "px;"
+			}
+			var anime = localStorage.getItem("animation");
+			if (anime == "yes" || !anime) {
+				var animecss = "box-anime";
+			} else {
+				var animecss = "";
+			}
 			if (acct.type == "notf") {
-			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fa fa-share exc-icons"></i></label> '+
+				var exclude = lang.lang_excluded + ':<br><input type="checkbox" class="filled-in" id="exc-reply-' + key + '" ' + excludeCk(key, "mention") + ' /><label for="exc-reply-' + key + '" class="exc-chb"><i class="fas fa-share exc-icons"></i></label> ' +
-			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fa fa-star exc-icons"></i></label> '+
+					'<input type="checkbox" class="filled-in" id="exc-fav-' + key + '"  ' + excludeCk(key, "favourite") + ' /><label for="exc-fav-' + key + '" class="exc-chb"><i class="fas fa-star exc-icons"></i></label> ' +
-			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fa fa-retweet exc-icons"></i></label> '+
+					'<input type="checkbox" class="filled-in" id="exc-bt-' + key + '" ' + excludeCk(key, "reblog") + ' /><label for="exc-bt-' + key + '" class="exc-chb" ><i class="fas fa-retweet exc-icons"></i></label> ' +
-			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fa fa-users exc-icons"></i></label> '+
+					'<input type="checkbox" class="filled-in" id="exc-follow-' + key + '" ' + excludeCk(key, "follow") + ' /><label for="exc-follow-' + key + '" class="exc-chb" ><i class="fas fa-users exc-icons"></i></label> ' +
-			'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>';
+					'<input type="checkbox" class="filled-in" id="exc-poll-' + key + '" ' + excludeCk(key, "poll") + ' /><label for="exc-poll-' + key + '" class="exc-chb" ><i class="fas fa-tasks exc-icons"></i></label> ' +
+					'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude(' + key + ')">Filter</button>';
+					if(checkNotfFilter(key)){
+						exclude=exclude+'<button class="btn red waves-effect" style="width:60px; padding:0;" onclick="resetNotfFilter(' + key + ')">Clear all</button>'
+					}
+					exclude=exclude+"<br>";
+			} else if (acct.type == "home") {
+				var exclude = '<a onclick="ebtToggle(' + key +
+					')" class="setting nex"><i class="fas fa-retweet waves-effect nex" title="' + lang.lang_layout_excludingbt + '" style="font-size:24px"></i><span id="sta-bt-' +
+					key + '">Off</span></a>' + lang.lang_layout_excludingbt + '<br>';
 			} else {
 				var exclude = "";
 			}
-		var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
+			if (!acct.left_fold) {
+				basekey = key;
+				var basehtml = '<div style="' + css + '" class="box ' + animecss + '" id="timeline_box_' + basekey + '_parentBox"></div>';
+				$("#timeline-container").append(basehtml);
+				var left_hold = '<a onclick="leftFoldSet(' + key + ')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_leftFold + '">view_agenda</i></a>' + lang.lang_layout_leftFold + '</span><br>';
+			} else {
+				var left_hold = '<a onclick="leftFoldRemove(' + key + ')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_leftUnfold + '">view_column</i></a>' + lang.lang_layout_leftUnfold + '</span><br>';
+			}
+			if (key === 0) {
+				left_hold = '';
+			}
+			if (localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct.domain)) == "misskey") {
+				var isMisRed = ""
+				exclude = ""
+				var if_misskey_hide = "hide"
+			} else {
+				var isMisRed = "red-text"
+				var if_misskey_hide = ""
+			}
+			var html = '<div class="boxIn" id="timeline_box_' + key + '_box" tlid="' + key +
 				'" data-acct="' + acct.domain + '"><div class="notice-box z-depth-2" id="menu_' + key + '" style="' + insert + ' ">' +
-			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang.lang_layout_gotop +'"></i></div>'+
+				'<div class="area-notice"><i class="material-icons waves-effect ' + isMisRed + '" id="notice_icon_' + key + '"' + notf_attr + ' style="font-size:40px; padding-top:25%;" onclick="checkStr(\'' + acct.type + '\', \'' + data + '\', \'' + acct.domain + '\', \'' + key + '\', \'' + delc + '\',\'' + voice + '\',null)" title="' + lang.lang_layout_gotop + '"></i></div>' +
 				'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>' +
 				'<div class="area-a1"><a onclick="notfToggle(' + acct.domain + ',' + key +
 				')" class="setting nex ' + if_notf + '" title="' + unique_notf + '"' + icnsert + '><i class="material-icons waves-effect nex notf-icon_' +
@@ -140,17 +213,17 @@ function parseColumn() {
 				')" class="setting nex" title="' + lang.lang_layout_setthis + '"' + icnsert + '><i class="material-icons waves-effect nex">settings</i></a></div></div>' +
 				'<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 				'"><div id="notifications_' + key +
-		  '" data-notf="' + acct.domain + '" data-type="notf"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
+				'" data-notf="' + acct.domain + '" data-type="notf" class="notf-timeline"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
-		  '" style="padding:5px;">'+exclude+'<a onclick="mediaToggle(' + key +
+				'" style="padding:5px;">' + exclude + left_hold + '<a onclick="mediaToggle(' + key +
 				')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_mediafil + '">perm_media</i><span id="sta-media-' +
 				key + '">On</span></a>' + lang.lang_layout_mediafil + '<br><a onclick="cardToggle(' + key +
 				')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_linkanades + '">link</i><span id="sta-card-' +
 				key + '">On</span></a>' + lang.lang_layout_linkana + '<br><a onclick="voiceToggle(' + key +
 				')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_tts + '">hearing</i><span id="sta-voice-' +
 				key + '">On</span></a>' + lang.lang_layout_tts + 'TL<br><a onclick="reconnector(' + key +
-		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+				',\'' + acct.type + '\',\'' + acct.domain + '\',\'' + escapeHTML(acct.data) + '\')" class="setting nex ' + if_notf + ' ' + if_misskey_hide + '"><i class="material-icons waves-effect nex ' + if_notf + '" title="' + lang.lang_layout_reconnect + '">low_priority</i></a><span class="' + if_notf + '">' + lang.lang_layout_reconnect + '</span><br>' + lang.lang_layout_headercolor + '<br><div id="picker_' + key + '" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
-			'" class="tl" tlid="' + key + '" data-type="' + acct.type + '"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div></div>';
+				'" class="tl ' + acct.type + '-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="' + acct.domain + '" data-const="' + acct.type + '_' + acct.domain + '"><div id="landing_' + key + '" style="text-align:center">' + lang.lang_layout_nodata + '</div></div></div>'
-		$("#timeline-container").append(html);
+			$('#timeline_box_' + basekey + '_parentBox').append(html);
 			localStorage.removeItem("pool_" + key);
 			if (acct.data) {
 				var data = acct.data;
@@ -170,14 +243,11 @@ function parseColumn() {
 			}
 			tl(acct.type, data, acct.domain, key, delc, voice, "");
 			cardCheck(key);
+			ebtCheck(key);
 			mediaCheck(key);
 			catchCheck(key);
 			voiceCheck(key);
 		}
-	});
-	var width = localStorage.getItem("width");
-	if (width) {
-		$(".box").css("min-width", width + "px");
 	}
 	var box = localStorage.getItem("box");
 	if (box == "absolute") {
@@ -204,6 +274,14 @@ function parseColumn() {
 		}
 	}
 }
+function checkStr(type, data, acct_id, key, delc, voice) {
+	if ($('#notice_icon_' + key).hasClass("red-text") && type != "notf" && type != "mix") {
+		goTop(key);
+		tlDiff(type, data, acct_id, key, delc, voice, "");
+	} else {
+		goTop(key);
+	}
+}
 //セカンダリートゥートボタン
 function secvis(set) {
 	if (set == "public") {
@@ -230,7 +308,9 @@ function secvis(set){
 //カラム追加
 function addColumn() {
 	var acct = $("#add-acct-sel").val();
+	if(acct != "webview" && acct != "noauth"){
 		localStorage.setItem("last-use", acct);
+	}
 	var type = $("#type-sel").val();
 	if (acct == "noauth") {
 		acct = $("#noauth-url").val();
@@ -276,10 +356,8 @@ function addselCk(){
 	}
 	if (domain == "knzk.me" || domain == "mstdn.y-zu.org") {
 		$("#type-sel").append('<option value="dm" data-trans="dm" id="direct-add">' + lang.layout_dm + '</option>');
-		$('#type-sel').material_select('update');
 	} else {
 		$("#direct-add").remove();
-		$('#type-sel').material_select('update');
 	}
 }
 //カラム削除
@@ -293,8 +371,7 @@ function removeColumn(tlid) {
 	var ipc = electron.ipcRenderer;
 	ipc.send('column-del', "");
 	ipc.on('column-del-reply', function (event, arg) {
-		console.log(arg);
+		if (arg === 1) {
-		if(arg==1){
 			localStorage.removeItem("card_" + tlid);
 			obj.splice(tlid, 1);
 			for (var i = 0; i < obj.length; i++) {
@@ -388,10 +465,10 @@ function coloradd(key,bg,txt){
 	}
 }
 //禁断のTwitter
-function webview(url,key,insert,icnsert){
+function webviewParse(url, key, insert, icnsert, css) {
 	var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
-			'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
+		'" style="' + css + '"><div class="notice-box z-depth-2" id="menu_' + key + '" style="' + insert + '">' +
-			'<div class="area-notice"><i class="fa fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
+		'<div class="area-notice"><i class="fab fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>' +
 		'<div class="area-notice_name tl-title">WebView(' + url + ')</div>' +
 		'<div class="area-sta"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">' + lang.lang_layout_webviewmode + '</label></div>' +
 		'<div class="area-a2"><a onclick="removeColumn(' + key +
@@ -400,8 +477,55 @@ function webview(url,key,insert,icnsert){
 		')" class="setting nex" title="' + lang.lang_layout_setthis + '"' + icnsert + '><i class="material-icons waves-effect nex">settings</i></a></div></div>' +
 		'<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 		'"></div><div class="column-hide notf-indv-box" id="util-box_' + key +
-		  '" style="padding:5px;">'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:calc(100% - 110px);"><div id="timeline_' + key +
+		'" style="padding:5px;">' + lang.lang_layout_headercolor + '<br><div id="picker_' + key + '" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:100%;"><div id="timeline_' + key +
 		'" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;"><webview src="' + url + '" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js"></webview></div></div></div>';
 
 	return html;
 }
+function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, animecss, q) {
+	if (!left_fold) {
+		var basehtml = '<div style="' + css + '" class="box ' + animecss + '" id="timeline_box_' + basekey + '_parentBox"></div>';
+		$("#timeline-container").append(basehtml);
+		var left_hold = '<a onclick="leftFoldSet(' + key + ')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_leftFold + '">view_agenda</i></a>' + lang.lang_layout_leftFold + '</span><br>';
+	} else {
+		var left_hold = '<a onclick="leftFoldRemove(' + key + ')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_leftUnfold + '">view_column</i></a>' + lang.lang_layout_leftUnfold + '</span><br>';
+	}
+	var html = '<div class="boxIn" id="timeline_box_' + key + '_box" tlid="' + key +
+		'"><div class="notice-box z-depth-2" id="menu_' + key + '" style="' + insert + ' ">' +
+		'<div class="area-notice"><i class="material-icons waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;" onclick="tootsearch(' + key + ',\'' + q + '\');" title="' + lang.lang_layout_gotop + '"></i></div>' +
+		'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>' +
+		'<div class="area-a1"></div><div class="area-sta"></div>' +
+		'<div class="area-a2"><a onclick="removeColumn(' + key +
+		')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_delthis + '"' + icnsert + '>cancel</i></a></div>' +
+		'<div class="area-a3"><a onclick="setToggle(' + key +
+		')" class="setting nex" title="' + lang.lang_layout_setthis + '"' + icnsert + '><i class="material-icons waves-effect nex">settings</i></a></div></div>' +
+		'<div class="column-hide notf-indv-box" id="util-box_' + key +
+		'" style="padding:5px;">' + left_hold + '<a onclick="mediaToggle(' + key +
+		')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_mediafil + '">perm_media</i><span id="sta-media-' +
+		key + '">On</span></a>' + lang.lang_layout_mediafil + '<br>' + lang.lang_layout_headercolor + '<br><div id="picker_' + key + '" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+		'" class="tl ' + type + '-timeline " tlid="' + key + '" data-type="' + type + '" data-acct="nostr"><div id="landing_' + key + '" style="text-align:center">' + lang.lang_layout_nodata + '</div></div></div>'
+	$('#timeline_box_' + basekey + '_parentBox').append(html);
+	tootsearch(key, q);
+	cardCheck(key);
+	ebtCheck(key);
+	mediaCheck(key);
+	catchCheck(key);
+	voiceCheck(key);
+	return true;
+}
+function leftFoldSet(key) {
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	obj[key].left_fold = true;
+	var json = JSON.stringify(obj);
+	localStorage.setItem("column", json);
+	parseColumn();
+}
+function leftFoldRemove(key) {
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	obj[key].left_fold = false;
+	var json = JSON.stringify(obj);
+	localStorage.setItem("column", json);
+	parseColumn();
+}

app/js/ui/menu.js

@@ -0,0 +1,56 @@
+function menu() {
+  localStorage.setItem("menu-done", true);
+  $("#fukidashi").addClass("hide")
+  if (!$("#menu").hasClass("appear")) {
+    $("#menu").addClass("appear")
+    var left = localStorage.getItem("menu-left");
+    if (left > $('body').width() - $('#menu').width()) {
+      left = $('body').width() - $('#menu').width();
+    } else if (left < 0) {
+      left = 0;
+    }
+    var top = localStorage.getItem("menu-top");
+    if (top > $('body').height() - $('#menu').height()) {
+      top = $('body').height() - $('#menu').height();
+    } else if (top < 0) {
+      top = 0;
+    }
+    $('#menu').css("left", left + "px")
+    $('#menu').css("top", top + "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");
+  } else {
+    $('#menu').fadeOut()
+    $("#menu").removeClass("appear")
+  }
+
+}
+$(function () {
+  $("#menu").draggable({
+    handle: "#menu-bar",
+    stop: function () {
+      var left = $('#menu').offset().left;
+      if (left > $('body').width() - $('#menu').width()) {
+        left = $('body').width() - $('#menu').width();
+      } else if (left < 0) {
+        left = 0;
+      }
+      var top = $('#menu').offset().top;
+      if (top > $('body').height() - $('#menu').height()) {
+        top = $('body').height() - $('#menu').height();
+      } else if (top < 0) {
+        top = 0;
+      }
+      localStorage.setItem("menu-left", left);
+      localStorage.setItem("menu-top", top);
+    }
+  });
+});
+function help() {
+  const { shell } = require('electron');
+  shell.openExternal("https://docs.thedesk.top");
+}

app/js/ui/post-box.js

@@ -1,11 +1,14 @@
 /*ささやきボックス(Cr民並感)*/
 //✕隠す
 function hide() {
-	$('#post-box').removeClass("appear")
+	$("#right-side").hide()
-	$('#post-box').animate({
+	$('#post-box').fadeOut()
-		'bottom': "-500px"
+	$("#post-box").removeClass("appear")
-	});
 	$("#emoji").addClass("hide")
+	$("#left-side").show();
+	$("#default-emoji").show();
+	$("#unreact").show();
+	$("#addreact").addClass("hide");
 }
 //最小化
 function mini() {
@@ -18,16 +21,47 @@ function mini() {
 }
 //最小化時に展開
 function show() {
+	$("#post-box").addClass("appear")
 	$("#textarea").focus();
-	$('#post-box').addClass("appear")
+	console.log("show" + localStorage.getItem("postbox-left"));
-	console.log($('#posttgl').offset());
+	var left = localStorage.getItem("postbox-left");
-	$('#post-box').css("left",$('#posttgl').offset().left+"px");
+	if (left > $('body').width() - $('#post-box').width()) {
-	$('#post-box').animate({
+		left = $('body').width() - $('#post-box').width();
-		'bottom': 0
+	} else if (left < 0) {
-	});
+		left = 0;
+	}
+	var top = localStorage.getItem("postbox-top");
+	if (top > $('body').height() - $('#post-box').height()) {
+		top = $('body').height() - $('#post-box').height();
+	} else if (top < 0) {
+		top = 0;
+	}
+	$('#post-box').css("left", left + "px")
+	$('#post-box').css("top", top + "px")
+	$('#post-box').fadeIn();
 }
 
-
+$(function () {
+	$("#post-box").draggable({
+		handle: "#post-bar",
+		stop: function () {
+			var left = $('#post-box').offset().left;
+			if (left > $('body').width() - $('#post-box').width()) {
+				left = $('body').width() - $('#post-box').width();
+			} else if (left < 0) {
+				left = 0;
+			}
+			var top = $('#post-box').offset().top;
+			if (top > $('body').height() - $('#post-box').height()) {
+				top = $('body').height() - $('#post-box').height();
+			} else if (top < 0) {
+				top = 0;
+			}
+			localStorage.setItem("postbox-left", left);
+			localStorage.setItem("postbox-top", top);
+		}
+	});
+});
 
 //コード受信
 if (location.search) {
@@ -43,9 +77,11 @@ if(location.search){
 		$(".mini-btn").text("expand_less");
 	}
 }
-$('#posttgl').focusin(function(e) {
+$('#posttgl').click(function (e) {
 	if (!$('#post-box').hasClass("appear")) {
 		show();
+	} else {
+		hide();
 	}
 });
 
@@ -65,22 +101,3 @@ $('#textarea,#cw-text').focusout(function(e) {
 	}
 	//setTimeout(remove, 100);
 });
-
-$("#timeline-container").click(function(e) {
-	if(!$('#list-box').hasClass("hide")){
-		$("#list-box").removeClass("show");
-		$("#list-box").addClass("hide")
-	}
-	if(!$('#src-box').hasClass("hide")){
-		$("#src-box").removeClass("show");
-		$("#src-box").addClass("hide")
-	}
-	if(!$('#filter-box').hasClass("hide")){
-		$("#filter-box").removeClass("show");
-		$("#filter-box").addClass("hide")
-	}
-	if(!$('#add-box').hasClass("hide")){
-		$("#add-box").removeClass("show");
-		$("#add-box").addClass("hide")
-	}
-});

app/js/ui/scroll.js

@@ -10,7 +10,7 @@ function scrollck() {
 	$(".tl-box").each(function (i, elem) {
 		var tlid = $(this).attr('tlid');
 		//一番上ならためていた新しいトゥートを表示
-		if ($(this).scrollTop() == 0) {
+		if ($(this).scrollTop() === 0) {
 			var pool = localStorage.getItem("pool_" + tlid);
 			if (pool) {
 				$("#timeline_" + tlid).prepend(pool);
@@ -28,6 +28,7 @@ function scrollck() {
 		var scrt = $(this).find(".tl").height() - $(window).height();
 		var scr = $(this).scrollTop();
 		if (scr > scrt) {
+			console.log("kicked more loading:" + tlid);
 			moreload('', tlid);
 		}
 	});
@@ -43,7 +44,6 @@ function goColumn(key){
 	$("#sort-box").addClass("hide");
 	$("#sort-box").removeClass("show");
 	if ($('[tlid=' + key + ']').length) {
-		console.log($('[tlid='+key+']').offset().left);
 		$("#timeline-container").animate({ scrollLeft: $("#timeline-container").scrollLeft() + $('[tlid=' + key + ']').offset().left });
 	}
 }

app/js/ui/settings.js

@@ -1,107 +1,73 @@
 //設定(setting.html)で読む
+var envView = new Vue({
+	el: '#envView',
+	data: { config: envConstruction },
+	methods: {
+		complete: function (i, val) {
+			var ls = envView.config[i].storage;
+			Materialize.toast("Complete", 3000);
+			if (!val) {
+				var id = envView.config[i].id;
+				var val = $("#" + id).val()
+			}
+			localStorage.setItem(ls, val)
+			if (ls == "ha") {
+				hardwareAcceleration(val)
+			}
+			return true
+		}
+	}
+});
+var tlView = new Vue({
+	el: '#tlView',
+	data: { config: tlConstruction },
+	methods: {
+		complete: function (i, val) {
+			var ls = tlView.config[i].storage;
+			if (!val) {
+				var id = tlView.config[i].id;
+				var val = $("#" + id).val()
+			}
+			Materialize.toast("Complete", 3000);
+			localStorage.setItem(ls, val)
+			return true
+		}
+	}
+});
+var postView = new Vue({
+	el: '#postView',
+	data: { config: postConstruction, kirishima: localStorage.getItem('kirishima') },
+	methods: {
+		complete: function (i, val) {
+			var ls = postView.config[i].storage;
+			Materialize.toast("Complete", 3000);
+			if (!val) {
+				var id = postView.config[i].id;
+				var val = $("#" + id).val()
+			}
+			localStorage.setItem(ls, val)
+			return true
+		}
+	}
+});
 //設定ボタン押した。
 function settings() {
-	var dd = $("[name=time]:checked").val();
-	var dt = $("[for="+dd+"]").text();
-		if (dd != localStorage.getItem("datetype")) {
-		Materialize.toast(lang.lang_setting_time.replace("{{set}}" ,dt), 3000);
-	}
-	localStorage.setItem("datetype", dd);
-
 	var cd = $("[name=theme]:checked").val();
 	var ct = $("[for=" + cd + "]").html();
+	if (cd == "custom" && !$("#custom-sel-sel").val()) {
+		var theme = localStorage.getItem("theme");
+		if (!theme) {
+			var theme = "white";
+		}
+		$("#" + theme).prop("checked", true);
+	} else {
 		if (cd != localStorage.getItem("theme")) {
 			Materialize.toast(lang.lang_setting_theme.replace("{{set}}", ct), 3000);
 		}
 		//テーマはこの場で設定
 		themes(cd);
 		localStorage.setItem("theme", cd);
-
-	var nd = $("[name=nsfw]:checked").val();
-	var nt = $("[for=n_"+nd+"]").text();
-	if (nd != localStorage.getItem("nsfw")) {
-		Materialize.toast(lang.lang_setting_nsfw.replace("{{set}}" ,nt), 3000);
 	}
-	localStorage.setItem("nsfw", nd);
-
-	var cwd = $("[name=cw]:checked").val();
-	var cwt = $("[for=c_"+cwd+"]").text();
-	if (cwd != localStorage.getItem("cw")) {
-		Materialize.toast(lang.lang_setting_cw.replace("{{set}}" ,cwt), 3000);
-	}
-	localStorage.setItem("cw", cwd);
-
-	var cwtd = $("#cw-text").val();
-	if (cwtd != localStorage.getItem("cw-text")) {
-		Materialize.toast(lang.lang_setting_cwtext.replace("{{set}}" ,cwtd), 3000);
-	}
-	localStorage.setItem("cw-text", cwtd);
-
-	var cwsd = $("[name=cws]:checked").val();
-	var cwst = $("[for=cws_"+cwsd+"]").text();
-	if (cwsd != localStorage.getItem("always-cw")) {
-		Materialize.toast(lang.lang_setting_cws.replace("{{set}}" ,cwst), 3000);
-	}
-	localStorage.setItem("always-cw", cwsd);
-
-	var rpd = $("[name=rp]:checked").val();
-	var rpt = $("[for=c_"+cwd+"]").text();
-	if (rpd != localStorage.getItem("replyct")) {
-		Materialize.toast(lang.lang_setting_rp.replace("{{set}}" ,rpt), 3000);
-	}
-	localStorage.setItem("replyct", rpd);
-
-	var visd = $("[name=vis]:checked").val();
-	var vist = $("[for="+visd+"]").text();
-	if (visd != localStorage.getItem("vis")) {
-		Materialize.toast(lang.lang_setting_vis.replace("{{set}}" ,vist), 3000);
-	}
-	localStorage.setItem("vis", visd);
-
-	var popd = $("#popup").val();
-	if (popd > 0 && popd != localStorage.getItem("popup")) {
-		Materialize.toast(lang.lang_setting_popup.replace("{{set}}" ,popd+lang.lang_setting_s), 3000);
-	} else if (popd != localStorage.getItem("popup")) {
-		Materialize.toast(lang.lang_setting_popup.replace("{{set}}" ,lang.lang_setting_off), 3000);
-	}
-	localStorage.setItem("popup", popd);
-
-	var gifd = $("[name=gif]:checked").val();
-	var gift = $("[for=g_"+gifd+"]").text();
-	if (gifd != localStorage.getItem("gif")) {
-		Materialize.toast(lang.lang_setting_gif.replace("{{set}}" ,gift), 3000);
-	}
-	localStorage.setItem("gif", gifd);
-
-	var sentd = $("#sentence").val();
-	var ltrd = $("#letters").val();
-	if (sentd != localStorage.getItem("sentence") || ltrd != localStorage.getItem("letters")) {
-		Materialize.toast(lang.lang_setting_selt.replace("{{set1}}" ,sentd).replace("{{set2}}" ,ltrd), 3000);
-	}
-	localStorage.setItem("sentence", sentd);
-	localStorage.setItem("letters", ltrd);
-
-	var csentd = $("#cw_sentence").val();
-	var cltrd = $("#cw_letters").val();
-	if (csentd != localStorage.getItem("cw_sentence") || cltrd != localStorage.getItem("cw_letters")) {
-		Materialize.toast(lang.lang_setting_autocw.replace("{{set1}}" ,csentd).replace("{{set2}}" ,cltrd), 3000);
-	}
-	localStorage.setItem("cw_sentence", csentd);
-	localStorage.setItem("cw_letters", cltrd);
-
-	var widthd = $("#width").val();
-	if (widthd != localStorage.getItem("width")) {
-		Materialize.toast(lang.lang_setting_width.replace("{{set}}" ,widthd), 3000);
-	}
-	localStorage.setItem("width", widthd);
-
-	var imgd = $("[name=img]:checked").val();
-	var imgt = $("[for=i_"+imgd+"]").text();
-	if (imgd != localStorage.getItem("img")) {
-		Materialize.toast(lang.lang_setting_img.replace("{{set}}" ,imgt), 3000);
-	}
-	localStorage.setItem("img", imgd);
-
 	var fontd = $("#font").val();
 	if (fontd) {
 		if (fontd != localStorage.getItem("font")) {
@@ -116,310 +82,54 @@ function settings() {
 			themes();
 		}
 	}
-	
-
-	var sized = $("#size").val();
-	if (sized != localStorage.getItem("size")) {
-		Materialize.toast(lang.lang_setting_size.replace("{{set}}" ,sized), 3000);
-	}
-	localStorage.setItem("size", sized);
-
-	var heid = $("#img-height").val();
-	if (heid != localStorage.getItem("img-height")) {
-		Materialize.toast(lang.lang_setting_imgheight.replace("{{set}}" ,heid), 3000);
-	}
-	localStorage.setItem("img-height", heid);
-
-	var tckrd = $("[name=ticker]:checked").val();
-	var tckrt = $("[for=ticker_"+tckrd+"]").text();
-	if (tckrd != localStorage.getItem("ticker_ok")) {
-		Materialize.toast(lang.lang_setting_ticker.replace("{{set}}" ,tckrt), 3000);
-	}
-	localStorage.setItem("ticker_ok", tckrd);
-
-	var boxd = $("[name=box]:checked").val();
-	var boxt = $("[for=bx_"+boxd+"]").text();
-	if (boxd != localStorage.getItem("box")) {
-		Materialize.toast(lang.lang_setting_boxConfirm.replace("{{set}}" ,boxt), 3000);
-	}
-	localStorage.setItem("box", boxd);
-
-	var tagd = $("[name=tag]:checked").val();
-	var tagt = $("[for=t_"+tagd+"]").text();
-	if (tagd != localStorage.getItem("tag-range")) {
-		Materialize.toast(lang.lang_setting_tag.replace("{{set}}" ,tagt), 3000);
-	}
-	localStorage.setItem("tag-range", tagd);
-
-	var uld = $("[name=ul]:checked").val();
-	var ult = $("[for=ul_"+uld+"]").text();
-	if (uld != localStorage.getItem("locale")) {
-		Materialize.toast(lang.lang_setting_ul.replace("{{set}}" ,ult), 3000);
-	}
-	localStorage.setItem("locale", uld);
-
-	var ntd = $("[name=notf]:checked").val();
-	var ntt = $("[for=ntf_"+ntd+"]").text();
-	if (ntd != localStorage.getItem("nativenotf")) {
-		Materialize.toast(lang.lang_setting_notf.replace("{{set}}" ,ntt), 3000);
-	}
-	localStorage.setItem("nativenotf", ntd);
-
-	var qtd = $("[name=quote]:checked").val();
-	var qtt = $("[for=q_"+qtd+"]").text();
-	if (qtd != localStorage.getItem("quote")) {
-		Materialize.toast(lang.lang_setting_quote.replace("{{set}}" ,qtt), 3000);
-	}
-	localStorage.setItem("quote", qtd);
-	
-	var viad = $("[name=via]:checked").val();
-	var viat = $("[for=via_"+viad+"]").text();
-	if (viad != localStorage.getItem("viashow")) {
-		Materialize.toast(lang.lang_setting_via.replace("{{set}}" ,viat), 3000);
-	}
-	localStorage.setItem("viashow", viad);
-
-	var notfmd = $("[name=notfm]:checked").val();
-	var notfmt = $("[for=notfm_"+notfmd+"]").text();
-	if (notfmd != localStorage.getItem("setasread")) {
-		Materialize.toast(lang.lang_setting_setasread.replace("{{set}}" ,notfmt), 3000);
-	}
-	localStorage.setItem("setasread", notfmd);
-
-	var movd = $("[name=mov]:checked").val();
-	var movt = $("[for=mov_"+movd+"]").text();
-	if (movd != localStorage.getItem("mouseover")) {
-		Materialize.toast(lang.lang_setting_mov.replace("{{set}}" ,movt), 3000);
-	}
-	localStorage.setItem("mouseover", movd);
-
-	var maind = $("[name=main]:checked").val();
-	var maint = $("[for=mn_"+maind+"]").text();
-	if (maind != localStorage.getItem("mainuse")) {
-		Materialize.toast(lang.lang_setting_main.replace("{{set}}" ,maint), 3000);
-	}
-	localStorage.setItem("mainuse", maind);
-
-	var secd = $("[name=sec]:checked").val();
-	var sect = $("[for=sec-"+secd+"]").text();
-	if (secd != localStorage.getItem("sec")) {
-		Materialize.toast(lang.lang_setting_sec.replace("{{set}}" ,sect), 3000);
-	}
-	localStorage.setItem("sec", secd);
 }
 
 //読み込み時の設定ロード
 function load() {
+	var max = envView.config.length;
+	for (var i = 0; i < max; i++) {
+		var ls = envView.config[i].storage;
+		if (localStorage.getItem(ls)) {
+			envView.config[i].setValue = localStorage.getItem(ls)
+		}
+	}
+	var max = tlView.config.length;
+	for (var i = 0; i < max; i++) {
+		var ls = tlView.config[i].storage;
+		if (localStorage.getItem(ls)) {
+			tlView.config[i].setValue = localStorage.getItem(ls)
+		}
+	}
+	var max = postView.config.length;
+	for (var i = 0; i < max; i++) {
+		var ls = postView.config[i].storage;
+		if (localStorage.getItem(ls)) {
+			postView.config[i].setValue = localStorage.getItem(ls)
+		}
+	}
 	if (localStorage.getItem("imas")) {
 		$(".imas").removeClass("hide");
 	}
 	if (localStorage.getItem("kirishima")) {
 		$(".kirishima").removeClass("hide");
 	}
-	var prof = localStorage.getItem("prof");
-	$("#my-prof").attr("src", prof);
-	var datetype = localStorage.getItem("datetype");
-	if (!datetype) {
-		var datetype = "absolute";
-	}
-	$("#" + datetype).prop("checked", true);
-
 	var theme = localStorage.getItem("theme");
 	if (!theme) {
 		var theme = "white";
 	}
 	$("#" + theme).prop("checked", true);
-
-	var nsfw = localStorage.getItem("nsfw");
-	if (!nsfw) {
-		var nsfw = "yes";
-	}
-	$("#n_" + nsfw).prop("checked", true);
-
-	var cw = localStorage.getItem("cw");
-	if (!cw) {
-		var cw = "yes";
-	}
-	$("#c_" + cw).prop("checked", true);
-
-	var cws = localStorage.getItem("always-cw");
-	if (!cws) {
-		var cws = "no";
-	}
-	$("#cws_" + cws).prop("checked", true);
-
-	var popup = localStorage.getItem("popup");
-	if (!popup) {
-		var popup = "0";
-	}
-	$("#popup").val(popup);
-
-	var box = localStorage.getItem("box");
-	if (!box) {
-		var box = "no";
-	}
-	if(box=="absolute"){
-		var box = "abs";
-	}
-	$("#bx_" + box).prop("checked", true);
-
-	var gif = localStorage.getItem("gif");
-	if (!gif) {
-		var gif = "yes";
-	}
-	$("#g_" + gif).prop("checked", true);
-
-	var sent = localStorage.getItem("sentence");
-	if (!sent) {
-		var sent = "500";
-	}
-	$("#sentence").val(sent);
-	var ltrs = localStorage.getItem("letters");
-	if (!ltrs) {
-		var ltrs = "500";
-	}
-	$("#letters").val(ltrs);
-
-	var csent = localStorage.getItem("cw_sentence");
-	if (!csent) {
-		var csent = "500";
-	}
-	$("#cw_sentence").val(csent);
-	var cltrs = localStorage.getItem("cw_letters");
-	if (!cltrs) {
-		var cltrs = "500";
-	}
-	$("#cw_letters").val(cltrs);
-
-	var width = localStorage.getItem("width");
-	if (!width) {
-		var width = "300";
-	}
-	$("#width").val(width);
-
-	var cwt = localStorage.getItem("cw-text");
-	if (!cwt) {
-		var cwt = "";
-	}
-	$("#cw-text").val(cwt);
-
-	var cws = localStorage.getItem("always-cw");
-	if (!cws) {
-		var cws = "no";
-	}
-	$("#cws_" + cws).prop("checked", true);
-
-	var rps = localStorage.getItem("replyct");
-	if (!rps) {
-		var rps = "hidden";
-	}
-	$("#rp_" + rps).prop("checked", true);
-
-	var vis = localStorage.getItem("vis");
-	if (!vis) {
-		var vis = "public";
-	}
-	$("#" + vis).prop("checked", true);
-
-	var img = localStorage.getItem("img");
-	if (!img) {
-		var img = "no-act";
-	}
-	$("#i_" + img).prop("checked", true);
-	
 	var font = localStorage.getItem("font");
 	if (!font) {
 		var font = "";
 	}
 	$("#font").val(font);
+	$("#c1-file").text(localStorage.getItem("custom1"))
+	$("#c2-file").text(localStorage.getItem("custom2"));
+	$("#c3-file").text(localStorage.getItem("custom3"));
+	$("#c4-file").text(localStorage.getItem("custom4"));
+	//$("#log").val(localStorage.getItem("errors"))
+}
 
-	var size = localStorage.getItem("size");
-	if (!size) {
-		var size = "13";
-	}
-	$("#size").val(size);
-
-	var imh = localStorage.getItem("img-height");
-	if (!imh) {
-		var imh = "200";
-	}
-	$("#img-height").val(imh);
-
-	var ticker = localStorage.getItem("ticker-ok");
-	if (!ticker) {
-		var ticker = "no";
-	}
-	$("#ticker_" + ticker).prop("checked", true);
-
-	var tag = localStorage.getItem("tag-range");
-	if (!tag) {
-		var tag = "all";
-	}
-	$("#t_" + tag).prop("checked", true);
-
-	var box = localStorage.getItem("box");
-	if (!box) {
-		var box = "yes";
-	}
-	$("#bx_" + box).prop("checked", true);
-
-	var uld = localStorage.getItem("locale");
-	if (!uld) {
-		var uld = "yes";
-	}
-	$("#ul_" + uld).prop("checked", true);
-
-	var nnd = localStorage.getItem("nativenotf");
-	if (!nnd) {
-		var nnd = "yes";
-	}
-	$("#ntf_" + nnd).prop("checked", true);
-
-	var qt = localStorage.getItem("quote");
-	if (!qt) {
-		var qt = "simple";
-	}
-	$("#q_" + qt).prop("checked", true);
-
-	var viat = localStorage.getItem("viashow");
-	if (!viat) {
-		var viat = "hide";
-	}
-	$("#via_" + viat).prop("checked", true);
-
-	var movt = localStorage.getItem("mouseover");
-	if (!movt) {
-		var movt = "no";
-	}
-	$("#mov_" + movt).prop("checked", true);
-
-	var notfmt = localStorage.getItem("setasread");
-	if (!notfmt) {
-		var notfmt = "yes";
-	}
-	$("#notfm_" + notfmt).prop("checked", true);
-
-	var maint = localStorage.getItem("mainuse");
-	if (!maint) {
-		var maint = "remain";
-	}
-	$("#mn_" + maint).prop("checked", true);
-
-	var sect = localStorage.getItem("sec");
-	if (!sect) {
-		var sect = "nothing";
-	}
-	$("#sec-" + sect).prop("checked", true);
-}
-//最初に読む
-load();
-climute();
-wordmute();
-wordemp();
-checkSpotify();
-voiceSettingLoad();
-oksload();
-npprovider();
 function climute() {
 	//クライアントミュート
 	var cli = localStorage.getItem("client_mute");
@@ -437,7 +147,7 @@ function climute(){
 			var list = key * 1 + 1;
 			templete = '<div class="acct" id="acct_' + key + '">' + list +
 				'.' +
-			cli + '<button class="btn waves-effect red disTar" onclick="cliMuteDel(' +
+				escapeHTML(cli) + '<button class="btn waves-effect red disTar" onclick="cliMuteDel(' +
 				key + ')">' + lang.lang_del + '</button><br></div>';
 			$("#mute-cli").append(templete);
 		});
@@ -449,7 +159,7 @@ function cliMuteDel(key){
 	obj.splice(key, 1);
 	var json = JSON.stringify(obj);
 	localStorage.setItem("client_mute", json);
-	mute();
+	climute();
 }
 
 function wordmute() {
@@ -521,9 +231,8 @@ function exportSettings(){
 	dialog.showSaveDialog(null, {
 		title: 'Export',
 		properties: ['openFile', 'createDirectory'],
-		defaultPath: "export.thedeskconfig"
+		defaultPath: "export.thedeskconfigv2"
 	}, (savedFiles) => {
-		console.log(savedFiles);
 		if (!savedFiles) {
 			return false;
 		}
@@ -537,20 +246,27 @@ function exportSettings(){
 		var column = JSON.parse(multi);
 		exp.columns = column;
 		//Themes
-		exp.theme=localStorage.getItem("theme");
+		var config = {};
-		//Min width
+		config.theme = localStorage.getItem("theme");
-		exp.minwidth=localStorage.getItem("width");
+		//Other configs
+		var max = envView.config.length;
+		for (var i = 0; i < max; i++) {
+			var ls = envView.config[i].storage;
+			config[ls] = localStorage.getItem(ls)
+		}
+		var max = tlView.config.length;
+		for (var i = 0; i < max; i++) {
+			var ls = tlView.config[i].storage;
+			config[ls] = localStorage.getItem(ls)
+		}
+		var max = postView.config.length;
+		for (var i = 0; i < max; i++) {
+			var ls = postView.config[i].storage;
+			config[ls] = localStorage.getItem(ls)
+		}
 		//Font
-		exp.font=localStorage.getItem("font");
+		config.font = localStorage.getItem("font");
-		exp.size=localStorage.getItem("size");
+		exp.config = config;
-		//Img height
-		exp.imgheight=localStorage.getItem("img-height");
-		//Main
-		exp.mainuse=localStorage.getItem("mainuse");
-		//CW text
-		exp.cw=localStorage.getItem("cw-text");
-		//vis
-		exp.vis=localStorage.getItem("vis");
 		//keysc
 		exp.ksc = [
 			localStorage.getItem("oks-1"),
@@ -577,7 +293,6 @@ function exportSettings(){
 		var tagarr = localStorage.getItem("tag");
 		var favtag = JSON.parse(tagarr);
 		exp.favoriteTags = favtag;
-		console.log(exp);
 		ipc.send('export', [savedFiles, JSON.stringify(exp)]);
 		alert("Done.")
 		//cards
@@ -596,10 +311,9 @@ function importSettings(){
 		title: 'Import',
 		properties: ['openFile'],
 		filters: [
-			{name: 'TheDesk Config', extensions: ['thedeskconfig']},
+			{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2'] },
 		]
 	}, (fileNames) => {
-		console.log(fileNames);
 		if (!fileNames) {
 			return false;
 		}
@@ -619,9 +333,33 @@ function importSettings(){
 					localStorage.setItem("acct_" + key + "_at", acct.at);
 				}
 				localStorage.setItem("column", JSON.stringify(obj.columns));
+				if (obj.config) {
+					//Version 2
+					var max = envView.config.length;
+					for (var i = 0; i < max; i++) {
+						var ls = envView.config[i].storage;
+						if (obj.config[ls]) {
+							localStorage.setItem(ls, obj.config[ls])
+						}
+					}
+					var max = tlView.config.length;
+					for (var i = 0; i < max; i++) {
+						var ls = tlView.config[i].storage;
+						if (obj.config[ls]) {
+							localStorage.setItem(ls, obj.config[ls])
+						}
+					}
+					var max = postView.config.length;
+					for (var i = 0; i < max; i++) {
+						var ls = postView.config[i].storage;
+						if (obj.config[ls]) {
+							localStorage.setItem(ls, obj.config[ls])
+						}
+					}
+				} else {
+					//Version 1
 					localStorage.setItem("theme", obj.theme);
 					if (obj.width) {
-					console.log(obj.width)
 						localStorage.setItem("width", obj.width);
 					}
 					if (obj.font) {
@@ -639,6 +377,8 @@ function importSettings(){
 						localStorage.setItem("cwtext", obj.cw);
 					}
 					localStorage.setItem("vis", obj.vis);
+					//End
+				}
 				if (obj.ksc[0]) {
 					localStorage.setItem("oks-1", obj.ksc[0]);
 				}
@@ -663,7 +403,7 @@ function importSettings(){
 					localStorage.setItem("card_" + i, "true");
 					localStorage.removeItem("catch_" + i);
 				}
-				location.href="language.html";
+				location.href = "index.html";
 			} else {
 				alert("Error.")
 			}
@@ -699,3 +439,227 @@ function font(){
 function insertFont(name) {
 	$("#font").val(name);
 }
+$(".color-picker").each(function (i, elem) {
+	pickerDefine(i, "fff");
+});
+function pickerDefine(i, color) {
+	var pickr = new Pickr({
+		el: '#color-picker' + i,
+		default: color,
+		showAlways: true,
+		appendToBody: true,
+		closeWithKey: 'Escape',
+		comparison: false,
+		components: {
+			preview: true, // Left side color comparison
+			opacity: false, // Opacity slider
+			hue: true,     // Hue slider
+			interaction: {
+				rgba: false, // rgba option (red green blue and alpha)
+				input: true, // input / output element
+			}
+		},
+		strings: {
+			save: 'Save',  // Default for save button
+			clear: 'Clear' // Default for clear button
+		}
+	});
+	pickr.on('change', (...args) => {
+		var rgb = 'rgb(' + args[0].toRGBA()[0] + ',' + args[0].toRGBA()[1] + ',' + args[0].toRGBA()[2] + ')';
+		$("#color-picker" + i + "_value").val(rgb)
+	});
+}
+function customComp() {
+	var nameC = $("#custom_name").val();
+	if (!nameC) { return false; }
+	var descC = $("#custom_desc").val();
+	var primaryC = $("#color-picker0_value").val();
+	if (!primaryC) { primaryC = "rgb(255,255,255)" }
+	var secondaryC = $("#color-picker1_value").val();
+	if (!secondaryC) { secondaryC = "rgb(255,255,255)" }
+	var textC = $("#color-picker2_value").val();
+	if (!textC) { textC = "rgb(255,255,255)" }
+	var accentC = $("#color-picker3_value").val();
+	if (!accentC) { accentC = "rgb(255,255,255)" }
+	var multi = localStorage.getItem("multi");
+	var my = JSON.parse(multi)[0].name;
+	var id = $("#custom-edit-sel").val();
+	if (id == "add_new") {
+		id = makeCID();
+	}
+	var json = {
+		"name": nameC,
+		"author": my,
+		"desc": descC,
+		"base": $("[name=direction]:checked").val(),
+		"vars": {
+			"primary": primaryC,
+			"secondary": secondaryC,
+			"text": textC
+		},
+		"props": {
+			"TheDeskAccent": accentC
+		},
+		"id": id
+	}
+	$("#custom_json").val(JSON.stringify(json));
+	themes();
+	$("#custom_name").val("");
+	$("#custom_desc").val("");
+	$("#dark").prop("checked", true);
+	$("#custom_json").val("");
+	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
+	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
+	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
+	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
+	$("#color-picker0_value").val("");
+	$("#color-picker1_value").val("");
+	$("#color-picker2_value").val("");
+	$("#color-picker3_value").val("");
+	pickerDefine(0, "fff");
+	pickerDefine(1, "fff");
+	pickerDefine(2, "fff");
+	pickerDefine(3, "fff");
+	ipc.send('theme-json-create', JSON.stringify(json));
+}
+function deleteIt() {
+	var id = $("#custom-sel-sel").val();
+	$("#custom_name").val("");
+	$("#custom_desc").val("");
+	$("#dark").prop("checked", true);
+	$("#custom_json").val("");
+	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
+	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
+	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
+	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
+	$("#color-picker0_value").val("");
+	$("#color-picker1_value").val("");
+	$("#color-picker2_value").val("");
+	$("#color-picker3_value").val("");
+	pickerDefine(0, "fff");
+	pickerDefine(1, "fff");
+	pickerDefine(2, "fff");
+	pickerDefine(3, "fff");
+	ipc.on('theme-json-delete-complete', function (event, args) {
+		ctLoad()
+	});
+	ipc.send('theme-json-delete', id);
+}
+function ctLoad() {
+	ipc.send('theme-json-list', "");
+	ipc.on('theme-json-list-response', function (event, args) {
+		var templete = "";
+		Object.keys(args).forEach(function (key) {
+			var theme = args[key];
+			var themeid = theme.id
+			templete = templete + '<option value="' + themeid + '">' + theme.name + '</option>';
+		});
+		if (args[0]) {
+			localStorage.setItem("customtheme-id", args[0].id)
+		}
+		$("#custom-sel-sel").html(templete);
+		templete = '<option value="add_new">' + $("#edit-selector").attr("data-add") + '</option>' + templete;
+		$("#custom-edit-sel").html(templete);
+		$('select').material_select('update');
+	});
+}
+function customSel() {
+	var id = $("#custom-sel-sel").val();
+	localStorage.setItem("customtheme-id", id)
+}
+function custom() {
+	var id = $("#custom-edit-sel").val();
+	if (id == "add_new") {
+		$("#custom_name").val("");
+		$("#custom_desc").val("");
+		$("#dark").prop("checked", true);
+		$("#custom_json").val("");
+		$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
+		$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
+		$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
+		$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
+		$("#color-picker0_value").val("");
+		$("#color-picker1_value").val("");
+		$("#color-picker2_value").val("");
+		$("#color-picker3_value").val("");
+		pickerDefine(0, "fff");
+		pickerDefine(1, "fff");
+		pickerDefine(2, "fff");
+		pickerDefine(3, "fff");
+		$("#delTheme").addClass("disabled")
+	} else {
+		$("#delTheme").removeClass("disabled")
+		ipc.send('theme-json-request', id);
+		ipc.on('theme-json-response', function (event, args) {
+			$("#custom_name").val(args.name);
+			$("#custom_desc").val(args.desc);
+			$("#" + args.base).prop("checked", true);
+			$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
+			pickerDefine(0, rgbToHex(args.vars.primary))
+			$("#color-picker0_value").val(args.vars.primary);
+			$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
+			pickerDefine(1, rgbToHex(args.vars.secondary))
+			$("#color-picker1_value").val(args.vars.secondary);
+			$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
+			$("#color-picker2_value").val(args.vars.text);
+			pickerDefine(2, rgbToHex(args.vars.text))
+			if (args.props) {
+				if (args.props.TheDeskAccent) {
+					var accent = args.props.TheDeskAccent;
+				} else {
+					var accent = args.vars.secondary;
+				}
+			} else {
+				var accent = args.vars.secondary;
+			}
+			$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
+			pickerDefine(3, rgbToHex(accent))
+			$("#custom_json").val(JSON.stringify(args));
+		});
+	}
+}
+function customImp() {
+	var json = $("#custom_import").val();
+	if (JSON5.parse(json)) {
+		ipc.send('theme-json-create', json);
+	} else {
+		alert("Error")
+	}
+}
+function hardwareAcceleration(had) {
+	ipc.send('ha', had);
+}
+
+ipc.on('theme-json-create-complete', function (event, args) {
+	$("#custom_import").val("");
+	ctLoad()
+});
+function customSound(key) {
+	var electron = require("electron");
+	var remote = electron.remote;
+	var dialog = remote.dialog;
+	dialog.showOpenDialog(null, {
+		title: 'Custom sound',
+		properties: ['openFile'],
+		filters: [
+			{ name: 'Audio', extensions: ['mp3', 'aac', 'wav', 'flac', 'm4a'] },
+			{ name: 'All', extensions: ['*'] },
+		]
+	}, (fileNames) => {
+		localStorage.setItem("custom" + key, fileNames[0]);
+		$("#c1-file").text(fileNames[0])
+	});
+}
+window.onload = function () {
+	//最初に読む
+	load();
+	climute();
+	wordmute();
+	wordemp();
+	checkSpotify();
+	voiceSettingLoad();
+	oksload();
+	npprovider();
+	ctLoad()
+};
+

app/js/ui/settings.old.js

@@ -0,0 +1,953 @@
+//設定(setting.html)で読む
+var envView = new Vue({
+	el: '#env-view',
+	data: {config:envConstruction,value:envValue},
+	method: {
+		settings: function (index) {
+			return true
+		}
+	}
+});
+
+//設定ボタン押した。
+function settings() {
+	var dd = $("[name=time]:checked").val();
+	var dt = $("[for="+dd+"]").text();
+		if (dd != localStorage.getItem("datetype")) {
+		Materialize.toast(lang.lang_setting_time.replace("{{set}}" ,dt), 3000);
+	}
+	localStorage.setItem("datetype", dd);
+
+	var cd = $("[name=theme]:checked").val();
+	var ct = $("[for="+cd+"]").html();
+	if(cd=="custom" && !$("#custom-sel-sel").val()){
+		var theme = localStorage.getItem("theme");
+		if (!theme) {
+			var theme = "white";
+		}
+		$("#" + theme).prop("checked", true);
+	}else{
+		if (cd != localStorage.getItem("theme")) {
+			Materialize.toast(lang.lang_setting_theme.replace("{{set}}" ,ct), 3000);
+		}
+		//テーマはこの場で設定
+		themes(cd);
+		localStorage.setItem("theme", cd);
+	}
+
+	var nd = $("[name=nsfw]:checked").val();
+	var nt = $("[for=n_"+nd+"]").text();
+	if (nd != localStorage.getItem("nsfw")) {
+		Materialize.toast(lang.lang_setting_nsfw.replace("{{set}}" ,nt), 3000);
+	}
+	localStorage.setItem("nsfw", nd);
+
+	var cwd = $("[name=cw]:checked").val();
+	var cwt = $("[for=c_"+cwd+"]").text();
+	if (cwd != localStorage.getItem("cw")) {
+		Materialize.toast(lang.lang_setting_cw.replace("{{set}}" ,cwt), 3000);
+	}
+	localStorage.setItem("cw", cwd);
+
+	var cwtd = $("#cw-text").val();
+	if (cwtd != localStorage.getItem("cw-text")) {
+		Materialize.toast(lang.lang_setting_cwtext.replace("{{set}}" ,cwtd), 3000);
+	}
+	localStorage.setItem("cw-text", cwtd);
+
+	var cwsd = $("[name=cws]:checked").val();
+	var cwst = $("[for=cws_"+cwsd+"]").text();
+	if (cwsd != localStorage.getItem("always-cw")) {
+		Materialize.toast(lang.lang_setting_cws.replace("{{set}}" ,cwst), 3000);
+	}
+	localStorage.setItem("always-cw", cwsd);
+
+	var rpd = $("[name=rp]:checked").val();
+	var rpt = $("[for=c_"+cwd+"]").text();
+	if (rpd != localStorage.getItem("replyct")) {
+		Materialize.toast(lang.lang_setting_rp.replace("{{set}}" ,rpt), 3000);
+	}
+	localStorage.setItem("replyct", rpd);
+
+	var visd = $("[name=vis]:checked").val();
+	var vist = $("[for="+visd+"]").text();
+	if (visd != localStorage.getItem("vis")) {
+		Materialize.toast(lang.lang_setting_vis.replace("{{set}}" ,vist), 3000);
+	}
+	localStorage.setItem("vis", visd);
+
+	var popd = $("#popup").val();
+	if (popd > 0 && popd != localStorage.getItem("popup")) {
+		Materialize.toast(lang.lang_setting_popup.replace("{{set}}" ,popd+lang.lang_setting_s), 3000);
+	} else if (popd != localStorage.getItem("popup")) {
+		Materialize.toast(lang.lang_setting_popup.replace("{{set}}" ,lang.lang_setting_off), 3000);
+	}
+	localStorage.setItem("popup", popd);
+
+	var gifd = $("[name=gif]:checked").val();
+	var gift = $("[for=g_"+gifd+"]").text();
+	if (gifd != localStorage.getItem("gif")) {
+		Materialize.toast(lang.lang_setting_gif.replace("{{set}}" ,gift), 3000);
+	}
+	localStorage.setItem("gif", gifd);
+
+	var sentd = $("#sentence").val();
+	var ltrd = $("#letters").val();
+	if (sentd != localStorage.getItem("sentence") || ltrd != localStorage.getItem("letters")) {
+		Materialize.toast(lang.lang_setting_selt.replace("{{set1}}" ,sentd).replace("{{set2}}" ,ltrd), 3000);
+	}
+	localStorage.setItem("sentence", sentd);
+	localStorage.setItem("letters", ltrd);
+
+	var csentd = $("#cw_sentence").val();
+	var cltrd = $("#cw_letters").val();
+	if (csentd != localStorage.getItem("cw_sentence") || cltrd != localStorage.getItem("cw_letters")) {
+		Materialize.toast(lang.lang_setting_autocw.replace("{{set1}}" ,csentd).replace("{{set2}}" ,cltrd), 3000);
+	}
+	localStorage.setItem("cw_sentence", csentd);
+	localStorage.setItem("cw_letters", cltrd);
+
+	var widthd = $("#width").val();
+	if (widthd != localStorage.getItem("width")) {
+		Materialize.toast(lang.lang_setting_width.replace("{{set}}" ,widthd), 3000);
+	}
+	localStorage.setItem("width", widthd);
+
+	var fwidthd = $("#fixwidth").val();
+	if (fwidthd != localStorage.getItem("fixwidth")) {
+		Materialize.toast(lang.lang_setting_fixwidth.replace("{{set}}" ,fwidthd), 3000);
+	}
+	localStorage.setItem("fixwidth", fwidthd);
+
+	var imgd = $("[name=img]:checked").val();
+	var imgt = $("[for=i_"+imgd+"]").text();
+	if (imgd != localStorage.getItem("img")) {
+		Materialize.toast(lang.lang_setting_img.replace("{{set}}" ,imgt), 3000);
+	}
+	localStorage.setItem("img", imgd);
+
+	var fontd = $("#font").val();
+	if(fontd){
+		if (fontd != localStorage.getItem("font")) {
+			Materialize.toast(lang.lang_setting_font.replace("{{set}}" ,fontd), 3000);
+		}
+		localStorage.setItem("font", fontd);
+		themes();
+	}else{
+		if(localStorage.getItem("font")){
+			localStorage.removeItem("font");
+			Materialize.toast(lang.lang_setting_font.replace("{{set}}" ,lang.lang_setting_default), 3000);
+			themes();
+		}
+	}
+	
+
+	var sized = $("#size").val();
+	if (sized != localStorage.getItem("size")) {
+		Materialize.toast(lang.lang_setting_size.replace("{{set}}" ,sized), 3000);
+	}
+	localStorage.setItem("size", sized);
+
+	var heid = $("#img-height").val();
+	if (heid != localStorage.getItem("img-height")) {
+		Materialize.toast(lang.lang_setting_imgheight.replace("{{set}}" ,heid), 3000);
+	}
+	localStorage.setItem("img-height", heid);
+
+	var tckrd = $("[name=ticker]:checked").val();
+	var tckrt = $("[for=ticker_"+tckrd+"]").text();
+	if (tckrd != localStorage.getItem("ticker_ok")) {
+		Materialize.toast(lang.lang_setting_ticker.replace("{{set}}" ,tckrt), 3000);
+	}
+	localStorage.setItem("ticker_ok", tckrd);
+
+	var animed = $("[name=anime]:checked").val();
+	var animet = $("[for=anime_"+animed+"]").text();
+	if (animed != localStorage.getItem("animation")) {
+		Materialize.toast(lang.lang_setting_animation.replace("{{set}}" ,animet), 3000);
+	}
+	localStorage.setItem("animation", animed);
+
+	var boxd = $("[name=box]:checked").val();
+	var boxt = $("[for=bx_"+boxd+"]").text();
+	if (boxd != localStorage.getItem("box")) {
+		Materialize.toast(lang.lang_setting_boxConfirm.replace("{{set}}" ,boxt), 3000);
+	}
+	localStorage.setItem("box", boxd);
+
+	var tagd = $("[name=tag]:checked").val();
+	var tagt = $("[for=t_"+tagd+"]").text();
+	if (tagd != localStorage.getItem("tag-range")) {
+		Materialize.toast(lang.lang_setting_tag.replace("{{set}}" ,tagt), 3000);
+	}
+	localStorage.setItem("tag-range", tagd);
+
+	var uld = $("[name=ul]:checked").val();
+	var ult = $("[for=ul_"+uld+"]").text();
+	if (uld != localStorage.getItem("locale")) {
+		Materialize.toast(lang.lang_setting_ul.replace("{{set}}" ,ult), 3000);
+	}
+	localStorage.setItem("locale", uld);
+
+	var ntd = $("[name=notf]:checked").val();
+	var ntt = $("[for=ntf_"+ntd+"]").text();
+	if (ntd != localStorage.getItem("nativenotf")) {
+		Materialize.toast(lang.lang_setting_notf.replace("{{set}}" ,ntt), 3000);
+	}
+	localStorage.setItem("nativenotf", ntd);
+
+	var qtd = $("[name=quote]:checked").val();
+	var qtt = $("[for=q_"+qtd+"]").text();
+	if (qtd != localStorage.getItem("quote")) {
+		Materialize.toast(lang.lang_setting_quote.replace("{{set}}" ,qtt), 3000);
+	}
+	localStorage.setItem("quote", qtd);
+	
+	var viad = $("[name=via]:checked").val();
+	var viat = $("[for=via_"+viad+"]").text();
+	if (viad != localStorage.getItem("viashow")) {
+		Materialize.toast(lang.lang_setting_via.replace("{{set}}" ,viat), 3000);
+	}
+	localStorage.setItem("viashow", viad);
+
+	var notfmd = $("[name=notfm]:checked").val();
+	var notfmt = $("[for=notfm_"+notfmd+"]").text();
+	if (notfmd != localStorage.getItem("setasread")) {
+		Materialize.toast(lang.lang_setting_setasread.replace("{{set}}" ,notfmt), 3000);
+	}
+	localStorage.setItem("setasread", notfmd);
+
+	var movd = $("[name=mov]:checked").val();
+	var movt = $("[for=mov_"+movd+"]").text();
+	if (movd != localStorage.getItem("mouseover")) {
+		Materialize.toast(lang.lang_setting_mov.replace("{{set}}" ,movt), 3000);
+	}
+	localStorage.setItem("mouseover", movd);
+
+	var maind = $("[name=main]:checked").val();
+	var maint = $("[for=mn_"+maind+"]").text();
+	if (maind != localStorage.getItem("mainuse")) {
+		Materialize.toast(lang.lang_setting_main.replace("{{set}}" ,maint), 3000);
+	}
+	localStorage.setItem("mainuse", maind);
+
+	var secd = $("[name=sec]:checked").val();
+	var sect = $("[for=sec-"+secd+"]").text();
+	if (secd != localStorage.getItem("sec")) {
+		Materialize.toast(lang.lang_setting_sec.replace("{{set}}" ,sect), 3000);
+	}
+	localStorage.setItem("sec", secd);
+}
+
+//読み込み時の設定ロード
+function load() {
+	if(localStorage.getItem("imas")){
+		$(".imas").removeClass("hide");
+	}
+	if(localStorage.getItem("kirishima")){
+		$(".kirishima").removeClass("hide");
+	}
+	var prof = localStorage.getItem("prof");
+	$("#my-prof").attr("src", prof);
+	var datetype = localStorage.getItem("datetype");
+	if (!datetype) {
+		var datetype = "absolute";
+	}
+	$("#" + datetype).prop("checked", true);
+
+	var theme = localStorage.getItem("theme");
+	if (!theme) {
+		var theme = "white";
+	}
+	$("#" + theme).prop("checked", true);
+
+	var ha = localStorage.getItem("ha");
+	if (!ha) {
+		var ha = "false";
+	}
+	$("#ha_" + ha).prop("checked", true);
+
+	var nsfw = localStorage.getItem("nsfw");
+	if (!nsfw) {
+		var nsfw = "yes";
+	}
+	$("#n_" + nsfw).prop("checked", true);
+
+	var cw = localStorage.getItem("cw");
+	if (!cw) {
+		var cw = "yes";
+	}
+	$("#c_" + cw).prop("checked", true);
+
+	var cws = localStorage.getItem("always-cw");
+	if (!cws) {
+		var cws = "no";
+	}
+	$("#cws_" + cws).prop("checked", true);
+
+	var popup = localStorage.getItem("popup");
+	if (!popup) {
+		var popup = "0";
+	}
+	$("#popup").val(popup);
+
+	var box = localStorage.getItem("box");
+	if (!box) {
+		var box = "no";
+	}
+	if(box=="absolute"){
+		var box = "abs";
+	}
+	$("#bx_" + box).prop("checked", true);
+
+	var gif = localStorage.getItem("gif");
+	if (!gif) {
+		var gif = "yes";
+	}
+	$("#g_" + gif).prop("checked", true);
+
+	var sent = localStorage.getItem("sentence");
+	if (!sent) {
+		var sent = "500";
+	}
+	$("#sentence").val(sent);
+	var ltrs = localStorage.getItem("letters");
+	if (!ltrs) {
+		var ltrs = "500";
+	}
+	$("#letters").val(ltrs);
+
+	var csent = localStorage.getItem("cw_sentence");
+	if (!csent) {
+		var csent = "500";
+	}
+	$("#cw_sentence").val(csent);
+	var cltrs = localStorage.getItem("cw_letters");
+	if (!cltrs) {
+		var cltrs = "500";
+	}
+	$("#cw_letters").val(cltrs);
+
+	var width = localStorage.getItem("width");
+	if (!width) {
+		var width = "300";
+	}
+	$("#width").val(width);
+
+	var fwidth = localStorage.getItem("fixwidth");
+	if (!fwidth) {
+		var fwidth = "300";
+	}
+	$("#fixwidth").val(fwidth);
+
+	var cwt = localStorage.getItem("cw-text");
+	if (!cwt) {
+		var cwt = "";
+	}
+	$("#cw-text").val(cwt);
+
+	var cws = localStorage.getItem("always-cw");
+	if (!cws) {
+		var cws = "no";
+	}
+	$("#cws_" + cws).prop("checked", true);
+
+	var rps = localStorage.getItem("replyct");
+	if (!rps) {
+		var rps = "hidden";
+	}
+	$("#rp_" + rps).prop("checked", true);
+
+	var vis = localStorage.getItem("vis");
+	if (!vis) {
+		var vis = "public";
+	}
+	$("#" + vis).prop("checked", true);
+
+	var img = localStorage.getItem("img");
+	if (!img) {
+		var img = "no-act";
+	}
+	$("#i_" + img).prop("checked", true);
+	
+	var font = localStorage.getItem("font");
+	if (!font) {
+		var font = "";
+	}
+	$("#font").val(font);
+
+	var size = localStorage.getItem("size");
+	if (!size) {
+		var size = "13";
+	}
+	$("#size").val(size);
+
+	var imh = localStorage.getItem("img-height");
+	if (!imh) {
+		var imh = "200";
+	}
+	$("#img-height").val(imh);
+
+	var ticker = localStorage.getItem("ticker_ok");
+	if (!ticker) {
+		var ticker = "no";
+	}
+	$("#ticker_" + ticker).prop("checked", true);
+
+	var animation = localStorage.getItem("animation");
+	if (!animation) {
+		var animation = "yes";
+	}
+	$("#anime_" + animation).prop("checked", true);
+
+	var tag = localStorage.getItem("tag-range");
+	if (!tag) {
+		var tag = "all";
+	}
+	$("#t_" + tag).prop("checked", true);
+
+	var box = localStorage.getItem("box");
+	if (!box) {
+		var box = "yes";
+	}
+	$("#bx_" + box).prop("checked", true);
+
+	var uld = localStorage.getItem("locale");
+	if (!uld) {
+		var uld = "yes";
+	}
+	$("#ul_" + uld).prop("checked", true);
+
+	var nnd = localStorage.getItem("nativenotf");
+	if (!nnd) {
+		var nnd = "yes";
+	}
+	$("#ntf_" + nnd).prop("checked", true);
+
+	var qt = localStorage.getItem("quote");
+	if (!qt) {
+		var qt = "simple";
+	}
+	$("#q_" + qt).prop("checked", true);
+
+	var viat = localStorage.getItem("viashow");
+	if (!viat) {
+		var viat = "hide";
+	}
+	$("#via_" + viat).prop("checked", true);
+
+	var movt = localStorage.getItem("mouseover");
+	if (!movt) {
+		var movt = "no";
+	}
+	$("#mov_" + movt).prop("checked", true);
+
+	var notfmt = localStorage.getItem("setasread");
+	if (!notfmt) {
+		var notfmt = "yes";
+	}
+	$("#notfm_" + notfmt).prop("checked", true);
+
+	var maint = localStorage.getItem("mainuse");
+	if (!maint) {
+		var maint = "remain";
+	}
+	$("#mn_" + maint).prop("checked", true);
+
+	var sect = localStorage.getItem("sec");
+	if (!sect) {
+		var sect = "nothing";
+	}
+	$("#sec-" + sect).prop("checked", true);
+	
+}
+
+function climute(){
+	//クライアントミュート
+	var cli = localStorage.getItem("client_mute");
+	var obj = JSON.parse(cli);
+	if(!obj){
+		$("#mute-cli").html(lang.lang_setting_nomuting);
+	}else{
+		if(!obj[0]){
+			$("#mute-cli").html(lang.lang_setting_nomuting);
+			return;
+		}
+	var templete;
+	Object.keys(obj).forEach(function(key) {
+		var cli = obj[key];
+		var list = key * 1 + 1;
+		templete = '<div class="acct" id="acct_' + key + '">' + list +
+			'.' +
+			cli + '<button class="btn waves-effect red disTar" onclick="cliMuteDel(' +
+			key + ')">'+lang.lang_del+'</button><br></div>';
+		$("#mute-cli").append(templete);
+	});
+}
+}
+function cliMuteDel(key){
+	var cli = localStorage.getItem("client_mute");
+	var obj = JSON.parse(cli);
+	obj.splice(key, 1);
+	var json = JSON.stringify(obj);
+	localStorage.setItem("client_mute", json);
+	mute();
+}
+
+function wordmute(){
+	var word = localStorage.getItem("word_mute");
+	var obj = JSON.parse(word);
+	$('#wordmute').material_chip({
+		data: obj,
+	  });
+}
+function wordmuteSave(){
+	var word=$('#wordmute').material_chip('data');
+	var json = JSON.stringify(word);
+	localStorage.setItem("word_mute", json);
+}
+
+function wordemp(){
+	var word = localStorage.getItem("word_emp");
+	var obj = JSON.parse(word);
+	$('#wordemp').material_chip({
+		data: obj,
+	});
+}
+function wordempSave(){
+	var word=$('#wordemp').material_chip('data');
+	var json = JSON.stringify(word);
+	localStorage.setItem("word_emp", json);
+}
+function notftest(){
+		var electron = require("electron");
+		var ipc = electron.ipcRenderer;
+		var os = electron.remote.process.platform;
+		var options = {
+				body: lang.lang_setting_notftest+'('+lang.lang_setting_notftestprof+')',
+				icon: localStorage.getItem("prof_0")
+		  };
+		if(os=="darwin"){
+			var n = new Notification('TheDesk'+lang.lang_setting_notftest, options);
+		}else{
+			ipc.send('native-notf', ['TheDesk'+lang.lang_setting_notftest,lang.lang_setting_notftest+'('+lang.lang_setting_notftestprof+')',localStorage.getItem('prof_0'),"",""]);
+		}
+	
+}
+function oks(no){
+	var txt=$("#oks-"+no).val();
+	localStorage.setItem("oks-"+no, txt);
+	Materialize.toast(lang.lang_setting_ksref, 3000);
+}
+function oksload(){
+	if(localStorage.getItem("oks-1")){$("#oks-1").val(localStorage.getItem("oks-1"))}
+	if(localStorage.getItem("oks-2")){$("#oks-2").val(localStorage.getItem("oks-2"))}
+	if(localStorage.getItem("oks-3")){$("#oks-3").val(localStorage.getItem("oks-3"))}
+}
+function changelang(lang){
+	var electron = require("electron");
+	var ipc = electron.ipcRenderer;
+	ipc.send('lang',lang);
+	ipc.on('langres', function (event, arg) {
+		location.href="../"+lang+"/setting.html"
+	});
+}
+function exportSettings(){
+	if(!confirm(lang.lang_setting_exportwarn)){
+		return false;
+	}
+	var electron = require("electron");
+	var remote=electron.remote;
+	var dialog=remote.dialog;
+	var ipc = electron.ipcRenderer;
+	dialog.showSaveDialog(null, {
+		title: 'Export',
+		properties: ['openFile', 'createDirectory'],
+		defaultPath: "export.thedeskconfig"
+	}, (savedFiles) => {
+		console.log(savedFiles);
+		if(!savedFiles){
+			return false;
+		}
+		var exp={};
+		//Accounts
+		var multi = localStorage.getItem("multi");
+		var acct = JSON.parse(multi);
+		exp.accts=acct;
+		//Columns
+		var multi = localStorage.getItem("column");
+		var column = JSON.parse(multi);
+		exp.columns=column;
+		//Themes
+		exp.theme=localStorage.getItem("theme");
+		//Min width
+		exp.minwidth=localStorage.getItem("width");
+		//Font
+		exp.font=localStorage.getItem("font");
+		exp.size=localStorage.getItem("size");
+		//Img height
+		exp.imgheight=localStorage.getItem("img-height");
+		//Main
+		exp.mainuse=localStorage.getItem("mainuse");
+		//CW text
+		exp.cw=localStorage.getItem("cw-text");
+		//vis
+		exp.vis=localStorage.getItem("vis");
+		//keysc
+		exp.ksc=[
+			localStorage.getItem("oks-1"),
+			localStorage.getItem("oks-2"),
+			localStorage.getItem("oks-3")
+		];
+		//climu
+		var cli = localStorage.getItem("client_mute");
+		var climu = JSON.parse(cli);
+		exp.clientMute=climu;
+		//wordmu
+		var wdm = localStorage.getItem("word_mute");
+		var wordmu = JSON.parse(wdm);
+		exp.wordMute=wordmu;
+		//spotify
+		exp.spotifyArtwork=localStorage.getItem("artwork")
+		var content=localStorage.getItem("np-temp");
+		if(content || content=="" || content=="null"){
+			exp.spotifyTemplete=content;
+		}else{
+			exp.spotifyTemplete=null;
+		}
+		//tags
+		var tagarr = localStorage.getItem("tag");
+		var favtag = JSON.parse(tagarr);
+		exp.favoriteTags=favtag;
+		console.log(exp);
+		ipc.send('export', [savedFiles,JSON.stringify(exp)]);
+		alert("Done.")
+		//cards
+		//lang
+	});
+}
+function importSettings(){
+	if(!confirm(lang.lang_setting_importwarn)){
+		return false;
+	}
+	var electron = require("electron");
+	var remote=electron.remote;
+	var dialog=remote.dialog;
+	var ipc = electron.ipcRenderer;
+	dialog.showOpenDialog(null, {
+		title: 'Import',
+		properties: ['openFile'],
+		filters: [
+			{name: 'TheDesk Config', extensions: ['thedeskconfig']},
+		]
+	}, (fileNames) => {
+		console.log(fileNames);
+		if(!fileNames){
+			return false;
+		}
+		ipc.send('import', fileNames[0]);
+		ipc.on('config', function (event, arg) {
+			var obj = JSON.parse(arg);
+			if(obj){
+				localStorage.clear();
+				localStorage.setItem("multi",JSON.stringify(obj.accts));
+				for(var key=0;key<obj.accts.length;key++){
+					var acct=obj.accts[key];
+					localStorage.setItem("name_" + key, acct.name);
+					localStorage.setItem("user_" + key, acct.user);
+					localStorage.setItem("user-id_" + key, acct.id);
+					localStorage.setItem("prof_" + key, acct.prof);
+					localStorage.setItem("domain_" + key, acct.domain);
+					localStorage.setItem("acct_"+ key + "_at", acct.at);
+				}
+				localStorage.setItem("column",JSON.stringify(obj.columns));
+				localStorage.setItem("theme",obj.theme);
+				if(obj.width){
+					console.log(obj.width)
+					localStorage.setItem("width",obj.width);
+				}
+				if(obj.font){
+					localStorage.setItem("font",obj.font);
+				}
+				if(obj.size){
+					localStorage.setItem("size",obj.size);
+				}
+				themes(obj.theme);
+				if(obj.imgheight){
+					localStorage.setItem("img-height",obj.imgheight);
+				}
+				localStorage.setItem("mainuse",obj.mainuse);
+				if(obj.cw){
+					localStorage.setItem("cwtext",obj.cw);
+				}
+				localStorage.setItem("vis",obj.vis);
+				if(obj.ksc[0]){
+					localStorage.setItem("oks-1",obj.ksc[0]);
+				}
+				if(obj.ksc[1]){
+					localStorage.setItem("oks-2",obj.ksc[1]);
+				}
+				if(obj.ksc[2]){
+					localStorage.setItem("oks-3",obj.ksc[2]);
+				}
+				if(obj.clientMute){
+					localStorage.setItem("client_mute",JSON.stringify(obj.clientMute));
+				}
+				if(obj.wordMute){
+					localStorage.setItem("word_mute",JSON.stringify(obj.wordMute));
+				}
+				if(obj.favoriteTags){
+					localStorage.setItem("tag",JSON.stringify(obj.favoriteTags));
+				}
+				
+				localStorage.setItem("np-temp",obj.spotifyTemplete);
+				for(var i=0;i<obj.columns.length;i++){
+					localStorage.setItem("card_" + i,"true");
+					localStorage.removeItem("catch_" + i);
+				}
+				location.href="language.html";
+			}else{
+				alert("Error.")
+			}
+		})
+		//cards
+		//lang
+	});
+}
+function savefolder(){
+	var electron = require("electron");
+	var remote=electron.remote;
+	var dialog=remote.dialog;
+	dialog.showOpenDialog(null, {
+		title: 'Save folder',
+		properties: ['openDirectory'],
+	}, (fileNames) => {
+		localStorage.setItem("savefolder",fileNames[0]);
+	});
+}
+
+function font(){
+	var electron = require("electron");
+	var ipc = electron.ipcRenderer;
+	ipc.send('fonts', []);
+	ipc.on('font-list', function (event, arg) {
+		$("#fonts").removeClass("hide");
+		for( var i=0; i<arg.length; i++) {
+			var font=arg[i];
+			$("#fonts").append('<div class="font pointer" style="font-family:'+font.family+'" onclick="insertFont(\''+font.family+'\')">'+font.family+"</div>")
+		}
+	});
+}
+function insertFont(name){
+	$("#font").val(name);
+}
+$(".color-picker").each(function(i, elem) {
+	pickerDefine(i,"fff");
+});
+function pickerDefine(i,color){
+	var pickr = new Pickr({
+		el: '#color-picker'+i,
+		default: color,
+		showAlways: true,
+		appendToBody: true,
+		closeWithKey: 'Escape',
+		comparison: false,
+		components: {
+			preview: true, // Left side color comparison
+			opacity: false, // Opacity slider
+			hue: true,     // Hue slider
+			interaction: {
+				rgba: false, // rgba option (red green blue and alpha)
+				input: true, // input / output element
+			}
+		},
+		strings: {
+		   save: 'Save',  // Default for save button
+		   clear: 'Clear' // Default for clear button
+		}
+	   });
+		   pickr.on('change', (...args) => {
+			 	var rgb='rgb('+args[0].toRGBA()[0]+','+args[0].toRGBA()[1]+','+args[0].toRGBA()[2]+')';
+				$("#color-picker"+i+"_value").val(rgb)
+			});
+}
+function customComp(){
+	var nameC=$("#custom_name").val();
+	if(!nameC){return false;}
+	var descC=$("#custom_desc").val();
+	var primaryC=$("#color-picker0_value").val();
+	if(!primaryC){primaryC="rgb(255,255,255)"}
+	var secondaryC=$("#color-picker1_value").val();
+	if(!secondaryC){secondaryC="rgb(255,255,255)"}
+	var textC=$("#color-picker2_value").val();
+	if(!textC){textC="rgb(255,255,255)"}
+	var accentC=$("#color-picker3_value").val();
+	if(!accentC){accentC="rgb(255,255,255)"}
+	var multi = localStorage.getItem("multi");
+	var my=JSON.parse(multi)[0].name;
+	var id=$("#custom-edit-sel").val();
+	if(id=="add_new"){
+		id=makeCID();
+	}
+	var json={
+		"name": nameC,
+		"author": my,
+		"desc": descC,
+		"base": $("[name=direction]:checked").val(),
+		"vars": {
+		  "primary": primaryC,
+		  "secondary": secondaryC,
+		  "text": textC
+		},
+		"props": {
+			"TheDeskAccent": accentC
+		},
+		"id": id
+	  }
+	  $("#custom_json").val(JSON.stringify(json));
+	  themes();
+	  $("#custom_name").val("");
+	  $("#custom_desc").val("");
+	  $("#dark").prop("checked", true);
+	  $("#custom_json").val("");
+	  $("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
+	  $("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
+	  $("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
+	  $("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
+	  $("#color-picker0_value").val("");
+	  $("#color-picker1_value").val("");
+	  $("#color-picker2_value").val("");
+	  $("#color-picker3_value").val("");
+	  pickerDefine(0,"fff");
+	  pickerDefine(1,"fff");
+	  pickerDefine(2,"fff");
+	  pickerDefine(3,"fff");
+	  ipc.send('theme-json-create', JSON.stringify(json));
+}
+function deleteIt(){
+	var id=$("#custom-sel-sel").val();
+	$("#custom_name").val("");
+	$("#custom_desc").val("");
+	$("#dark").prop("checked", true);
+	$("#custom_json").val("");
+	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
+	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
+	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
+	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
+	$("#color-picker0_value").val("");
+	$("#color-picker1_value").val("");
+	$("#color-picker2_value").val("");
+	$("#color-picker3_value").val("");
+	pickerDefine(0,"fff");
+	pickerDefine(1,"fff");
+	pickerDefine(2,"fff");
+	pickerDefine(3,"fff");
+	ipc.on('theme-json-delete-complete', function (event, args) {
+		ctLoad()
+	});
+	ipc.send('theme-json-delete', id);
+}
+function ctLoad(){
+	ipc.send('theme-json-list', "");
+	ipc.on('theme-json-list-response', function (event, args) {
+		console.log(args);
+		var templete="";
+		Object.keys(args).forEach(function(key) {
+			var theme = args[key];
+			var themeid=theme.id
+			templete = templete+'<option value="'+themeid+'">' + theme.name +'</option>';
+		});
+		if(args[0]){
+			localStorage.setItem("customtheme-id",args[0].id)
+		}
+		$("#custom-sel-sel").html(templete);
+		templete='<option value="add_new">'+$("#edit-selector").attr("data-add")+'</option>'+templete;
+		$("#custom-edit-sel").html(templete);
+		$('select').material_select('update');
+	});
+}
+function customSel(){
+	var id=$("#custom-sel-sel").val();
+	localStorage.setItem("customtheme-id",id)
+}
+function custom(){
+	var id=$("#custom-edit-sel").val();
+	if(id=="add_new"){
+		$("#custom_name").val("");
+		$("#custom_desc").val("");
+		$("#dark").prop("checked", true);
+		$("#custom_json").val("");
+		$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
+		$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
+		$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
+		$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
+		$("#color-picker0_value").val("");
+		$("#color-picker1_value").val("");
+		$("#color-picker2_value").val("");
+		$("#color-picker3_value").val("");
+		pickerDefine(0,"fff");
+		pickerDefine(1,"fff");
+		pickerDefine(2,"fff");
+		pickerDefine(3,"fff");
+		$("#delTheme").addClass("disabled")
+	}else{
+		$("#delTheme").removeClass("disabled")
+		ipc.send('theme-json-request', id);
+		ipc.on('theme-json-response', function (event, args) {
+			console.log(args);
+			$("#custom_name").val(args.name);
+			$("#custom_desc").val(args.desc);
+			$("#"+args.base).prop("checked", true);
+			$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
+			pickerDefine(0,rgbToHex(args.vars.primary))
+			$("#color-picker0_value").val(args.vars.primary);
+			$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
+			pickerDefine(1,rgbToHex(args.vars.secondary))
+			$("#color-picker1_value").val(args.vars.secondary);
+			$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
+			$("#color-picker2_value").val(args.vars.text);
+			pickerDefine(2,rgbToHex(args.vars.text))
+			if(args.props){
+				if(args.props.TheDeskAccent){
+					var accent=args.props.TheDeskAccent;
+				}else{
+					var accent=args.vars.secondary;
+				}
+			}else{
+				var accent=args.vars.secondary;
+			}
+			$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
+			pickerDefine(3,rgbToHex(accent))
+			$("#custom_json").val(JSON.stringify(args));
+		});
+	}
+}
+function customImp(){
+	var json=$("#custom_import").val();
+	if(JSON5.parse(json)){
+		ipc.send('theme-json-create', json);
+	}else{
+		alert("Error")
+	}
+}
+function hardwareAcceleration(){
+	var had = $("[name=ha]:checked").val();
+	localStorage.setItem("ha", had);
+	console.log("ha");
+	ipc.send('ha', had);
+}
+
+ipc.on('theme-json-create-complete', function (event, args) {
+	$("#custom_import").val("");
+	ctLoad()
+});
+//最初に読む
+load();
+climute();
+wordmute();
+wordemp();
+checkSpotify();
+voiceSettingLoad();
+oksload();
+npprovider();
+ctLoad()

app/js/ui/sort.js

@@ -32,9 +32,9 @@ function sortload(){
 			var acctdata = user + "@" + domain;
 		}
 
-			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><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, escapeHTML(acct.data), acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
-			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムへ">forward</i></a> <a onclick="removeColumn(' + 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><br>'+acctdata+" "+cap(acct.type, acct.data,acct.domain)+'</li>';
+			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>';
 		$("#sort").append(html);
 	});
 	drag();
@@ -58,8 +58,10 @@ function Scap(type, data) {
 		return "Integrated"
 	} else if (type == "webview") {
 		return "Twitter"
+	} else if (type == "tootsearch") {
+		return "tootsearch(" + data + ")"
 	} else {
-		console.log(type);
+		console.error("unknown timeline type: " + type);
 	}
 }
 
@@ -101,21 +103,17 @@ function sort(){
 	var json = JSON.stringify(newobj);
 	localStorage.setItem("column", json);
 	$("#sort").html("");
-	Materialize.toast("並べ替え完了。", 3000);
+	Materialize.toast("Sorted", 3000);
 	sortload();
 	parseColumn();
-	sortToggle()
+	sortMenu()
 }
 //ソートボタントグル
-function sortToggle(){
+function sortMenu() {
-	$("#sort").html("");
+	$("#left-menu div").removeClass("active");
-	if ($("#sort-box").hasClass("hide")) {
+	$("#sortMenu").addClass("active");
+	$(".menu-content").addClass("hide");
 	$("#sort-box").removeClass("hide");
-		$("#sort-box").addClass("show");
+	$("#sort").html("");
-		//並べ替え
 	sortload();
-	} else {
-		$("#sort-box").addClass("hide");
-		$("#sort-box").removeClass("show");
-	}
 }

app/js/ui/spotify.js

@@ -79,7 +79,7 @@ function nowplaying(mode){
                 todo(error);
                 console.error(error);
             }).then(function (json) {
-            console.log(json);
+                console.table(json);
                 if (json.length < 1) {
                     return false;
                 }
@@ -123,17 +123,33 @@ function nowplaying(mode){
     } else if (mode == "itunes") {
         var electron = require("electron");
         var ipc = electron.ipcRenderer;
+        if (ipc.listenerCount('itunes-np') > 0) {
+            return false;
+        }
+
         ipc.send('itunes', "");
-	    ipc.on('itunes-np', function (event, arg) {
+        ipc.once('itunes-np', function (event, arg) {
-            console.log(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 remote = electron.remote;
+            var platform = remote.process.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");
@@ -145,11 +161,11 @@ function nowplaying(mode){
             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, "");
-            content = content.replace(regExp, arg.sampleRate/1000+"kHz");
             var regExp = new RegExp("{bitRate}", "g");
             content = content.replace(regExp, arg.bitRate + "kbps");
             var regExp = new RegExp("{genre}", "g");
@@ -203,49 +219,3 @@ $("#npbtn").bind('contextmenu', function() {
     nowplaying('itunes');
     return false;
 });
-/*cinderella NP*/
-function cgNP(q){
-    suggest = "https://cg.toot.app/api/v1/?song=" + q
-		console.log(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) {
-			console.log(json);
-			var electron = require("electron");
-            var ipc = electron.ipcRenderer;
-            var flag=localStorage.getItem("artwork");
-            if(flag){
-                  var img=json.album.artwork;
-                ipc.send('bmp-image', [img,0]);
-             }
-            var content=localStorage.getItem("np-temp");
-             if(!content || content==""){
-                   var content="#NowPlaying {song} / {album} / {artist}\n{url}";
-             }
-            var regExp = new RegExp("{song}", "g");
-            content = content.replace(regExp, json.name);
-            var regExp = new RegExp("{album}", "g");
-            content = content.replace(regExp, json.album.name);
-            var regExp = new RegExp("{artist}", "g");
-            content = content.replace(regExp, json.artist.text);
-            var regExp = new RegExp("{composer}", "g");
-            content = content.replace(regExp, json.composer);
-            var regExp = new RegExp("{lyricist}", "g");
-            content = content.replace(regExp, json.lyricist);
-            var regExp = new RegExp("{bpm}", "g");
-            content = content.replace(regExp, json.bpm);
-            var regExp = new RegExp("{genre}", "g");
-            content = content.replace(regExp, "");
-            var regExp = new RegExp("{url}", "g");
-            content = content.replace(regExp, "");
-            $("#textarea").val(content);
-				});
-}

app/js/ui/theme.js

@@ -11,6 +11,7 @@ function themes(theme) {
 	$("html").removeClass("greentheme");
 	$("html").removeClass("browntheme");
 	$("html").removeClass("blacktheme");
+	$("html").removeClass("customtheme");
 	$("html").addClass(theme + "theme");
 	var font = localStorage.getItem("font");
 	if (font) {
@@ -18,5 +19,10 @@ function themes(theme) {
 	} else {
 		$("html").css("font-family", "");
 	}
+	if (theme == "custom") {
+		if (localStorage.getItem("customtheme-id")) {
+			ipc.send('theme-css-request', localStorage.getItem("customtheme-id"));
+		}
+	}
 }
 themes();

app/js/ui/tips.js

@@ -57,7 +57,7 @@ function startmem(){
 		var use = arg[0];
 		var cpu = arg[1];
 		var total = arg[2]
-		$("#tips-text").html(cpu+"<br>Memory:"+Math.floor(use/1024/1024/102.4)/10+"/"+Math.floor(total/1024/1024/102.4)/10+"GB("+Math.floor(use/total*100)+"%)")
+		$("#tips-text").html(escapeHTML(cpu) + "<br>Memory:" + Math.floor(use / 1024 / 1024 / 102.4) / 10 + "/" + Math.floor(total / 1024 / 1024 / 102.4) / 10 + "GB(" + Math.floor(use / total * 100) + "%)")
 	})
 }
 //トレンドタグ
@@ -66,7 +66,6 @@ function trendTagonTip(){
 	var domain = "imastodon.net"
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/trend_tags"
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -83,7 +82,7 @@ function trendTagonTip(){
 			var tags = "";
 			json = json.score;
 			Object.keys(json).forEach(function (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><br>';
+				tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + escapeHTML(tag) + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
 			});
 			$("#tips-text").html('<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTagonTip()" style="font-size:12px">refresh</i>:<br>' + tags + '</div>');
 			trendTagonTipInterval()
@@ -109,7 +108,6 @@ function spotifytips(){
 			todo(error);
 			console.error(error);
 		}).then(function (json) {
-            console.log(json);
 			var ms = json.progress_ms;
 			var last = 1000 - ms % 1000;
 			var item = json.item;
@@ -200,4 +198,3 @@ function tipsToggle(){
 if (localStorage.getItem("tips")) {
 	tips(localStorage.getItem("tips"));
 }
-	

app/js/userdata/his-data.js

@@ -438,10 +438,11 @@ function showReq(more, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		if(localStorage.getItem("mode_" + domain)=="misskey"){
+
-			var templete = userparse(json, 'true',acct_id);
+		if (localStorage.getItem("mode_" + domain) != "misskey") {
+			var templete = userparse(json, "request", acct_id);
 		} else {
-			var templete = misskeyUserparse(json, 'true',acct_id);
+			var templete = misskeyUserparse(json, true, acct_id);
 		}
 
 		if (!json[0]) {
@@ -537,9 +538,8 @@ function showFrl(more, acct_id) {
 		$("#his-follow-recom-contents").html(lang.lang_details_nodata + "(" + lang.lang_hisdata_frcreq + ")<br>");
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (!json[0]) {
-			console.log("No data");
+			console.warn("No suggestions(recommend) data");
 			templete = lang.lang_details_nodata + "(" + lang.lang_hisdata_frcwarn + ")<br>";
 		} else {
 			var templete = userparse(json, '', acct_id);
@@ -553,6 +553,51 @@ function showFrl(more, acct_id) {
 
 	});
 }
+//Keybase
+function udAdd(start) {
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'Accept': 'application/json'
+		},
+		//body: JSON.stringify({})
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var fields = json.attachment;
+		for (var i = 0; i < fields.length; i++) {
+			if (fields[i].type == "IdentityProof") {
+				if (fields[i].signatureAlgorithm == "keybase") {
+					var html = '<a href="https://keybase.io/' + fields[i].name + '" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].signatureAlgorithm)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].signatureAlgorithm) + ':' + escapeHTML(fields[i].name) + '</a>';
+				} else {
+					var html = '<span class="cbadge teal" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].signatureAlgorithm)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].signatureAlgorithm) + ':' + escapeHTML(fields[i].name) + '</span>';
+				}
+				$("#his-proof-prof").append(html)
+			}
+		}
+	});
+	fetch("https://notestock.osa-p.net/api/v1/isstock.json?id=" + start.replace("@", "users/"), {
+		method: 'GET',
+		headers: {
+			'Accept': 'application/json'
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (json.user.public_view) {
+			var html = '<a href="' + json.user.url + '" target="_blank" class="cbadge purple waves-effect" style="max-width:200px;" title="Notestock">Notestock</a>';
+			$("#his-proof-prof").append(html)
+		}
+	});
+
+}
+
 
 //ユーザーマッチングリスト
 function showMat() {
@@ -562,7 +607,6 @@ function showMat() {
 	var acct_id = $("#his-data").attr("use-acct");
 	full = full.split("@");
 	var start = "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-filtered-api.cgi?" + full[1] + "+" + full[0];
-	console.log(start);
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -575,7 +619,6 @@ function showMat() {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		var templete = "";
 		Object.keys(json).forEach(function (key) {
 			var user = json[key];

app/js/userdata/prof-edit.js

@@ -12,13 +12,13 @@ function profedit() {
 	httpreq.open('PATCH', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		display_name: name,
 		note: des,
 	}));
 	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			$('#his-data').modal('close');
 			todc();
 		}
@@ -30,7 +30,7 @@ function imgChange(imgfile, target) {
 	var acct_id = $('#his-data').attr("use-acct");
 	todo("アップロードしています")
 	if (!imgfile.files.length) {
-		console.log("No Img");
+		console.warn("No Image to upload");
 		return;
 	}
 	var file = imgfile.files[0];
@@ -47,12 +47,11 @@ function imgChange(imgfile, target) {
 		httpreq.open('PATCH', start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
 		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(fd);
 		httpreq.onreadystatechange = function () {
-			if (httpreq.readyState == 4) {
+			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
-				console.log(json);
 				$('#his-data').modal('close');
 				todc();
 				localStorage.removeItem("image");

app/js/userdata/showOnTL.js

@@ -19,7 +19,7 @@ function udgEx(user,acct_id){
 	if (acct_id == "main") {
 		acct_id = localStorage.getItem("main");
 	}
-	console.log(user);
+	console.log("Get user data of " + user);
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) == "misskey") { return false; }
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
@@ -36,7 +36,6 @@ function udgEx(user,acct_id){
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.accounts) {
 			var id = json.accounts[0].id;
 			udg(id, acct_id);
@@ -46,13 +45,12 @@ function udgEx(user,acct_id){
 			shell.openExternal(url);
 		}
 	});
-	return;
+	return true;
 }
 function udg(user, acct_id) {
 	reset();
 	if (!user) {
 		user = localStorage.getItem("user-id_" + acct_id);
-		console.log(user);
 	}
 	todo("User Data Loading...");
 	var domain = localStorage.getItem("domain_" + acct_id);
@@ -62,7 +60,6 @@ function udg(user, acct_id) {
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/accounts/" + user;
-	console.log(start);
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -75,7 +72,6 @@ function udg(user, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		//一つ前のユーザーデータ
 		if (!localStorage.getItem("history")) {
 			$("#his-history-btn").prop("disabled", true);
@@ -105,6 +101,7 @@ function udg(user, acct_id) {
 		fer(json.id, '', acct_id);
 		var dis_name = escapeHTML(json.display_name);
 		dis_name = twemoji.parse(dis_name);
+
 		var note = json.note;
 		if (json.emojis) {
 			var actemojick = json.emojis[0];
@@ -117,12 +114,17 @@ function udg(user, acct_id) {
 				var emoji = json.emojis[key5];
 				var shortcode = emoji.shortcode;
 				var emoji_url = '<img src="' + emoji.url +
-					'" class="emoji-img" data-emoji="'+shortcode+'">';
+					'" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				dis_name = dis_name.replace(regExp, emoji_url);
 				note = note.replace(regExp, emoji_url);
 			});
 		}
+		//noteの解析
+		//var tags =  '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
+		//var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
+		//note=note.replace(/#(\S+)/gi, tags)
+		//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
 		$("#his-name").html(dis_name);
 		$("#his-acct").text(json.acct);
 		$("#his-acct").attr("fullname", fullname);
@@ -130,7 +132,11 @@ function udg(user, acct_id) {
 		$('#his-data').css('background-image', 'url(' + json.header + ')');
 		$("#his-sta").text(json.statuses_count);
 		$("#his-follow").text(json.following_count);
-			$("#his-follower").text(json.followers_count);
+		var flerc = json.followers_count;
+		if (flerc < 0) {
+			flerc = "-";
+		}
+		$("#his-follower").text(flerc);
 		$("#his-since").text(crat(json.created_at));
 		$("#his-openin").attr("data-href", json.url);
 		if (json.fields) {
@@ -139,8 +145,14 @@ function udg(user, acct_id) {
 				for (var i = 0; i < json.fields.length; i++) {
 					var fname = json.fields[i].name;
 					var fval = json.fields[i].value;
-						fval=twemoji.parse(fval);
+					if (json.fields[i].verified_at) {
-						note=note+'<tr><td class="his-field-title">'+fname+'</td><td class="his-field-content">'+fval+'</td></tr>';
+						var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at);
+						var color = "rgba(121,189,154,.25);"
+					} else {
+						var when = "";
+						var color = "inherit"
+					}
+					note = note + '<tr><td class="his-field-title">' + twemoji.parse(escapeHTML(fname)) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + twemoji.parse(fval) + '</td></tr>';
 				}
 				note = note + '</table>'
 				$("#his-des").html(twemoji.parse(note));
@@ -153,6 +165,7 @@ function udg(user, acct_id) {
 		if (json.bot) {
 			$("#his-bot").html(lang.lang_showontl_botacct);
 		}
+		$("#his-des").attr("data-acct", acct_id);
 		$('#his-data').css('background-size', 'cover');
 		$("#his-data .tab-content").css("height", $("#his-float-timeline").height() - 70 + "px")
 		localStorage.setItem("history", user);
@@ -166,10 +179,10 @@ function udg(user, acct_id) {
 			showFrl('', acct_id);
 			$("#his-name-val").val(json.display_name);
 			if (json.fields.length > 0) {
-					$("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value));
+				if (json.fields[0]) { $("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value)); }
-					$("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value));
+				if (json.fields[1]) { $("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value)); }
-					$("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value));
+				if (json.fields[2]) { $("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value)); }
-					$("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value));
+				if (json.fields[3]) { $("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value)); }
 			}
 			var des = json.note;
 			des = des.replace(/<br \/>/g, "\n")
@@ -189,13 +202,14 @@ function udg(user, acct_id) {
 			$(".only-his-data").show();
 		}
 		todc();
+		//外部データ取得(死かもしれないので)
+		udAdd(json.url);
 	});
 }
 function misskeyUdg(user, acct_id) {
 	reset();
 	if (!user) {
 		user = localStorage.getItem("user-id_" + acct_id);
-		console.log(user);
 	}
 	todo("User Data Loading...");
 	var domain = localStorage.getItem("domain_" + acct_id);
@@ -205,7 +219,6 @@ function misskeyUdg(user, acct_id) {
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/users/show";
-	console.log(user);
 	fetch(start, {
 		method: 'POST',
 		headers: {
@@ -221,7 +234,6 @@ function misskeyUdg(user, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		//一つ前のユーザーデータ
 		if (!localStorage.getItem("history")) {
 			$("#his-history-btn").prop("disabled", true);
@@ -258,7 +270,7 @@ function misskeyUdg(user, acct_id) {
 		$("#his-follow").text(json.followingCount);
 		$("#his-follower").text(json.followersCount);
 		$("#his-since").text(crat(json.createdAt));
-			var note=json.description;
+		var note = escapeHTML(json.description);
 		$("#his-des").html(twemoji.parse(note));
 		if (json.isCat) {
 			$("#his-bot").html("Cat" + twemoji.parse("😺"));
@@ -320,7 +332,6 @@ function historyShow(){
 function profShow() {
 	var acct_id = $("#post-acct-sel").val();
 	var user = localStorage.getItem("user-id_" + acct_id);
-	console.log("user-id_"+acct_id+":"+user);
 	udg(user, acct_id)
 	hide();
 }
@@ -388,6 +399,12 @@ function relations(user, acct_id) {
 			$("#his-end-btn").removeClass("endorsed");
 			$("#his-end-btn").text(lang.lang_status_endorse)
 		}
+		//Blocked
+		if (json.blocked_by) {
+			$("#his-float-timeline").hide();
+			$("#his-float-blocked").show();
+			$("#his-follow-btn").hide()
+		}
 
 	});
 }
@@ -449,6 +466,9 @@ function reset(){
 	$("#his-f4-name").val(""); $("#his-f4-val").val("");
 	$("#his-endorse").html("");
 	$("#his-openin").attr("data-href", "");
+	$("#his-float-timeline").show();
+	$("#his-float-blocked").hide();
+	$("#his-proof-prof").html("")
 }
 $('#my-data-nav .custom-tab').on('click', function () {
 	var target = $(this).find("a").attr("go");

app/language.html

@@ -1,75 +0,0 @@
-<!doctype html>
-<html lang="ja">
-<head>
-	<title>Languages - TheDesk</title>
-	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="./css/materialize.css" type="text/css" rel="stylesheet">
-	<link href="./css/themes.css" type="text/css" rel="stylesheet">
-	<link href="./css/master.css" type="text/css" rel="stylesheet">
-	<link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans" rel="stylesheet">
-	<meta charset="utf-8">
-</head>
-<body style="max-width:100vw; width:500px; padding:10px;">
-<script type="text/javascript" src="./js/common/jquery.js"></script>
-<script type="text/javascript" src="./js/platform/first.js"></script>
-<script type="text/javascript" src="./js/common/materialize.js"></script>
-<script type="text/javascript" src="./js/lang/lang.js"></script>
-<script type="text/javascript" src="./js/ui/theme.js"></script>
-<h3 id="language"></h3>
-<select id="language-sel" style="color:black" onchange="btn();"></select>
-<button class="btn waves-effect indigo nex" style="width:100%; max-width:200px;" onclick="sel()" id="sel"></button>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;" id="back"></a><br>
-<br>
-<span id="notice"></span>
-<script>
-    //コード受信
-    if(location.search){
-	    var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)/);
-	    var mode=m[1];
-	    if(mode=="redirect"){
-		    if(localStorage.getItem("lang")){
-                changelang(localStorage.getItem("lang"))
-            }
-	    }
-    }
-    var fstlang="";
-    var langtxt="";
-    var addit="";
-    Object.keys(lang_lang).forEach(function(i) {
-        if(langtxt==""){
-            langtxt=lang_lang[i];
-            $("#sel").text(lang_set[i]);
-            $("#back").text(lang_back[i]);
-        }else{
-            langtxt=langtxt+"/"+lang_lang[i];
-        }
-        addit=addit+"<br>"+lang_langadd[i];
-        var loc=lang_langlocale[i];
-        $("#language-sel").append('<option value="'+i+'">'+loc+'</option>');
-    });
-    
-$("#language").text(langtxt)
-$("#notice").html(addit)
-$('select').material_select('update');
-function sel(){
-    var val=$("#language-sel").val();
-    changelang(val);
-}
-function changelang(val){
-    var electron = require("electron");
-    var ipc = electron.ipcRenderer;
-    localStorage.setItem("lang",val);
-    ipc.send('lang', val);
-	ipc.on('langres', function (event, arg) {
-        location.href="index.html";
-	})
-
-}
-function btn(){
-    var val=$("#language-sel").val();
-    $("#sel").text(lang_set[val]);
-    $("#back").text(lang_back[val]);
-}
-</script>
-<script type="text/javascript" src="./js/platform/end.js"></script>

app/main.js

@@ -1,34 +1,34 @@
-'use strict';
 
+var dir = 'file://' + __dirname;
+var base = dir + '/view/';
 // Electronのモジュール
 const electron = require("electron");
 const fs = require("fs");
-const dialog = require('electron').dialog;
+const language = require('./main/language.js');
-var Jimp = require("jimp");
+const css = require('./main/css.js');
-const shell = electron.shell;
+const dl = require('./main/dl.js');
-const os = require('os')
+const img = require('./main/img.js');
-const path = require('path')
+const np = require('./main/np.js');
-const fm = require('font-manager');
+const systemFunc = require('./main/system.js');
 const Menu = electron.Menu
-var updatewin=null;
 const join = require('path').join;
-// linuxの時は定義しない
-if (process.platform=='win32') {
-  const {NowPlaying,PlayerName} = require("nowplaying-node");
-}
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
 // ウィンドウを作成するモジュール
 const BrowserWindow = electron.BrowserWindow;
-const {
-	download
-} = require('electron-dl');
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow;
 var info_path = join(app.getPath("userData"), "window-size.json");
 var max_info_path = join(app.getPath("userData"), "max-window-size.json");
 var lang_path = join(app.getPath("userData"), "language");
-var tmp_img = join(app.getPath("userData"), "tmp.png");
+var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+try {
+	fs.readFileSync(ha_path, 'utf8');
+	app.disableHardwareAcceleration()
+	console.log("disabled: HA");
+} catch{
+	console.log("enabled: HA");
+}
 var window_size;
 try {
 	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'));
@@ -47,9 +47,17 @@ try {
 		height: "string",
 		x: "string",
 		y: "string"
+
 	}; // デフォルトバリュー
 }
-
+function isFile(file) {
+	try {
+		fs.statSync(file);
+		return true
+	} catch (err) {
+		if (err.code === 'ENOENT') return false
+	}
+}
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function () {
 	if (process.platform != 'darwin') {
@@ -57,28 +65,42 @@ app.on('window-all-closed', function() {
 		app.quit();
 	}
 });
+// macOSでウィンドウを閉じた後に再度開けるようにする
+app.on('activate', function () {
+	if (mainWindow == null) {
+		createWindow();
+	}
+});
 
 function createWindow() {
-	// メイン画面の表示。ウィンドウの幅、高さを指定できる
+	if (isFile(lang_path)) {
-	var platform=process.platform;
+		console.log("exist");
-	var bit=process.arch;
-	if(platform=="linux"){
-		var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,icon: __dirname + '/desk.png'}
-	}else{
-		var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,simpleFullscreen:true}
-	}
-	mainWindow = new BrowserWindow(arg);
-	try {
 		var lang = fs.readFileSync(lang_path, 'utf8');
-	} catch (e) {
+	} else {
-		var lang=app.getLocale();
+		var langs = app.getLocale();
-		if(~lang.indexOf("ja")){
+		console.log(langs);
+		if (~langs.indexOf("ja")) {
 			lang = "ja";
 		} else {
 			lang = "en";
 		}
+		fs.mkdir(app.getPath("userData"), function (err) {
 			fs.writeFileSync(lang_path, lang);
+		});
 	}
+	console.log(app.getLocale());
+	console.log("launch:" + lang);
+	// メイン画面の表示。ウィンドウの幅、高さを指定できる
+	var platform = process.platform;
+	var bit = process.arch;
+	if (platform == "linux") {
+		var arg = { webPreferences: { webviewTag: true, nodeIntegration: true }, width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png' }
+	} else if (platform == "win32") {
+		var arg = {webPreferences: { webviewTag: true, nodeIntegration: true }, width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true }
+	} else if (platform == "darwin") {
+		var arg = { webPreferences: { webviewTag: true, nodeIntegration: true }, width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true }
+	}
+	mainWindow = new BrowserWindow(arg);
 	electron.session.defaultSession.clearCache(() => { })
 	if (process.argv) {
 		if (process.argv[1]) {
@@ -96,7 +118,7 @@ function createWindow() {
 	} else {
 		var plus = "";
 	}
-	mainWindow.loadURL('file://' + __dirname + '/view/'+lang+'/index.html'+plus);
+	mainWindow.loadURL(base + lang + '/index.html' + plus);
 	if (!window_size.x && !window_size.y) {
 		mainWindow.center();
 	}
@@ -105,6 +127,7 @@ function createWindow() {
 	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function () {
+		electron.ipcMain.removeAllListeners();
 		mainWindow = null;
 	});
 	mainWindow.on('close', function () {
@@ -123,61 +146,22 @@ function createWindow() {
 	mainWindow.on('maximize', function () {
 		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
 	});
-	  // Create the Application's main menu
-	  var template = [{
-        label: "アプリケーション",
-        submenu: [
-			{ label: "TheDeskについて", click: function() { about(); } },
-            { type: "separator" },
-			{ label: "終了", accelerator: "Command+Q", click: function() { app.quit(); }}
 
-        ]}, {
-        label: "編集",
-        submenu: [
-            { label: "元に戻す", accelerator: "CmdOrCtrl+Z", selector: "undo:" },
-            { label: "やり直し", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
-            { type: "separator" },
-            { label: "切り取り", accelerator: "CmdOrCtrl+X", selector: "cut:" },
-            { label: "コピー", accelerator: "CmdOrCtrl+C", selector: "copy:" },
-            { label: "貼り付け", accelerator: "CmdOrCtrl+V", selector: "paste:" },
-            { label: "すべて選択", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
-		]},{
-		label: "表示",
-		submenu: [
-			{
-				label: 'Toggle Developer Tools',
-				accelerator: 'Alt+Command+I',
-				click: function() { mainWindow.toggleDevTools(); }
-			  },
-          {
-            label: '再読み込み',
-            accelerator: 'CmdOrCtrl+R',
-            click: function() { mainWindow.webContents.send('reload', " "); }
-          }
-		]
-		},
-		{
-		label: 'ウィンドウ',
-		role: 'window',
-		submenu: [
-			  {
-				label: '最小化',
-				accelerator: 'CmdOrCtrl+M',
-				role: 'minimize'
-			  },
-			  {
-				label: '閉じる',
-				accelerator: 'CmdOrCtrl+W',
-				role: 'close'
-			  },
-			]
-		  }
-    ];
 	var platform = process.platform;
 	var bit = process.arch;
 	if (platform == "darwin") {
-		Menu.setApplicationMenu(Menu.buildFromTemplate(template));
+		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, false, dir)));
 	}
+	//CSS
+	css.css(mainWindow);
+	//アップデータとダウンロード
+	dl.dl(mainWindow, lang_path, base);
+	//画像選択と画像処理
+	img.img(mainWindow, dir);
+	//NowPlaying
+	np.TheDeskNowPlaying(mainWindow);
+	//その他system
+	systemFunc.system(mainWindow, dir, lang);
 }
 // Electronの初期化完了後に実行
 app.on('ready', createWindow);
@@ -185,510 +169,4 @@ var onError = function(err,response){
 	console.error(err, response);
 };
 
-var ipc = electron.ipcMain;
-ipc.on('native-notf', function(e, args) {
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform=="win32"){
-		const notifier = require('node-notifier')
-		var tmp_imge=tmp_img;
-	Jimp.read(args[2], function (err, lenna) {
-		if(!err && lenna){
-			lenna.write(tmp_img);
-			var tmp_imge=tmp_img;
-		}else{
-			var tmp_imge="";
-		}
-		notifier.notify({
-			appID: "top.thedesk",
-			message: args[1],
-			title: args[0],
-			icon : tmp_imge,
-			sound: false,
-			wait: true,
-		},
-		function(err, response) {
-		  console.log(err, response)
-		});	
-	});
-	}
-});
-//言語
-ipc.on('lang', function(e, arg) {
-	fs.writeFileSync(lang_path,arg);
-	mainWindow.webContents.send('langres', "");
-})
-
-ipc.on('update', function(e, x, y) {
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform!="others"){
-	updatewin = new BrowserWindow({
-		width: 600,
-		height: 400,
-		"transparent": false, // ウィンドウの背景を透過
-		"frame": false, // 枠の無いウィンドウ
-		"resizable": false
-	});
-	var lang = fs.readFileSync(lang_path, 'utf8');
-	updatewin.loadURL('file://' + __dirname + '/view/'+lang+'/update.html');
-
-	return "true"
-	}else{
-		return false;
-	}
-})
-//Web魚拓
-ipc.on('shot', function(e, args) {
-	console.log("link:"+args[0]+" width:"+args[1]+" height:"+args[2]+" title:"+args[4]+" top:"+args[5]+" left:"+args[6]);
-	var platform=process.platform;
-	var bit=process.arch;
-	if(args[7]==""){
-		if(platform=="win32"){
-			var dir=app.getPath('home')+"\\Pictures\\TheDesk\\Screenshots\\"+args[4]+"-toot.png";
-			var folder=app.getPath('home')+"\\Pictures\\TheDesk\\Screenshots\\";
-		}else if(platform=="linux" || platform=="darwin" ){
-			var dir=app.getPath('home')+"/Pictures/TheDesk/Screenshots/"+args[4]+"-toot.png";
-			var folder=app.getPath('home')+"/Pictures/TheDesk/Screenshots/";
-		}
-	}else{
-		var folder=args[7];
-		var dir=folder+args[4]+"-toot.png";
-	}
-	
-	Jimp.read(Buffer.from( args[3],'base64'), function (err, lenna) {
-		if (err) throw err;
-		lenna.crop( args[6], args[5], args[1], args[2] ).write(dir);
-	});
-	shell.showItemInFolder(folder);
-})
-ipc.on('shot-img-dl', (e, args) => {
-	Jimp.read(args[0], function (err, lenna) {
-		if (err) throw err;
-		if(args[1]==""){
-			if(process.platform=="win32"){
-				var folder=app.getPath('home')+"\\Pictures\\TheDesk\\Screenshots\\";
-			}else if(process.platform=="linux" || process.platform=="darwin" ){
-				var folder=app.getPath('home')+"/Pictures/TheDesk/Screenshots/";
-			}
-		}else{
-			var folder=args[2];
-		}
-		
-		lenna.write(folder+args[1]);
-	});
-})
-//アプデDL
-ipc.on('download-btn', (e, args) => {
-	var platform=process.platform;
-	var bit=process.arch;
-	var versioning=args[3];
-	var portable=args[2];
-	if(platform=="win32" || platform=="linux" || platform=="darwin" ){
-		var exe=false;
-		if(platform=="win32" && bit=="x64"){
-			if(portable){
-				var zip="TheDesk.exe";
-			}else{
-				var zip="TheDesk-setup.exe";
-			}
-			exe=true;
-		}else if(platform=="win32" && bit=="ia32"){
-			if(portable){
-				var zip="TheDesk-ia32.exe";
-			}else{
-				var zip="TheDesk-setup-ia32.exe";
-			}
-			exe=true;
-		}else if(platform=="linux" && bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(platform=="linux" && bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}else if(platform=="darwin"){
-			var zip="TheDesk-darwin-x64.zip";
-		}else{
-			return;
-		}
-		if(versioning && !exe){
-			zip=zip.replace(".zip","."+args[1]+".zip");
-		}else if(versioning){
-			zip=zip.replace(".exe","."+args[1]+".exe");
-		}
-	}else{
-		const options = {
-			type: 'info',
-			title: 'Other OS Supporting System',
-			message: "thedesk.topをブラウザで開きます。",
-			buttons: ['OK']
-		  }
-		  dialog.showMessageBox(options, function(index) {
-			shell.openExternal("https://thedesk.top");
-		  })
-		  return;
-		if(bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}
-	}
-	var ver=args[1];
-	
-	console.log(zip);
-	if(args[0]=="true"){
-		dialog.showSaveDialog(null, {
-            title: '保存',
-			properties: ['openFile', 'createDirectory'],
-			defaultPath: zip
-        }, (savedFiles) => {
-			console.log(savedFiles);
-			if(!savedFiles){
-				return false;
-			}
-			if(platform=="win32"){
-				var m = savedFiles.match(/(.+)\\(.+)$/);
-			}else{
-				var m = savedFiles.match(/(.+)\/(.+)$/);
-			}
-			
-			  if(isExistFile(savedFiles)){
-				fs.statSync(savedFiles);
-				fs.unlink(savedFiles);
-			  }
-			  console.log(m[1]+":"+savedFiles)
-              dl(portable,ver,m[1],savedFiles);
-        });
-	}else{
-		dl(portable,ver);
-	}
-	
-});
-function isExistFile(file) {
-	try {
-	  fs.statSync(file);
-	  return true
-	} catch(err) {
-	  if(err.code === 'ENOENT') return false
-	}
-  }
-function dl(portable,ver,files,fullname){
-	console.log(files);
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform=="win32"){
-		if(bit=="x64"){
-			if(portable){
-				var zip="TheDesk.exe";
-			}else{
-				var zip="TheDesk-setup.exe";
-			}
-		}else if(bit=="ia32"){
-			if(portable){
-				var zip="TheDesk-ia32.exe";
-			}else{
-				var zip="TheDesk-setup-ia32.exe";
-			}
-		}
-	}else if(platform=="linux"){
-		if(bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}
-	}else if(platform=="darwin"){
-			var zip="TheDesk-darwin-x64.zip";
-	}
-	//zip=zip+"?"+ver;
-	var l = 8;
-
-	// 生成する文字列に含める文字セット
-	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
-
-	var cl = c.length;
-	var r = "";
-	for(var i=0; i<l; i++){
-	  r += c[Math.floor(Math.random()*cl)];
-	}
-
-	updatewin.webContents.send('mess', "ダウンロードを開始します。");
-	const opts = {
-		directory:fullname,
-		openFolderWhenDone: true,
-		onProgress: function(e) {
-			updatewin.webContents.send('prog', e);
-		},
-		saveAs: false
-	};
-	download(BrowserWindow.getFocusedWindow(),
-			'https://dl.thedesk.top/'+zip, opts)
-		.then(dl => {
-			updatewin.webContents.send('mess', "ダウンロードが完了しました。");
-			app.quit();
-			
-		})
-		.catch(console.error);
-}
-ipc.on('general-dl', (e, args) => {
-	var name="";
-	var platform=process.platform;
-	var bit=process.arch;
-	if(args[1]==""){
-		if(platform=="win32"){
-			var dir=app.getPath('home')+"\\Pictures\\TheDesk";
-		}else if(platform=="linux" || platform=="darwin" ){
-			var dir=app.getPath('home')+"/Pictures/TheDesk";
-		}
-	}else{
-		var dir=args[1];
-	}	
-	mainWindow.webContents.send('general-dl-message', "ダウンロードを開始します。");
-	const opts = {
-		directory: dir,
-		filename:name,
-		openFolderWhenDone: true,
-		onProgress: function(e) {
-			mainWindow.webContents.send('general-dl-prog', e);
-		},
-		saveAs: false
-	};
-	download(BrowserWindow.getFocusedWindow(),
-			args[0], opts)
-		.then(dl => {
-			mainWindow.webContents.send('general-dl-message', "ダウンロードが完了しました。");
-		})
-		.catch(console.error);
-});
-ipc.on('quit', (e, args) => {
-	app.quit();
-});
-ipc.on('about', (e, args) => {
-	about();
-});
-function about(){
-	var ver=app.getVersion()
-	var window = new BrowserWindow({width: 300, height: 460,
-			"transparent": false,    // ウィンドウの背景を透過
-			"frame": false,     // 枠の無いウィンドウ
-			"resizable": false });
-	   window.loadURL('file://' + __dirname + '/about.html?ver='+ver);
-	   return "true"
-}
-ipc.on('itunes', (e, args) => {
-	if(args[0]=="set"){
-		var nppath=join(app.getPath("userData"), "nowplaying");
-		var npProvider;
-		try {
-			npProvider = args[1];
-		} catch (e) {
-			npProvider="AIMP";
-		}
-		var myAIMP = new NowPlaying({
-			fetchCover: true,
-			player: PlayerName[npProvider],
-		});
-		fs.writeFileSync(nppath, npProvider);
-	}else{
-		var platform=process.platform;
-		var bit=process.arch;
-		if(platform=="darwin"){
-		const nowplaying = require("itunes-nowplaying-mac")
-		nowplaying.getRawData().then(function (value) {
-		mainWindow.webContents.send('itunes-np', value);
-		}).catch(function (error) {
-			// 非同期処理失敗。呼ばれない
-			console.log(error);
-		});
-		}else{
-			var nppath=join(app.getPath("userData"), "nowplaying");
-			var npProvider;
-			try {
-				npProvider = fs.readFileSync(nppath, 'utf8');
-			} catch (e) {
-				npProvider="AIMP";
-			}
-			var myAIMP = new NowPlaying({
-				fetchCover: true,
-				player: PlayerName[npProvider],
-			});
-			myAIMP.update();
-			var path=myAIMP.getCoverPath();
-			if(path){
-				var bin = fs.readFileSync(path, 'base64');
-			}else{
-				var bin=false;
-			}
-			
-			var value={
-				name:myAIMP.getTitle(),
-				artist:myAIMP.getArtist(),
-				album:myAIMP.getAlbum(),
-				path:bin
-			}
-			mainWindow.webContents.send('itunes-np', value);
-		}
-	}
-	
-});
-ipc.on('file-select', (e, args) => {
-	dialog.showOpenDialog(null, {
-		properties: ['openFile', 'multiSelections'],
-		title: '添付ファイルを選択',
-		defaultPath: '.',
-		filters: [
-			{name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg','mp4','webm']},
-			{name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg']},
-      		{name: '動画', extensions: ['mp4','webm']},
-      		{name: '全てのファイル', extensions: ['*']}
-		]
-	}, (fileNames) => {
-		if(!fileNames){
-			return false;
-		}
-		for(var i=0;i<fileNames.length;i++){
-			var path=fileNames[i];
-			var bin = fs.readFileSync(path, 'base64');
-			mainWindow.webContents.send('bmp-img-comp', [bin,'new']);
-		}
-	});
-});
-
-ipc.on('column-del', (e, args) => {
-const options = {
-    type: 'info',
-    title: 'カラム削除',
-    message: "カラムを削除しますか？(すべてのカラムのリンク解析がOFFになります。)",
-    buttons: ['いいえ', 'はい']
-  }
-  dialog.showMessageBox(options, function(index) {
-    mainWindow.webContents.send('column-del-reply', index);
-  })
-});
-ipc.on('bmp-image', (e, args) => {
-	var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
-	Jimp.read(args[0], function (err, lenna) {
-		if (err) throw err;
-		lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
-			mainWindow.webContents.send('bmp-img-comp', [src,args[1]]);
-	   });
-	});
-	
-});
-ipc.on('nano', function (e, x, y) {
-	var nano_info_path = join(app.getPath("userData"), "nano-window-position.json");
-	var window_pos;
-	try {
-		window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'));
-	} catch (e) {
-	window_pos = [0,0]; // デフォルトバリュー
-	}
-	var nanowindow = new BrowserWindow({width: 350, height: 200,
-	"transparent": false,    // ウィンドウの背景を透過
-		 "frame": false,     // 枠の無いウィンドウ
-		 "resizable": false });
-	nanowindow.loadURL('file://' + __dirname + '/nano.html');
-	nanowindow.setAlwaysOnTop(true);
-
-	nanowindow.setPosition(window_pos[0], window_pos[1]);
-   nanowindow.on('close', function() {
-		fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
-	});
-	return true;
- })
- ipc.on('adobe', (e, arg) => {
-	 if(!arg){
-		const options = {
-			type: 'info',
-			title: 'Adobeフォトエディタ',
-			message: "「許可」または「永続的に許可」をクリックするとTheDeskとAdobeで情報を共有します。\n次のウィンドウを開いている時以外は一切提供しません。",
-			buttons: ['拒否', '許可','永続的に許可']
-		  }
-		  dialog.showMessageBox(options, function(index) {
-			if(index==2){
-				mainWindow.webContents.send('adobeagree', "true");
-			}
-			if(index>0){
-				adobeWindow();
-			}
-		  })
-	 }else{
-		adobeWindow();
-	 }
-});
-function adobeWindow(){
-	var window = new BrowserWindow({
-		width: 1000,
-		height: 750
-	});
-	window.loadURL('file://' + __dirname + '/adobe.html');
-}
-var cbTimer1;
-ipc.on('startmem', (e, arg) => {
-	cbTimer1 = setInterval(mems, 1000);
-});
-ipc.on('endmem', (e, arg) => {
-	if(cbTimer1){
-		clearInterval(cbTimer1);
-	}
-});
-function mems(){
-	var mem=os.totalmem()-os.freemem();
-	if(mainWindow){
-		mainWindow.webContents.send('memory', [mem,os.cpus()[0].model,os.totalmem()]);
-	}
-}
-ipc.on('mkc', (e, arg) => {
-	var platform=process.platform;
-	if(platform=="linux" || platform=="win32" ){
-		var mkc = fs.readFileSync(__dirname + '/.tkn', 'utf8');
-		
-	}else{
-		var mkc = "";
-	}
-	mainWindow.webContents.send('mkcr', mkc);
-});
-ipc.on('export', (e, args) => {
-	fs.writeFileSync(args[0], args[1]);
-});
-ipc.on('import', (e, arg) => {
-	mainWindow.webContents.send('config', fs.readFileSync(arg, 'utf8'));
-});
-//フォント
-function object_array_sort(data,key,order,fn){
-	//デフォは降順(DESC)
-	var num_a = -1;
-	var num_b = 1;
-   
-	if(order === 'asc'){//指定があれば昇順(ASC)
-	  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 = {};
-	for (var i = 0; i < data.length; i++) {
-	  arrObj[data[i]['family']] = data[i];
-	}
-   
-	data = [];
-	for (var key in arrObj) {
-	  data.push(arrObj[key]);
-	}
-   
-	fn(data); // ソート後の配列を返す
-  }
-ipc.on('fonts', (e, arg) => {
-	var fonts = fm.getAvailableFontsSync();
-object_array_sort(fonts, 'family', 'asc', function(fonts_sorted){
-	mainWindow.webContents.send('font-list', fonts_sorted);
-});
-});
-
-
 app.setAsDefaultProtocolClient('thedesk')

app/main/css.js

@@ -0,0 +1,105 @@
+function css(mainWindow) {
+	const electron = require("electron");
+	const fs = require("fs");
+	const path = require('path')
+	var ipc = electron.ipcMain;
+	var JSON5 = require('json5');
+	const app = electron.app;
+	const join = require('path').join;
+	var customcss = join(app.getPath("userData"), "custom.css");
+
+	ipc.on('custom-css-create', function (e, arg) {
+		fs.writeFileSync(customcss, arg);
+		mainWindow.webContents.send('custom-css-create-complete', "");
+	})
+	ipc.on('custom-css-request', function (e, arg) {
+		try {
+			var css = fs.readFileSync(customcss, 'utf8');
+		} catch (e) {
+			var css = "";
+		}
+		mainWindow.webContents.send('custom-css-response', css);
+	})
+	ipc.on('theme-json-create', function (e, arg) {
+		var themecss = join(app.getPath("userData"), JSON5.parse(arg)["id"] +
+			".thedesktheme");
+		fs.writeFileSync(themecss, JSON.stringify(JSON5.parse(arg)));
+		if (JSON5.parse(arg)["id"]) {
+			mainWindow.webContents.send('theme-json-create-complete', "");
+		} else {
+			mainWindow.webContents.send('theme-json-create-complete', "error");
+		}
+	})
+	ipc.on('theme-json-delete', function (e, arg) {
+		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		console.log(themecss);
+		fs.unlink(themecss, function (err) {
+			mainWindow.webContents.send('theme-json-delete-complete', "");
+		});
+	})
+	ipc.on('theme-json-request', function (e, arg) {
+		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+		mainWindow.webContents.send('theme-json-response', json);
+	})
+	ipc.on('theme-css-request', function (e, arg) {
+		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		try {
+			var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+
+			var primary = json.vars.primary;
+			var secondary = json.vars.secondary;
+			var text = json.vars.text;
+			if (json.base == "light") {
+				var drag = "rgba(255, 255, 255, 0.8)";
+				var beforehover = "#757575";
+			} else {
+				var drag = "rgba(0, 0, 0, 0.8)";
+				var beforehover = "#9e9e9e";
+			}
+			if (json.props) {
+				if (json.props.TheDeskAccent) {
+					var emphasized = json.props.TheDeskAccent
+				} else {
+					var emphasized = secondary;
+				}
+			} else {
+				var emphasized = primary;
+			}
+
+			var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
+				"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
+				secondary + ";--subcolor:" + primary + ";--box:" + primary +
+				";--sidebar:" + primary + ";--shared:" + emphasized + ";" +
+				"--notfbox:" + secondary + ";--emphasized:" + primary + ";--his-data:" +
+				secondary +
+				";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
+				primary +
+				";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}";
+			mainWindow.webContents.send('theme-css-response', css);
+		} catch (e) {
+			var css = "";
+		}
+
+	})
+	ipc.on('theme-json-list', function (e, arg) {
+		fs.readdir(app.getPath("userData"), function (err, files) {
+			if (err) throw err;
+			var fileList = files.filter(function (file) {
+				var tfile = join(app.getPath("userData"), file);
+				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile); //絞り込み
+			})
+			var themes = [];
+			for (var i = 0; i < fileList.length; i++) {
+				var themecss = join(app.getPath("userData"), fileList[i]);
+				var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+				themes.push({
+					name: json.name,
+					id: json.id
+				})
+			}
+			mainWindow.webContents.send('theme-json-list-response', themes);
+		});
+	})
+}
+exports.css = css;

app/main/dl.js

@@ -0,0 +1,126 @@
+function dl(mainWindow, lang_path, base) {
+	const electron = require("electron");
+	const shell = electron.shell;
+	const fs = require("fs");
+	const { download } = require('electron-dl');
+	const BrowserWindow = electron.BrowserWindow;
+	const dialog = electron.dialog;
+	var updatewin = null;
+	var ipc = electron.ipcMain;
+	const app = electron.app;
+	const join = require('path').join;
+	ipc.on('update', function (e, x, y) {
+
+		var platform = process.platform;
+		var bit = process.arch;
+		if (platform != "others") {
+			updatewin = new BrowserWindow({
+				webPreferences: {
+					nodeIntegration:true
+				},
+				width: 600,
+				height: 400,
+				"transparent": false, // ウィンドウの背景を透過
+				"frame": false, // 枠の無いウィンドウ
+				"resizable": false,
+				"modal": true
+			});
+			var lang = fs.readFileSync(lang_path, 'utf8');
+			updatewin.loadURL(base + lang + '/update.html');
+
+			return "true"
+		} else {
+			return false;
+		}
+	})
+	//アプデDL
+	ipc.on('download-btn', (e, args) => {
+
+		var platform = process.platform;
+		var bit = process.arch;
+		dialog.showSaveDialog(null, {
+			title: 'Save',
+			defaultPath: app.getPath('home') + "/" + args[1]
+		}, (savedFiles) => {
+			console.log(savedFiles);
+			if (!savedFiles) {
+				return false;
+			}
+			if (platform == "win32") {
+				var m = savedFiles.match(/(.+)\\(.+)$/);
+			} else {
+				var m = savedFiles.match(/(.+)\/(.+)$/);
+			}
+			//console.log(m);
+			if (isExistFile(savedFiles)) {
+				fs.unlinkSync(savedFiles);
+			}
+			dl(args[0], args[1], m[1]);
+		});
+	});
+
+	function isExistFile(file) {
+		try {
+			fs.statSync(file);
+			return true
+		} catch (err) {
+			if (err.code === 'ENOENT') return false
+		}
+	}
+
+	function dl(url, file, dir) {
+
+		updatewin.webContents.send('mess', "ダウンロードを開始します。");
+		const opts = {
+			directory: dir,
+			openFolderWhenDone: true,
+			onProgress: function (e) {
+				updatewin.webContents.send('prog', e);
+			},
+			saveAs: false
+		};
+		download(updatewin,
+			url, opts)
+			.then(dl => {
+				updatewin.webContents.send('mess', "ダウンロードが完了しました。");
+				app.quit();
+
+			})
+			.catch(console.error);
+	}
+	ipc.on('general-dl', (e, args) => {
+
+		var name = "";
+		var platform = process.platform;
+		var bit = process.arch;
+		if (args[1] == "") {
+			if (platform == "win32") {
+				var dir = app.getPath('home') + "\\Pictures\\TheDesk";
+			} else if (platform == "linux" || platform == "darwin") {
+				var dir = app.getPath('home') + "/Pictures/TheDesk";
+			}
+		} else {
+			var dir = args[1];
+		}
+		const opts = {
+			directory: dir,
+			filename: name,
+			openFolderWhenDone: false,
+			onProgress: function (e) {
+				mainWindow.webContents.send('general-dl-prog', e);
+			},
+			saveAs: false
+		};
+		download(BrowserWindow.getFocusedWindow(),
+			args[0], opts)
+			.then(dl => {
+				mainWindow.webContents.send('general-dl-message', dir);
+			})
+			.catch(console.error);
+	});
+	ipc.on('open-finder', (e, folder) => {
+
+		shell.showItemInFolder(folder)
+	});
+}
+exports.dl = dl;

app/main/img.js

@@ -0,0 +1,74 @@
+function img(mainWindow, dir) {
+    const electron = require("electron");
+    const dialog = electron.dialog;
+    const fs = require("fs");
+    var Jimp = require("jimp");
+    var ipc = electron.ipcMain;
+    const BrowserWindow = electron.BrowserWindow;
+    ipc.on('file-select', (e, args) => {
+
+        dialog.showOpenDialog(null, {
+            properties: ['openFile', 'multiSelections'],
+            title: '添付ファイルを選択',
+            defaultPath: '.',
+            filters: [
+                { name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] },
+                { name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
+                { name: '動画', extensions: ['mp4', 'webm'] },
+                { name: '全てのファイル', extensions: ['*'] }
+            ]
+        }, (fileNames) => {
+            if (!fileNames) {
+                return false;
+            }
+            for (var i = 0; i < fileNames.length; i++) {
+                var path = fileNames[i];
+                var bin = fs.readFileSync(path, 'base64');
+                mainWindow.webContents.send('bmp-img-comp', [bin, 'new']);
+            }
+        });
+    });
+    ipc.on('adobe', (e, arg) => {
+
+        if (!arg) {
+            const options = {
+                type: 'info',
+                title: 'Adobeフォトエディタ',
+                message: "「許可」または「永続的に許可」をクリックするとTheDeskとAdobeで情報を共有します。\n次のウィンドウを開いている時以外は一切提供しません。",
+                buttons: ['拒否', '許可', '永続的に許可']
+            }
+            dialog.showMessageBox(options, function (index) {
+                if (index === 2) {
+                    mainWindow.webContents.send('adobeagree', "true");
+                }
+                if (index > 0) {
+                    adobeWindow();
+                }
+            })
+        } else {
+            adobeWindow();
+        }
+    });
+    function adobeWindow() {
+        var window = new BrowserWindow({
+            webPreferences: {
+				nodeIntegration:true
+			},
+            width: 1000,
+            height: 750
+        });
+        window.loadURL(dir + '/adobe.html');
+    }
+    ipc.on('bmp-image', (e, args) => {
+
+        var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
+        Jimp.read(args[0], function (err, lenna) {
+            if (err) throw err;
+            lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
+                mainWindow.webContents.send('bmp-img-comp', [src, args[1]]);
+            });
+        });
+
+    });
+}
+exports.img = img;

app/main/language.js

@@ -0,0 +1,164 @@
+// Create the Application's main menu
+function templete(lang, mainWindow, packaged, dir) {
+    const electron = require("electron");
+    const app = electron.app;
+    const BrowserWindow = electron.BrowserWindow;
+    const dict = {
+        "application": {
+            "ja": "アプリケーション",
+            "en": "Application"
+        },
+        "about": {
+            "ja": "TheDeskについて",
+            "en": "About TheDesk"
+        },
+        "quit": {
+            "ja": "終了",
+            "en": "Quit"
+        },
+        "edit": {
+            "ja": "編集",
+            "en": "Edit"
+        },
+        "undo": {
+            "ja": "元に戻す",
+            "en": "Undo"
+        },
+        "redo": {
+            "ja": "やり直す",
+            "en": "Redo"
+        },
+        "cut": {
+            "ja": "切り取り",
+            "en": "Cut"
+        },
+        "copy": {
+            "ja": "コピー",
+            "en": "Copy"
+        },
+        "paste": {
+            "ja": "貼り付け",
+            "en": "Paste"
+        },
+        "selall": {
+            "ja": "すべて選択",
+            "en": "Select All"
+        },
+        "view": {
+            "ja": "表示",
+            "en": "View"
+        },
+        "reload": {
+            "ja": "再読み込み",
+            "en": "Reload"
+        },
+        "window": {
+            "ja": "ウィンドウ",
+            "en": "Window"
+        },
+        "minimun": {
+            "ja": "最小化",
+            "en": "Minimarize"
+        },
+        "close": {
+            "ja": "閉じる",
+            "en": "Close"
+        }
+    }
+    const menu = [{
+        label: dict.application[lang],
+        submenu: [
+            {
+                label: dict.about[lang], click: function () {
+                    var ver = app.getVersion()
+                    var window = new BrowserWindow({
+                        webPreferences: {
+                            nodeIntegration:true
+                        },
+                        width: 300, height: 460,
+                        "transparent": false,    // ウィンドウの背景を透過
+                        "frame": false,     // 枠の無いウィンドウ
+                        "resizable": false
+                    });
+                    window.loadURL(dir + '/about.html?ver=' + ver);
+                }
+            },
+            { type: "separator" },
+            { label: dict.quit[lang], accelerator: "Command+Q", click: function () { app.quit(); } }
+
+        ]
+    }, {
+        label: dict.edit[lang],
+        submenu: [
+            { label: dict.undo[lang], accelerator: "CmdOrCtrl+Z", selector: "undo:" },
+            { label: dict.redo[lang], accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
+            { type: "separator" },
+            { label: dict.cut[lang], accelerator: "CmdOrCtrl+X", selector: "cut:" },
+            { label: dict.copy[lang], accelerator: "CmdOrCtrl+C", selector: "copy:" },
+            { label: dict.paste[lang], accelerator: "CmdOrCtrl+V", selector: "paste:" },
+            { label: dict.selall[lang], accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
+        ]
+    }, {
+        label: dict.view[lang],
+        submenu: [
+            {
+                label: 'Toggle Developer Tools',
+                accelerator: 'Alt+Command+I',
+                click: function () { if (!packaged) { mainWindow.toggleDevTools(); } }
+            },
+            {
+                label: dict.reload[lang],
+                accelerator: 'CmdOrCtrl+R',
+                click: function () { mainWindow.webContents.send('reload', " "); }
+            }
+        ]
+    },
+    {
+        label: dict.window[lang],
+        role: 'window',
+        submenu: [
+            {
+                label: dict.minimun[lang],
+                accelerator: 'CmdOrCtrl+M',
+                role: 'minimize'
+            },
+            {
+                label: dict.close[lang],
+                accelerator: 'CmdOrCtrl+W',
+                role: 'close'
+            },
+        ]
+    }
+    ];
+    return menu;
+}
+function delsel(lang) {
+    const dict = {
+        "delete": {
+            "ja": "カラム削除",
+            "en": "Delete this column"
+        },
+        "mess": {
+            "ja": "カラムを削除しますか？(すべてのカラムのリンク解析がOFFになります。)",
+            "en": "Delete this column(URL analyzes of all windows will be disabled.)"
+        },
+        "yes": {
+            "ja": "はい",
+            "en": "Yes"
+        },
+        "no": {
+            "ja": "いいえ",
+            "en": "No"
+        }
+    }
+    const options = {
+        type: 'info',
+        title: dict.delete[lang],
+        message: dict.mess[lang],
+        buttons: [dict.no[lang], dict.yes[lang]]
+    }
+    return options;
+}
+
+exports.template = templete;
+exports.delsel = delsel;

app/main/np.js

@@ -0,0 +1,71 @@
+function np(mainWindow) {
+    const electron = require("electron");
+    const join = require('path').join;
+    const app = electron.app;
+    const fs = require("fs");
+    var ipc = electron.ipcMain;
+    ipc.on('itunes', async (e, args) => {
+        //Verified on Windows
+        console.log("Access");
+        if (args[0] == "set") {
+            var { NowPlaying, PlayerName } = require("nowplaying-node");
+            var nppath = join(app.getPath("userData"), "nowplaying");
+            var npProvider;
+            try {
+                npProvider = args[1];
+            } catch (e) {
+                npProvider = "AIMP";
+            }
+            var myAIMP = new NowPlaying({
+                fetchCover: true,
+                player: PlayerName[npProvider],
+            });
+            fs.writeFileSync(nppath, npProvider);
+        } else {
+            var platform = process.platform;
+            var bit = process.arch;
+            if (platform == "darwin") {
+                try {
+                    const nowplaying = require("itunes-nowplaying-mac");
+                    const value = await nowplaying.getRawData();
+                    mainWindow.webContents.send('itunes-np', value);
+                } catch (error) {
+                    // エラーを返す
+                    console.error(error);
+                    mainWindow.webContents.send('itunes-np', error);
+                }
+            } else {
+                var { NowPlaying, PlayerName } = require("nowplaying-node");
+                var nppath = join(app.getPath("userData"), "nowplaying");
+                var npProvider;
+                try {
+                    npProvider = fs.readFileSync(nppath, 'utf8');
+                } catch (e) {
+                    npProvider = "AIMP";
+                }
+                var myAIMP = new NowPlaying({
+                    fetchCover: true,
+                    player: PlayerName[npProvider],
+                });
+                myAIMP.update();
+                var path = myAIMP.getCoverPath();
+                if (path) {
+                    var bin = fs.readFileSync(path, 'base64');
+                } else {
+                    var bin = false;
+                }
+
+                var value = {
+                    win: true,
+                    name: myAIMP.getTitle(),
+                    artist: myAIMP.getArtist(),
+                    album: myAIMP.getAlbum(),
+                    path: bin
+                }
+                mainWindow.webContents.send('itunes-np', value);
+            }
+        }
+
+    });
+}
+exports.TheDeskNowPlaying = np;

app/main/system.js

@@ -0,0 +1,187 @@
+function system(mainWindow, dir, lang) {
+	const electron = require("electron");
+	const app = electron.app;
+	const join = require('path').join;
+	var Jimp = require("jimp");
+	const fs = require("fs");
+	var ipc = electron.ipcMain;
+	var tmp_img = join(app.getPath("userData"), "tmp.png");
+	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+	var lang_path = join(app.getPath("userData"), "language");
+	const BrowserWindow = electron.BrowserWindow;
+	const dialog = electron.dialog;
+	const os = require('os')
+	const language = require("../main/language.js");
+	ipc.on('native-notf', function (e, args) {
+
+		var platform = process.platform;
+		var bit = process.arch;
+		if (platform == "win32") {
+			const notifier = require('node-notifier')
+			var tmp_imge = tmp_img;
+			Jimp.read(args[2], function (err, lenna) {
+				if (!err && lenna) {
+					lenna.write(tmp_img);
+					var tmp_imge = tmp_img;
+				} else {
+					var tmp_imge = "";
+				}
+				notifier.notify({
+					appID: "top.thedesk",
+					message: args[1],
+					title: args[0],
+					icon: tmp_imge,
+					sound: false,
+					wait: true,
+				},
+					function (err, response) {
+						console.log(err, response)
+					});
+			});
+		}
+	});
+	//言語
+	ipc.on('lang', function (e, arg) {
+
+		console.log("set:" + arg);
+		fs.writeFileSync(lang_path, arg);
+		mainWindow.webContents.send('langres', "");
+	})
+	//ハードウェアアクセラレーションの無効化
+	ipc.on('ha', function (e, arg) {
+
+		if (arg == "true") {
+			fs.writeFileSync(ha_path, arg);
+		} else {
+			fs.unlink(ha_path, function (err) { });
+		}
+		app.relaunch()
+		app.exit()
+	})
+
+	ipc.on('quit', (e, args) => {
+
+		app.quit();
+	});
+	ipc.on('about', (e, args) => {
+
+		about();
+	});
+
+	function about() {
+
+		var ver = app.getVersion()
+		var window = new BrowserWindow({
+			webPreferences: {
+				nodeIntegration:true
+			},
+			width: 300,
+			height: 480,
+			"transparent": false, // ウィンドウの背景を透過
+			"frame": false, // 枠の無いウィンドウ
+			"resizable": false
+		});
+		window.loadURL(dir + '/about.html?ver=' + ver);
+		return "true"
+	}
+	ipc.on('column-del', (e, args) => {
+
+		console.log(lang);
+		var options = language.delsel(lang)
+		dialog.showMessageBox(options, function (index) {
+			mainWindow.webContents.send('column-del-reply', index);
+		})
+	});
+	ipc.on('nano', function (e, x, y) {
+
+		var nano_info_path = join(app.getPath("userData"),
+			"nano-window-position.json");
+		var window_pos;
+		try {
+			window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'));
+		} catch (e) {
+			window_pos = [0, 0]; // デフォルトバリュー
+		}
+		var nanowindow = new BrowserWindow({
+			webPreferences: {
+				nodeIntegration:true
+			},
+			width: 350,
+			height: 200,
+			"transparent": false, // ウィンドウの背景を透過
+			"frame": false, // 枠の無いウィンドウ
+			"resizable": false
+		});
+		nanowindow.loadURL(dir + '/nano.html');
+		nanowindow.setAlwaysOnTop(true);
+
+		nanowindow.setPosition(window_pos[0], window_pos[1]);
+		nanowindow.on('close', function () {
+			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
+		});
+		return true;
+	})
+
+	var cbTimer1;
+	ipc.on('startmem', (e, arg) => {
+		cbTimer1 = setInterval(mems, 1000);
+	});
+	ipc.on('endmem', (e, arg) => {
+		if (cbTimer1) {
+			clearInterval(cbTimer1);
+		}
+	});
+
+	function mems() {
+		var mem = os.totalmem() - os.freemem();
+		if (mainWindow) {
+			mainWindow.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()]);
+		}
+	}
+	ipc.on('export', (e, args) => {
+		fs.writeFileSync(args[0], args[1]);
+	});
+	ipc.on('import', (e, arg) => {
+		mainWindow.webContents.send('config', fs.readFileSync(arg, 'utf8'));
+	});
+	//フォント
+	function object_array_sort(data, key, order, fn) {
+		//デフォは降順(DESC)
+		var num_a = -1;
+		var num_b = 1;
+
+		if (order === 'asc') { //指定があれば昇順(ASC)
+			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 = {};
+		for (var i = 0; i < data.length; i++) {
+			arrObj[data[i]['family']] = data[i];
+		}
+
+		data = [];
+		for (var key in arrObj) {
+			data.push(arrObj[key]);
+		}
+
+		fn(data); // ソート後の配列を返す
+	}
+	ipc.on('fonts', (e, arg) => {
+		const fm = require('font-manager');
+		var fonts = fm.getAvailableFontsSync();
+		object_array_sort(fonts, 'family', 'asc', function (fonts_sorted) {
+			mainWindow.webContents.send('font-list', fonts_sorted);
+		});
+	});
+}
+exports.system = system;

app/nano.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
 	<meta charset="utf-8">
 	<link href="./css/themes.css" type="text/css" rel="stylesheet">
@@ -15,38 +16,58 @@ html{
 			overflow: hidden;
 			font-family: sans-serif;
 		}
+
 		body {
 			background-color: rgba(0, 0, 0, 0.1);
 			font-size: 11px;
 		}
+
 		#timeline_nano {
 			overflow-y: scroll;
 			overflow-x: hidden;
 			-webkit-app-region: no-drag;
 			max-height: 100px;
 		}
-.user{font-size:12px;}
+
+		.user {
+			font-size: 12px;
+		}
+
 		select {
 			-webkit-app-region: no-drag;
 		}
+
 		button {
 			-webkit-app-region: no-drag;
 		}
+
 		textarea {
 			-webkit-app-region: no-drag;
 		}
+
 		::-webkit-scrollbar {
 			width: 5px;
 			height: 10px;
 			background: rgba(0, 0, 0, 0.05);
 		}
+
 		::-webkit-scrollbar-track {
 			-webkit-border-radius: 5px;
 			border-radius: 5px;
 		}
- .area-actions{display:none !important;}
+
- .area-date_via{display:none !important;}
+		.area-actions {
- .area-side{display:none !important;}
+			display: none !important;
+		}
+
+		.area-date_via {
+			display: none !important;
+		}
+
+		.area-side {
+			display: none !important;
+		}
+
 		/* Handle */
 		::-webkit-scrollbar-thumb {
 			-webkit-border-radius: 5px;
@@ -54,22 +75,29 @@ textarea {
 			background: rgba(0, 0, 0, 0.8);
 			-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
 		}
+
 		.blacktheme body {
 			color: white;
 			background-color: #212121;
 		}
+
 		.blacktheme button {
 			background-color: black;
 			color: white;
 		}
-.blacktheme textarea, .blacktheme select{
+
+		.blacktheme textarea,
+		.blacktheme select {
 			color: white;
 		}
-.blacktheme select,.blacktheme option{
+
+		.blacktheme select,
+		.blacktheme option {
 			background-color: black;
 		}
 	</style>
 </head>
+
 <body>
 	<script>
 		//jQuery読む
@@ -178,10 +206,10 @@ function post(){
 			httpreq.open('POST', start, true);
 			httpreq.setRequestHeader('Content-Type', 'application/json');
 			httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+			httpreq.responseType = "json";
 			httpreq.send(JSON.stringify(toot));
 			httpreq.onreadystatechange = function () {
-		if (httpreq.readyState == 4) {
+				if (httpreq.readyState === 4) {
 					$("#textarea").val("");
 				}
 			}

app/package.json

@@ -1,23 +1,31 @@
 {
   "name": "thedesk",
-  "version": "17.0.1",
+  "version": "18.5.0",
   "description": "TheDesk is a Mastodon client for PC.",
+  "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dist": "build --linux snap",
+    "build:js": "node build.js",
+    "build": "electron-builder",
     "build:all": "electron-builder --win --linux",
     "build:win": "electron-builder --win"
   },
-  "keywords": [],
+  "keywords": [
+    "mastodon",
+    "client",
+    "electron",
+    "thedesk"
+  ],
   "bugs": {
     "url": "https://github.com/cutls/TheDesk/issues",
-    "email": "mstdn@thedesk.top"
+    "email": "web-pro@cutls.com"
   },
   "homepage": "https://thedesk.top",
   "author": {
-    "name": "Cutls P",
+    "name": "Cutls",
-    "url": "https://kirishima.clooud/@Cutls",
+    "url": "https://cutls.com/@Cutls",
     "email": "web-pro@cutls.com"
   },
   "contributor": [
@@ -30,31 +38,56 @@
       "name": "ぽぷんじゃ",
       "url": "https://popon.pptdn.jp/@popn_ja",
       "email": "popn.ja@gmail.com"
+    },
+    {
+      "name": "kPherox",
+      "url": "https://pawoo.net/@kPherox",
+      "email": "admin@mail.kr-kp.com"
     }
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "electron-dl": "^1.11.0",
+    "electron-dl": "^1.14.0",
-    "font-manager": "^0.3.0",
+    "jimp": "^0.6.4",
-    "jimp": "^0.2.28",
+    "json5": "^2.1.0",
-    "node-notifier": "^5.2.1",
+    "node-notifier": "^5.4.0",
-    "sumchecker": "^2.0.2"
+    "sumchecker": "^3.0.0",
+    "vue": "^2.6.10"
   },
   "optionalDependencies": {
-    "nowplaying-node": "^0.1.3",
+    "nowplaying-node": "git+https://github.com/cutls/nowplaying-node",
-    "itunes-nowplaying-mac": "^0.2.3"
+    "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/4/head",
+    "font-manager": "^0.3.0"
+  },
+  "devDependencies": {
+    "electron": "^5.0.1",
+    "electron-builder": "^20.40.2"
   },
   "build": {
     "productName": "TheDesk",
     "appId": "top.thedesk",
+    "asarUnpack": [
+      "node_modules/itunes-nowplaying-mac"
+    ],
     "directories": {
       "output": "../build"
     },
     "win": {
-      "icon": "thedesk.ico",
+      "icon": "build/thedesk.ico",
       "target": [
         "nsis",
-        "portable"
+        "portable",
+        "appx"
+      ]
+    },
+    "appx": {
+      "identityName": "53491Cutls.TheDesk",
+      "applicationId": "Cutls.TheDesk",
+      "publisherDisplayName": "Cutls",
+      "publisher": "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+      "languages": [
+        "JA-JP",
+        "EN-US"
       ]
     },
     "nsis": {
@@ -65,22 +98,19 @@
     "linux": {
       "icon": "build/icons",
       "target": [
-        "snap"
+        "zip"
       ],
       "category": "Network"
     },
     "mac": {
-      "target": "dmg"
+      "target": [
+        "dmg",
+        "zip"
+      ]
     },
     "electronDownload": {
-      "version": "3.0.10"
+      "version": "5.0.1"
     },
-    "electronVersion": "3.0.10"
+    "electronVersion": "5.0.1"
-  },
-  "devDependencies": {
-    "electron": "^3.0.10",
-    "electron-packager": "^13.0.1",
-    "electron-prebuilt": "^1.4.13",
-    "electron-rebuild": "^1.8.2"
   }
 }

app/view/en/acct.html

@@ -1,5 +1,6 @@
 <!doctype html>
 <html lang="en">
+
 <head>
       <title>Account Manager - TheDesk</title>
       <meta content="width=device-width,initial-scale=1.0" name="viewport">
@@ -10,14 +11,57 @@
       <link href='../../css/tl.css' rel='stylesheet' type='text/css'>
       <link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
       <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
-<style>.acct{display:flex; justify-content:space-around;}
+      <style>
-.card{width:400px; background-color: #9e9e9e; margin:10px; }
+            .acct {
-body,html{overflow-y: scroll;}
+                  display: flex;
-#acct-list{display:flex; flex-wrap:wrap; color:white; align-items: flex-start}
+                  justify-content: space-around;
-.lts{font-size:150%}
+            }
-.colorsel{ display:flex; }
+
-.card .colorsel div:not(.exc){width:20px;height:20px;}
+            .card {
-.card .colorsel div.exc{width:40px;height:20px;}
+                  width: 400px;
+                  background-color: #9e9e9e;
+                  margin: 10px;
+            }
+
+            body,
+            html {
+                  overflow-y: scroll;
+            }
+
+            #acct-list {
+                  display: flex;
+                  flex-wrap: wrap;
+                  color: white;
+                  align-items: flex-start
+            }
+
+            .lts {
+                  font-size: 150%
+            }
+
+            .colorsel {
+                  display: flex;
+            }
+
+            .card .colorsel div:not(.exc) {
+                  width: 20px;
+                  height: 20px;
+            }
+
+            .card .colorsel div.exc {
+                  width: 40px;
+                  height: 20px;
+            }
+
+            .first {
+                  display: flex;
+                  justify-content: center;
+                  align-items: center
+            }
+
+            .first .hide-first {
+                  display: none;
+            }
       </style>
       <meta charset="utf-8">
       <!--
@@ -28,6 +72,7 @@ body,html{overflow-y: scroll;}
       <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
       -->
 </head>
+
 <body id="mainView">
       <script type="text/javascript" src="../../js/common/jquery.js"></script>
       <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -39,28 +84,33 @@ body,html{overflow-y: scroll;}
       <script type="text/javascript" src="../../js/ui/tips.js"></script>
       <script type="text/javascript" src="../../js/common/time.js"></script>
       <script type="text/javascript" src="../../js/common/modal.js"></script>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">Back</a><br>
+      <div class="hide-first">
+            <a href="index.html" class="btn waves-effect orange nex"
+                  style="width:100%; max-width:200px;">Back</a><br>
             <h5>List of accounts</h5>
             <div id="acct-list"></div>
             <div class="divider"></div>
+      </div>
+      <div>
             <h5>Add an account</h5><br>
             <div id="add">
                   <div class="row">
-      <div class="col s6">
+                        <div class="col s8">
                               <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
                               <div id="ins-suggest"></div>
-            Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.<br>
+                              Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)<br>
                               <input type="checkbox" class="filled-in" id="linux" />
                               <label for="linux">Code setup</label><br>
                               <input type="checkbox" class="filled-in" id="misskey" />
                               <label for="misskey">Login as Misskey</label><br>
                               <button class="btn waves-effect" onclick="instance()">Login</button><br>
                         </div>
-      <div class="col s6">
+                        <div class="col s4">
                               <span style="font-family:Open Sans;">Supports</span>
                               <div id="support" class="collection transparent"></div>
                         </div>
-</div></div>
+                  </div>
+            </div>
             <div id="auth" style="display:none">
                   Paste the code and close browser.<br>
                   <input type="text" id="code" placeholder="Code">
@@ -73,6 +123,8 @@ body,html{overflow-y: scroll;}
                   <input type="text" id="misskey-key" placeholder="Code">
                   <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
             </div>
+      </div>
+      <div class="hide-first">
             <h5>Main an account</h5>
             <div class="input-field" style="width:300px"><span data-trans="your_acct">Select an account</span>
                   <br>
@@ -91,6 +143,7 @@ Toots:<span id="ins-toot"></span><br>
             Users:<span id="ins-user"></span>Users<br>
             Connection:<span id="ins-per"></span>%<br>
             Mastodon version:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
+      </div>
       <script type="text/javascript" src="../../js/ui/theme.js"></script>
       <script type="text/javascript" src="../../js/platform/end.js"></script>
       <script type="text/javascript" src="../../js/common/sha256.js"></script>

app/view/en/index.html

@@ -1,16 +1,18 @@
 <!doctype html>
 <html lang="en">
+
 <head>
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css"
+		integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	<!--
@@ -21,28 +23,29 @@
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 	-->
 </head>
+
 <body>
 	<script type="text/javascript" src="../../js/common/jquery.js"></script>
 	<script type="text/javascript" src="../../js/platform/first.js"></script>
 	<script type="text/javascript" src="../../js/common/materialize.js"></script>
 	<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
 	<script type="text/javascript" src="../../js/common/time.js"></script>
+	<script type="text/javascript" src="../../js/common/blurhash.js"></script>
 	<script type="text/javascript" src="../../js/common/version.js"></script>
 	<script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 	<script>
-var ver="Miria (17.0.1) beta4";
+		var ver = "Usamin (18.5.0)";
 		//betaを入れるとバージョンチェックしない
 		//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 		//var ver="beta";
 		//WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
-var winstore=false;
 		var acct_id = 0;
 		var tlid = 0;
-  verck(ver,winstore);
 	</script>
 	<textarea id="copy" style="top:-100px; position:fixed;"></textarea>
+	<canvas id="canvas" style="top:-100px; position:fixed;width:32px;height:32px" width="32" height="32"></canvas>
 	<div id="tl">
 		<!--TL-->
 		<!--ドラッグハンドラ-->
@@ -53,56 +56,86 @@ var tlid=0;
 			</div>
 		</div>
 	</div>
-<div id="post-box" class="z-depth-3">
+	<div id="post-box" class="z-depth-5">
+		<div id="post-bar" class="drag-bar"><span id="unreact">Post new</span><span id="addreact"
+				class="hide">Reaction</span></div>
 		<!--トゥートボックス-->
+		<div id="left-side">
 			<div class="row" style="margin-bottom:0;">
 				</span>
 				<div class="" style="float:left;">
 					<a onclick="profShow()" style="vertical-align:-2.5rem;" class="pointer mize">
-	<img src="../../img/missing.svg" id="acct-sel-prof" title="Show profile of the selecting account(Ctrl+Shift+P)" data-trans-title="post_box_prof" width="24px">
+						<img src="../../img/missing.svg" id="acct-sel-prof" title="Show profile of the selecting account(Ctrl+Shift+P)"
+							data-trans-title="post_box_prof" width="24px">
 					</a>
 				</div>
 				<div class="input-field mize" style="float:left; width:calc(100% - 24px)">
 					<select id="post-acct-sel" class="acct-sel" onchange="mdCheck()"></select>
 				</div>
 				<span class="cancel">
-		<i class="material-icons waves-effect" onclick="hide()" title="Close this box(X)" data-trans-title="post_box_close">cancel</i>
+					<i class="material-icons waves-effect" onclick="hide()" title="Close this box(X)"
+						data-trans-title="post_box_close">cancel</i>
 				</span>
 				<!--Markdown-->
 				<div class="row" style="margin-bottom:0">
 					<div class="markdown mize hide">
 						<div class="col s12">
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('b')" title="太字(Ctrl+B)テキストボックス内を選択してから押すと囲みます。">format_bold</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('b')"
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('i')" title="斜字(Ctrl+I)テキストボックス内を選択してから押すと囲みます。">format_italic</i>
+								title="太字(Ctrl+B)テキストボックス内を選択してから押すと囲みます。">format_bold</i>
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('u')" title="下線(Ctrl+U)テキストボックス内を選択してから押すと囲みます。">format_underlined</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('i')"
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('s')" title="取り消し(Ctrl+S)テキストボックス内を選択してから押すと囲みます。">strikethrough_s</i>
+								title="斜字(Ctrl+I)テキストボックス内を選択してから押すと囲みます。">format_italic</i>
-<i class="material-icons pointer setting waves-effect" onclick="markdown('>','no','yes')" title="引用">format_quote</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('u')"
-<i class="material-icons pointer setting waves-effect" onclick="markdown('#','no','yes')" title="見出し">short_text</i>
+								title="下線(Ctrl+U)テキストボックス内を選択してから押すと囲みます。">format_underlined</i>
-<i class="material-icons pointer setting waves-effect" onclick="markdown('`','yes','no')" title="コード挿入　テキストボックス内を選択してから押すと囲みます。">code</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('s')"
-<i class="material-icons pointer setting waves-effect" onclick="markdown('- ','yes','yes')" title="箇条書きリスト">format_list_bulleted</i>
+								title="取り消し(Ctrl+S)テキストボックス内を選択してから押すと囲みます。">strikethrough_s</i>
-<i class="material-icons pointer setting waves-effect" onclick="markdown('1. ','yes','yes')" title="番号付きリスト">format_list_numbered</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('>','no','yes')"
-<i class="pointer setting fa fa-subscript waves-effect" onclick="markdown('__','yes','no','before')" title="下付き文字　テキストボックス内を選択してから押すと囲みます。" style="font-size:1.5rem"></i>
+								title="引用">format_quote</i>
-<i class="pointer setting fa fa-superscript waves-effect" onclick="markdown('_','yes','no','before')" title="上付き文字　テキストボックス内を選択してから押すと囲みます。" style="font-size:1.5rem"></i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('#','no','yes')"
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('spin')" title="回転　テキストボックス内を選択してから押すと囲みます。">autorenew</i>
+								title="見出し">short_text</i>
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('pulse')" title="点滅　テキストボックス内を選択してから押すと囲みます。">flare</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('`','yes','no')"
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=vertical')" title="上下反転　テキストボックス内を選択してから押すと囲みます。">swap_vert</i>
+								title="コード挿入　テキストボックス内を選択してから押すと囲みます。">code</i>
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=horizontal')" title="左右反転　テキストボックス内を選択してから押すと囲みます。">swap_horiz</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('- ','yes','yes')"
+								title="箇条書きリスト">format_list_bulleted</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('1. ','yes','yes')"
+								title="番号付きリスト">format_list_numbered</i>
+							<i class="pointer setting fa fa-subscript waves-effect"
+								onclick="markdown('__','yes','no','before')" title="下付き文字　テキストボックス内を選択してから押すと囲みます。"
+								style="font-size:1.5rem"></i>
+							<i class="pointer setting fa fa-superscript waves-effect"
+								onclick="markdown('_','yes','no','before')" title="上付き文字　テキストボックス内を選択してから押すと囲みます。"
+								style="font-size:1.5rem"></i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('spin')"
+								title="回転　テキストボックス内を選択してから押すと囲みます。">autorenew</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('pulse')"
+								title="点滅　テキストボックス内を選択してから押すと囲みます。">flare</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=vertical')"
+								title="上下反転　テキストボックス内を選択してから押すと囲みます。">swap_vert</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=horizontal')"
+								title="左右反転　テキストボックス内を選択してから押すと囲みます。">swap_horiz</i>
 							<span class="sml gray pointer waves-effect">
 								<a onclick="mdToggle()">Markdownエディタを隠す</a>
 							</span>
 							<br>
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('size')" title="文字サイズ変更　テキストボックス内を選択してから押すと囲みます。">format_size</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('size')"
+								title="文字サイズ変更　テキストボックス内を選択してから押すと囲みます。">format_size</i>
 							<input id="size" style="width: calc(50% - 20px); margin: 0; height: 24px;" value="12">px
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('colorhex')" title="文字色変更　テキストボックス内を選択してから押すと囲みます。">color_lens</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('colorhex')"
+								title="文字色変更　テキストボックス内を選択してから押すと囲みます。">color_lens</i>
 							<input id="colorhex" style="width: calc(50% - 50px); margin: 0; height: 24px;" type="color">
 							<br>
-<i class="material-icons pointer setting waves-effect" onclick="markdownLink()" title="リンク挿入">link</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdownLink()"
-<input id="linkt" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="リンクテキスト">&nbsp;
+								title="リンク挿入">link</i>
-<input id="link2" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="リンクアドレス">
+							<input id="linkt" style="width: calc(50% - 20px); margin: 0; height: 24px;"
+								placeholder="リンクテキスト">&nbsp;
+							<input id="link2" style="width: calc(50% - 20px); margin: 0; height: 24px;"
+								placeholder="リンクアドレス">
 							<br>
-<i class="material-icons pointer setting waves-effect" onclick="markdownImage()" title="インライン画像挿入">image</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdownImage()"
-<input id="image" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="代替テキスト">&nbsp;
+								title="インライン画像挿入">image</i>
-<input id="image2" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="画像アドレス">
+							<input id="image" style="width: calc(50% - 20px); margin: 0; height: 24px;"
+								placeholder="代替テキスト">&nbsp;
+							<input id="image2" style="width: calc(50% - 20px); margin: 0; height: 24px;"
+								placeholder="画像アドレス">
 						</div>
 					</div>
 					<div class="input-field col s12" id="preview-field" style="margin-top: 0;">
@@ -114,7 +147,8 @@ var tlid=0;
 					</div>
 					<div class="input-field col s12" id="toot-field" style="margin-top: 10px;">
 
-<textarea id="textarea" class="materialize-textarea unmize" style="margin-bottom:0;" data-length="500"></textarea>
+						<textarea id="textarea" class="materialize-textarea unmize" style="margin-bottom:0;"
+							data-length="500"></textarea>
 						<label for="textarea" data-trans="toot">Toot</label>
 						<br>
 						<span class="sml gray pointer markdown mize" id="preview-btn">
@@ -123,20 +157,25 @@ var tlid=0;
 						<span class="sml gray pointer anti-markdown mize">
 							<a onclick="mdToggle()">Markdownエディタを表示</a>
 						</span>
-<span id="suggest"></span>
 					</div>
 					<div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
-		<i class="waves-effect gray material-icons" id="nsfw" title="Mark media as sensitive" onclick="nsfw()">visibility_off</i>
+						<i class="waves-effect gray material-icons" id="nsfw" title="Mark media as sensitive"
-		<i class="waves-effect gray material-icons purple-text dropdown-button" data-activates='dropdown1' id="vis-icon">public</i>
+							onclick="nsfw()">visibility_off</i>
+						<i class="waves-effect gray material-icons purple-text dropdown-button"
+							data-activates='dropdown1' id="vis-icon">public</i>
 						<a class="waves-effect gray" id="cw" onclick="cw()" title="Hide text behind warning">CW</a>
-		<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray" onclick="fileselect()" title="Attach..">photo_library</i></span></span>
+						<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray"
-		<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn" title="Emojis">tag_faces</i>
+									onclick="fileselect()" title="Attach..">photo_library</i></span></span>
-		<i class="waves-effect gray material-icons dropdown-button" data-activates='dropdown2'>more_vert</i>
+						<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn"
-		<i class="material-icons nex gray waves-effect" title="Clear toot box(Ctrl+Shit+C)" data-trans-title="post_box_clear" id="clear">clear</i>
+							title="Emojis">tag_faces</i>
+						<i class="waves-effect gray material-icons dropdown-button"
+							data-activates='dropdown2'>more_vert</i>
+						<i class="material-icons nex gray waves-effect" title="Clear toot box(Ctrl+Shit+C)"
+							data-trans-title="post_box_clear" id="clear">clear</i>
 					</div>
 					<div class="col s12 mize" style="margin-bottom:5px; padding:0;">
 						<div id="taglist"></div>
-<span id="preview" class="mize"></span>
+						<div id="preview" class="mize"></div>
 						<span class=" sml mize"><span data-trans="reply">Reply</span>:
 							<span id="rec">No</span>/<span data-trans="file">Attaching files</span>:
 							<span id="mec">None</span>/<span data-trans="vis">Adjust status privacy</span>:
@@ -145,13 +184,15 @@ var tlid=0;
 						<br>
 						<input type="text" id="cw-text" placeholder="Warning text" class="mize" style="margin:0">
 						<div id="sch-box">Post at<br><span class="sml">2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)</span><br>
-	<input type="datetime-local" id="sch-date" placeholder="Scheduled toot" class="datepicker" style="margin:0">
+							<input type="datetime-local" id="sch-date" placeholder="Scheduled toot" class="datepicker"
+								style="margin:0">
 						</div>
 					</div>
 				</div>
 				<!-- 公開範囲 Dropdown Structure -->
 				<ul id='dropdown1' class='dropdown-content'>
-<li style="font-size: 16px; display: block; line-height: 22px; padding: 14px 16px;">Adjust status privacy</li>
+					<li style="font-size: 16px; display: block; line-height: 22px; padding: 14px 16px;">Adjust status privacy
+					</li>
 					<li>
 						<a onclick="vis('public')">(Public)</a>
 					</li>
@@ -185,6 +226,9 @@ var tlid=0;
 					<li>
 						<a onclick="schedule();">Scheduled toot</a>
 					</li>
+					<li>
+						<a onclick="pollToggle();">Poll</a>
+					</li>
 				</ul>
 				<!--hidden area-->
 				<input type="hidden" id="reply">
@@ -192,26 +236,32 @@ var tlid=0;
 				<!--END hidden area-->
 			</div>
 			<div id="toot-btn-field">
-	<button class="btn waves-effect indigo unmize toot-btn-group" onclick="post()" id="toot-post-btn">Toot</button>
+				<button class="btn waves-effect indigo unmize toot-btn-group" onclick="post()"
-	<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="Secondary Toot">lock_open</i></button>
+					id="toot-post-btn">Toot</button>
+				<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()"
+					id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon"
+						title="Secondary Toot">lock_open</i></button>
 			</div>
 		</div>
+		<div id="right-side">
+			<div id="suggest"></div>
 			<!--絵文字ピッカー-->
-<div id="emoji" class="hide shared z-depth-4">
+			<div id="emoji" class="hide">
 				<span class="gray sml">
 					<a onclick="emojiGet('true')" class="pointer">Refresh emojis list</a>
-		<i class="material-icons waves-effect" onclick="emoji()" title="Close this box" data-trans-title="post_box_close">cancel</i>
 					<br>
 				</span>
 				<div id="emoji-list" class="" style="">
 				</div>
 				<div class="emoji-control center">
-		<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
+					<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')"
+						id="emoji-before">
 						<i class="material-icons">navigate_before</i>
 					</button>
 					<span id="emoji-count"></span>/
 					<span id="emoji-sum"></span>
-		<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')" id="emoji-next">
+					<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')"
+						id="emoji-next">
 						<i class="material-icons">navigate_next</i>
 					</button>
 				</div>
@@ -246,14 +296,57 @@ var tlid=0;
 						<i class="material-icons">flag</i>
 					</a>
 					<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-		<i class="fa fa-fort-awesome"></i>
+						<i class="fab fa-fort-awesome"></i>
 					</a>
 				</div>
 			</div>
+			<!--Poll UI-->
+			<div id="poll" class="hide">
+				<select id="poll-sel" onchange="pollProviderCk()">
+					<option value="nothing">Polls: Disabled</option>
+					<option value="mastodon-poll">Mastodon(2.8~)</option>
+				</select>
+				<div id="mastodon-poll" class="poll-provider hide">
+					<input type="text" class="mastodon-choice" placeholder="Choice1">
+					<input type="text" class="mastodon-choice" placeholder="Choice2">
+					<input type="text" class="mastodon-choice" placeholder="Choice3">
+					<input type="text" class="mastodon-choice" placeholder="Choice4">
+					<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+					<label for="poll-multiple">Multiple select</label><br>
+					<input type="checkbox" class="filled-in" id="poll-until" value="1" />
+					<label for="poll-until">Hide 'votes' count until people vote it.</label><br>
+					<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">day(s)
+					<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hour(s)
+					<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">minute(s)
+				</div>
+			</div>
+		</div>
+	</div>
 	<!-- Modal Structure Tootdata-->
 	<div id="tootmodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
 			<ul class="collapsible" data-collapsible="accordion" id="det-col">
+				<li class="dm-hide">
+					<div class="collapsible-header">
+						<i class="material-icons">people_outline</i>Local TL after this toot)
+					</div>
+					<div class="collapsible-body toot-reset" id="ltl-after">
+					</div>
+				</li>
+				<li class="dm-hide">
+					<div class="collapsible-header">
+						<i class="material-icons">person_outline</i>User TL before this toot
+					</div>
+					<div class="collapsible-body toot-reset" id="user-after">
+					</div>
+				</li>
+				<li class="dm-hide">
+					<div class="collapsible-header">
+						<i class="material-icons">language</i>Federated TL after this toot
+					</div>
+					<div class="collapsible-body toot-reset" id="ftl-after">
+					</div>
+				</li>
 				<li>
 					<div class="collapsible-header">
 						<i class="material-icons">arrow_upward</i>Context before this toot
@@ -276,14 +369,14 @@ var tlid=0;
 					<div class="collapsible-body toot-reset" id="toot-after">
 					</div>
 				</li>
-	<li>
+				<li class="dm-hide">
 					<div class="collapsible-header">
 						<i class="material-icons">people_outline</i>Local TL before this toot
 					</div>
 					<div class="collapsible-body toot-reset" id="toot-before">
 					</div>
 				</li>
-	<li>
+				<li class="dm-hide">
 					<div class="collapsible-header">
 						<i class="material-icons">person_outline</i>User TL before this toot
 					</div>
@@ -297,27 +390,31 @@ var tlid=0;
 					<div class="collapsible-body toot-reset" id="toot-fav">
 					</div>
 				</li>
-	<li>
+				<li class="dm-hide">
 					<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>People who boosted it
+						<i class="text-darken-3 false fas fa-retweet"></i>People who boosted it
 					</div>
 					<div class="collapsible-body toot-reset" id="toot-rt">
 					</div>
 				</li>
 			</ul>
-	Use other account(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>:unfav and unBT are disabled.)<br>
+			<div class="dm-hide">
+				Use other account(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>:unfav and unBT are disabled.)<br>
 				<div class="row">
-		<div class="col s4">
+					<div class="col s6">
 						<select id="status-acct-sel" class="acct-sel"></select>
 					</div>
 					<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share left"></i>Reply</button>
+						<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i
+								class="fas fa-share"></i></button>
 					</div>
 					<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet left"></i>Boost</button>
+						<button class="dropdown-button btn waves-effect indigo" style="width:100%;"
+							onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 					</div>
-		<div class="col s3">
+					<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>Favourite</button>
+						<button class="dropdown-button btn waves-effect orange" style="width:100%;"
+							onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 					</div>
 				</div>
 				<div id="toot-tools">
@@ -325,11 +422,11 @@ var tlid=0;
 				<div id="toot-after">
 				</div>
 			</div>
+		</div>
 		<div class="modal-footer">
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="brws()">Open in browser</a>
+			<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">Open in browser</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="shot()">Take a screenshot</a>
+			<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">Copy URL of this toot</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy()">Copy URL of this toot</a>
+			<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">Embed</a>
-	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy('emb')">Embed</a>
 			<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
 		</div>
 	</div>
@@ -339,7 +436,7 @@ var tlid=0;
 			<div id="his-data-show">
 				<div class="his-float" id="his-float-data">
 					<div id="his-basic-prof">
-			<img src="../../img/loading.svg" id="his-prof">
+						<img src="../../img/loading.svg" id="his-prof" draggable="false">
 						<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 						<br>@
 						<span id="his-acct"></span><br>
@@ -357,12 +454,16 @@ var tlid=0;
 						<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 							<span id="his-since"></span>
 						</span>
+						<div id="his-proof-prof"></div>
 					</div>
-			<div id="his-des"></div><br>
+					<div id="his-des" data-acct=""></div><br>
 					<div id="his-plus-action">
-					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">Emphasize this user</a>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn"
-					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
+							onclick="empUser()">Emphasize this user</a>
-					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin" onclick="profbrws()">Open in browser</a><br>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data"
+							id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
+							onclick="profbrws()">Open in browser</a><br>
 					</div><br>
 					<div id="his-matching-list">
 						Get people resembling this user.<br>
@@ -381,10 +482,12 @@ var tlid=0;
 								<a go="#his-follow-list" title="Follow"><i class="material-icons">people</i>→</a>
 							</li>
 							<li class="custom-tab col my-data-width">
-					<a go="#his-follower-list" title="Follower"><i class="material-icons">people</i>←</a>
+								<a go="#his-follower-list" title="Follower"><i
+										class="material-icons">people</i>←</a>
 							</li>
 							<li class="custom-tab col my-data-width only-his-data">
-					<a go="#his-action" title="Cross-account"><i class="material-icons">account_box</i></a>
+								<a go="#his-action" title="Cross-account"><i
+										class="material-icons">account_box</i></a>
 							</li>
 							<li class="custom-tab col my-data-width only-his-data">
 								<a go="#his-list" title="List"><i class="material-icons">list</i></a>
@@ -396,43 +499,52 @@ var tlid=0;
 								<a go="#his-blocking-list" title="Blocks"><i class="material-icons">block</i></a>
 							</li>
 							<li class="custom-tab col my-data-width only-my-data">
-						<a go="#his-blocking-list" title="Blocks"><i class="material-icons">voice_over_off</i></a>
+								<a go="#his-blocking-list" title="Blocks"><i
+										class="material-icons">voice_over_off</i></a>
 							</li>
 							<li class="custom-tab col my-data-width only-my-data">
-					<a go="#his-domain-list" title="Domain block"><i class="material-icons">language</i><i class="material-icons">block</i></a>
+								<a go="#his-domain-list" title="Domain block"><i
+										class="material-icons">language</i><i class="material-icons">block</i></a>
 							</li>
 							<li class="custom-tab col my-data-width only-my-data">
 								<a go="#his-prof-list" title="Edit profile"><i class="material-icons">create</i></a>
 							</li>
 							<li class="custom-tab col my-data-width only-my-data">
-					<a go="#his-request-list" title="Follow requests"><i class="material-icons">how_to_reg</i></a>
+								<a go="#his-request-list" title="Follow requests"><i
+										class="material-icons">how_to_reg</i></a>
 							</li>
 							<li class="custom-tab col my-data-width only-my-data">
-					<a go="#his-follow-recom-list" title="Suggest"><i class="material-icons">recent_actors</i></a>
+								<a go="#his-follow-recom-list" title="Suggest"><i
+										class="material-icons">recent_actors</i></a>
 							</li>
 						</ul>
 					</div>
 					<div id="his-tl" class="tab-content">
 						<div id="his-tl-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="utl('--now','more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="utl('--now','more')">More</button>
 					</div>
 					<div id="his-follow-list" class="tab-content">
 						<div id="his-follow-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="flw('--now','more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="flw('--now','more')">More</button>
 					</div>
 					<div id="his-follower-list" class="tab-content">
 						<div id="his-follower-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="fer('--now','more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="fer('--now','more')">More</button>
 					</div>
 					<div id="his-action" class="tab-content">
 						Use other account to Follow((Unable to unfollow))<br>
 						<div style="max-width:500px;"><select id="user-acct-sel" class="acct-sel"></select></div>
+						
 						<a href="#!" class="waves-effect btn" onclick="follow('selector','true')">Follow</a><br>
 						or<br>
-				<a href="#!" class="waves-effect btn" onclick="udgEx('selector', 'selector')">Show profile</a><br>
+						<a href="#!" class="waves-effect btn"
+							onclick="udgEx('selector', 'selector')">Show profile</a><br>
 					</div>
 					<div id="his-list" class="tab-content">
 						<div id="his-lists-a">Follow to add this user to lists.</div>
@@ -442,22 +554,26 @@ var tlid=0;
 					<div id="his-fav-list" class="tab-content">
 						<div id="his-fav-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect" style="width:100%; padding:0;" onclick="showFav('more')">More</button>
+						<button class="btn waves-effect" style="width:100%; padding:0;"
+							onclick="showFav('more')">More</button>
 					</div>
 					<div id="his-blocking-list" class="tab-content">
 						<div id="his-blocking-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showBlo('more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="showBlo('more')">More</button>
 					</div>
 					<div id="his-muting-list" class="tab-content">
 						<div id="his-muting-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showMut('more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="showMut('more')">More</button>
 					</div>
 					<div id="his-domain-list" class="tab-content">
 						<div id="his-domain-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showDom('more')">More</button>Add blocking domain
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="showDom('more')">More</button>Add blocking domain
 						<br>
 						<input type="text" placeholder="example.com" id="domainblock">
 						<button class="btn waves-effect" onclick="addDomainblock()">Add</button>
@@ -472,7 +588,8 @@ var tlid=0;
 							<textarea placeholder="Note" id="his-des-val" class="materialize-textarea"></textarea>
 							<label for="his-des-val">Note</label>
 						</div>
-			<button class="btn waves-effect" style="width:100%; padding:0;" onclick="profedit()">Save</button>
+						<button class="btn waves-effect" style="width:100%; padding:0;"
+							onclick="profedit()">Save</button>
 						<br>Change avataor:
 						<span id="prof-change">
 							<input type="file" onchange="imgChange(this,'avatar')">
@@ -485,20 +602,28 @@ var tlid=0;
 					<div id="his-request-list" class="tab-content">
 						<div id="his-request-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showReq('more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="showReq('more')">More</button>
 					</div>
 					<div id="his-follow-recom-list" class="tab-content">
 						<div id="his-follow-recom-contents" class="cont-series">
 						</div>
 					</div>
 				</div>
+				<div class="his-float" id="his-float-blocked">
+					<div>You are blocked. Why?</div>
+				</div>
 			</div>
 		</div>
 		<div class="modal-footer">
-			<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn" onclick="historyShow()">Back</button>
+			<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
-			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn" onclick="follow()">Follow</a>
+				onclick="historyShow()">Back</button>
-			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn" onclick="mute()">Mute</a>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
-			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn" onclick="block()">Block</a>
+				onclick="follow()">Follow</a>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
+				onclick="mute()">Mute</a>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
+				onclick="block()">Block</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">Close</a>
 		</div>
 	</div>
@@ -550,31 +675,49 @@ var tlid=0;
 			<a href="https://thedesk.top" target="_blank">HP</a><br>
 			<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 			<br>
-			<div id="release-Miria_17-0-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-5-0" class="release-do" style="display:none; ">
 				<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
-					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
+				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Miria (17.0.1)</h5>
+				<h5>Release Note Usamin (18.5.0)</h5>
-					バグ修正<br>
+				・macOSでのアップデータについて修正。<br>
-					(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br>
+				・本来不要なところにフォロリク許可画面が出るようになっていたのを修正。<br>
-					(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
+				・不明なメディアに対するリンクを表示します。<br>
-					
+				・PleromaでのVideoの挙動について修正しました。<br>
+				・Patreonでの支援を開始しました。<br>
+				・アスタルテの新しいBBCodeに対応しました。<br>
+				・タイムライン下の方が切れてしまう不具合の修正。<br>
+				・通知をユーザーごとにフィルターする機能(最新のMastodonのみ)。<br>
+				・Electron 5.0.1になりました。<br>
+				<br>
+				<h5>ThinkingDeskラベル</h5>
+				<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>
+				手作りマットラベル。貼ってはがせる。300円なのでポイントの余りでどうぞ。<br>
+				<a href="https://item.mercari.com/jp/m822743330" target="_blank">メルカリ</a>へ。
+			</div>
+			<div id="release-en" style="display:none">
+				<h5>Let's make it native!</h5>
+				<a href="https://translate.thedesk.top">Crowdin translation project</a>
 			</div>
 			<br><br>
 			<h3>Support TheDesk!</h3>
 			TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
+			<a class="btn-share btn waves-effect waves-light red lighten-2"
-  				Support on Enty
+				href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
+				Support on Pixiv FANBOX
 			</a>
-			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank">
+			<a class="btn-share btn waves-effect waves-light red darken-2"
-  				Osushi.love: give me sushi
+				href="https://www.patreon.com/cutls" target="_blank">
+				Support on Patreon
 			</a>
-			<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
+			<a class="btn-share btn waves-effect waves-light blue"
+				href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
 				Amazon Wish List
 			</a>
 			<br>
-			Give me Amazon Gift Card:<a href="mailto:mstdn@thedesk.top" target="_blank">mstdn@thedesk.top</a><br>
+			Give me Amazon Gift Card:<a href="mailto:web-pro@cutls.com"
+				target="_blank">web-pro@cutls.com</a><br>
 			Kyash<br>
 			<img src="../../img/kyash.png" width="100"><br>
 		</div>
@@ -590,50 +733,102 @@ var tlid=0;
 		<div id="pip-content">
 		</div>
 	</div>
+	<!--menu-->
+	<div id="menu" class="z-depth-5" style="display:none">
+		<div id="menu-bar" class="drag-bar"></div>
+		<span class="cancel">
+			<i class="material-icons waves-effect" onclick="menu()" title="Close this box(X)">cancel</i>
+		</span>
+		<div id="menu-wrapper">
+			<div id="left-menu">
+				<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"><i
+						class="material-icons">add</i><span>Add a column</span></div>
+				<div class="waves-effect" onclick="sortMenu()" id="sortMenu"><i
+						class="material-icons">sort</i><span>Sort</span></div>
+				<div class="waves-effect" onclick="searchMenu()" id="searchMenu"><i
+						class="material-icons">search</i><span>Search</span></div>
+				<div class="waves-effect" onclick="listMenu()" id="listMenu"><i
+						class="material-icons">view_headline</i><span>List</span></div>
+				<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i
+						class="material-icons">filter_list</i><span>Filter</span></div>
+				<div class="waves-effect" onclick="help()"><i
+						class="material-icons">help_outline</i><span>Help</span></div>
+				<div class="waves-effect" onclick="location.href='index.html'"><i
+						class="material-icons">refresh</i><span>Reload TL</span></div>
+			</div>
+			<div id="right-menu">
 				<!--カラム追加-->
-<div id="add-box" class="hide z-depth-4 notf-box">
+				<div id="add-box" class="hide menu-content">
-<div class="input-field"><span data-trans="your_acct">Select an account</span>
+					<div class="input-field"><span data-trans="your_acct">Account(Scroll to show all)</span>
 						<br>
 						<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
 						<label></label>
 					</div>
 					<div class="input-field">
 						<div id="auth">
-<select id="type-sel" style="color:black">
+							<input type="hidden" value="local" id="type-sel">
-	<option value="local" data-trans="local">Local</option>
+							Show this TL:
-	<option value="local-media" data-trans="local-media">Local(Media)</option>
+							<div id="tltype">
-	<option value="home" data-trans="home">Home</option>
+								<div class="type waves-effect active" data-type="local">
-	<option value="pub" data-trans="public">Federated</option>
+									<div><i class="material-icons">people_outline</i></div><span>Local</span>
-	<option value="pub-media" data-trans="public-media">Federated(Media)</option>
+								</div>
-	<option value="dm" data-trans="dm">Direct Message</option>
+								<div class="type waves-effect" data-type="local-media">
-	<option value="mix" data-trans="integrated">Integrated(Local and Home)</option>
+									<div><i class="material-icons">people_outline</i><i
-	<option value="plus" data-trans="plus">Integrated(Local and replies and BT on Home)</option>
+											class="material-icons sub-icon">perm_media</i>
-	<option value="notf" data-trans="notification">Notifications</option>
+									</div><span>Local(Media)</span>
-</select>
+								</div>
-<label data-trans="show_tl">Show this TL:</label>
+								<div class="type waves-effect" data-type="home">
+									<div><i class="material-icons">home</i></div><span>Home</span>
+								</div>
+								<div class="type waves-effect" data-type="pub">
+									<div><i class="material-icons">language</i></div><span>Federated</span>
+								</div>
+								<div class="type waves-effect" data-type="pub-media">
+									<div><i class="material-icons">language</i><i
+											class="material-icons sub-icon">perm_media</i></div>
+									<span>Federated(Media)</span>
+								</div>
+								<div class="type waves-effect" data-type="dm">
+									<div><i class="material-icons">mail_outline</i></div><span>Direct Message</span>
+								</div>
+								<div class="type waves-effect" data-type="mix">
+									<div><i class="material-icons">merge_type</i></div><span>Integrated(Local/Home)</span>
+								</div>
+								<div class="type waves-effect" data-type="plus">
+									<div><i class="material-icons">merge_type</i><i
+											class="material-icons sub-icon">reply</i></div>
+									<span>LTL+Reply+BT</span>
+								</div>
+								<div class="type waves-effect" data-type="notf">
+									<div><i class="material-icons">notifications</i></div><span>Notifications</span>
+								</div>
+							</div>
 						</div>
 						<div id="noauth" class="hide">Show this TL:
-	<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);" placeholder="e.g:mstdn.jp">
+							<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);"
+								placeholder="e.g:mstdn.jp">
 						</div>
 						<div id="webview-add" class="hide">TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.
 						</div>
 					</div>
-<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()" data-trans-i="add">
+					<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()"
+						data-trans-i="add">
 						<i class="material-icons left">add</i>Add
 					</button>
 					<br>
 					<br>
 				</div>
 				<!--検索-->
-<div id="src-box" class="hide notf-box z-depth-4" style="width:500px">
+				<div id="src-box" class="hide menu-content">
 					<div class="input-field">
 						<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
-</div><div class="input-field">
+					</div>
-<i class="material-icons prefix">search</i>
+					<div class="input-field">
-<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
+						<input id="src" type="text" class="validate" style="width:60%">
 						<label for="src" data-trans="src">Search</label>
-<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
+						<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;"
-	<i class="material-icons left">search</i>Search
+							onclick="src()" data-trans-i="src">
+							<i class="material-icons left" style="margin:0">search</i>Search
 						</button>
 						<br>
 						<br>
@@ -644,25 +839,23 @@ var tlid=0;
 					</div>
 				</div>
 				<!--並べ替え-->
-<div id="sort-box" class="hide">
+				<div id="sort-box" class="hide menu-content">
 					<ul id="sort"></ul>
 					<div>
-<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+						<button onclick="sort()" class="btn waves-effect nex" style="width:97.5%;" data-trans-i="sort">
 							<i class="material-icons left">sort</i>Sort
 						</button>
-<button onclick="sortToggle()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="close">
-		<i class="material-icons left">close</i>Close
-</button>
 					</div>
 				</div>
 				<!--リスト-->
-<div id="list-box" class="hide notf-box z-depth-4">
+				<div id="list-box" class="hide menu-content">
 					<div class="input-field" style="width:calc( 100% - 100px);float:left">
 						<select id="list-acct-sel" class="acct-sel"></select>
-		<label>Select an account</label>
+						<label>Account(Scroll to show all)</label>
 					</div>
 					<div style="float:left; padding-top:8px; padding-bottom:28px;">
-		<button class="btn waves-effect indigo" style="width:80px;" onclick="list()" data-trans-i="lists">
+						<button class="btn waves-effect indigo" style="width:80px;" onclick="list()"
+							data-trans-i="lists">
 							List
 						</button>
 					</div>
@@ -673,13 +866,14 @@ var tlid=0;
 					<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">Save</button>
 				</div>
 				<!--フィルター-->
-<div id="filter-box" class="hide notf-box z-depth-4">
+				<div id="filter-box" class="hide menu-content">
 					<div class="input-field" style="width:calc( 100% - 100px);float:left">
 						<select id="filter-acct-sel" class="acct-sel"></select>
-		<label>Select an account</label>
+						<label>Account(Scroll to show all)</label>
 					</div>
 					<div style="float:left; padding-top:8px; padding-bottom:28px;">
-		<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()" data-trans-i="filters">
+						<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()"
+							data-trans-i="filters">
 							List
 						</button>
 					</div>
@@ -703,16 +897,39 @@ var tlid=0;
 					<label for="except_filter">Drop instead of hide</label><br>
 					<span class="sml">Filtered toots will disappear irreversibly, even if filter is later removed</span><br>
 					Expire after<span class="sml">Unset or "0" means "Never"<b>This value may contain some error</b></span><br><br>
-	<input type="text" style="width:50px" id="days_filter" placeholder="d" value="0">days
+					<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">day(s)
-	<input type="text" style="width:50px" id="hours_filter" placeholder="h" value="0">hours
+					<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">hour(s)
-	<input type="text" style="width:50px" id="mins_filter" placeholder="m" value="0">minutes
+					<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">minute(s)<br>
-	<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">Add</button><br>
+					Quick:<a onclick="filterTime(0,0,30)" class="pointer">30minute(s)</a>/
+					<a onclick="filterTime(0,1,0)" class="pointer">1hour(s)</a>/
+					<a onclick="filterTime(0,6,0)" class="pointer">6hour(s)</a>/
+					<a onclick="filterTime(0,12,0)" class="pointer">12hour(s)</a>/
+					<a onclick="filterTime(1,0,0)" class="pointer">1day(s)</a>/
+					<a onclick="filterTime(7,0,0)" class="pointer">7day(s)</a>/
+					<a onclick="filterTime(0,0,0)" class="pointer">Never</a><br>
+					<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()"
+						id="add-filter-btn">Add</button><br>
 					<span class="sml">Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.</span>
 				</div>
+			</div>
+		</div>
+		<a onclick="about()" class="nex waves-effect">
+			<i class="material-icons" style="font-size: 1rem;">info</i>About TheDesk
+		</a>&nbsp;|&nbsp;
+		<a onclick="bottomReverse()" class="nex waves-effect">
+			<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>Toot button layout reverse
+		</a>&nbsp;|&nbsp;
+		<a onclick="openRN()" class="nex waves-effect">
+			<i class="material-icons" style="font-size: 1rem;">new_releases</i>Release Note
+		</a>
+	</div>
 	<div id="main">
 		<!--TLのTL-->
 		<div id="timeline-container">
-	<h3>Welcome to TheDesk</h3><br><a href="acct.html">Add an account</a> or click <i class="material-icons">add</i> to add a column.
+			<div id="something-wrong">
+				<img src="" style="width:150px;margin:5px;display:none;" draggable="false">
+				<div>Internal error: please clear all data(at setting page) <b>All data will be deleted.</b></div>
+			</div>
 		</div>
 	</div>
 	</div>
@@ -720,50 +937,28 @@ var tlid=0;
 	<div id="bottom" class="reverse">
 		<div class="leftside reverse">
 			<div id="dambox">
-                <input type="text" id="posttgl" placeholder="Toot" style="height:2rem">
+				<button id="posttgl" class="btn waves-effect indigo"
+					style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
+					<i class="material-icons"
+						style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>Toot
+				</button>
 			</div>
 			<div class="leftside reverse" id="group">
-            <div class="btnsgroup"><span class="grouptitle">Columns:</span>
+				<div class="btnsgroup">
-                <a onclick="addToggle()" class="nex waves-effect" data-trans-i="add" id="add-tgl">
-                    <i class="material-icons nex" title="Add a column" data-trans-title="column_add">add</i>
-                </a>
-                <a onclick="sortToggle()" class="nex waves-effect">
-                    <i class="material-icons nex big-icon" title="Sort" data-trans-title="sort">sort</i>
-                </a>
-            </div>
-            <div class="btnsgroup"><span class="grouptitle">Accounts:</span>
 					<a href="acct.html" class="nex waves-effect">
-                    <i class="material-icons nex big-icon" title="Account Manager(Ctrl+Shift+M)" data-trans-title="manager">account_circle</i>
+						<i class="material-icons nex big-icon" title="Account Manager(Ctrl+Shift+M)">account_circle</i>
-                </a>
-                <a onclick="srcToggle()" class="nex waves-effect" id="src-tgl">
-                    <i class="material-icons" title="Search" data-trans-title="src">search</i>
-                </a>
-                <a onclick="listToggle()" class="nex waves-effect" id="list-tgl">
-                    <i class="material-icons" title="List" data-trans-title="list">view_headline</i>
-                </a>
-                <a onclick="filterToggle()" class="nex waves-effect" id="filter-tgl">
-                    <i class="material-icons" title="Filter" data-trans-title="filter">filter_list</i>
-                </a>
-            </div>
-			<div class="btnsgroup"><span class="grouptitle">Preferences:</span>
-				<a onclick="bottomReverse()" class="nex waves-effect">
-                    <i class="material-icons nex" title="Toot box reverse" data-trans-title="reverse">swap_horiz</i>
 					</a>
 					<a href="setting.html" class="nex waves-effect">
-                    <i class="material-icons nex" title="Preferences(Ctrl+Shift+S)" data-trans-title="setting">settings</i>
+						<i class="material-icons nex" title="Preferences(Ctrl+Shift+S)">settings</i>
-                </a>
-                <a href="index.html" class="nex mize waves-effect">
-                    <i class="material-icons nex" title="Super Reload(F5/⌘+R)" data-trans-title="reload">refresh</i>
 					</a>
 					<a onclick="nano()" class="nex waves-effect">
-                    <i class="material-icons" title="The smallest Mastodon,TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
+						<i class="material-icons" title="The smallest Mastodon,TheDesk Nano"
+							data-trans-title="nano_desp">remove_from_queue</i>
 					</a>
-                <a onclick="window.open('https://astarte.thedesk.top');" class="setting nex waves-effect" target="_blank" id="ranking-btn" style="display:none;">
+					<a onclick="menu()" class="nex waves-effect" id="list-tgl">
-                    <i class="material-icons nex" title="アスタルテランキング">timeline</i>
+						<i class="material-icons" title="List">apps</i>
-				</a>
-				<a href="https://docs.thedesk.top" class="setting nex waves-effect" target="_blank">
-                    <i class="material-icons nex" title="Help">help_outline</i>
 					</a>
+					<span id="fukidashi"><- Add TL</span>
 				</div>
 			</div>
 		</div>
@@ -783,7 +978,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 					</a>
 					<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+						<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 					</a>
 				</div>
 			</div>
@@ -806,9 +1001,11 @@ var tlid=0;
 	<script type="text/javascript" src="../../js/common/about.js"></script>
 	<script type="text/javascript" src="../../js/tl/parse.js"></script>
 	<script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
+	<script type="text/javascript" src="../../js/tl/dm.js"></script>
 	<script type="text/javascript" src="../../js/ui/scroll.js"></script>
 	<script type="text/javascript" src="../../js/tl/tl.js"></script>
 	<script type="text/javascript" src="../../js/tl/card.js"></script>
+	<script type="text/javascript" src="../../js/tl/poll.js"></script>
 	<script type="text/javascript" src="../../js/tl/date.js"></script>
 	<script type="text/javascript" src="../../js/tl/notification.js"></script>
 	<script type="text/javascript" src="../../js/tl/datails.js"></script>
@@ -820,6 +1017,7 @@ var tlid=0;
 	<script type="text/javascript" src="../../js/tl/speech.js"></script>
 	<script type="text/javascript" src="../../js/ui/post-box.js"></script>
 	<script type="text/javascript" src="../../js/ui/layout.js"></script>
+	<script type="text/javascript" src="../../js/post/emoji.js"></script>
 	<script type="text/javascript" src="../../js/login/instance.js"></script>
 	<script type="text/javascript" src="../../js/login/login.js"></script>
 	<script type="text/javascript" src="../../js/ui/img.js"></script>
@@ -833,7 +1031,6 @@ var tlid=0;
 	<script type="text/javascript" src="../../js/post/img.js"></script>
 	<script type="text/javascript" src="../../js/post/status.js"></script>
 	<script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
-<script type="text/javascript" src="../../js/post/emoji.js"></script>
 	<script type="text/javascript" src="../../js/post/suggest.js"></script>
 	<script type="text/javascript" src="../../js/post/bb-md.js"></script>
 	<script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>
@@ -842,3 +1039,4 @@ var tlid=0;
 	<script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
 	<script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
 	<script type="text/javascript" src="../../js/platform/end.js"></script>
+	<script type="text/javascript" src="../../js/ui/menu.js"></script>

app/view/en/oss.html

@@ -15,7 +15,7 @@
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
 <a href="setting.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>Back</a>
-LICENSE of TheDesk:<a href="https://github.com/cutls/TheDesk/blob/master/LICENSE.md">TheDesk LICENSE (Latest Ver.)</a><br>
+LICENSE of TheDesk:<a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">TheDesk LICENSE (Latest Ver.)</a><br>
 <article style="width:500px; max-width:100%; margin:15px; font-family:Arial,Helvetica">
 	<h5>TheDesk</h5>
 <i class="fa fa-github"></i><a href="https://github.com/cutls/TheDesk" target="_blank">cutls/TheDesk</a><br>

app/view/en/setting.html

@@ -1,5 +1,6 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" style="overflow:scroll">
+
 <head>
 	<title>Settings - TheDesk</title>
 	<!--
@@ -12,16 +13,31 @@
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
+	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
+	<style>
+		input {
+			max-height: 50px !important
+		}
+
+		.pcr-result {
+			height: 1rem !important;
+		}
+	</style>
 </head>
+
 <body id="mainView" style="overflow-y:scroll">
 	<script type="text/javascript" src="../../js/common/jquery.js"></script>
 	<script type="text/javascript" src="../../js/platform/first.js"></script>
 	<script type="text/javascript" src="../../js/common/materialize.js"></script>
 	<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
+	<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+	<script src="../../node_modules/vue/dist/vue.min.js"></script>
+	<script type="text/javascript" src="setting.vue.js"></script>
+
 	<h4>Preferences</h4>
 	<ul class="collapsible" data-collapsible="accordion">
 		<li>
@@ -30,11 +46,64 @@
 			</div>
 			<div class="collapsible-body">
 				<h5>Languages</h5>
-		<a onclick="changelang('ja')" class="pointer">日本語</a>/<a onclick="changelang('en')" class="pointer">English</a>/<a onclick="changelang('ps')" class="pointer">Crowdin In-context translation(beta)</a>
+				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
+				<a onclick="changelang('ja')" class="pointer" style="margin-right:5px;">日本語</a><a onclick="changelang('en')" class="pointer" style="margin-right:5px;">English</a><a onclick="changelang('ps')" class="pointer" style="margin-right:5px;">Crowdin translate system(beta)</a>
 				<h5>Import and export of preferences</h5>
-		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">Export</button>
+				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
-		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">Import</button>
+					style="width:100%; max-width:200px;">Export</button>
-		<h5>Themes</h5>
+				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
+					style="width:100%; max-width:200px;">Import</button>
+				<div id="envView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.id=='notf'"><a onclick="notftest()"
+								class="pointer">Notification test</a><br></template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<label v-bind:for="item.id+check.value">{{check.text}}</label>
+							</template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">Change</button>
+						</template><br>
+					</template>
+				</div>
+				<h5>Font</h5>
+				Select your favorite font to 'Select'(Windows/ macOS only)<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
+				<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
+				<br>
+				<input type="text" style="width:150px" id="font">
+				<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+				<br>
+				<h5>Folder to save</h5>
+				TheDesk uses this value when it try to save pictures or take screenshots.<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">Change</button>
+				<br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">color_lens</i>Themes
+			</div>
+			<div class="collapsible-body">
+				<h4>Select theme</h4>
 				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
 				<label for="black">Black</label>
 				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
@@ -45,141 +114,111 @@
 				<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
 				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
 				<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
-		<br>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
-		<h5>Popup notification(on Windows)</h5>Hide to set "0"
+				<label for="custom">Custom</label>
-		<br>
+				<div style="width:300px" id="sel-selector">
-		<input type="text" style="width:50px" id="popup">sec
+					<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
-		<br>
-		<h5>Native notification</h5>
-		This does not work on Windows Portable ver.<br><a onclick="notftest()" class="pointer">Notification test</a>
-		<br>
-		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_yes" value="yes" />
-		<label for="ntf_yes">Yes</label>
-		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_no" value="no" />
-		<label for="ntf_no">No</label>
-		<br>
-		<h5>Minimam width of columns</h5>Scroll bar will be shown when your window size is more than ammounts of columns.
-		<br>
-		<input type="text" style="width:50px" id="width">pxabove
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
-		<br>
-		<h5>Font</h5>
-		Select your favorite font to 'Select'<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;">
-
 				</div>
-		<br>
+				<h4>Edit and add custom themes</h4>
-		<input type="text" style="width:150px" id="font">
+				<div style="width:300px" id="edit-selector" data-add="Add new">
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+					<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
-		<br>
+						<option value="add_new">Add new</option>
-		<h5>Font size</h5>
+					</select>
-		<span style="font-size:15px">15px(absolute value)</span>
-		<br>
-		<input type="text" style="width:50px" id="size">px 
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button><br>
-		<h5>Folder to save</h5>
-		TheDesk uses this value when it try to save pictures or take screenshots.<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">Change</button>
-		<br>
 				</div>
+				<h5>Name</h5>
+				<input type="text" style="width:300px" id="custom_name" placeholder="Name...">
+				<h5>About this theme</h5>
+				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
+						placeholder="About this theme..."></textarea></div>
+				<h5>Color scheme</h5>
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
+				<label for="dark">Dark</label>
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
+				<label for="light">Light</label>
+				<div id="pickers">
+					<div>
+						<h5>Primary</h5>Background of components
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
+						<input type="hidden" id="color-picker0_value">
+					</div>
+					<div>
+						<h5>Secondary</h5>Background color
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
+						<input type="hidden" id="color-picker1_value">
+					</div>
+					<div>
+						<h5>Texts</h5>Text color
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
+						<input type="hidden" id="color-picker2_value">
+					</div>
+					<div>
+						<h5>Accent</h5>Background of boosts
+						<div id="color-picker3-wrap">
+							<div class="color-picker" id="color-picker3"></div>
+						</div>
+						<input type="hidden" id="color-picker3_value">
+					</div>
+				</div>
+				<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button
+					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">Delete</button><br><br>
+				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+					placeholder="JSON style" readonly><br>
+				Share this code with other TheDesk. Do not share this code with MiAS.
+				<h4>Import of custom themes</h4>
+				Get more themes on <a href="https://assets.msky.cafe/" target="_blank">MiAS</a><br>
+				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+					placeholder="JSON/JSON5 style">
+				<button class="btn waves-effect" onclick="customImp()">Import</button><br>
 		</li>
 		<li>
 			<div class="collapsible-header">
 				<i class="material-icons">reorder</i>Timeline Preferences
 			</div>
 			<div class="collapsible-body">
-		<h5>Time format</h5>Relative format:"1 minutes ago","3 days ago"
+				<div id="tlView">
-		<br>Absolute format:"23:25:21","2017/12/30 23:59:00"
+					<template v-for="(item, i) in config">
-		<br>Mixed format:toots posted today are relative-format, others are absolute-format.
+						<h5>{{item.text.head}}</h5>
-		<br>
+						<template v-if="item.text.desc">
-		<input class="with-gap" onchange="settings()" onchange="settings()" name="time" type="radio" id="relative" value="relative" />
+							<templete v-html="item.text.desc"></templete><br>
-		<label for="relative">Relative</label>
+						</template>
-		<input class="with-gap" onchange="settings()" name="time" type="radio" id="absolute" value="absolute" />
+						<template v-if="item.checkbox">
-		<label for="absolute">Absolute</label>
+							<template v-for="(check, j) in item.text.checkbox">
-		<input class="with-gap" onchange="settings()" name="time" type="radio" id="double" value="double" />
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
-		<label for="double">Both relative and absolute</label>
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-		<input class="with-gap" onchange="settings()" name="time" type="radio" id="medium" value="medium" />
+								<label v-bind:for="item.id+check.value">{{check.text}}</label>
-		<label for="medium">Mixed</label>
+							</template>
-		<h5>Server's unique locale</h5>This value is available on some Japanese servers
+						</template>
-		<br>
+						<template v-else>
-		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_yes" value="yes" />
+							<template v-if="item.doubleText">
-		<label for="ul_yes">Yes</label>
+								<template v-for="(textbox, j) in item.data">
-		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_no" value="no" />
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
-		<label for="ul_no">No</label>
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-		<br>
+								</template>
-		<h5>Hide NSFW pictures</h5>Strong blur effect
+							</template>
-		<br>
+							<template v-else>
-		<input class="with-gap" onchange="settings()" name="nsfw" type="radio" id="n_yes" value="yes" />
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-		<label for="n_yes">Yes</label>
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-		<input class="with-gap" onchange="settings()" name="nsfw" type="radio" id="n_no" value="no" />
+							</template>
-		<label for="n_no">No</label>
+							<button class="btn waves-effect" style="width:100px;"
-		<br>
+								v-on:click="complete(i)">Change</button>
-		<h5>Hide CW contents</h5>
+						</template><br>
-		<input class="with-gap" onchange="settings()" name="cw" type="radio" id="c_yes" value="yes" />
+					</template>
-		<label for="c_yes">Yes</label>
+				</div>
-		<input class="with-gap" onchange="settings()" name="cw" type="radio" id="c_no" value="no" />
+				<h5>Custom sound</h5>
-		<label for="c_no">No</label>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span
-		<br>
+					id="c1-file"></span><br>
-		<h5>Reply counter style</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span
-		<input class="with-gap" onchange="settings()" name="rp" type="radio" id="rp_hidden" value="hidden" />
+					id="c2-file"></span><br>
-		<label for="rp_hidden">Show 1+ if the replies are more than 1.</label>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span
-		<input class="with-gap" onchange="settings()" name="rp" type="radio" id="rp_all" value="all" />
+					id="c3-file"></span><br>
-		<label for="rp_all">Show full count(1,2...)</label>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span
-		<br>
+					id="c4-file"></span><br>
-		<h5>Animated GIF images animation</h5>
-		<input class="with-gap" onchange="settings()" name="gif" type="radio" id="g_yes" value="yes" />
-		<label for="g_yes">Yes</label>
-		<input class="with-gap" onchange="settings()" name="gif" type="radio" id="g_no" value="no" />
-		<label for="g_no">No</label>
-		<br>
-		<h5>Tag TL Search</h5>
-		<input class="with-gap" onchange="settings()" name="tag" type="radio" id="t_all" value="all" />
-		<label for="t_all">Use federated network</label>
-		<input class="with-gap" onchange="settings()" name="tag" type="radio" id="t_local" value="local" />
-		<label for="t_local">Use local network</label>
-		<br>
-		<h5>Show via</h5>
-		<input class="with-gap" onchange="settings()" name="via" type="radio" id="via_yes" value="yes" />
-		<label for="via_yes">Yes</label>
-		<input class="with-gap" onchange="settings()" name="via" type="radio" id="via_hide" value="hide" />
-		<label for="via_hide">No</label>
-		<br>
-		<h5>Hide action buttons without mouseover</h5>
-		You may feel 'mouseover' is unconfortable:(<br>
-		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_yes" value="yes" />
-		<label for="mov_yes">Mouseover to show</label>
-		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_click" value="click" />
-		<label for="mov_click">Click to show</label>
-		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_no" value="no" />
-		<label for="mov_no">No</label>
-		<br>
-		<h5>Show Notification marker, red colored bell and counter(if you show a notification column.)</h5>
-		<input class="with-gap" onchange="settings()" name="notfm" type="radio" id="notfm_yes" value="yes" />
-		<label for="notfm_yes">Yes</label>
-		<input class="with-gap" onchange="settings()" name="notfm" type="radio" id="notfm_no" value="no" />
-		<label for="notfm_no">No</label>
-		<br>
-		<h5>Auto folding</h5>
-		TheDesk does not collapse totes of 5 characters or less. Also, when collapsing, newlines are not shown. TheDesk count only newlines as the number of lines.
-		<br>
-		<input type="text" style="width:50px" id="sentence">lines above or
-		<input type="text" style="width:50px" id="letters">letters above
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
-		<br>
-		<h5>Height of images
-        </h5>
-		<input type="text" style="width:50px" id="img-height">px
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
-		<br>
-		<h5>Enable #InstanceTicker</h5>
-		Show colorful stickers about tooters' server. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.<br>
-		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_yes" value="yes" />
-		<label for="ticker_yes">Yes</label>
-		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
-		<label for="ticker_no">No</label>
-		<br>
 			</div>
 		</li>
 		<li>
@@ -187,89 +226,38 @@
 				<i class="material-icons">send</i>Posting Preferences
 			</div>
 			<div class="collapsible-body">
-		<h5>Default warining text</h5>
+				<div id="postView">
-		<input type="text" style="width:150px" id="cw-text">
+					<template v-for="(item, i) in config">
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+						<h5>{{item.text.head}}</h5>
-		<br>
+						<template v-if="item.text.desc">
-		<h5>Alert before posting a long toot.</h5>
+							<templete v-html="item.text.desc"></templete><br>
-		Show dialog whether you make too-long text hidden.
+						</template>
-		<br>
+						<template v-if="item.checkbox">
-		<input type="text" style="width:50px" id="cw_sentence">lines above or
+							<template v-for="(check, j) in item.text.checkbox">
-		<input type="text" style="width:50px" id="cw_letters">letters above
+								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
-		<br>
+										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-		<h5>Always CW set</h5>
+									<label v-bind:for="item.id+check.value">{{check.text}}</label>
-		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_yes" value="yes" />
+									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
-		<label for="cws_yes">Yes</label>
+								</template>
-		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_no" value="no" />
+							</template>
-		<label for="cws_no">No
+						</template>
-		</label>
+						<template v-else>
-		<br>
+							<template v-if="item.doubleText">
-		<h5>Default visibility</h5>
+								<template v-for="(textbox, j) in item.data">
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="public" value="public" />
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
-		<label for="public">Public</label>
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="unlisted" value="unlisted" />
+								</template>
-		<label for="unlisted">Unlisted</label>
+							</template>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="private" value="private" />
+							<template v-else>
-		<label for="private">Private</label>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="direct" value="direct" />
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
-		<label for="direct">Direct</label>
+							</template>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="memory" value="memory" />
+							<button class="btn waves-effect" style="width:100px;"
-		<label for="memory">Memory(memorized as each server)</label>
+								v-on:click="complete(i)">Change</button>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="server" value="server" />
+						</template><br>
-		<label for="server">Default of your visibility(Set on preferences of Mastodon server)</label>
+					</template>
-		<br>
+				</div>
-		<h5>Posting images preferences</h5>
-		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_url" value="url" />
-		<label for="i_url">Insert media URL</label>
-		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_no-act" value="no-act" />
-		<label for="i_no-act">Insert nothig</label>
-		<br>
-		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_inline" value="inline" disabled />
-		<label for="i_inline">Disabled 
-			<!--画像を投稿し、インラインで表示(Markdownに対応したインスタンスのみ。マルチアカウント環境では非推奨。)-->
-		</label>
-		<br>
-		<h5>Action of posting-box</h5>
-		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_yes" value="yes" />
-		<label for="bx_yes">Folding</label>
-		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_no" value="no" />
-		<label for="bx_no">Open after posting
-		</label>
-		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_abs" value="absolute" />
-		<label for="bx_abs">Absolutely open</label>
-		<br>
-		<h5>Quote format</h5>
-		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_simple" value="simple" />
-		<label for="q_simple">Only URL</label>
-		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_mention" value="mention" />
-		<label for="q_mention">URL and acct(mention to the user)</label>
-		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_full" value="full" />
-		<label for="q_full">URL, text and acct(mention to the user)
-		</label>
-		<br>
-		<h5>Default accounts of actions</h5>
-		Main account can be set on Account Manager.<br>
-		<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_remain" value="remain" />
-		<label for="mn_remain">Account you used recently</label>
-		<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_main" value="main" />
-		<label for="mn_main">Main account</label>
-		</label>
-		<h5>Secondary Toot Button</h5>
-		Toot with other visibility setting<br>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-nothing" value="nothing" />
-		<label for="sec-nothing">Hidden</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-public" value="public" />
-		<label for="sec-public">Public</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-unlisted" value="unlisted" />
-		<label for="sec-unlisted">Unlisted</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-private" value="private" />
-		<label for="sec-private">Private</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-direct" value="direct" />
-		<label for="sec-direct">Direct</label>
-		<input class="with-gap hide kirishima" onchange="settings()" name="sec" type="radio" id="sec-local" value="local" />
-		<label for="sec-local">Local Only</label><span class="hide kirishima">非対応インスタンスでは「未収載」になります。</span>
-		<br>
 			</div>
 		</li>
 		<li>
@@ -316,7 +304,7 @@
 			</div>
 			<div class="collapsible-body">
 				<h5>NowPlaying Provider(Windows)</h5>
-			macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required.<br>
+				macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
 				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
 				<label for="aimp">AIMP</label>
 				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
@@ -334,9 +322,14 @@
 				Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
 				<h5>Account Connection</h5>
 				TheDesk save your data on thedesk.top server.<br>
-			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">Save</button></div>
+				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
-			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>Connect</a>
+						onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">Save</button></div>
-			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>Disconnect</a>
+				<a onclick="spotifyConnect()" class="btn waves-effect nex"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
+						class="fa fa-spotify left"></i>Connect</a>
+				<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
+						class="fa fa-spotify left"></i>Disconnect</a>
 				<h5>Edit a template</h5>
 				<br>
 				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
@@ -344,11 +337,8 @@
 				Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify<br>
 				macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}<br>
 				Windows:{song}:Song name/{album}:Album name/{artist}:Artist name<br>
-				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
-                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
 				<h5>Attach an Artwork of Spotify</h5>
-			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
 				<label for="awk_yes">Yes</label>
 				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
@@ -363,23 +353,28 @@
 			<div class="collapsible-body">
 				<h5>Speed</h5>
 				1-100(default:10)<br>
-			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
+						style="width:500px; max-width:100%" /></p>
 				<h5>Pitch</h5>
 				0-100(default:50)<br>
-			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
+						style="width:500px; max-width:100%" /></p>
 				<h5>Volume</h5>
 				0-100(default:100)<br>
-			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
+				<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
+						style="width:500px; max-width:100%" /></p>
 				<h5>Test</h5>
 				<input type="text" style="width:350px" id="voicetxt" value="TheDesk is an open-source Mastodon client for PC.">
-			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">Play/Stop</button><br>
+				<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
+					id="testplay">Play/Stop</button><br>
 				<br>
 				<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">Save</button>
 			</div>
 		</li>
 	</ul>
 	<br>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>Back</a>
+	<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
+			class="material-icons left">undo</i>Back</a>
 	<br>
 	<br>Keyboard shortcuts
 	<li>Ctrl+1-9:Jump to n(1-9)th column</li>
@@ -387,6 +382,7 @@
 	<li>X:Toggle toot box</li>
 	<li>Ctrl+Enter:Post</li>
 	<li>Ctrl+Enter+Shift:Post(secondary toot)</li>
+	<li>Alt+Enter:Secondary Toot Button</li>
 	<li>Ctrl+E:Make all notifications read</li>
 	<li>Esc:Hide toot box</li>
 	<li>F5:Super Reload</li>
@@ -409,23 +405,36 @@
 			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
 		</li><br>
 	</div>
-<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('Delete all data. You cannot undo. Continue?')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>Reset(Danger)</button><br><br>
+	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
-<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>About TheDesk</button>
+		onclick="if(confirm('Delete all data. You cannot undo. Continue?')){ localStorage.clear(); location.href='index.html'; }"><i
-<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>Website</a>
+			class="material-icons left">delete</i>Reset(Danger)</button><br><br>
-<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Enty)</a>
+	<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
-<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>Help/Docs(Constructing)</a>
+			class="material-icons left">info</i>About TheDesk</button>
-<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
-<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
+			class="material-icons left">web</i>Website</a>
-<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">Give me a sushi!</a>
+	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
+		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Pixiv FANBOX)</a>
+	<a href="https://www.patreon.com/cutls" class="btn waves-effect red darken-2"
+		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Patreon)</a>
+	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
+			class="material-icons left">list</i>Help/Docs(Constructing)</a>
+	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
+		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
+		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
+			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
 	<br>
 	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
-<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">Check update</a><br>
+	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
+		class="pointer">Check update</a><br>
 	<a href="oss.html">OSS License</a><br>
-<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
+	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://github.com/cutls/TheDesk/blob/master/TOS.md">Terms of Use</a>
+		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
+			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
+			Policy</a>
 		<br>Developer: Cutls P(
-	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+		<a href="index.html?mode=user&code=Cutls@cutls.com">@Cutls@cutls.com</a>)
 		<br>
 	</span><br>
 	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
@@ -433,9 +442,9 @@ TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のため
 	<script type="text/javascript" src="../../js/common/about.js"></script>
 	<script type="text/javascript" src="../../js/platform/end.js"></script>
 	<script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.js"></script>
 	<script type="text/javascript" src="../../js/ui/spotify.js"></script>
 	<script type="text/javascript" src="../../js/tl/speech.js"></script>
+	<script type="text/javascript" src="../../js/platform/pickr.js"></script>
 	<script type="text/javascript" src="../../js/ui/settings.js"></script>
 	<script type="text/javascript" src="../../js/ui/theme.js"></script>
 	<script type="text/javascript" src="../../js/tl/date.js"></script>