fix merge

* New translations index.json (German)

* New translations index.json (Spanish, Argentina)

* New translations main.json (Spanish, Argentina)

* New translations acct.json (Sinhala)

* New translations index.json (Sinhala)

* New translations main.json (Sinhala)

* New translations setting.json (Sinhala)

* New translations index.json (Sinhala)

* New translations main.json (Sinhala)

* New translations setting.json (Sinhala)

.github/dependabot.yml

@@ -0,0 +1,49 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/app"
+  schedule:
+    interval: daily
+    time: "20:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: font-manager
+    versions:
+    - "> 0.3.0, < 0.4"
+  - dependency-name: sweetalert2
+    versions:
+    - 10.14.1
+    - 10.15.0
+    - 10.15.1
+    - 10.15.2
+    - 10.15.3
+    - 10.15.5
+    - 10.15.6
+    - 10.16.0
+    - 10.16.2
+    - 10.16.5
+  - dependency-name: electron
+    versions:
+    - 11.2.1
+    - 12.0.2
+    - 12.0.3
+    - 12.0.4
+  - dependency-name: eslint
+    versions:
+    - 7.18.0
+    - 7.19.0
+    - 7.20.0
+    - 7.21.0
+    - 7.22.0
+    - 7.24.0
+  - dependency-name: itunes-nowplaying-mac
+    versions:
+    - 0.4.0
+  - dependency-name: electron-dl
+    versions:
+    - 3.0.3
+    - 3.1.0
+    - 3.2.0
+  - dependency-name: electron-rebuild
+    versions:
+    - 2.3.4

.github/workflows/build-linux.yml

@@ -0,0 +1,43 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Linux build
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: cd app && yarn
+    - run: cd app && yarn build:all
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.zip"
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.snap"
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.deb"
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.AppImage"

.github/workflows/build-macos.yml

@@ -0,0 +1,42 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: macOS build
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+    environment:
+      name: build
+    env: 
+      APPLEID: ${{ secrets.APPLEID }}
+      APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+      CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+      CSC_LINK: ${{ secrets.CSC_LINK}}
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: cd app && yarn
+    - run: cd app && yarn build:all
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.zip"
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.dmg"

.github/workflows/build.yml

@@ -0,0 +1,35 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Windows build
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: cd app && yarn
+    - run: cd app && yarn build:all
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.exe"
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.appx"

.gitignore

@@ -21,15 +21,22 @@ app/view/cs
 app/view/ps
 app/view/es-AR
 app/view/it-IT
+app/view/pl-PL
 app/git
 *.code-workspace
 releasenote.md
 app/yarn-error.log
-app/js/platform/aiscript.js
+app/js/platform/native.js
 app/view/es-ES
 app/view/fr-FR
 app/view/no-NO
 app/view/zh-CN
 app/view/ru-RU
 app/view/zh-TW
-app/view/pt-BR
+app/view/pt-BR
+app/view/si-LK
+app/build.js
+app/view/make/make.js
+app/view/make/makeCli.ts
+app/.env
+app/view/make/index.generated.html

.prettierrc

@@ -0,0 +1,8 @@
+{
+    "tabWidth": 4,
+    "useTabs": true,
+    "semi": false,
+    "singleQuote": true,
+    "printWidth": 200,
+    "jsxBracketSameLine": true
+}

.travis.yml

@@ -1,54 +1,19 @@
-os: 
+matrix:
- - windows
+  include:
- - linux
+  - os: osx
- - osx
+    osx_image: xcode11.3
 language: node_js
 env:
   - YARN_GPG=no
 node_js:
-- '12.17.0'
+- '14.16.1'
 cache:
   yarn: true
 script: node -v
 before_deploy:
-  - yarn global add electron-builder
-  - yarn global add browserify
   - cd app
-  - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
+  - yarn
-  - yarn install --no-lockfile --prod
+  - yarn build:all
-  - yarn construct:store
-  - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ];then cd ../build;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ];then mv *.dmg TheDesk-$VERSION-store.dmg;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ];then cd ../app;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux snap:x64 -p never;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv *.snap TheDesk-$VERSION-store.snap;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then yarn add electron-builder;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win appx:x64 -p never ;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv *.appx TheDesk-$VERSION-store.appx;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../app;else :;fi
-  - yarn construct
-  - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then ls;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv thedesk-*.zip thedesk.zip;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then 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 build
 deploy:

README.md

@@ -1,9 +1,14 @@
-<img src="https://thedesk.top/img/top.png" width="300" align="left">
+ **English** | [日本語](README_ja.md)
-<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)
+<div align="center">
+
+<img src="https://thedesk.top/img/desk.png" width="150" align="center">
+
+<h1 align="center">TheDesk</h1>
+
+[![Windows build](https://github.com/cutls/TheDesk/actions/workflows/build.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build.yml)
+[![Linux build](https://github.com/cutls/TheDesk/actions/workflows/build-linux.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build-linux.yml)
+[![Linux build](https://github.com/cutls/TheDesk/actions/workflows/build-macos.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build-macos.yml)  
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
 [![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
 [![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
@@ -11,158 +16,40 @@
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)  
   
-Download:[TheDesk](https://thedesk.top)
+[![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
 
-On GitHub Releases, `-store.*` assets are made for some application store or manager(Snapcraft, Homebrew, Microsoft Store). 
+</div>
-They do not check the latest version(Which you can get the latest ver or not depends on the store)
 
-<a href="https://www.patreon.com/cutls"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160"></a>  
-<a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a>
 ![Screenshots1](https://thedesk.top/img/scr1.png)  
 
-## License
+## Build and Development
 
-[GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  
+See [Wiki](https://github.com/cutls/TheDesk/wiki)
 
-The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/)
+## Translation
-[Press Kit](https://d2upiril6ywqp9.cloudfront.net/press/TheDesk+PressKit.zip)  
-
-* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
-* [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
-* [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
-* [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
-* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
-
-The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
-
-## Privacy Policy
-
-* [プライバシーポリシー(Privacy Policy(ja))](https://thedesk.top/priv.html)
-
-## Language
-
-* 日本語(Japanese)
-* 日本語, 関西(Japanese, Kansai)
-* English
-* български(Bulgarian) with [translate project](https://translate.thedesk.top/project/thedesk/bg)
-* Česky(Czech) with [translate project](https://translate.thedesk.top/project/thedesk/cs)
-* Deutsch(German) with [translate project](https://translate.thedesk.top/project/thedesk/de)
-* Español, argentina(Spanish, Argentina) with [translate project](https://translate.thedesk.top/project/thedesk/es-AR)
-* italiano(Italian) with [translate project](https://translate.thedesk.top/project/thedesk/it-IT)
-
-### Translation
 
 Crowdin project is available! Visit: https://translate.thedesk.top
 
-### Run on developer mode
-
-`npm run dev` on `app` folder.(before you should run `yarn construct` to make HTML views)
-
-If you change HTML or language files, you should rub to `yarn construct`. Or `yarn watchview` can always watch and construct such files with 1 process.
-
-## Contributors
-
-Build for macOS(Now: Travis CI)  
-
-* [toneji](https://minohdon.jp/@toneji)
-
-Build for Linux(Now: Travis CI)  
-
-* [popn_ja](https://popon.pptdn.jp/@popn_ja)
-
-Fellow coder
-
-* [kPherox](https://pl.kpherox.dev/kPherox)
-
-## Build
-
-You should use `yarn` but you can use also `npm`, but if you build on Windows, you should strongly use `yarn`  
-`yarn ***` and `npm run ***` has the same meaning,
-
-### npm
-
-```sh
-git clone https://github.com/cutls/TheDesk
-cd TheDesk/app
-npm install
-npm install --only=dev
-npm run construct
-```
-
-### yarn
-
-```sh
-git clone https://github.com/cutls/TheDesk
-cd TheDesk/app
-# Linux or macOS
-yarn install --no-lockfile
-# Windows
-yarn install
-
-yarn construct
-```
-
-run `yarn dev` to launch developer version with console(click `view`)
-
-### electron-builder(Recommended)
-Use scripts(they can work well with npm, **yarn**).  
-
-```sh
-# Build for current platform
-yarn build
-
-# Select build target
-## Windows
-yarn build:win
-
-## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
-yarn build:all
-```
-
-
-Config is all on package.json  
-
-### electron-packager
-`yarn --D electron-rebuild`  
-  
-Linux/macOS  
-`./node_modules/.bin/electron-rebuild`  
-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`  
-`npm install --global windows-build-tools`  
-
-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
-```  
-
-### PWA support
-
-TheDesk is a web-based app, so you can run it on a browser. Of course, the main stream is as Electron. Some features won't work as well as Electron.
-
-You can run `npm run build:pwa` to build as PWA, including `manifest.json` and the ServiceWorker.
-
-**You have to rename `node_modules` to `dependencies` to run as a web application. (restricted by Netlify, but always you should do to run as PWA)**
-
-Check the app on Chrome or Firefox: [Here](https://app.thedesk.top) (it follows the `master` branch, so not stable.)  
-[![Netlify Status](https://api.netlify.com/api/v1/badges/6916503b-2882-43f7-9681-ab814e6d28f9/deploy-status)](https://app.netlify.com/sites/thedesk/deploys)
-
 ## Pleroma support
 
 Did you find a bug with Pleroma accounts?  
 Pleroma **does not** follow Mastodon API rules completely although Pleroma developers say so.  
 Please write issues to improve TheDesk affinity with Pleroma.
 
-## Vulnerabilities when `yarn install`???
+## License
 
-No, if your npm says materialize-css has vulnerabilities(CVE-2019-11002/3/4), look at [here](https://github.com/Dogfalo/materialize/issues/6286) under discussion, but I do not think this report is really fatal.
+* [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)
+* [License of other assets](https://github.com/cutls/TheDesk/wiki/License-of-other-assets)
+* [プライバシーポリシー(Privacy Policy(ja))](https://thedesk.top/priv.html)
+
+## Contributors
+
+[![](https://opencollective.com/TheDesk/contributors.svg?width=400&button=false)](https://github.com/cutls/TheDesk/graphs/contributors)
+
+## Support
+
+<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!" height="30"></a>
+<a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="30"></a>
+<a href="https://cutls.fanbox.cc"><img alt="PixivFANBOX" src="https://thedesk.top/img/fanbox.png" height="30"></a>
+
+Or [others](https://cutls.dev) to support me.

README_ja.md

@@ -1,171 +1,59 @@
-<img src="https://thedesk.top/img/top.png" width="300" align="left">
+[English](README.md) | **日本語**
-<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)
+<div align="center">
+
+<img src="https://thedesk.top/img/desk.png" width="150" align="center">
+
+<h1 align="center">TheDesk</h1>
+
+[![Windows build](https://github.com/cutls/TheDesk/actions/workflows/build.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build.yml)
+[![Linux build](https://github.com/cutls/TheDesk/actions/workflows/build-linux.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build-linux.yml)
+[![Linux build](https://github.com/cutls/TheDesk/actions/workflows/build-macos.yml/badge.svg)](https://github.com/cutls/TheDesk/actions/workflows/build-macos.yml)  
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
 [![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
 [![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
 ![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント  
-Download:[TheDesk](https://thedesk.top)
 
-[Pixiv FANBOX](https://www.pixiv.net/fanbox/creator/28105985)
+[![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
 
-`-store.*`とあるアセットはストアやパッケージマネージャ向けのもので、アップデートの確認をソフト本体で行いません。
+</div>
 
 ![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://d2upiril6ywqp9.cloudfront.net/press/TheDesk+PressKit.zip)  
-
-* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
-* [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
-* [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
-* [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
-* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
-
-標準の通知音は [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) で提供されています。
-
-## プライバシーポリシー
-
-* [プライバシーポリシー](https://thedesk.top/priv.html)
-
-## 言語
-
-* 日本語
-* 日本語(関西)
-* English(英語)
-* ドイツ語, チェコ語, ブルガリア語, イタリア語, スペイン語アルゼンチン方言 (from [Crowdin](https://translate.thedesk.top))
-
-### 翻訳
   
 Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.top  
 
-以下、`yarn ***`は全て`npm run ***`で実行できます。(yarnが推奨)
+## ビルドと開発
 
-### デベロッパーモード
+[Wiki](https://github.com/cutls/TheDesk/wiki)を参照。
-
-`yarn dev`を`app`フォルダ内で実行。  
-ただし、最初に`yarn construct`必須。
-
-watchモード(ホットリロードはしません): `yarn construct`の代わりに`yarn watchview`  
-HTMLや言語定義の変更について、このコマンドで継続監視します。その他のアセットの変更には不要です。  
-プロセス1つを占拠するので、`yarn dev`は他のプロセスで行ってください。
-
-## 主なコントリビューター
-
-macOSビルダー(現在はTravis CI)
-
-* [とねぢ](https://minohdon.jp/@toneji)
-
-Linuxビルダー(現在はTravis CI)
-
-* [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
-
-コーダー
-
-* [kPherox](https://pl.kpherox.dev/kPherox)
-
-## ビルド
-
-npmでもyarnでも好きな方を選んでください。Windows環境ではyarnを強く推奨します。
-
-### npm
-
-```sh
-git clone https://github.com/cutls/TheDesk
-cd TheDesk/app
-npm install
-npm install --only=dev
-npm run construct
-```
-
-### yarn
-
-```sh
-git clone https://github.com/cutls/TheDesk
-cd TheDesk/app
-# Linux or macOS
-yarn install --no-lockfile
-# Windows
-yarn install
-
-yarn construct
-```
-
-### electron-builder(推奨)
-
-scriptsを利用します
-
-```sh
-# 実行している環境向けにビルド
-yarn build
-
-# ターゲットを指定してビルド
-## Windows
-yarn build:win
-
-## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
-yarn build:all
-```
-
-
-ビルド設定はすべてpackage.jsonに記載しています。  
-
-### electron-packager(非推奨)
-`yarn -D 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
-```  
-
-### PWAとして実行
-
-TheDeskはウェブ技術を使用して作られているので、ブラウザで動かすこともできます。もちろん、Electron向けに設計されているので一部機能は動きません。
-
-`yarn build:pwa`でビルドできます。PWAに必要な`manifest.json`やサービスワーカーなども用意されています。
-
-**`node_modules`を`dependencies`にリネームしないと動きません。(Netlifyの制限ですが、Netlify以外で動かす場合にも必須です)**
-
-ChromeまたはFirefoxでチェック: [こちら](https://app.thedesk.top) (`master`ブランチに追従しています。不安定です。)  
-[![Netlify Status](https://api.netlify.com/api/v1/badges/6916503b-2882-43f7-9681-ab814e6d28f9/deploy-status)](https://app.netlify.com/sites/thedesk/deploys)
 
 ## Pleromaのサポート
 
 Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  
 Issuesに書いてある問題についてはなるべく対処しますので、ぜひお知らせください。
 
-## 詳しく
+## よみもの
 
-[TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
+* [TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
+* [TheDeskを作って思う今クライアントを作る意味 | Cutls Code Archives ](https://code.cutls.com/thedesk-log/)
 
-## `yarn install`したら脆弱性あるって言われた
+## ライセンス
 
-materialize-cssの脆弱性(CVE-2019-11002/3/4)については[こちら](https://github.com/Dogfalo/materialize/issues/6286)で本当に脆弱性かどうか議論しています。  
+* [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)
-実際には害が無いものと思われます。
+* [License of other assets](https://github.com/cutls/TheDesk/wiki/License-of-other-assets)
+* [プライバシーポリシー](https://thedesk.top/priv.html)
+
+## 主なコントリビューター
+
+[![](https://opencollective.com/TheDesk/contributors.svg?width=400&button=false)](https://github.com/cutls/TheDesk/graphs/contributors)
+
+## 支援
+
+<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!" height="30"></a>
+<a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="30"></a>
+<a href="https://cutls.fanbox.cc"><img alt="PixivFANBOX" src="https://thedesk.top/img/fanbox.png" height="30"></a>
+
+[その他の支援法](https://cutls.dev)

app/about.html

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

app/build.d.ts

@@ -0,0 +1,14 @@
+declare function _exports(options?: {
+    onlyStore?: boolean;
+    withStore?: boolean;
+    withIa32?: boolean;
+    withArm64?: boolean;
+    windows?: boolean;
+    linux?: boolean;
+    macOS?: boolean;
+    skipWindows?: boolean;
+    skipLinux?: boolean;
+    skipMacOS?: boolean;
+    unnotarize?: boolean;
+}): void;
+export = _exports;

app/build.js

@@ -1,112 +1,254 @@
-const builder = require("electron-builder");
+const builder = require('electron-builder')
-const fs = require('fs');
+const path = require('path')
-const os = process.platform;
+const fs = require('fs')
+const basefile = __dirname + '/'
+const package = fs.readFileSync(basefile + 'package.json')
+const data = JSON.parse(package)
+const version = data.version
+const codename = data.codename
+const ver = `${version} (${codename})`
+const construct = require('./view/make/make.js')
+const { platform, arch } = process
 const Platform = builder.Platform
 const Arch = builder.Arch
-const targets = new Map();
+const artifactName = 'TheDesk-setup-${arch}.${ext}'
-const archToType = new Map();
+const config = {
-const pref = {
+    productName: 'TheDesk',
-    productName: "TheDesk",
+    appId: 'top.thedesk',
-    appId: "top.thedesk",
+    asarUnpack: ['node_modules/itunes-nowplaying-mac', 'main/script'],
-    asarUnpack: [
+    afterSign: 'build/notarize.js',
-        "node_modules/itunes-nowplaying-mac"
-    ],
     directories: {
-        output: "../build/"
+        output: '../build',
     },
     win: {
-        icon: "build/thedesk.ico",
+        icon: 'build/thedesk.ico',
-        target: [
+        target: ['nsis', 'appx', 'portable'],
-            "nsis",
+        publish: []
-            "portable",
-            "appx"
-        ]
     },
     appx: {
-        identityName: "53491Cutls.TheDesk",
+        identityName: '53491Cutls.TheDesk',
-        applicationId: "Cutls.TheDesk",
+        applicationId: 'Cutls.TheDesk',
-        publisherDisplayName: "Cutls",
+        publisherDisplayName: 'Cutls',
-        publisher: "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+        publisher: 'CN=629757F5-A5EE-474F-9562-B304A89A9FD1',
-        languages: [
+        languages: ['JA-JP', 'EN-US'],
-            "JA-JP",
-            "EN-US"
-        ]
     },
     nsis: {
         oneClick: false,
-        allowToChangeInstallationDirectory: true
+        allowToChangeInstallationDirectory: true,
+        artifactName: 'TheDesk-setup-${arch}.${ext}',
     },
     linux: {
-        icon: "build/icons",
+        target: ['zip', 'appImage', 'snap', 'deb'],
-        target: [
+        category: 'Network',
-            "zip",
-            "snap"
-        ],
-        category: "Network"
     },
     mac: {
-        target: [
+        hardenedRuntime: true,
-            "dmg",
+        gatekeeperAssess: false,
-            "zip"
+        entitlements: 'build/entitlements.mac.plist',
-        ]
+        entitlementsInherit: 'build/entitlements.mac.plist',
     },
-    electronDownload: {
+    dmg: {
-        version: "5.0.1"
+        sign: false,
     },
-    electronVersion: "5.0.1"
 }
-const json = JSON.parse(fs.readFileSync("package.json", 'utf8'));
-const version = json.version;
 
+async function build(os, arch, config) {
+    let targets = new Map()
+    let archToType = new Map()
+    archToType.set(arch, [])
+    targets.set(os, archToType)
+    await builder.build({
+        targets: targets,
+        config: config,
+        publish: 'never'
+    })
+}
+async function cmd(options) {
+    if (isTrue(options, 'help', 'h')) {
+        return console.log(help())
+    }
+    if (isTrue(options, 'onlyStore') || isTrue(options, 'withStore')) {
+        console.log('start building for application stores')
+        construct(ver, basefile, false, true)
+        if ((platform === 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
+            if ((isTrue(options, 'withIa32') && arch === 'x64') || arch === 'ia32') {
+                config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
+                await build(Platform.WINDOWS, Arch.ia32, config)
+                fs.renameSync(
+                    `../build/TheDesk ${version}.exe`,
+                    '../build/TheDesk-ia32-store.exe'
+                )
+                fs.renameSync(
+                    `../build/TheDesk-setup-ia32.exe`,
+                    '../build/TheDesk-setup-ia32-store.exe'
+                )
+            }
+            if (arch === 'x64') {
+                config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
+                await build(Platform.WINDOWS, Arch.x64, config)
+                fs.renameSync(
+                    `../build/TheDesk ${version}.exe`,
+                    '../build/TheDesk-store.exe'
+                )
+                fs.renameSync(
+                    `../build/TheDesk-setup-x64.exe`,
+                    '../build/TheDesk-setup-store.exe'
+                )
+            }
+        }
+        if ((platform === 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
+            if (arch === 'ia32') {
+                await build(Platform.LINUX, Arch.ia32, config)
+            }
+            if ((isTrue(options, 'withIa32') && arch === 'x64')) {
+                console.log('snapcraft does not curretly support builing i386 on amd64')
+            }
+            if (arch === 'x64') {
+                await build(Platform.LINUX, Arch.x64, config)
+                if (!isTrue(options, 'onlyStore')) {
+                    fs.renameSync(
+                        `../build/thedesk_${version}_amd64.snap`,
+                        `../build/thedesk_${version}_amd64-store.snap`
+                    )
+                }
+            }
+        }
+    }
+    if (!isTrue(options, 'onlyStore')) {
+        console.log('start building for normal usage')
+        construct(ver, basefile, false, false)
+        if ((platform === 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
+            if ((isTrue(options, 'withIa32') && arch === 'x64') || arch === 'ia32') {
+                config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
+                await build(Platform.WINDOWS, Arch.ia32, config)
+                fs.renameSync(
+                    `../build/TheDesk ${version}.exe`,
+                    '../build/TheDesk-ia32.exe'
+                )
+            }
+            if (arch === 'x64') {
+                config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
+                await build(Platform.WINDOWS, Arch.x64, config)
+                fs.renameSync(
+                    `../build/TheDesk ${version}.exe`,
+                    '../build/TheDesk.exe'
+                )
+                fs.renameSync(
+                    `../build/TheDesk-setup-x64.exe`,
+                    '../build/TheDesk-setup.exe'
+                )
+            }
+            if ((isTrue(options, 'withArm64') && arch === 'x64') || arch === 'arm64') {
+                config.nsis.artifactName = artifactName.replace('${arch}', 'arm64')
+                await build(Platform.WINDOWS, Arch.arm64, config)
+                fs.renameSync(
+                    `../build/TheDesk ${version}.exe`,
+                    '../build/TheDesk-arm64.exe'
+                )
+            }
+        }
+        if ((platform === 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
+            if (arch === 'ia32') {
+                await build(Platform.LINUX, Arch.ia32, config)
+            }
+            if (isTrue(options, 'withIa32') && arch === 'x64') {
+                console.log('snapcraft does not curretly support builing i386 on amd64')
+            }
+            if (arch === 'x64') {
+                await build(Platform.LINUX, Arch.x64, config)
+                fs.renameSync(
+                    `../build/thedesk_${version}_amd64.snap`,
+                    `../build/thedesk_${version}_amd64-normal.snap`
+                )
+                if (isTrue(options, 'onlyStore') || isTrue(options, 'withStore')) {
+                    fs.renameSync(
+                        `../build/thedesk_${version}_amd64-store.snap`,
+                        `../build/thedesk_${version}_amd64.snap`
+                    )
+                }
+            }
+        }
+        if (platform === 'darwin' && !isTrue(options, 'skipMacOS')) {
+            if(isTrue(options, 'unnotarize')) delete config.afterSign
+            if (arch === 'x64') {
+                await build(Platform.MAC, Arch.x64, config)
+                fs.renameSync(
+                    `../build/TheDesk-${version}.dmg`,
+                    `../build/TheDesk-${version}-x64.dmg`
+                )
+                if (isTrue(options, 'withArm64')) {
+                    delete config.afterSign
+                    await build(Platform.MAC, Arch.arm64, config)
+                    fs.renameSync(
+                        `../build/TheDesk-${version}.dmg`,
+                        `../build/TheDesk-${version}-arm64.dmg`
+                    )
+                }
+                fs.renameSync(
+                    `../build/TheDesk-${version}-x64.dmg`,
+                    `../build/TheDesk-${version}.dmg`
+                )
+            }
+            if (arch === 'arm64') {
+                delete config.afterSign
+                await build(Platform.MAC, Arch.arm64, config)
+                fs.renameSync(
+                    `../build/TheDesk-${version}.dmg`,
+                    `../build/TheDesk-${version}-arm64.dmg`
+                )
+                if(isTrue(options, 'skipX64')) await build(Platform.MAC, Arch.x64, config)
+            }
 
-if (os == "win32") {
+        }
-    archToType.set(Arch.ia32, []);
+    }
-    targets.set(Platform.WINDOWS, archToType);
+}
-} else if (os == "linux") {
+function isTrue(options, long, short) {
-    archToType.set(Arch.x64, []);
+    const { argv } = process
-    archToType.set(Arch.ia32, []);
+    if (options ? options[long] : 0) return true
-    targets.set(Platform.LINUX, archToType);
+    if (argv.includes(`--${long}`)) return true
-} else if (os == "darwin") {
+    if (short && argv.includes(`-${short}`)) return true
-    archToType.set(Arch.x64, []);
-    targets.set(Platform.MAC, archToType);
-} else {
     return false
 }
-builder.build({
+function help() {
-    targets: targets,
+    return `
-    config: pref
+TheDesk Builder command tool
-})
+    yarn build [options] (or node build.js [options])
-    .then(() => {
+    yarn build:[preset] (check package.json)
-        console.log("Done on "+os)
+
-        if (os == "win32") {
+    --help or -h: show help
-            console.log("Windows")
+
-            fs.renameSync('../build/TheDesk ' + version + '.exe', '../build/TheDesk-ia32.exe');
+    [Build for other platforms]
-            fs.renameSync('../build/TheDesk Setup ' + version + '.exe', '../build/TheDesk-setup-ia32.exe');
+    --windows (-w)
-            retry()
+    --linux (-l)
-        }else if (os == "linux") {
+
-            console.log("Linux")
+    --skipWindows
-            fs.renameSync('../build/thedesk-' + version + '.zip', '../build/TheDesk.zip');
+    --skipLinux
-            fs.renameSync('../build/TheDesk Setup ' + version + '.exe', '../build/TheDesk-setup-ia32.exe');
+    --skipMacOS
-        }
+        To skip building for itself platform.
-    })
+
-    .catch((error) => {
+
-        // handle error
+    [only Windows, Linux]
-    })
+    --onlyStore: application store of platforms assets(without update check)
-function retry(){
+    --withStore: application store assets and normal version
-    console.log("Windows x64")
+
-    const targetsAlt = new Map();
+    [only Windows]
-    const archToTypeAlt = new Map();
+
-    targetsAlt.set(Platform.WINDOWS, archToTypeAlt);
+    --withIa32: ia32 build on x64 system(if your machine is ia32, it will be built if this arg is not passed)
-    archToTypeAlt.set(Arch.x64, []);
+    --withArm64(beta) arm64 build on x64 system(if your machine is arm64, it will be built if this arg is not passed, and not build store build for arm64)
-    builder.build({
+
-        targets: targetsAlt,
+    [only macOS]
-        config: pref
+    --unnotarize: Without notarize
-    })
+    `
-        .then(() => {
+}
-            fs.renameSync('../build/TheDesk Setup ' + version + '.exe', '../build/TheDesk-setup.exe');
+
-            fs.renameSync('../build/TheDesk ' + version + '.exe', '../build/TheDesk.exe');
+/**
-        })
+ * Builder
-        .catch((error) => {
+ * @module builder
-            // handle error
+ * @param {Object} [options] - Options
-        })
+ * @param {boolean} [options.onlyStore] - App Store of platforms assets(without update check)
-}
+ * @param {boolean} [options.withStore] - App Store of platforms assets(without update check) assets and normal version
+ * @param {boolean} [options.withIa32] - [Windows only] ia32 build on x64 system(if your machine is ia32, it will be built if this arg is not passed)
+ * @param {boolean} [options.withArm64] - [Windows only(beta)] arm64 build on x64 system(if your machine is arm64, it will be built if this arg is not passed, and not build store build for arm64)
+ * @return {void}
+ */
+ module.exports = cmd

app/build/entitlements.mac.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+  </dict>
+</plist>

app/build/notarize.js

@@ -0,0 +1,23 @@
+require('dotenv').config()
+const { notarize } = require('electron-notarize')
+
+// Notarizeをしない場合、下のuseNotarizeをtrueからfalseに変更してください。
+const useNotarize = true
+
+
+exports.default = async function notarizing(context) {
+    const { electronPlatformName, appOutDir } = context
+    if (electronPlatformName !== 'darwin' || !useNotarize) return
+    const appName = context.packager.appInfo.productFilename
+    console.log(`start notarize: ${appOutDir}/${appName}.app`)
+    try {
+        return await notarize({
+            appBundleId: 'top.thedesk',
+            appPath: `${appOutDir}/${appName}.app`,
+            appleId: process.env.APPLEID,
+            appleIdPassword: process.env.APPLEIDPASS,
+        })
+    } catch (e) {
+        throw console.log(e)
+    }
+}

app/buildCli.js

@@ -0,0 +1,2 @@
+const cmd = require('./build')
+cmd()

app/css/acct.css

@@ -91,4 +91,19 @@ i.left {
 }
 .text-line-icon {
 	font-size: 1rem;
+}
+.loginBtnWrap {
+	padding-top: 10px !important;
+}
+#add {
+	max-width: 1000px;
+}
+.autocomplete-content {
+	min-width: 450px;
+}
+.autocomplete-content li {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    word-break: break-word;
+    overflow: hidden;
 }

app/css/master.css

@@ -28,7 +28,9 @@ html {
 	text-transform: none;
 	height: 2.76rem;
 	line-height: 2.76rem;
+	border-radius: 0.5rem;
 }
+
 .markdown {
 	display: none;
 }
@@ -84,26 +86,26 @@ option {
 #imagemodal .modal-footer {
 	overflow-x: hidden;
 	overflow-y: hidden;
+	height: 56px;
 }
 
 #imagewrap {
 	width: 100%;
-	height: 100%;
+	height: calc(100% - 4px);
 }
 #imagewrap img.rotate-90 {
-	transform: rotate(-90deg)
+	transform: rotate(-90deg);
 }
 #imagewrap img.rotate-180 {
-	transform: rotate(-180deg)
+	transform: rotate(-180deg);
 }
 #imagewrap img.rotate-270 {
-	transform: rotate(-270deg)
+	transform: rotate(-270deg);
 }
 .pointer {
 	cursor: pointer;
 }
 .badge {
-	min-width: 0 !important;
 	margin-left: 0.4rem !important;
 }
 .unvisible {
@@ -235,6 +237,12 @@ blockquote:before,
 	right: 0;
 	top: 0;
 }
+.menu-icon {
+	font-size: 1.4rem !important;
+	top: 0.3rem;
+	line-height: 1rem !important;
+	position: relative;
+}
 #start {
 	display: none;
 	position: fixed;
@@ -330,8 +338,26 @@ blockquote:before,
 .collapsible-header:focus {
 	background-color: var(--thirdColor) !important;
 }
-.modal-footer {
+.modal .modal-footer {
 	background-color: var(--modalfooter) !important;
+	border-radius: 0;
+	padding: 0;
+}
+.modal {
+	border-radius: 1.5rem;
+}
+.progress .determinate,
+.progress .indeterminate {
+	background-color: var(--active);
+}
+.nomargin {
+	margin: 0;
+}
+#imginfo {
+	float: left;
+	padding-top: 0.23rem;
+	line-height: normal;
+	padding-left: 1rem;
 }
 .font {
 	font-size: 1.5rem;
@@ -343,7 +369,8 @@ blockquote:before,
 .release-do {
 	border: solid 2px;
 	border-color: var(--text);
-	padding: 5px;
+	padding: 1.5rem;
+	border-radius: 0.5rem;
 }
 #pickers {
 	display: flex;
@@ -393,7 +420,8 @@ input[type='color']::-webkit-color-swatch {
 	color: var(--text);
 }
 #left-menu a:hover {
-	background-color: var(--beforehover);
+	background-color: var(--emphasized);
+    filter: brightness(80%);
 }
 #left-menu span {
 	margin-left: 0.4rem;
@@ -402,7 +430,9 @@ input[type='color']::-webkit-color-swatch {
 	background-color: var(--emphasized);
 }
 #left-menu a.active span {
-	text-decoration: underline;
+	text-decoration: none;
+	border-bottom: 1px solid;
+	padding-bottom: 0.5px;
 }
 #right-menu {
 	width: 100%;
@@ -418,16 +448,27 @@ input[type='color']::-webkit-color-swatch {
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
-	width: 13rem;
+	min-width: 150px;
-	height: 3.1rem;
+	width: 50%;
+	height: 2.5rem;
 	cursor: pointer;
 	color: var(--text);
 }
+#tltype .type div {
+	margin-left: 5px;
+	margin-right: 5px;
+	margin-top: 3px;
+}
 #tltype .type span {
-	width: calc(100% - 2.3rem);
+	width: calc(100% - 4rem);
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	word-break: break-word;
+	overflow: hidden;
 }
 #tltype .type:hover {
-	background-color: var(--beforehover);
+	background-color: var(--emphasized);
+    filter: brightness(80%);
 }
 #tltype .active {
 	background-color: var(--emphasized);
@@ -499,13 +540,25 @@ textarea {
 	font-size: 1rem !important;
 	font-family: inherit;
 }
-.swal2-popup {
+.swal2-popup,
+.swal2-header {
 	background-color: var(--subcolor) !important;
 }
 .swal2-title,
 .swal2-content {
 	color: var(--text) !important;
 }
+h2.swal2-title {
+	margin: 0;
+	line-height: 100%;
+}
+.swal2-close:focus {
+	background-color: inherit !important;
+	box-shadow: none !important;
+}
+.swal2-actions {
+	background-color: var(--modalfooter);
+}
 #src-contents svg {
 	margin-right: 0.4rem;
 }
@@ -548,6 +601,7 @@ textarea {
 	background-color: var(--emphasized);
 }
 #pageSrc {
+	border-radius: 10px;
 	position: absolute;
 	top: 0;
 	left: calc(50vw - 11.53rem);
@@ -555,10 +609,22 @@ textarea {
 	max-width: 100%;
 	background-color: var(--subcolor);
 	z-index: 501;
-	padding: 0.4rem;
 }
-#pageSrcInput {
+.pageSrcBtn:hover {
-	width: 12.3rem;
+	background-color: var(--selected);
+}
+.srcQ {
+	margin-top: 0.4rem;
+	padding-left: 0.5rem;
+	padding-right: 0.5rem;
+	border-bottom: 1px solid;
+}
+.lastPSB {
+	margin-bottom: 0.4rem;
+}
+.pageSrcBtn {
+	padding-left: 0.5rem;
+	padding-right: 0.5rem;
 }
 .voice {
 	clip: rect(1px, 1px, 1px, 1px);
@@ -679,10 +745,19 @@ button {
 }
 .pluginNex {
 	width: 2rem;
-    text-align: center;
+	text-align: center;
 }
 .pluginNex span {
 	font-size: 2rem;
-    position: relative;
+	position: relative;
-    top: -4px;
+	top: -4px;
-}
+}
+#fonts {
+	overflow-y: scroll;
+	width: 22rem;
+	height: 40rem;
+	position: absolute;
+	background-color: var(--bg);
+	z-index: 2;
+	padding: 5px;
+}

app/css/post.css

@@ -69,6 +69,20 @@ textarea {
 	overflow-y: scroll;
 	overflow-x: hidden;
 }
+#suggest {
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: var(--bg);
+	z-index: 2;
+	border-radius: 0.5rem;
+	display: none;
+	max-height: 10rem;
+}
+#suggest a {
+	margin-left: 0.5rem;
+	margin-right: 0.5rem;
+}
 #emoji-list {
 	width: 100%;
 	height: 15.4rem;

app/css/tl.css

@@ -260,7 +260,7 @@ iframe,
 	width: 100%;
 	display: grid;
 	grid-template-columns: 3.3rem 2fr 1fr;
-	grid-template-rows: auto 1.6rem 1fr auto 2.5rem;
+	grid-template-rows: auto 1.6rem 1fr auto 1.9rem;
 	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space toot toot' 'space additional additional' 'vis actions side';
 }
 .hide-actions {
@@ -353,15 +353,26 @@ iframe,
 .area-actions {
 	padding: 0;
 	margin: 0;
-	top: -0.4rem;
-	position: relative;
 	display: flex;
 	justify-content: space-around;
 	max-width: 100%;
 	grid-area: actions;
 }
+.area-actions .btn-flat {
+	height: 1.3rem;
+	line-height: 1.3rem;
+}
+.area-actions .btn-flat,
+.area-vis i,
+.area-side .btn-flat {
+	margin: 0;
+}
+.area-side i {
+	line-height: initial;
+}
+
 .area-vis {
-	margin: 0.4rem;
+	margin: 0.2rem;
 	grid-area: vis;
 	text-align: center;
 }
@@ -373,7 +384,16 @@ iframe,
 	margin: 0.15rem;
 	grid-area: side;
 }
-
+.notf-udg-text {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	word-break: break-word;
+	overflow: hidden;
+	max-width: calc(100% - 150px);
+	display: inline-block;
+	position: relative;
+	top: 0.2rem;
+}
 .cusr {
 	user-select: text;
 	padding-left: 0.4rem;
@@ -398,6 +418,12 @@ iframe,
 	margin-top: 0.46rem;
 	margin-left: 0.46rem;
 }
+.landing {
+	text-align: center;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
 
 .quote-inline {
 	display: none;
@@ -431,6 +457,12 @@ iframe,
 .btn-flat {
 	color: var(--text);
 }
+.sublink {
+	font-size: 1.4rem !important;
+	position: relative;
+	top: 0.4rem;
+	cursor: pointer;
+}
 .area-side i {
 	margin-left: 0.75rem;
 }
@@ -441,6 +473,9 @@ iframe,
 	font-size: 1.2rem;
 	margin-right: 0.15rem;
 }
+.action li i {
+	margin-right: 0.5rem;
+}
 .action .fa-quote-right {
 	margin-top: 0.15rem;
 }
@@ -534,15 +569,67 @@ p:not(:last-child) {
 	grid-template-rows: 2.3rem 2.3rem;
 	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }
+.small-header.notice-box {
+	min-height: 2rem;
+	grid-template-columns: 2.3rem 1fr 5rem 2rem 2rem;
+	grid-template-rows: 1.8rem;
+	grid-template-areas: 'notice notice_name a1 a3 a2';
+}
+.small-header.has-notf.notice-box {
+	min-height: 2rem;
+	grid-template-columns: 2.3rem 1fr 8rem 5rem 2rem 2rem;
+	grid-template-rows: 1.8rem;
+	grid-template-areas: 'notice notice_name sta a1 a3 a2';
+}
 .emp {
 	font-weight: bold;
 	text-decoration: underline;
 }
-
+.rotate-90 {
+	transform: rotate(90deg);
+}
 .area-notice {
 	grid-area: notice;
 }
-
+.small-header .area-notice {
+	margin: 0;
+}
+.small-header .area-sta {
+	display: none;
+}
+.small-header.has-notf .area-sta {
+	overflow-x: scroll;
+	overflow-y: hidden;
+	height: 2rem;
+	width: 8rem;
+	display: flex;
+}
+.small-header .area-sta::-webkit-scrollbar {
+	height: 5px;
+}
+#tagContextMenu {
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: var(--subcolor);
+	z-index: 2;
+	border-radius: 0.4rem;
+}
+#tagContextMenu a {
+	display: block;
+	color: var(--text);
+	padding-left: 0.5rem;
+	padding-right: 0.5rem;
+}
+#tagContextMenu a:hover {
+	background-color: var(--selected);
+}
+.firstTCM {
+	margin-top: 0.4rem;
+}
+.lastTCM {
+	margin-bottom: 0.4rem;
+}
 .area-notice_name {
 	grid-area: notice_name;
 	overflow: hidden;
@@ -558,6 +645,10 @@ p:not(:last-child) {
 	grid-area: a1;
 }
 .area-sta {
+	display: none;
+}
+.has-notf .area-sta {
+	display: block;
 	text-align: center;
 	grid-area: sta;
 }
@@ -624,24 +715,37 @@ 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),
+	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;
-		0 5px 5px -3px rgba(0, 0, 0, 0.3), 0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset;
 }
 .notf-indv-box label span {
 	padding-left: 23px !important;
 	margin-right: 5px;
 }
+.columnSettings {
+	display: flex;
+	flex-wrap: wrap;
+}
 .notf-indv-box .setting {
 	font-size: 1rem;
-	width: calc(25% - 3px);
+	width: calc(25% - 6px);
-	text-align: left;
+	margin: 3px;
-	padding: 5px;
+	height: 100px;
-	height: 70px;
 	text-align: center;
+	display: flex;
+	flex-direction: column;
+	padding-top: 17px;
+	border: 1px solid;
+	border-radius: 5px;
+}
+.notf-indv-box .setting:hover {
+	color: var(--text);
+}
+.notf-exclude-btn {
+	border: 1px solid;
 }
 .notf-exclude-btn:hover {
 	background-color: inherit !important;
-	border: 1px solid;
+	filter: brightness(70%);
 }
 .type-b {
 	display: none;
@@ -673,6 +777,9 @@ p:not(:last-child) {
 	overflow: hidden;
 	position: relative;
 }
+.dropdown-content li {
+	padding-top: 0.4rem;
+}
 .fa-2x > .emoji-img {
 	width: 2.3rem !important;
 	height: 2.3rem !important;
@@ -756,7 +863,9 @@ p:not(:last-child) {
 	width: 100%;
 	height: 100%;
 }
-.fav_ct, .rt_ct, .rep_ct {
+.fav_ct,
+.rt_ct,
+.rep_ct {
 	font-size: 1.1rem;
 }
 .shared.selectedToot {
@@ -856,6 +965,14 @@ audio {
 .box .ui-resizable-se {
 	display: none !important;
 }
+.small-header .top-icon {
+	font-size: 2rem !important;
+	padding-top: 0%;
+}
+.top-icon {
+	font-size: 40px !important;
+	padding-top: 25%;
+}
 .announcement {
 	padding: 0.38rem;
 	border-bottom: 1px solid;
@@ -883,4 +1000,4 @@ audio {
 }
 .reactionsPack {
 	display: flex;
-}
+}

app/css/userdata.css

@@ -1,162 +1,219 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
+
 #his-data {
-	background-repeat: no-repeat;
+    background-repeat: no-repeat;
-	background-image: url('../img/loading.svg');
+    background-image: url('../img/loading.svg');
-	overflow-y: hidden;
+    overflow-y: hidden;
 }
+
 #his-data .btn .material-icons {
-	float: left;
+    float: left;
 }
+
 #his-data-content {
-	display: flex;
+    display: flex;
-	justify-content: center;
+    justify-content: center;
 }
+
 #his-name {
-	font-size: 1.5rem;
+    font-size: 1.5rem;
 }
+
 #his-prof {
-	width: 7.7rem;
+    width: 7.7rem;
-	margin-right: 0.4rem;
+    margin-right: 0.4rem;
 }
+
 .his-float {
-	overflow-y: scroll;
+    overflow-y: scroll;
-	padding: 0.4rem;
+    padding: 0.4rem;
 }
+
 #his-float-data {
-	height: 100%;
+    height: 100%;
-  overflow-y: hidden;
+    overflow-y: hidden;
-  
 }
+
 #his-leftside {
-  width: 28.4rem;
+    width: 28.4rem;
-  max-width: 30vw;
+    max-width: 30vw;
 }
+
 #his-float-timeline {
-  max-width: 47.5rem;
+    max-width: 47.5rem;
-  min-width: calc(100% - 29.4rem);
+    width: calc(100% - 28.4rem);
-	height: 100%;
+    height: 100%;
-	overflow-y: hidden;
+    overflow-y: hidden;
 }
+
 #his-basic-prof {
-  display: flex;
+    display: flex;
-	min-height: 10rem;
+    min-height: 10rem;
 }
+
 #his-field {
-	vertical-align: baseline;
+    vertical-align: baseline;
-	text-align: center;
+    text-align: center;
-	padding: 0;
+    padding: 0;
 }
+
 #his-field tr {
-	height: 1.5rem;
+    height: 1.5rem;
 }
+
 .his-field-title {
-	height: 1.5rem;
+    height: 1.5rem;
-	padding: 0;
+    padding: 0;
-	background-color: #757575;
+    background-color: #757575;
-	text-align: center;
+    text-align: center;
-	padding: 0.4rem;
+    padding: 0.4rem;
-	margin-bottom: 1px;
+    margin-bottom: 1px;
-	width: 30%;
+    width: 30%;
 }
+
 .his-field-content {
-	height: 1.5rem;
+    height: 1.5rem;
-	padding: 0;
+    padding: 0;
-	padding-left: 0.4rem;
+    padding-left: 0.4rem;
 }
+
 .his-var-content a span.ellipsis:after {
-	content: '...';
+    content: '...';
 }
+
 .his-var-content a:not(.mention) span:last-of-type {
-	display: none;
+    display: none;
 }
+
 #his-data a .rep_ct,
 #his-data a .rt_ct,
 #his-data a .fav_ct {
-	display: inline !important;
+    display: inline !important;
 }
+
 #his-data-show {
-	margin: 1.5rem;
+    margin: 1.5rem;
-	margin-left: 3.8rem;
+    margin-left: 3.8rem;
-	margin-right: 3.8rem;
+    margin-right: 3.8rem;
-	background-color: var(--his-data);
+    background-color: var(--his-data);
-	height: calc(100% - 1.5rem);
+    height: calc(100% - 1.5rem);
-	margin-bottom: 0;
+    margin-bottom: 0;
-	padding: 0.4rem;
+    padding: 0.4rem;
 }
+
 #his-data-wrap {
-	display: flex;
+    display: flex;
 }
+
 .his-var-content {
-	overflow-y: scroll;
+    overflow-y: scroll;
-	overflow-x: hidden;
+    overflow-x: hidden;
-	height: calc(100% - 3.4rem);
+    height: calc(100% - 3.4rem);
-	padding-bottom: 60px;
+    padding-bottom: 60px;
 }
+
 #my-data-nav .btn {
-	width: 10.6rem;
+    width: 10.6rem;
 }
+
 #my-data-nav .active-back {
-	display: none;
+    display: none;
 }
+
 #his-name .emojione,
 #his-name .emoji-img {
-	width: 1.538rem;
+    width: 1.538rem;
 }
+
 #his-plus-action .btn {
-	padding-right: 0.4rem;
+    padding-right: 0.4rem;
-	padding-left: 0.4rem;
+    padding-left: 0.4rem;
 }
+
 .tabs {
-	display: flex;
+    display: flex;
 }
+
 .tabs .tab a {
-	padding: 0.6rem 0.9rem;
+    padding: 0.6rem 0.9rem;
 }
+
 #his-des {
-	max-height: 17.7rem;
+    max-height: 17.7rem;
-	overflow-y: scroll;
+    overflow-y: scroll;
+    user-select: text;
+    cursor: text;
 }
+
 #his-sign-action {
-	border: 1px solid;
+    border: 1px solid;
-	border-radius: 0.4rem;
+    border-radius: 0.4rem;
-	display: flex;
+    display: flex;
-	align-items: center;
+    align-items: center;
-	padding-left: 0.75rem;
+    padding-left: 0.75rem;
-	padding-right: 0.75rem;
+    padding-right: 0.75rem;
-	flex-wrap: wrap;
+    flex-wrap: wrap;
 }
-#his-sign-action .btn {
+
-	flex-basis: calc(50% - 10.6px);
+#his-sign-action .shrinker {
+    margin-right: 0.5rem;
+    flex-basis: calc(50% - 1rem);
 }
+
+#his-sign-action .shrinker.btn {
+    width: 100%;
+}
+
 #his-sign-action .dropdown-trigger {
-	flex-basis: 100%;
+    flex-basis: 100%;
 }
+
 #his-des .mention {
-	color: #039be5;
+    color: #039be5;
-	cursor: pointer;
+    cursor: pointer;
 }
+
 #his-table {
-	max-height: 11.538rem;
+    max-height: 9.2rem;
-	overflow-y: scroll;
+    overflow-y: scroll;
+    user-select: text;
 }
+
 #his-float-blocked {
-	display: flex;
+    display: flex;
-	justify-content: center;
+    justify-content: center;
-	align-items: center;
+    align-items: center;
-	font-size: 2rem;
+    font-size: 2rem;
-	height: 100%;
+    height: 100%;
 }
+
 #hisdropdown {
-	background-color: var(--bg);
+    background-color: var(--bg);
 }
+
 #hisdropdown li a {
-	color: white;
+    color: var(--text);
 }
+
 #hisdropdown li:hover {
-	background-color: var(--active);
+    background-color: var(--active);
 }
-#his-data-title {
+
-	width: 100%;
+#his-data-title-wrap {
-	text-align: center;
+    width: 100%;
-	font-size: 1.5rem;
+    text-align: center;
+    font-size: 1.5rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }
+
+#his-data-title .material-icons {
+    position: relative;
+    top: 5px;
+    margin-right: 3px;
+}
+
+#his-data-title a {
+    color: white;
+}

app/gitHash.js

@@ -0,0 +1,6 @@
+const fs = require('fs')
+const execSync = require('child_process').execSync
+const gitHash = execSync('git rev-parse HEAD')
+    .toString()
+    .trim()
+fs.writeFileSync('git', gitHash)

app/js/common/version.js

@@ -5,20 +5,6 @@ function verck(ver, jp) {
 	$('body').addClass(localStorage.getItem('platform'))
 	var date = new Date()
 	var showVer = false
-	//Spotify
-	if (localStorage.getItem('spotify')) {
-		localStorage.removeItem('spotify')
-		localStorage.removeItem('spotify-refresh')
-		var spDc = 'Spotify NowPlaying sysytem was changed, please re-login to Spotify'
-		if(lang.language == 'ja') {
-			spDc = 'Spotify NowPlayingの機能が変更されたため、もう一度ログインしてください'
-		}
-		Swal.fire({
-			type: 'info',
-			title: spDc,
-		})
-	}
-	//Spotify(e)
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
 		showVer = true
 		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
@@ -44,10 +30,7 @@ function verck(ver, jp) {
 	localStorage.setItem('ver', ver)
 	if (!showVer) {
 		console.log(showVer)
-		if (
+		if (!localStorage.getItem('showSupportMe')) {
-			date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
-			!localStorage.getItem('showSupportMe')
-		) {
 			if (date.getMonth() == 11) {
 				var yrs = date.getFullYear() + 1
 				var nextmonth = yrs * 100 + 1
@@ -55,21 +38,35 @@ function verck(ver, jp) {
 				var yrs = date.getFullYear() 
 				var nextmonth = yrs * 100 + date.getMonth() + 2
 			}
-			if (lang.language != 'ja') {
-				$('#support-btm-ja').addClass('hide')
-				$('#support-btm-en').removeClass('hide')
-			}
 			localStorage.setItem('showSupportMe', nextmonth)
-			$('#support-btm').removeClass('hide')
+		} else {
-			$('#support-btm').animate(
+			if (
-				{
+				date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe')
-					bottom: '0'
+			) {
-				},
+				if (date.getMonth() == 11) {
-				{
+					var yrs = date.getFullYear() + 1
-					duration: 300
+					var nextmonth = yrs * 100 + 1
+				} else {
+					var yrs = date.getFullYear() 
+					var nextmonth = yrs * 100 + date.getMonth() + 2
 				}
-			)
+				localStorage.setItem('showSupportMe', nextmonth)
+				if (lang.language != 'ja') {
+					$('#support-btm-ja').addClass('hide')
+					$('#support-btm-en').removeClass('hide')
+				}
+				$('#support-btm').removeClass('hide')
+				$('#support-btm').animate(
+					{
+						bottom: '0'
+					},
+					{
+						duration: 300
+					}
+				)
+			}
 		}
+		
 	}
 	var platform = localStorage.getItem('platform')
 	console.log('Your platform:' + platform)
@@ -114,11 +111,6 @@ function verck(ver, jp) {
 		.then(function(mess) {
 			console.table(mess)
 			if (mess) {
-				//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
-				if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
-					localStorage.setItem('askjp_jp_ua', true)
-					$('#askjp_jp_ua').removeClass('hide')
-				}
 				var platform = localStorage.getItem('platform')
 				if (platform == 'darwin') {
 					var newest = mess.desk_mac

app/js/login/login.js

@@ -537,9 +537,10 @@ function multiSelector(parseC) {
 	}
 	last = last + ''
 	var sel
+	const webview = localStorage.getItem('webview_setting') === 'true'
 	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>')
+		$('#add-acct-sel').html('<option value="noauth">' + lang.lang_login_noauth + `</option>${webview ? `<option value="webview">TweetDeck</option>` : ''}`)
 	} else {
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key]
@@ -610,7 +611,7 @@ function multiSelector(parseC) {
 		$('#add-acct-sel').append(
 			'<option value="noauth">' +
 			lang.lang_login_noauth +
-			'</option><!--option value="webview">Twitter</option-->'
+			`</option>${webview ? `<option value="webview">TweetDeck</option>` : ''}`
 		)
 		$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
 	}

app/js/login/manager.js

@@ -205,8 +205,6 @@ function multiDel(target) {
 		text: obj[target]['user'] + '@' + obj[target]['domain'] + lang.lang_manager_confirm,
 		type: 'warning',
 		showCancelButton: true,
-		confirmButtonColor: '#3085d6',
-		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
 		cancelButtonText: lang.lang_no
 	}).then(result => {
@@ -299,8 +297,6 @@ function multiDel2(target) {
 		text: obj[target]['user'] + '@' + obj[target]['domain'] + lang.lang_manager_confirm,
 		type: 'warning',
 		showCancelButton: true,
-		confirmButtonColor: '#3085d6',
-		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
 		cancelButtonText: lang.lang_no
 	}).then(result => {
@@ -427,10 +423,6 @@ function login(url) {
 			versionChecker(url)
 			$('#add').hide()
 			postMessage(['openUrl', auth], '*')
-			if ($('#linux:checked').val() == 'on') {
-			} else {
-				postMessage(['sendSinmpleIpc', 'quit'], '*')
-			}
 		}
 	}
 }
@@ -629,15 +621,16 @@ function misskeyAuth(url, mkc) {
 
 //テキストボックスにURL入れた
 function instance() {
-	var url = $('#url').val()
+	var url = $('#autocomplete-input').val()
 	if (url.indexOf('@') != -1 || url.indexOf('https') != -1) {
 		alert('入力形式が違います。(Cutls@mstdn.jpにログインする場合、入力するのは"mstdn.jp"です。)')
 		return false
 	}
-	login(url)	
+	login(url)
 }
 //コード入れてAccessTokenゲット
 function code(code) {
+	var red = localStorage.getItem('redirect')
 	localStorage.removeItem('redirect')
 	if (!code) {
 		var code = $('#code').val()
@@ -700,7 +693,7 @@ function code(code) {
 		}
 		return
 	} else {
-		var red = 'urn:ietf:wg:oauth:2.0:oob'
+		if (!red) red = 'urn:ietf:wg:oauth:2.0:oob'
 		if (~url.indexOf('pixelfed')) {
 			red = 'https://thedesk.top/hello.html'
 		}
@@ -724,6 +717,7 @@ function code(code) {
 			if (httpreq.readyState === 4) {
 				var json = httpreq.response
 				if (this.status !== 200) {
+					M.toast({ html: lang.lang_fatalerroroccured + 'Error: cannot complete', displayLength: 5000 })
 					setLog(start, this.status, json)
 				}
 				if (json['access_token']) {
@@ -1093,15 +1087,14 @@ function coloradd(key, bg, txt) {
 //入力時にハッシュタグと@をサジェスト
 var timer = null
 
-var input = document.getElementById('url')
+var input = document.getElementById('autocomplete-input')
-
 var prev_val = input.value
 var oldSuggest
 var suggest
 input.addEventListener(
 	'focus',
 	function () {
-		$('#ins-suggest').html('')
+		const instance = M.Autocomplete.getInstance(input)
 		window.clearInterval(timer)
 		timer = window.setInterval(function () {
 			var new_val = input.value
@@ -1112,7 +1105,7 @@ input.addEventListener(
 						method: 'GET',
 						headers: {
 							'content-type': 'application/json',
-							}
+						}
 					})
 						.then(function (response) {
 							if (!response.ok) {
@@ -1129,21 +1122,20 @@ input.addEventListener(
 						})
 						.then(function (json) {
 							if (!json.error) {
-								var urls = 'Suggest:'
+								let data = {}
 								Object.keys(json.data).forEach(function (key) {
 									var url = json.data[key]
-									urls =
+									data[url.uri] = escapeHTML(url.title ? url.title : url.uri)
-										urls +
-										`<a onclick="login('${url.uri}')" class="pointer" title="${url.uri}">${escapeHTML(url.title ? url.title : url.uri)}</a>, `
 								})
-								$('#ins-suggest').html(urls)
+								instance.updateData(data)
+								instance.open()
 							} else {
 								console.error(json.error)
 							}
 						})
 				}
 				oldSuggest = suggest
-				prev_value = new_val
+				prev_val = new_val
 			}
 		}, 1000)
 	},
@@ -1161,3 +1153,12 @@ input.addEventListener(
 function asReadEnd() {
 	postMessage(['asReadComp', ''], '*')
 }
+
+// Or with jQuery
+
+$(document).ready(function(){
+    $('input.autocomplete').autocomplete({
+      data: {},
+    });
+  });
+        

app/js/platform/end.js

@@ -29,7 +29,7 @@ $(document).on('click', 'a', e => {
 					acct_id = 0
 				}
 				$a.parent().addClass('loadp')
-				$a.parent().text('Loading...')
+				
 				detEx(url, acct_id)
 			}
 		} else if (tags) {
@@ -186,7 +186,7 @@ onmessage = function (e) {
 	} else if (e.data[0] == 'asReadEnd') {
 		asReadEnd()
 	} else if (e.data[0] == 'accessibility') {
-		console.log('atrue')
+		console.log('accessibility mode')
 		$('body').addClass('accessibility')
 		$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
 	} else if (e.data[0] == 'logData') {
@@ -198,6 +198,24 @@ onmessage = function (e) {
 			type: 'info',
 			title: e.data[1]
 		})
+	} else if (e.data[0] == 'twitterLoginComplete') {
+		location.reload()
+	} else if (e.data[0] == 'customUrl') {
+		const mode = e.data[1][0]
+		const codex = e.data[1][1]
+		if (mode === 'share') {
+			$('textarea').focus()
+			$('#textarea').val(decodeURI(codex))
+			show()
+			$('body').removeClass('mini-post')
+			$('.mini-btn').text('expand_less')
+		} else if (mode === 'manager' || mode === 'login') {
+			code(codex)
+		} else if (mode === 'spotify') {
+			var coder = codex.split(':')
+			localStorage.setItem('spotify', coder[0])
+			localStorage.setItem('spotify-refresh', coder[1])
+		}
 	}
 }
 /* PWA */
@@ -234,3 +252,34 @@ const connection = function (event) {
 }
 window.onoffline = connection
 window.ononline = connection
+
+let lastSelection = null
+let isSame = true
+$(document).on('keyup mouseup', function (e) {
+	lastSelection = (window.getSelection().toString() !== '') ? window.getSelection().getRangeAt(0) : null
+	if (!isSame) $('#pageSrc').addClass('hide')
+})
+
+// カスタム右クリックメニュー
+$(document).on('contextmenu', function (e) {
+	// テキスト選択中であれば何もしない
+	if (lastSelection !== null) {
+		const currentSelection = window.getSelection().getRangeAt(0)
+		for (let key in currentSelection) {
+			if (currentSelection[key] != lastSelection[key]) {
+				isSame = false
+				break
+			}
+		}
+
+		if (isSame && currentSelection != '') {
+			$('#pageSrc').removeClass('hide')
+			$('#pageSrc').css('left', e.pageX)
+			$('#pageSrc').css('top', e.pageY)
+			$('.srcQ').text(currentSelection)
+		}
+	}
+})
+$('textarea, input').on('contextmenu', function (e) {
+	postMessage(['textareaContextMenu', { x: e.pageX, y: e.pageY }], '*')
+})

app/js/platform/first.js

@@ -1,292 +1,305 @@
-window.onload = function () {
+window.onload = function() {
-	console.log('loaded')
+    console.log('loaded')
-	initPostbox()
+    initPostbox()
-	connection()
+    connection()
-	initPlugin(plugins)
+    initPlugin(plugins)
-	if(localStorage.getItem('control-center-np')) $('#ccnp').removeClass('hide')
+    if (localStorage.getItem('control-center-np')) $('#ccnp').removeClass('hide')
 }
-$.strip_tags = function (str, allowed) {
+$.strip_tags = function(str, allowed) {
-	if (!str) {
+    if (!str) {
-		return ''
+        return ''
-	}
+    }
-	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join('')
+    allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join('')
-	var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
+    var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
-		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
+        commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
-	return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
+    return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
-		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
+        return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
-	})
+    })
 }
+
 function escapeHTML(str) {
-	if (!str) {
+    if (!str) {
-		return ''
+        return ''
-	}
+    }
-	return str
+    return str
-		.replace(/&/g, '&amp;')
+        .replace(/&/g, '&amp;')
-		.replace(/</g, '&lt;')
+        .replace(/</g, '&lt;')
-		.replace(/>/g, '&gt;')
+        .replace(/>/g, '&gt;')
-		.replace(/"/g, '&quot;')
+        .replace(/"/g, '&quot;')
-		.replace(/'/g, '&#039;')
+        .replace(/'/g, '&#039;')
 }
 //PHPのnl2brと同様
 function nl2br(str) {
-	if (!str) {
+    if (!str) {
-		return ''
+        return ''
-	}
+    }
-	str = str.replace(/\r\n/g, '<br />')
+    str = str.replace(/\r\n/g, '<br />')
-	str = str.replace(/(\n|\r)/g, '<br />')
+    str = str.replace(/(\n|\r)/g, '<br />')
-	return str
+    return str
 }
+
 function br2nl(str) {
-	if (!str) {
+    if (!str) {
-		return ''
+        return ''
-	}
+    }
-	str = str.replace(/<br \/>/g, '\r\n')
+    str = str.replace(/<br \/>/g, '\r\n')
-	return str
+    return str
 }
+
 function formattime(date) {
-	var str = date.getFullYear() + '-'
+    var str = date.getFullYear() + '-'
-	if (date.getMonth() + 1 < 10) {
+    if (date.getMonth() + 1 < 10) {
-		str = str + '0' + (date.getMonth() + 1) + '-'
+        str = str + '0' + (date.getMonth() + 1) + '-'
-	} else {
+    } else {
-		str = str + (date.getMonth() + 1) + '-'
+        str = str + (date.getMonth() + 1) + '-'
-	}
+    }
-	if (date.getDate() < 10) {
+    if (date.getDate() < 10) {
-		str = str + '0' + date.getDate()
+        str = str + '0' + date.getDate()
-	} else {
+    } else {
-		str = str + date.getDate()
+        str = str + date.getDate()
-	}
+    }
-	str = str + 'T'
+    str = str + 'T'
-	if (date.getHours() < 10) {
+    if (date.getHours() < 10) {
-		str = str + '0' + date.getHours() + ':'
+        str = str + '0' + date.getHours() + ':'
-	} else {
+    } else {
-		str = str + date.getHours() + ':'
+        str = str + date.getHours() + ':'
-	}
+    }
-	if (date.getMinutes() < 10) {
+    if (date.getMinutes() < 10) {
-		str = str + '0' + date.getMinutes()
+        str = str + '0' + date.getMinutes()
-	} else {
+    } else {
-		str = str + date.getMinutes()
+        str = str + date.getMinutes()
-	}
+    }
-	return escapeHTML(str)
+    return escapeHTML(str)
 }
+
 function formattimeutc(date) {
-	var str = date.getUTCFullYear() + '-'
+    var str = date.getUTCFullYear() + '-'
-	if (date.getUTCMonth() + 1 < 10) {
+    if (date.getUTCMonth() + 1 < 10) {
-		str = str + '0' + (date.getUTCMonth() + 1) + '-'
+        str = str + '0' + (date.getUTCMonth() + 1) + '-'
-	} else {
+    } else {
-		str = str + (date.getUTCMonth() + 1) + '-'
+        str = str + (date.getUTCMonth() + 1) + '-'
-	}
+    }
-	if (date.getUTCDate() < 10) {
+    if (date.getUTCDate() < 10) {
-		str = str + '0' + date.getUTCDate()
+        str = str + '0' + date.getUTCDate()
-	} else {
+    } else {
-		str = str + date.getUTCDate()
+        str = str + date.getUTCDate()
-	}
+    }
-	str = str + 'T'
+    str = str + 'T'
-	if (date.getUTCHours() < 10) {
+    if (date.getUTCHours() < 10) {
-		str = str + '0' + date.getUTCHours() + ':'
+        str = str + '0' + date.getUTCHours() + ':'
-	} else {
+    } else {
-		str = str + date.getUTCHours() + ':'
+        str = str + date.getUTCHours() + ':'
-	}
+    }
-	if (date.getUTCMinutes() < 10) {
+    if (date.getUTCMinutes() < 10) {
-		str = str + '0' + date.getUTCMinutes()
+        str = str + '0' + date.getUTCMinutes()
-	} else {
+    } else {
-		str = str + date.getUTCMinutes()
+        str = str + date.getUTCMinutes()
-	}
+    }
-	return escapeHTML(str)
+    return escapeHTML(str)
 }
 postMessage(['sendSinmpleIpc', 'custom-css-request'], '*')
-function makeCID() {
+
-	let chars = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split("")
+incrementid=0
-	for (let i = 0, len = chars.length; i < len; i++) {
+function makeCID()
-		switch (chars[i]) {
+{
-			case "x":
+	return incrementid++
-				chars[i] = Math.floor(Math.random() * 16).toString(16)
-				break
-			case "y":
-				chars[i] = (Math.floor(Math.random() * 4) + 8).toString(16)
-				break
-		}
-	}
-	return chars.join("")
-}
-function randomStr(l) {
-	// 生成する文字列に含める文字セット
-	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
-	var cl = c.length
-	var r = ''
-	for (var i = 0; i < l; i++) {
-		r += c[Math.floor(Math.random() * cl)]
-	}
-	return r
 }
+
 function rgbToHex(color) {
-	// HEXに変換したものを代入する変数
+    // HEXに変換したものを代入する変数
-	var hex = ''
+    var hex = ''
 
-	// 第1引数がHEXのとき変換処理は必要ないのでそのままreturn
+    // 第1引数がHEXのとき変換処理は必要ないのでそのままreturn
-	// IE8の場合はjQueryのcss()関数でHEXを返すので除外
+    // IE8の場合はjQueryのcss()関数でHEXを返すので除外
-	if (color.match(/^#[a-f\d]{3}$|^#[a-f\d]{6}$/i)) {
+    if (color.match(/^#[a-f\d]{3}$|^#[a-f\d]{6}$/i)) {
-		return color
+        return color
-	}
+    }
 
-	// 正規表現
+    // 正規表現
-	var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/)
+    var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/)
 
-	// 正規表現でマッチしたとき
+    // 正規表現でマッチしたとき
-	if (regex) {
+    if (regex) {
-		var rgb = [
+        var rgb = [
-			// RGBからHEXへ変換
+            // RGBからHEXへ変換
-			parseInt(regex[1]).toString(16),
+            parseInt(regex[1]).toString(16),
-			parseInt(regex[2]).toString(16),
+            parseInt(regex[2]).toString(16),
-			parseInt(regex[3]).toString(16)
+            parseInt(regex[3]).toString(16)
-		]
+        ]
 
-		for (var i = 0; i < rgb.length; ++i) {
+        for (var i = 0; i < rgb.length; ++i) {
-			// rgb(1,1,1)のようなときHEXに変換すると1桁になる
+            // rgb(1,1,1)のようなときHEXに変換すると1桁になる
-			// 1桁のときは前に0を足す
+            // 1桁のときは前に0を足す
-			if (rgb[i].length == 1) {
+            if (rgb[i].length == 1) {
-				rgb[i] = '0' + rgb[i]
+                rgb[i] = '0' + rgb[i]
-			}
+            }
-			hex += rgb[i]
+            hex += rgb[i]
-		}
+        }
 
-		return hex
+        return hex
-	}
+    }
 
-	console.error(color + ':第1引数はRGB形式で入力')
+    console.error(color + ':第1引数はRGB形式で入力')
 }
 /*マルチバイト用切り出し*/
-$.isSurrogatePear = function (upper, lower) {
+$.isSurrogatePear = function(upper, lower) {
-	return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
+    return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
 }
-$.mb_strlen = function (str) {
+$.mb_strlen = function(str) {
-	var splitter = new GraphemeSplitter()
+    var splitter = new GraphemeSplitter()
-	var arr = splitter.splitGraphemes(str)
+    var arr = splitter.splitGraphemes(str)
-	return arr.length
+    return arr.length
 }
-$.mb_substr = function (str, begin, end) {
+$.mb_substr = function(str, begin, end) {
-	//配列にする
+        //配列にする
-	var splitter = new GraphemeSplitter()
+        var splitter = new GraphemeSplitter()
-	var arr = splitter.splitGraphemes(str)
+        var arr = splitter.splitGraphemes(str)
-	var newarr = []
+        var newarr = []
-	for (var i = 0; i < arr.length; i++) {
+        for (var i = 0; i < arr.length; i++) {
-		if (i >= begin && i <= end) {
+            if (i >= begin && i <= end) {
-			newarr.push(arr[i])
+                newarr.push(arr[i])
-		}
+            }
-	}
+        }
-	return newarr.join('')
+        return newarr.join('')
-}
+    }
-//ソートするやつ
+    //ソートするやつ
 function object_array_sort(data, key, order, fn) {
-	var num_a = -1
+    var num_a = -1
-	var num_b = 1
+    var num_b = 1
-	if (order === 'asc') {
+    if (order === 'asc') {
-		num_a = 1
+        num_a = 1
-		num_b = -1
+        num_b = -1
-	}
+    }
-	data = data.sort(function (a, b) {
+    data = data.sort(function(a, b) {
-		var x = a[key]
+        var x = a[key]
-		var y = b[key]
+        var y = b[key]
-		if (x > y) return num_a
+        if (x > y) return num_a
-		if (x < y) return num_b
+        if (x < y) return num_b
-		return 0
+        return 0
-	})
+    })
-	var arrObj = {}
+    var arrObj = {}
-	for (var i = 0; i < data.length; i++) {
+    for (var i = 0; i < data.length; i++) {
-		arrObj[data[i]['family']] = data[i]
+        arrObj[data[i]['family']] = data[i]
-	}
+    }
-	data = []
+    data = []
-	for (var key in arrObj) {
+    for (var key in arrObj) {
-		data.push(arrObj[key])
+        data.push(arrObj[key])
-	}
+    }
-	fn(data)
+    fn(data)
 }
+
 function setLog(txt1, txt2, txt3) {
-	//url,statuscode,responsetext
+    //url,statuscode,responsetext
-	var text = new Date().toUTCString()
+    var text = new Date().toUTCString()
-	text = text + ',' + txt1 + ',' + txt2 + ',' + escapeCsv(txt3)
+    text = text + ',' + txt1 + ',' + txt2 + ',' + escapeCsv(txt3)
-	console.error(text)
+    console.error(text)
-	postMessage(['log', text], '*')
+    postMessage(['log', text], '*')
 }
+
 function escapeCsv(str) {
-	if (!str) {
+    if (!str) {
-		return str
+        return str
-	}
+    }
-	var result
+    var result
-	result = str.toString().replace(/\"/g, '""')
+    result = str.toString().replace(/\"/g, '""')
-	if (result.indexOf(',') >= 0) {
+    if (result.indexOf(',') >= 0) {
-		result = '"' + result + '"'
+        result = '"' + result + '"'
-	}
+    }
-	return result
+    return result
 }
+
 function evalAttr(json, attr, lenCk) {
-	if (json[attr]) {
+    if (json[attr]) {
-		if (lenCk) {
+        if (lenCk) {
-			if (json[attr][0]) {
+            if (json[attr][0]) {
-				return true
+                return true
-			} else {
+            } else {
-				return false
+                return false
-			}
+            }
-		} else {
+        } else {
-			return true
+            return true
-		}
+        }
-	} else {
+    } else {
-		return false
+        return false
-	}
+    }
 }
+
 function statusModel(now) {
-	if (!now) {
+    if (!now) {
-		var now = new Date().toString()
+        var now = new Date().toString()
-	}
+    }
-	return {
+    return {
-		id: '',
+        id: '',
-		created_at: now,
+        created_at: now,
-		in_reply_to_id: null,
+        in_reply_to_id: null,
-		in_reply_to_account_id: null,
+        in_reply_to_account_id: null,
-		sensitive: false,
+        sensitive: false,
-		spoiler_text: '',
+        spoiler_text: '',
-		visibility: 'public',
+        visibility: 'public',
-		language: 'en',
+        language: 'en',
-		uri: '',
+        uri: '',
-		url: '',
+        url: '',
-		replies_count: 0,
+        replies_count: 0,
-		reblogs_count: 0,
+        reblogs_count: 0,
-		favourites_count: 0,
+        favourites_count: 0,
-		favourited: false,
+        favourited: false,
-		reblogged: false,
+        reblogged: false,
-		muted: false,
+        muted: false,
-		bookmarked: false,
+        bookmarked: false,
-		pinned: false,
+        pinned: false,
-		content: '<p><i>No status here</i></p>',
+        content: '<p><i>No status here</i></p>',
-		reblog: null,
+        reblog: null,
-		application: {
+        application: {
-			name: null,
+            name: null,
-			website: null
+            website: null
-		},
+        },
-		account: {
+        account: {
-			id: '',
+            id: '',
-			username: '',
+            username: '',
-			acct: '',
+            acct: '',
-			display_name: '',
+            display_name: '',
-			locked: false,
+            locked: false,
-			bot: false,
+            bot: false,
-			created_at: now,
+            created_at: now,
-			note: '',
+            note: '',
-			url: '',
+            url: '',
-			avatar: '',
+            avatar: '',
-			avatar_static: '',
+            avatar_static: '',
-			header: '',
+            header: '',
-			header_static: '',
+            header_static: '',
-			followers_count: 0,
+            followers_count: 0,
-			following_count: 0,
+            following_count: 0,
-			statuses_count: 0,
+            statuses_count: 0,
-			last_status_at: now,
+            last_status_at: now,
-			emojis: [],
+            emojis: [],
-			fields: []
+            fields: []
-		},
+        },
-		media_attachments: [],
+        media_attachments: [],
-		mentions: [],
+        mentions: [],
-		tags: [],
+        tags: [],
-		card: null,
+        card: null,
-		poll: null
+        poll: null
-	}
+    }
 }
+
+function webviewFinder() {
+    const webview = document.querySelector('webview')
+    webview.addEventListener('did-navigate', (e) => {
+        const url = webview.getURL()
+        if (url.match('https://mobile.twitter.com/login')) {
+            postMessage(['twitterLogin', null], '*')
+        } else if (url.match('https://mobile.twitter.com/logout')) {
+            postMessage(['twitterLogin', true], '*')
+        }
+    })
+}
+
+function initWebviewEvent() {
+    if (document.querySelector('webview')) { webviewFinder() } else {
+        const timerWV = setInterval(function() {
+            document.querySelector('webview') ?
+                (webviewFinder(), clearInterval(timerWV)) :
+                console.log('まだロード中')
+        }, 500)
+    }
+}

app/js/platform/preload.js

@@ -54,6 +54,8 @@ onmessage = function(e) {
 		ipc.send('theme-json-request', e.data[1])
 	} else if (e.data[0] == 'ha') {
 		ipc.send('ha', e.data[1])
+	} else if (e.data[0] == 'webviewSetting') {
+		ipc.send('webview', e.data[1])
 	} else if (e.data[0] == 'frameSet') {
 		ipc.send('frameSet', e.data[1])
 	} else if (e.data[0] == 'ua') {
@@ -64,7 +66,9 @@ onmessage = function(e) {
 		console.log('NowPlaying')
 		ipc.send('itunes', e.data[1])
 	} else if (e.data[0] == 'themeCSSRequest') {
-		ipc.send('theme-css-request', e.data[1])
+		ipc.send('theme-css-request', e.data)
+	} else if (e.data[0] == 'themeCSSPreview') {
+		ipc.send('theme-css-request', e.data)
 	} else if (e.data[0] == 'customCSSRequest') {
 		ipc.send('custom-css-request', e.data[1])
 	} else if (e.data[0] == 'downloadButton') {
@@ -77,6 +81,10 @@ onmessage = function(e) {
 		ipc.send('copy', e.data[1])
 	} else if (e.data[0] == 'log') {
 		ipc.send('log', e.data[1])
+	} else if (e.data[0] == 'twitterLogin') {
+		ipc.send('twitterLogin', e.data[1])
+	} else if (e.data[0] == 'textareaContextMenu') {
+		ipc.send('textareaContextMenu', e.data[1])
 	}
 }
 //version.js
@@ -227,9 +235,12 @@ ipc.on('asReadEnd', function(event, arg) {
 ipc.on('accessibility', function(event, arg) {
 	postMessage(['accessibility', 'true'], '*')
 })
-var webviewDom = document.getElementById('webview')
+ipc.on('twitterLoginComplete', function(event, arg) {
-if (webviewDom) {
+	postMessage(['twitterLoginComplete', ''], '*')
-	webviewDom.addEventListener('new-window', function(e) {
+})
-		shell.openExternal(e.url)
+ipc.on('alert', function(event, arg) {
-	})
+	postMessage(['alert', arg], '*')
-}
+})
+ipc.on('customUrl', function(event, args) {
+	postMessage(['customUrl', args], '*')
+})

app/js/post/emoji.js

@@ -19,7 +19,7 @@ function emojiToggle(reaction) {
 		if (width) {
 			width = width.replace('px', '') * 1 + 300
 		} else {
-			width = 600
+			width = reaction ? 300 : 600
 		}
 		$('#post-box').css('width', width + 'px')
 		$('#suggest').html('')
@@ -126,8 +126,10 @@ function emojiGet(parse, started) {
 
 					md['if_categorized'] = if_categorized
 					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
+					localStorage.setItem(`emojis_raw_${acct_id}`, JSON.stringify(json))
 				} else {
 					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
+					localStorage.setItem(`emojis_raw_${acct_id}`, JSON.stringify(json))
 				}
 				localStorage.setItem('emojiseek', 0)
 				if (!started) {

app/js/post/img.js

@@ -276,8 +276,6 @@ function deleteImage(key) {
 		title: lang.lang_postimg_delete,
 		type: 'warning',
 		showCancelButton: true,
-		confirmButtonColor: '#3085d6',
-		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
 		cancelButtonText: lang.lang_no
 	}).then(result => {

app/js/post/post.js

@@ -55,8 +55,6 @@ function post(mode, postvis, dry) {
 				text: lang.lang_post_cwtxt + plus,
 				type: 'info',
 				showCancelButton: true,
-				confirmButtonColor: '#3085d6',
-				cancelButtonColor: '#3085d6',
 				confirmButtonText: lang.lang_post_btn2,
 				cancelButtonText: lang.lang_post_btn3,
 				showCloseButton: true,

app/js/post/suggest.js

@@ -9,183 +9,162 @@ var suggest
 
 input.addEventListener(
 	'focus',
-	function() {
+	function () {
 		localStorage.removeItem('cursor')
 		var acct_id = $('#post-acct-sel').val()
 		$('#suggest').html('')
+		$('#suggest').hide()
 		window.clearInterval(timer)
-		timer = window.setInterval(function() {
+		timer = window.setInterval(function () {
 			var new_val = input.value
 			if (new_val == '') {
 				$('#suggest').html('')
-				if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
+				$('#suggest').hide()
-					$('#right-side').hide()
-					$('#right-side').css('width', '300px')
-					$('#left-side').css('width', '100%')
-					var width = localStorage.getItem('postbox-width')
-					if (width) {
-						width = width.replace('px', '') * 1
-					} else {
-						width = 300
-					}
-					$('#post-box').css('width', width + 'px')
-				}
 				return
 			}
 			if (prev_val != new_val) {
-				var tag = new_val.match(/#(\S{3,})/)
+				const pos = input.selectionStart
-				var acct = new_val.match(/@(\S{3,})/)
+				let startI = pos - 1
-				if (tag && tag[1]) {
+				let hasDomain = false
-					var q = tag[1]
+				let hasDomainOnce = false
-				} else if (acct && acct[1]) {
+				for (startI = pos - 1; startI >= 0; startI--) {
-					var q = acct[1]
+					if (new_val[startI].match(/\./)) hasDomain = true
+					if (new_val[startI].match(/#|@|:/) && !hasDomain) break
+					if (new_val[startI].match(/@/) && hasDomainOnce) break
+					if (new_val[startI].match(/@/) && !hasDomainOnce) hasDomainOnce = true
+				}
+				const target = new_val.substr(startI, pos - startI)
+				var tag = target.match(/#(\S{3,})/g)
+				var acct = target.match(/@(\S{3,})(@(\S{3,}))?/g)
+				var emoji = target.match(/:(\S{1,})/g)
+				if (emoji && emoji[0]) {
+					const l = emoji[0]
+					const emojis = localStorage.getItem('emojis_raw_' + acct_id)
+					const json = emojis ? JSON.parse(emojis) : []
+					const reg = new RegExp(`${emoji[0]}`)
+					let listHtml = ''
+					for (const emoji of json) {
+						const { shortcode, url } = emoji
+						if (`:${shortcode}`.match(reg)) {
+							listHtml = listHtml + `${listHtml ? `<br>` : ``}<a onclick="tagInsert(':${shortcode}:','${l}')" class="pointer"><img src="${url}" width="15">:${shortcode}:</a>`
+						}
+					}
+					$('#suggest').html(listHtml)
+					$('#suggest').show()
+				} else if (tag && tag[0]) {
+					var q = tag[0]
+				} else if (acct && acct[0]) {
+					var q = acct[0]
 				} else {
 					$('#suggest').html('')
-					if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
+					$('#suggest').hide()
-						$('#right-side').hide()
-						$('#right-side').css('width', '300px')
-						$('#left-side').css('width', '100%')
-						var width = localStorage.getItem('postbox-width')
-						if (width) {
-							width = width.replace('px', '') * 1
-						} else {
-							width = 300
-						}
-						$('#post-box').css('width', width + 'px')
-					}
 					return
 				}
-				var domain = localStorage.getItem('domain_' + acct_id)
+				if (q) {
-				var at = localStorage.getItem('acct_' + acct_id + '_at')
+					var domain = localStorage.getItem('domain_' + acct_id)
-				suggest = 'https://' + domain + '/api/v2/search?q=' + q
+					var at = localStorage.getItem('acct_' + acct_id + '_at')
-				if (suggest != oldSuggest) {
+					suggest = 'https://' + domain + '/api/v2/search?q=' + encodeURIComponent(q)
-					console.log('Try to get suggest at ' + suggest)
+					if (suggest != oldSuggest) {
-					fetch(suggest, {
+						console.log('Try to get suggest at ' + suggest)
-						method: 'GET',
+						fetch(suggest, {
-						headers: {
+							method: 'GET',
-							'content-type': 'application/json',
+							headers: {
-							Authorization: 'Bearer ' + at
+								'content-type': 'application/json',
-						}
+								Authorization: 'Bearer ' + at
-					})
-						.then(function(response) {
-							if (!response.ok) {
-								response.text().then(function(text) {
-									setLog(response.url, response.status, text)
-								})
 							}
-							return response.json()
 						})
-						.catch(function(error) {
+							.then(function (response) {
-							todo(error)
+								if (!response.ok) {
-							setLog(start, 'JSON', error)
+									response.text().then(function (text) {
-							console.error(error)
+										setLog(response.url, response.status, text)
-						})
+									})
-						.then(function(json) {
+								}
-							console.log(['Search', json])
+								return response.json()
-							//ハッシュタグ
+							})
-							if (json.hashtags[0] && tag) {
+							.catch(function (error) {
-								if (tag[1]) {
+								todo(error)
-									var tags = []
+								setLog(start, 'JSON', error)
-									Object.keys(json.hashtags).forEach(function(key4) {
+								console.error(error)
-										var tag = json.hashtags[key4]
+							})
-										var his = tag.history
+							.then(function (json) {
-										var uses =
+								console.log(['Search', json])
-											his[0].uses * 1 +
+								//ハッシュタグ
-											his[1].uses * 1 +
+								if (json.hashtags[0] && tag) {
-											his[2].uses * 1 +
+									if (tag[0]) {
-											his[3].uses * 1 +
+										var tags = []
-											his[4].uses * 1 +
+										Object.keys(json.hashtags).forEach(function (key4) {
-											his[5].uses * 1 +
+											var tag = json.hashtags[key4]
-											his[6].uses * 1
+											var his = tag.history
-										tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
+											var uses =
-											tag.name
+												his[0].uses * 1 +
-										)}','#${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
+												his[1].uses * 1 +
+												his[2].uses * 1 +
+												his[3].uses * 1 +
+												his[4].uses * 1 +
+												his[5].uses * 1 +
+												his[6].uses * 1
+											tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
+												tag.name
+											)}','${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
 
-										var item = {
+											var item = {
-											uses: uses,
+												uses: uses,
-											html: tagHTML
+												html: tagHTML
-										}
+											}
-										tags.push(item)
+											tags.push(item)
-									})
+										})
-									var num_a = -1
+										var num_a = -1
-									var num_b = 1
+										var num_b = 1
-									tags = tags.sort(function(a, b) {
+										tags = tags.sort(function (a, b) {
-										var x = a['uses']
+											var x = a['uses']
-										var y = b['uses']
+											var y = b['uses']
-										if (x > y) return num_a
+											if (x > y) return num_a
-										if (x < y) return num_b
+											if (x < y) return num_b
-										return 0
+											return 0
-									})
+										})
-									var ins = ''
+										var ins = ''
-									var nev = false
+										var nev = false
-									Object.keys(tags).forEach(function(key7) {
+										Object.keys(tags).forEach(function (key7) {
-										ins = ins + tags[key7].html
+											ins = ins + tags[key7].html
-										if (key7 <= 0 && !nev) {
+											if (key7 <= 0 && !nev) {
-											ins = ins + '<br>'
+												//ins = ins + '<br>'
-											nev = true
+												nev = true
-										}
+											}
-									})
+										})
-									$('#suggest').html(ins)
+										$('#suggest').html(ins)
-									$('#right-side').show()
+										$('#suggest').show()
-									$('#right-side').css('width', '200px')
-									$('#left-side').css('width', 'calc(100% - 200px)')
-									var width = localStorage.getItem('postbox-width')
-									if (width) {
-										width = width.replace('px', '') * 1 + 200
-									} else {
-										width = 500
 									}
-									$('#post-box').css('width', width + 'px')
+								} else if (json.accounts[0] && acct[0]) {
-									$('#poll').addClass('hide')
+									var accts = ''
-									$('#emoji').addClass('hide')
+									Object.keys(json.accounts).forEach(function (key3) {
-									$('#draft').addClass('hide')
+										var acct = json.accounts[key3]
-								}
+										if (acct.acct != q) {
-							} else if (json.accounts[0] && acct[1]) {
+											//Instance Actorって…
-								var accts = ''
+											if (acct.username.indexOf('.') < 0) {
-								Object.keys(json.accounts).forEach(function(key3) {
+												accts =
-									var acct = json.accounts[key3]
+													accts +
-									if (acct.acct != q) {
+													`<a onclick="tagInsert('@${acct.acct}','${q}')" class="pointer">@${acct.acct}</a><br>`
-										//Instance Actorって…
+											}
-										if (acct.username.indexOf('.') < 0) {
-											accts =
-												accts +
-												`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
 										}
-									}
+									})
-								})
+									$('#suggest').html(accts)
-								$('#right-side').show()
+									$('#suggest').show()
-								$('#right-side').css('width', '200px')
-								$('#left-side').css('width', 'calc(100% - 200px)')
-								var width = localStorage.getItem('postbox-width')
-								if (width) {
-									width = width.replace('px', '') * 1 + 200
 								} else {
-									width = 500
+
 								}
-								$('#post-box').css('width', width + 'px')
+							})
-								$('#suggest').html(accts)
+					}
-								$('#poll').addClass('hide')
-								$('#emoji').addClass('hide')
-								$('#draft').addClass('hide')
-							} else {
-								if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
-									$('#right-side').hide()
-									$('#right-side').css('width', '300px')
-									$('#left-side').css('width', '100%')
-									var width = localStorage.getItem('postbox-width')
-									if (width) {
-										width = width.replace('px', '') * 1
-									} else {
-										width = 300
-									}
-									$('#post-box').css('width', width + 'px')
-								}
-							}
-						})
 				}
 			}
 			oldSuggest = suggest
-			prev_value = new_val
+			prev_val = new_val
+
+			const rectTextarea = document.querySelector('#textarea')
+			const rect = rectTextarea.getBoundingClientRect()
+			const caret = getCaretCoordinates(rectTextarea, rectTextarea.selectionEnd)
+			$('#suggest').css('top', `calc(${caret.top}px + 1rem)`)
+			const left = rect.width / 2 < caret.left ? rect.width / 2 : caret.left
+			$('#suggest').css('left', left)
 		}, 1000)
 	},
 	false
@@ -193,15 +172,20 @@ input.addEventListener(
 
 input.addEventListener(
 	'blur',
-	function() {
+	function () {
 		window.clearInterval(timer)
 		favTag()
 	},
 	false
 )
-function tagInsert(code, del) {
+function tagInsert(code, del, emoji) {
-	var blankBefore = ' '
+	if (localStorage.getItem('emoji-zero-width') == 'yes' && emoji) {
-	var blankAfter = ' '
+		var blankBefore = '​'
+		var blankAfter = '​'
+	} else {
+		var blankBefore = ' '
+		var blankAfter = ' '
+	}
 	var textarea = document.querySelector('#textarea')
 	var sentence = textarea.value
 	var len = sentence.length
@@ -217,10 +201,10 @@ function tagInsert(code, del) {
 	var after = sentence.substr(pos, len)
 	var start = after.substr(0, 1)
 	if (start == ' ') blankAfter = ''
-	if (len == 0) {
+	if (len === delLen) {
-		var word = code
+		var word = code + blankAfter
 	} else if (len == pos) {
-		var word = blankBefore + code
+		var word = blankBefore + code + blankAfter
 	} else if (pos == 0) {
 		var word = code + blankAfter
 	} else {
@@ -228,17 +212,9 @@ function tagInsert(code, del) {
 	}
 	sentence = before + word + after
 	textarea.value = sentence
-	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
-		$('#right-side').hide()
-		$('#right-side').css('width', '300px')
-		$('#left-side').css('width', '50%')
-		var width = localStorage.getItem('postbox-width').replace('px', '') * 1
-		if (!width) {
-			width = 300
-		}
-		$('#post-box').css('width', width + 'px')
-	}
 	$('#suggest').html('')
+	$('#suggest').hide()
+	$('#textarea').focus()
 }
 function cgNPs(q) {
 	suggest = 'https://cg.toot.app/api/v1/search/light?q=' + q
@@ -250,23 +226,23 @@ function cgNPs(q) {
 				'content-type': 'application/json'
 			}
 		})
-			.then(function(response) {
+			.then(function (response) {
 				if (!response.ok) {
-					response.text().then(function(text) {
+					response.text().then(function (text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function(error) {
+			.catch(function (error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(function (json) {
 				if (json[0]) {
 					var tags = ''
-					Object.keys(json).forEach(function(key4) {
+					Object.keys(json).forEach(function (key4) {
 						var tag = json[key4]
 						tags =
 							tags +

app/js/tl/card.js

@@ -17,7 +17,8 @@ function additional(acct_id, tlid) {
 		}
 
 		if (tagThis) {
-			$(this).attr('href', "javascript:tagShow('" + tagThis + "')")
+			$(this).attr('href', "#")
+			$(this).attr('onclick', "tagShow('" + tagThis + "', this)")
 			
 		}
 	})
@@ -334,7 +335,17 @@ function cardCheck(tlid) {
 	}
 }
 
-function mov(id, tlid, type, rand, target) {
+function mov(id, tlid, type, rand, target)
+{
+	mouseover=localStorage.getItem('mouseover')
+	switch (mouseover)
+	{
+		case 'yes': if (type=='mv') $(target).removeClass('hide-actions'); break;
+		case 'click': if (type=='cl') $(target).toggleClass('hide-actions'); break;
+		case 'no': break;
+	}
+}
+/*function mov(id, tlid, type, rand, target) {
 	const dropdownTrigger = `dropdown_${rand}`
 	let elm = document.querySelector(`#timeline_${tlid} #${dropdownTrigger}`)
 	if(tlid == 'notf') {
@@ -382,7 +393,7 @@ function mov(id, tlid, type, rand, target) {
 		//$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
 		//$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
 	}
-}
+}*/
 
 function resetmv(type) {
 	var mouseover = localStorage.getItem('mouseover')

app/js/tl/datails.js

@@ -637,42 +637,48 @@ function brws() {
 	postMessage(['openUrl', url], '*')
 }
 //外部からトゥート開く
-function detEx(url, acct_id) {
+async function detEx(url, acct_id) {
 	if (acct_id == 'main') {
 		acct_id = localStorage.getItem('main')
 	}
-	var domain = localStorage.getItem('domain_' + acct_id)
+	Swal.fire({
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
+		title: 'Loading...',
-	var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url)
+		html: lang.lang_details_fetch,
-	fetch(start, {
+		showConfirmButton: false,
+		showCloseButton: true,
+		onBeforeOpen: () => {
+			Swal.showLoading()
+		},
+		onClose: () => { },
+	}).then((result) => { })
+	const json = await detExCore(url, acct_id)
+	Swal.close()
+	if (!json.statuses) {
+		postMessage(['openUrl', url], '*')
+	} else {
+		var id = json.statuses[0].id
+		$('.loadp').text($('.loadp').attr('href'))
+		$('.loadp').removeClass('loadp')
+		details(id, acct_id, 0)
+	}
+	return
+}
+async function detExCore(url, acct_id) {
+	const domain = localStorage.getItem('domain_' + acct_id)
+	const start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url)
+	const at = localStorage.getItem('acct_' + acct_id + '_at')
+	let promise = await fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
 			Authorization: 'Bearer ' + at
 		}
 	})
-		.then(function(response) {
+
-			if (!response.ok) {
+	const json = await promise.json()
-				response.text().then(function(text) {
+	if (json) {
-					setLog(response.url, response.status, text)
+		return json
-				})
+	} else {
-			}
+		return false
-			return response.json()
+	}
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			if (!json.statuses) {
-				postMessage(['openUrl', url], '*')
-			} else {
-				var id = json.statuses[0].id
-				$('.loadp').text($('.loadp').attr('href'))
-				$('.loadp').removeClass('loadp')
-				details(id, acct_id, 0)
-			}
-		})
-	return
 }

app/js/tl/directory.js

@@ -1,76 +1,96 @@
 //ディレクトリ
 //ディレクトリトグル
 function dirMenu() {
-	$("#dir-contents").html("")
+    $('#dir-contents').html('')
-	directory()
+    directory('directory')
-	$("#left-menu a").removeClass("active")
+    $('#left-menu a').removeClass('active')
-	$("#dirMenu").addClass("active")
+    $('#dirMenu').addClass('active')
-	$(".menu-content").addClass("hide")
+    $('.menu-content').addClass('hide')
-	$("#dir-box").removeClass("hide")
+    $('#dir-box').removeClass('hide')
 }
+
 function dirselCk() {
-	var acct = $("#dir-acct-sel").val()
+    var acct = $('#dir-acct-sel').val()
-	if (acct == "noauth") {
+    if (acct == 'noauth') {
-		$("#dirNoAuth").removeClass("hide")
+        $('#dirNoAuth').removeClass('hide')
-	} else {
+    } else {
-		$("#dirNoAuth").addClass("hide")
+        $('#dirNoAuth').addClass('hide')
-		directory()
+        directory('check')
-	}
+    }
 }
-function directory(isMore) {
+
-	var order = $("[name=sort]:checked").val()
+function dirChange(mode) {
-	if (!order) {
+    if (mode === 'directory') $('#directoryConfig').removeClass('hide')
-		order = "active"
+    if (mode === 'suggest') $('#directoryConfig').addClass('hide')
-	}
+    directory(mode)
-	var local_only = $("#local_only:checked").val()
-	if (local_only) {
-		local_only = "true"
-	} else {
-		local_only = "false"
-	}
-	var acct_id = $("#dir-acct-sel").val()
-	if (acct_id == "noauth") {
-		var domain = $("#dirNoAuth-url").val()
-		var at = ""
-	} else {
-		var domain = localStorage.getItem("domain_" + acct_id)
-		var at = localStorage.getItem("acct_" + acct_id + "_at")
-	}
-	if (isMore) {
-		var addOffset = $("#dir-contents .cvo").length
-	} else {
-		var addOffset = 0
-		$("#dir-contents").html("")
-	}
-	var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset
-	console.log(start)
-	fetch(start, {
-		method: "GET",
-		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + at
-		}
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			setLog(start, "JSON", error)
-			console.error(error)
-		})
-		.then(function(json) {
-			if (json) {
-				$("#moreDir").removeClass("disabled")
-				var html = userparse(json, null, acct_id, "dir", null)
-				$("#dir-contents").append(html)
-				jQuery("time.timeago").timeago()
-			} else {
-				$("#moreDir").addClass("disabled")
-			}
-		})
 }
+
+function directory(modeRaw, isMore) {
+    const mode = modeRaw === 'check' ? $('[name=dirsug]:checked').val() : modeRaw
+    var order = $('[name=sort]:checked').val()
+    if (!order) {
+        order = 'active'
+    }
+    var local_only = $('#local_only:checked').val()
+    if (local_only) {
+        local_only = 'true'
+    } else {
+        local_only = 'false'
+    }
+    var acct_id = $('#dir-acct-sel').val()
+    if (acct_id == 'noauth') {
+        var domain = $('#dirNoAuth-url').val()
+        var at = ''
+    } else {
+        var domain = localStorage.getItem('domain_' + acct_id)
+        var at = localStorage.getItem('acct_' + acct_id + '_at')
+    }
+    if (isMore) {
+        var addOffset = $('#dir-contents .cvo').length
+        $('#dir-contents').append(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
+    } else {
+        var addOffset = 0
+        $('#dir-contents').html(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
+    }
+    let start = `https://${domain}/api/v1/directory?order=${order}&local=${local_only}&offset=${addOffset}`
+    if (mode === 'suggest') start = `https://${domain}/api/v2/suggestions`
+    console.log(start)
+    fetch(start, {
+            method: 'GET',
+            headers: {
+                'content-type': 'application/json',
+                Authorization: 'Bearer ' + at,
+            },
+        })
+        .then(function(response) {
+            $('#dir-contents .progress').remove()
+            if (!response.ok) {
+                $('#dir-contents').html(`v2 follow suggestion is supported by Mastodon 3.4.0 or above.`)
+                response.text().then(function(text) {
+                    setLog(response.url, response.status, text)
+                })
+            }
+            return response.json()
+        })
+        .catch(function(error) {
+            setLog(start, 'JSON', error)
+            console.error(error)
+        })
+        .then(function(json) {
+            if (json) {
+                $('#moreDir').removeClass('disabled')
+                let obj = []
+                if (mode === 'suggest') {
+                    $('#moreDir').addClass('disabled')
+                    for (const suggest of json) obj.push(suggest.account)
+                } else {
+                    obj = json
+                }
+                var html = userparse(obj, null, acct_id, 'dir', null)
+                $('#dir-contents').append(html)
+                jQuery('time.timeago').timeago()
+            } else {
+                $('#moreDir').addClass('disabled')
+            }
+        })
+}

app/js/tl/list.js

@@ -89,7 +89,7 @@ function list() {
 							</a>/
 							<a onclick="listUser('${list.id}','${acct_id}')" class="pointer">
 								${lang.lang_list_users}
-							'</a><br>`
+							</a><br>`
 					})
 					$('#lists').html(lists)
 				} else {

app/js/tl/notification.js

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

app/js/tl/src.js

@@ -13,7 +13,21 @@ function searchMenu() {
 //検索取得
 function src(mode, offset) {
 	if (!offset) {
-		$('#src-contents').html('')
+		$('#src-contents').html(`
+		<div class="preloader-wrapper small active" style="margin-left: calc(50% - 36px);">
+			<div class="spinner-layer spinner-blue-only">
+				<div class="circle-clipper left">
+					<div class="circle"></div>
+				</div>
+				<div class="gap-patch">
+					<div class="circle"></div>
+				</div>
+				<div class="circle-clipper right">
+					<div class="circle"></div>
+				</div>
+			</div>
+		</div>
+		`)
 		var add = ''
 	} else {
 		var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
@@ -48,24 +62,27 @@ function src(mode, offset) {
 			Authorization: 'Bearer ' + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
+			if (!offset) {
+				$('#src-contents').html(``)
+			}
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			src('v1')
 			return false
 		})
-		.then(function(json) {
+		.then(function (json) {
 			console.log(['Search', json])
 			//ハッシュタグ
 			if (json.hashtags[0]) {
 				var tags = ''
-				Object.keys(json.hashtags).forEach(function(key4) {
+				Object.keys(json.hashtags).forEach(function (key4) {
 					var tag = json.hashtags[key4]
 					if (mode) {
 						tags =
@@ -116,7 +133,7 @@ function tsAdd(q) {
 	parseColumn('add')
 }
 function tootsearch(tlid, q) {
-	if(!q || q=='undefined') {
+	if (!q || q == 'undefined') {
 		return false
 	}
 	var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
@@ -129,20 +146,20 @@ function tootsearch(tlid, q) {
 			'content-type': 'application/json'
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(raw) {
+		.then(function (raw) {
 			var templete = ''
 			var json = raw.hits.hits
 			var max_id = raw['hits'].length
@@ -180,20 +197,20 @@ function moreTs(tlid, q) {
 			'content-type': 'application/json'
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(raw) {
+		.then(function (raw) {
 			var templete = ''
 			var json = raw.hits.hits
 			var max_id = raw['hits'].length
@@ -256,8 +273,8 @@ function graphDrawCore(his, tag, acct_id) {
 				</div>
 				<div class="tagCompTag">
 					<a onclick="tl('tag','${escapeHTML(
-						tag.name
+		tag.name
-					)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
+	)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
 						#${escapeHTML(tag.name)}
 					</a>
 				</div>
@@ -290,21 +307,21 @@ function trend() {
 			Authorization: 'Bearer ' + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			var tags = ''
-			Object.keys(json).forEach(function(keye) {
+			Object.keys(json).forEach(function (keye) {
 				var tag = json[keye]
 				var his = tag.history
 				tags = graphDrawCore(his, tag, acct_id)
@@ -314,47 +331,31 @@ function trend() {
 		})
 }
 function srcBox(mode) {
-	var selectedText = window.getSelection().toString()
 	if (mode == 'open') {
 		$('#pageSrc').removeClass('hide')
 	} else if (mode == 'close') {
-		if(!selectedText) {
+		$('#pageSrc').addClass('hide')
-			$('#pageSrc').addClass('hide')
+		$('#pageSrc').removeClass('keep')
-			$('#pageSrc').removeClass('keep')
-		}
 	} else {
 		$('#pageSrc').toggleClass('hide')
 	}
-	if(!$('#pageSrc').hasClass('keep')) {
-		$('#pageSrcInput').val(selectedText)
-	}
 }
-$('#pageSrcInput').click(function() {
-	$('#pageSrc').addClass('keep')
-})
-$('#pageSrcInput').on('input', function(evt) {
-	if(!$('#pageSrcInput').val()) {
-		$('#pageSrc').removeClass('keep')
-	}
-})
-document.addEventListener('selectionchange', function() {
-	var selectedText = window.getSelection().toString()
-	if (selectedText && !$('input').is(':focus') && !$('textarea').is(':focus')) {
-		srcBox('open')
-	}
-})
 function doSrc(type) {
 	$('#pageSrc').addClass('hide')
 	$('#pageSrc').removeClass('keep')
-	var q = $('#pageSrcInput').val()
+	var q = $('.srcQ').text()
-	if(type == 'web') {
+	if (type == 'web') {
 		var start = localStorage.getItem('srcUrl')
-		if(!start) {
+		if (!start) {
 			start = 'https://google.com/search?q={q}'
 		}
 		start = start.replace(/{q}/, q)
 		postMessage(["openUrl", start], "*")
-	} else if(type == 'ts') {
+	} else if (type == 'ts') {
 		tsAdd(q)
+	} else if (type == 'copy') {
+		execCopy(q)
+	} else if (type == 'toot') {
+		brInsert(q)
 	}
 }

app/js/tl/tag.js

@@ -9,9 +9,47 @@ if (location.search) {
 	}
 }
 //よく使うタグ
-function tagShow(tag) {
+function tagShow(tag, elm) {
-	console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']')
+	tag = decodeURIComponent(tag)
-	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
+	const tagTL = lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)
+	const tagPin = lang.lang_parse_tagpin.replace('{{tag}}', '#' + tag)
+	const tagToot = lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)
+	$('#tagCMTL').text(tagTL)
+	$('#tagCMPin').text(tagPin)
+	$('#tagCMToot').text(tagToot)
+	const acct_id = $(elm).parents('.tl').attr('data-acct')
+	const rect = elm.getBoundingClientRect()
+	$('#tagContextMenu').css('top', `calc(${rect.top}px + 1rem)`)
+	$('#tagContextMenu').css('left', `${rect.left}px`)
+	$('#tagContextMenu').attr('data-tag', tag)
+	$('#tagContextMenu').attr('data-acct', acct_id)
+	$('#tagContextMenu').removeClass('hide')
+	setTimeout(() => tShowBox('open'), 500)
+}
+function tShowBox(mode) {
+	if (mode == 'open') {
+		$('#tagContextMenu').removeClass('hide')
+	} else if (mode == 'close') {
+		if (!$('#tagContextMenu').hasClass('hide')) $('#tagContextMenu').addClass('hide')
+		$('#tagContextMenu').removeClass('keep')
+	} else {
+		$('#tagContextMenu').toggleClass('hide')
+	}
+}
+function doTShowBox(type) {
+	$('#tagContextMenu').addClass('hide')
+	$('#tagContextMenu').removeClass('keep')
+	const q = $('#tagContextMenu').attr('data-tag')
+	const acct_id = $('#tagContextMenu').attr('data-acct')
+	if (type == 'tl') {
+		tl('tag', q, acct_id, 'add')
+	} else if (type == 'toot') {
+		brInsert(`#${q}`)
+	} else if (type == 'pin') {
+		tagPin(q)
+	} else if (type == 'f') {
+		tagFeature(q, acct_id)
+	}
 }
 //タグ追加
 function tagPin(tag) {
@@ -22,7 +60,7 @@ function tagPin(tag) {
 		var obj = JSON.parse(tags)
 	}
 	var can
-	Object.keys(obj).forEach(function(key) {
+	Object.keys(obj).forEach(function (key) {
 		var tagT = obj[key]
 		if (tagT == tag) {
 			can = true
@@ -56,7 +94,7 @@ function favTag() {
 	}
 	var tags = ''
 	var nowPT = localStorage.getItem('stable')
-	Object.keys(obj).forEach(function(key) {
+	Object.keys(obj).forEach(function (key) {
 		var tag = obj[key]
 		if (nowPT != tag) {
 			console.log('stable tags:' + nowPT + '/' + tag)
@@ -69,28 +107,31 @@ function favTag() {
 		tag = escapeHTML(tag)
 		tags =
 			tags +
-			`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
+			`<a onclick="tagShowHorizon('${tag}')" class="pointer">#${tag}</a>
 			${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 			<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}">
 				TL
-			</a>　
+			</a>
 			<a onclick="brInsert('#${tag}')" class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
 				Toot
-			</a>　
+			</a>
 			<a onclick="autoToot('${tag}');" class="pointer" title="${lang.lang_tags_always}${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
 				${ptt}
-			</a>　
+			</a>
 			<a onclick="tagRemove('${key}')" class="pointer" title="${lang.lang_tags_tagunpin.replace('{{tag}}', '#' + tag)}">
 				${lang.lang_del}
 			</a>
 			</span> `
 	})
 	if (obj.length > 0) {
-		$('#taglist').append('My Tags:' + tags)
+		$('#taglist').append('My Tags: ' + tags)
 	} else {
 		$('#taglist').append('')
 	}
 }
+function tagShowHorizon(tag) {
+	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
+}
 function trendTag() {
 	$('.trendtag').remove()
 	var domain = 'imastodon.net'
@@ -103,28 +144,28 @@ function trendTag() {
 			Authorization: 'Bearer ' + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json) {
 				var tags = ''
 				json = json.score
-				Object.keys(json).forEach(function(tag) {
+				Object.keys(json).forEach(function (tag) {
 					tag = escapeHTML(tag)
 					tags =
 						tags +
-						`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
+						`<a onclick="tagShow('${tag}', this)" class="pointer">#${tag}</a>
 						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 						<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
 						<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">
@@ -134,8 +175,8 @@ function trendTag() {
 				})
 				$('#taglist').append(
 					'<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' +
-						tags +
+					tags +
-						'</div>'
+					'</div>'
 				)
 				trendintervalset()
 			} else {
@@ -182,18 +223,18 @@ function tagFeature(name, acct_id) {
 			name: name
 		})
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			return false
 		})
-		.then(function(json) {
+		.then(function (json) {
 			console.log(json)
 			M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
 		})
@@ -202,7 +243,7 @@ function tagFeature(name, acct_id) {
 function addTag(id) {
 	var columns = JSON.parse(localStorage.getItem('column'))
 	var column = columns[id]
-	if(!column.data.name) {
+	if (!column.data.name) {
 		var name = column.data
 	} else {
 		var name = column.data.name
@@ -219,7 +260,7 @@ function addTag(id) {
 	o[id] = obj
 	var json = JSON.stringify(o)
 	console.log(json)
-	localStorage.setItem('column',json)
+	localStorage.setItem('column', json)
 	columnReload(id, 'tag')
 }
 

app/js/ui/img.js

@@ -21,7 +21,7 @@ function imgv(id, key, acct_id) {
 	if (remote_img == 'yes') {
 		murl = ourl
 	}
-	$(document).ready(function() {
+	$(document).ready(function () {
 		if (type == 'image') {
 			$('#imagemodal').modal('open')
 			imageXhr(id, key, murl)
@@ -62,7 +62,7 @@ function imgCont(type) {
 		$('#imgsec').text(0)
 		$('#imgmodal').attr('src', '../../img/loading.svg')
 		var type = $('#' + id + '-image-' + key).attr('data-type')
-		$(document).ready(function() {
+		$(document).ready(function () {
 			if (type == 'image') {
 				imageXhr(id, key, murl)
 				$('#imagewrap').dragScroll() // ドラッグスクロール設定
@@ -76,17 +76,29 @@ function imgCont(type) {
 	}
 }
 function imageXhr(id, key, murl) {
+	let time = 0
 	var startTime = new Date()
+	const timer = setInterval(function() {
+		time = time + 1
+		$('#imgsec').text(time)
+	}, 10)
+	$('#imgmodal-progress div').removeClass('determinate')
+	$('#imgmodal-progress div').addClass('indeterminate')
+	$('#imgmodal-progress').removeClass('hide')
 	xhr = new XMLHttpRequest()
 	xhr.open('GET', murl, true)
 	xhr.responseType = 'arraybuffer'
 	xhr.addEventListener(
 		'progress',
-		function(event) {
+		function (event) {
 			if (event.lengthComputable) {
 				var total = event.total
 				var now = event.loaded
+				$('#imgbyte').text(`${Math.floor(now / 1024)}KB/${Math.floor(total / 1024)}`)
 				var per = (now / total) * 100
+				$('#imgmodal-progress div').removeClass('indeterminate')
+				$('#imgmodal-progress div').addClass('determinate')
+				$('#imgmodal-progress div').css('width', `${per}%`)
 				$('#imgprog').text(Math.floor(per))
 			}
 		},
@@ -94,31 +106,35 @@ function imageXhr(id, key, murl) {
 	)
 	xhr.addEventListener(
 		'loadend',
-		function(event) {
+		function (event) {
 			var total = event.total
 			$('#imgbyte').text(Math.floor(total / 1024))
 			var now = event.loaded
 			var per = (now / total) * 100
 			$('#imgprog').text(Math.floor(per))
+			$('#imgmodal-progress').addClass('hide')
+			$('#imgmodal-progress div').css('width', '0%')
+			$('#imgmodal-progress div').removeClass('determinate')
+			$('#imgmodal-progress div').addClass('indeterminate')
 		},
 		false
 	)
 	xhr.addEventListener(
 		'error',
-		function(event) {
+		function (event) {
 			$('#imgmodal').attr('src', murl)
 		},
 		false
 	)
-	xhr.onreadystatechange = function() {
+	xhr.onreadystatechange = function () {
 		if (this.readyState == 4 && this.status == 200) {
 			r = new FileReader()
 			r.readAsDataURL(this.response)
-			r.onload = function() {
+			r.onload = function () {
 				var b64 = r.result
 				var element = new Image()
 				var width
-				element.onload = function() {
+				element.onload = function () {
 					var width = element.naturalWidth
 					var height = element.naturalHeight
 					calcNiceAspect(width, height)
@@ -137,6 +153,7 @@ function imageXhr(id, key, murl) {
 				}
 				element.src = b64
 				var endTime = new Date()
+				clearInterval(timer)
 				var proctime = endTime.getTime() - startTime.getTime()
 				$('#imgsec').text(proctime)
 				$('#imgmodal').attr('src', b64)
@@ -146,8 +163,8 @@ function imageXhr(id, key, murl) {
 	xhr.responseType = 'blob'
 	xhr.send()
 }
-function calcNiceAspect( width, height ) {
+function calcNiceAspect(width, height) {
-	if(width < 650) {
+	if (width < 650) {
 		width = 650
 	}
 	var windowH = $(window).height()
@@ -156,7 +173,7 @@ function calcNiceAspect( width, height ) {
 	$('#imagemodal img').css('width', 'auto')
 	if (height < windowH) {
 		$('#imagemodal').css('height', height + 100 + 'px')
-		$('#imagemodal img').css('height',  height + 'px')
+		$('#imagemodal img').css('height', height + 'px')
 		if (width > windowW * 0.8) {
 			$('#imagemodal').css('width', '80vw')
 			$('#imagemodal img').css('width', 'auto')
@@ -188,11 +205,11 @@ function zoom(z) {
 	$('#imagewrap img').css('height', hgt + 'px')
 }
 //スマホ対応ドラッグ移動システム
-(function() {
+(function () {
-	$.fn.dragScroll = function() {
+	$.fn.dragScroll = function () {
 		var target = this
 		$(this)
-			.mousedown(function(event) {
+			.mousedown(function (event) {
 				$(this)
 					.data('down', true)
 					.data('x', event.clientX)
@@ -207,7 +224,7 @@ function zoom(z) {
 			})
 		// ウィンドウから外れてもイベント実行
 		$(document)
-			.mousemove(function(event) {
+			.mousemove(function (event) {
 				if ($(target).data('down') == true) {
 					// スクロール
 					target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - event.clientX)
@@ -215,11 +232,11 @@ function zoom(z) {
 					return false // 文字列選択を抑止
 				}
 			})
-			.mouseup(function(event) {
+			.mouseup(function (event) {
 				$(target).data('down', false)
 			})
 		$(this)
-			.on('touchstart', function(event) {
+			.on('touchstart', function (event) {
 				$(this)
 					.data('down', true)
 					.data('x', getX(event))
@@ -232,7 +249,7 @@ function zoom(z) {
 				overflow: 'hidden', // スクロールバー非表示
 				cursor: 'move'
 			}) //指が触れたか検知
-		$(this).on('touchmove', function(event) {
+		$(this).on('touchmove', function (event) {
 			if ($(target).data('down') === true) {
 				// スクロール
 				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - getX(event))
@@ -241,7 +258,7 @@ function zoom(z) {
 			} else {
 			}
 		}) //指が動いたか検知
-		$(this).on('touchend', function(event) {
+		$(this).on('touchend', function (event) {
 			$(target).data('down', false)
 		})
 
@@ -258,7 +275,7 @@ function getY(event) {
 }
 //マウスホイールで拡大
 var element = document.getElementById('imagemodal')
-element.onmousewheel = function(e) {
+element.onmousewheel = function (e) {
 	var delta = e.wheelDelta
 	if (delta > 0) {
 		zoom(1.1)

app/js/ui/layout.js

@@ -52,7 +52,7 @@ function parseColumn(target, dontclose) {
 			localStorage.setItem('domain_' + key, acct.domain)
 			localStorage.setItem('acct_' + key + '_at', acct.at)
 			localStorage.setItem('acct_' + key + '_rt', acct.rt ? acct.rt : null)
-			if(!target) mastodonBaseStreaming(key)
+			if (!target) mastodonBaseStreaming(key)
 			ckdb(key)
 			//フィルターデータ読もう
 			getFilter(key)
@@ -167,11 +167,11 @@ function parseColumn(target, dontclose) {
 		}
 		var maxWidth = localStorage.getItem('max-width')
 		if (maxWidth) {
-			css = css +'max-width:' + maxWidth + 'px;'
+			css = css + 'max-width:' + maxWidth + 'px;'
 		}
 		var margin = localStorage.getItem('margin')
 		if (margin) {
-			css = css +'margin-right:' + margin + 'px;'
+			css = css + 'margin-right:' + margin + 'px;'
 		}
 		if (acct.width) {
 			css = css + ' min-width:' + acct.width + 'px !important;max-width:' + acct.width + 'px !important;'
@@ -185,6 +185,7 @@ function parseColumn(target, dontclose) {
 			}
 			var html = webviewParse('https://tweetdeck.twitter.com', key, insert, icnsert, css)
 			$('#timeline-container').append(html)
+			initWebviewEvent()
 		} else if (acct.type == 'tootsearch') {
 			if (!acct.left_fold) {
 				basekey = key
@@ -230,14 +231,14 @@ function parseColumn(target, dontclose) {
 			}
 			var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
 					 class="setting nex waves-effect" title="${lang.lang_layout_unread}">
-					<i class="material-icons waves-effect nex">more</i><br />${lang.lang_layout_unread}
+					<i class="material-icons waves-effect nex">more</i><span>${lang.lang_layout_unread}</span>
 				</a>`
 			var notfDomain = acct.domain
 			var notfKey = key
 			var if_tag = ''
 			var if_tag_btn = ''
 			if (acct.type == 'notf') {
-				var exclude =
+				var excludeNotf =
 					`<div style="border: 1px solid; padding: 5px; margin-top: 5px; margin-bottom: 5px;">${lang.lang_layout_excluded}:<br>
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-reply-${key}" ${excludeCk(key, 'mention')} />
@@ -271,20 +272,21 @@ function parseColumn(target, dontclose) {
 					</label> <br />
 					<button class="btn btn-flat waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="exclude('${key}')">Filter</button>`
 				if (checkNotfFilter(key)) {
-					exclude =
+					excludeNotf =
-						exclude +
+						excludeNotf +
 						`<button class="btn btn-flat red-text waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="resetNotfFilter('${key}')">
 							Clear all
 						</button>`
 				}
-				exclude = exclude + '</div>'
+				excludeNotf = excludeNotf + '</div>'
 				notfDomain = 'dummy'
 				notfKey = 'dummy'
+				var excludeHome = ''
 			} else if (acct.type == 'home') {
-				var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
+				var excludeNotf = ''
+				var excludeHome = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
 						<i class="fas fa-retweet nex" title="${lang.lang_layout_excludingbt}" style="font-size: 24px"></i>
-						<span id="sta-bt-${key}">Off</span><br />
+						<span>${lang.lang_layout_excludingbt}</span><span id="sta-bt-${key}">Off</span>
-					${lang.lang_layout_excludingbt}
 					</a>`
 			} else if (acct.type == 'tag') {
 				if (acct.data.name) {
@@ -312,10 +314,12 @@ function parseColumn(target, dontclose) {
 				<i class="material-icons waves-effect nex">note_add</i>
 				</a>`
 				unread = ''
-				var exclude = ''
+				var excludeNotf = ''
+				var excludeHome = ''
 				var if_notf = 'hide'
 			} else {
-				var exclude = ''
+				var excludeNotf = ''
+				var excludeHome = ''
 				unread = ''
 			}
 
@@ -325,6 +329,7 @@ function parseColumn(target, dontclose) {
 			} else {
 				markers = false
 			}
+			const smallHeader = localStorage.getItem('smallHeader') === 'yes'
 			if (!markers) {
 				unread = ''
 			}
@@ -335,12 +340,12 @@ function parseColumn(target, dontclose) {
 					$('#timeline-container').append(basehtml)
 				}
 				var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i><br />
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
-					${lang.lang_layout_leftFold}</a>`
+					<span>${lang.lang_layout_leftFold}</span></a>`
 			} else {
 				var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i><br />
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
-					${lang.lang_layout_leftUnfold}</a>`
+					<span>${lang.lang_layout_leftUnfold}</span></a>`
 			}
 			if (key === 0) {
 				left_hold = ''
@@ -361,8 +366,7 @@ function parseColumn(target, dontclose) {
 			if (acct.type != 'pub' && acct.type != 'pub-media') {
 				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex waves-effect">
 					<i class="material-icons nex" title="${lang.lang_layout_mediafil}">perm_media</i>
-					<span id="sta-media-${key}">On</span><br />
+				<span>${lang.lang_layout_mediafil}</span/><span id="sta-media-${key}">On</span></a>`
-				${lang.lang_layout_mediafil}</a>`
 			} else {
 				var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex waves-effect">
 					<i class="material-icons nex" title="${lang.lang_layout_remoteOnly}">perm_media</i><br />
@@ -371,10 +375,9 @@ function parseColumn(target, dontclose) {
 			}
 			var html = `
 				<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}" data-acct="${acct.domain}" style="${addHeight}">
-					<div class="notice-box z-depth-2" id="menu_${key}" style="${insert}">
+					<div class="notice-box ${smallHeader ? 'small-header' : ''} z-depth-2" id="menu_${key}" style="${insert}">
 						<div class="area-notice">
-							<i class="material-icons waves-effect ${isMisRed} notice_icon_acct_${acct.domain}" id="notice_icon_${key}" ${notf_attr}
+							<i class="material-icons waves-effect ${isMisRed} notice_icon_acct_${acct.domain} top-icon" id="notice_icon_${key}" ${notf_attr} 
-								 style="font-size:40px; padding-top:25%;" 
 								 onclick="checkStr('${acct.type}','${data}','${acct.domain}', '${key}', '${delc}','${voice}',null)"
 							 	 title="${lang.lang_layout_gotop}" aria-hidden="true">
 							</i>
@@ -397,10 +400,10 @@ function parseColumn(target, dontclose) {
 						${if_tag_btn}
 					</div>
 					<div class="area-sta">
-						<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply" aria-hidden="true">0</span>
+						<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Rp" aria-hidden="true">0</span>
-						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav" aria-hidden="true">0</span>
+						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fv" aria-hidden="true">0</span>
 						<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT" aria-hidden="true">0</span>
-						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow" aria-hidden="true">0</span>
+						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Fw" aria-hidden="true">0</span>
 					</div>
 					<div class="area-a2">
 						<a onclick="removeColumn('${key}')" class="setting nex">
@@ -421,39 +424,48 @@ function parseColumn(target, dontclose) {
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
-					${exclude}
+					${excludeNotf}
+					<div class="columnSettings">
+					${excludeHome}
 					${unread}
 					${left_hold}
 					${mediaFil}
 					<a onclick="cardToggle('${key}')" class="setting nex waves-effect">
 						<i class="material-icons nex" title="${lang.lang_layout_linkanades}">link</i>
-						<span id="sta-card-${key}">On</span><br />
+					<span>${lang.lang_layout_linkana}</span><span id="sta-card-${key}">On</span>
-					${lang.lang_layout_linkana}
 					</a>
 					<a onclick="voiceToggle('${key}')" class="setting nex waves-effect">
 						<i class="material-icons nex" title="${lang.lang_layout_tts}">hearing</i>
-						<span id="sta-voice-${key}">On</span><br />
+					<span>${lang.lang_layout_tts}TL</span/><span id="sta-voice-${key}">On</span>
-					${lang.lang_layout_tts}
+					</a>
-					TL</a>
 					<a onclick="columnReload('${key}','${acct.type}')" class="setting nex ${if_misskey_hide} waves-effect">
 						<i class="material-icons nex" title="${lang.lang_layout_reconnect}">refresh</i>
-					<br />
+						<span>${lang.lang_layout_reconnect}</span>
-						${lang.lang_layout_reconnect}
 					</a>
 					<a onclick="resetWidth('${key}')" class="setting nex waves-effect">
-						<i class="material-icons nex" title="${lang.lang_layout_resetWidth}">refresh</i>
+						<i class="material-icons nex rotate-90" title="${lang.lang_layout_resetWidth}">height</i>
-					<br />
+						<span>${lang.lang_layout_resetWidth}</span>
-						${lang.lang_layout_resetWidth}
+					</a></div>
-					</a><br />
+					<p>${lang.lang_layout_headercolor}</p>
-					${lang.lang_layout_headercolor}
-					<br>
 					<div id="picker_${key}" class="color-picker"></div>
 				</div>${if_tag}
 				<div class="tl-box" tlid="${key}">
 					<div id="timeline_${key}" 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">
+						<div id="landing_${key}" class="landing">
-						${lang.lang_layout_nodata}
+						<div class="preloader-wrapper small active " style="margin-top: calc(50vh - 15px)">
+							<div class="spinner-layer spinner-blue-only">
+								<div class="circle-clipper left">
+									<div class="circle"></div>
+								</div>
+								<div class="gap-patch">
+									<div class="circle"></div>
+								</div>
+								<div class="circle-clipper right">
+									<div class="circle"></div>
+								</div>
+							</div>
+					  </div>
 					</div>
 				</div>
 			</div>`
@@ -643,8 +655,6 @@ function removeColumn(tlid) {
 		text: lang.lang_layout_deleteColumnDesc,
 		type: 'warning',
 		showCancelButton: true,
-		confirmButtonColor: '#3085d6',
-		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
 		cancelButtonText: lang.lang_no,
 	}).then((result) => {
@@ -661,8 +671,6 @@ function removeColumn(tlid) {
 				$('#timeline_box_' + tlid + '_parentBox').remove()
 			}
 		}
-		$('#sort-box').removeClass('hide')
-		$('#sort-box').addClass('show')
 	})
 }
 

app/js/ui/post-box.js

@@ -101,6 +101,7 @@ if (location.search) {
 		$('.mini-btn').text('expand_less')
 	}
 }
+
 function initPostbox() {
 	$('#posttgl').click(function (e) {
 		if (!$('#post-box').hasClass('appear')) {
@@ -124,6 +125,7 @@ function initPostbox() {
 		selectedToot = 0
 		localStorage.removeItem('nohide')
 		srcBox('close')
+		tShowBox('close')
 	})
 	$('#textarea,#cw-text').focusout(function (e) {
 		localStorage.setItem('nohide', true)

app/js/ui/spotify.js

@@ -166,7 +166,7 @@ function nowplaying(mode) {
 		} else {
 			Swal.fire({
 				type: 'info',
-				title: lang.lang_spotify_acct,
+				text: lang.lang_spotify_acct,
 			})
 		}
 	} else if (mode == 'itunes') {
@@ -239,7 +239,7 @@ function nowplaying(mode) {
 		} else {
 			Swal.fire({
 				type: 'info',
-				title: lang.lang_spotify_acct,
+				text: lang.lang_spotify_acct,
 			})
 		}
 	}

app/js/ui/tips.js

@@ -117,7 +117,7 @@ function trendTagonTip() {
 				Object.keys(json).forEach(function(tag) {
 					tags =
 						tags +
-						`<a onclick="tagShow('${tag}')" class="pointer">
+						`<a onclick="tagShow('${tag}', this)" class="pointer">
 							#${escapeHTML(tag)}
 						</a>
 						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
@@ -226,7 +226,7 @@ function spotifytips() {
 	} else {
 		Swal.fire({
 			type: 'info',
-			title: lang.lang_spotify_acct
+			text: lang.lang_spotify_acct
 		})
 		tips('ver')
 		return false

app/main.js

@@ -14,12 +14,12 @@ const dl = require('./main/dl.js')
 const img = require('./main/img.js')
 const np = require('./main/np.js')
 const systemFunc = require('./main/system.js')
-const Menu = electron.Menu
+const { Menu, MenuItem, BrowserWindow, ipcMain } = electron
 const join = require('path').join
 // ウィンドウを作成するモジュール
-const BrowserWindow = electron.BrowserWindow
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow
+let opening = true
 
 // アプリが多重起動しないようにする
 const gotTheLock = app.requestSingleInstanceLock()
@@ -27,9 +27,12 @@ const gotTheLock = app.requestSingleInstanceLock()
 if (!gotTheLock) {
 	app.quit()
 } else {
-	app.on('second-instance', () => {
+	app.on('second-instance', (event, commandLine, workingDirector) => {
-		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
+		opening = false
-		// Someone tried to run a second instance, we should focus our window.
+		const m = commandLine[2].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
+		if (m) {
+			mainWindow.send('customUrl', [m[1], m[2]])
+		}
 		if (mainWindow) {
 			if (mainWindow.isMinimized()) mainWindow.restore()
 			mainWindow.focus()
@@ -39,7 +42,7 @@ if (!gotTheLock) {
 
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function () {
-	electron.session.defaultSession.clearCache(() => {})
+	electron.session.defaultSession.clearCache(() => { })
 	app.quit()
 })
 function isFile(file) {
@@ -76,25 +79,26 @@ function createWindow() {
 	if (!packaged) console.log('launch:' + lang)
 	//Opening
 	const package = fs.readFileSync(__dirname + '/package.json')
-	if(lang == 'ja') {
+	if (lang == 'ja') {
 		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
 		var show = maxims[Math.floor(Math.random() * maxims.length)]
-	} else if(lang == 'ja-KS') {
+	} else if (lang == 'ja-KS') {
 		//ja-KSも作れたらいいね
 		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
 		var show = maxims[Math.floor(Math.random() * maxims.length)]
-	} else{
+	} else {
 		var show = 'TheDesk 2018'
 	}
 	const data = JSON.parse(package)
 	const version = data.version
 	const codename = data.codename
-	var openingWindow = new BrowserWindow({
+	const openingWindow = new BrowserWindow({
 		width: 300,
 		height: 400,
 		transparent: false,
 		frame: false,
 		resizable: false,
+		show: opening
 	})
 	openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`)
 
@@ -104,18 +108,18 @@ function createWindow() {
 		var packaged = false
 		console.log(
 			'||\\\\\\ \n' +
-				'||||  \\\\\\\\ \n' +
+			'||||  \\\\\\\\ \n' +
-				'||||     \\\\\\\\ \n' +
+			'||||     \\\\\\\\ \n' +
-				'|||| Am I a \\\\\\\\ \n' +
+			'|||| Am I a \\\\\\\\ \n' +
-				'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
+			'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
-				'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
+			'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
-				"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
+			"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
-				'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
+			'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
-				'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
+			'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
-				'||||          /////         \n' +
+			'||||          /////         \n' +
-				'||||       /////\n' +
+			'||||       /////\n' +
-				'||||     /////\n' +
+			'||||     /////\n' +
-				'||||//////'
+			'||||//////'
 		)
 		console.log('If it does not show the window, you might forget `npm run construct`.')
 	}
@@ -123,6 +127,7 @@ function createWindow() {
 	var info_path = join(app.getPath('userData'), 'window-size.json')
 	var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
 	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
+	var wv_path = join(app.getPath('userData'), 'webview')
 	var ua_path = join(app.getPath('userData'), 'useragent')
 	try {
 		fs.readFileSync(ha_path, 'utf8')
@@ -131,6 +136,8 @@ function createWindow() {
 	} catch {
 		if (!packaged) console.log('enabled: Hardware Acceleration')
 	}
+	let webviewEnabled = false
+	if (fs.existsSync(wv_path, 'utf8')) webviewEnabled = true
 	var window_size
 	try {
 		window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
@@ -156,7 +163,7 @@ function createWindow() {
 	var bit = process.arch
 	var arg = {
 		webPreferences: {
-			webviewTag: true,
+			webviewTag: webviewEnabled,
 			nodeIntegration: false,
 			contextIsolation: true,
 			spellcheck: false,
@@ -187,13 +194,13 @@ function createWindow() {
 	})
 	mainWindow.webContents.on('page-title-updated', () => {
 		const url = mainWindow.webContents.getURL()
-		if(url.match(/https:\/\/crowdin.com\/profile/)) {
+		if (url.match(/https:\/\/crowdin.com\/profile/)) {
 			app.relaunch()
 			app.exit()
 		}
 	})
 	if (!packaged) mainWindow.toggleDevTools()
-	electron.session.defaultSession.clearCache(() => {})
+	electron.session.defaultSession.clearCache(() => { })
 	if (process.argv) {
 		if (process.argv[1]) {
 			var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
@@ -226,7 +233,7 @@ function createWindow() {
 	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function () {
-		electron.ipcMain.removeAllListeners()
+		ipcMain.removeAllListeners()
 		mainWindow = null
 	})
 	closeArg = false
@@ -236,10 +243,10 @@ function createWindow() {
 			e.preventDefault()
 		}
 		const promise = new Promise(function (resolve) {
-			mainWindow.webContents.send('asReadEnd', '')
+			mainWindow.send('asReadEnd', '')
 			let wait = 3000
 			const url = mainWindow.webContents.getURL()
-			if(!url.match(/index.html/)) wait = 0
+			if (!url.match(/index.html/)) wait = 0
 			setTimeout(function () {
 				resolve()
 			}, wait)
@@ -249,7 +256,7 @@ function createWindow() {
 			mainWindow.close()
 		})
 	})
-	electron.ipcMain.on('sendMarkersComplete', function (e, arg) {
+	ipcMain.on('sendMarkersComplete', function (e, arg) {
 		closeArg = true
 		mainWindow.close()
 	})
@@ -283,7 +290,7 @@ function createWindow() {
 	})
 	mainWindow.on('minimize', function () {
 		writePos(mainWindow)
-		mainWindow.webContents.send('asRead', '')
+		mainWindow.send('asRead', '')
 	})
 
 	var platform = process.platform
@@ -319,7 +326,7 @@ function mouseTrack(mainWindow) {
 		if (unchanged > 60 && !locked) {
 			unchanged = 0
 			locked = true
-			mainWindow.webContents.send('asRead', '')
+			mainWindow.send('asRead', '')
 		}
 	}
 	x = xNow

app/main/css.js

@@ -10,7 +10,7 @@ function css(mainWindow) {
 
 	ipc.on('custom-css-create', function (e, arg) {
 		fs.writeFileSync(customcss, arg);
-		e.sender.webContents.send('custom-css-create-complete', "");
+		e.sender.send('custom-css-create-complete', "");
 	})
 	ipc.on('custom-css-request', function (e, arg) {
 		try {
@@ -18,29 +18,29 @@ function css(mainWindow) {
 		} catch (e) {
 			var css = "";
 		}
-		e.sender.webContents.send('custom-css-response', css);
+		e.sender.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, JSON5.stringify(JSON5.parse(arg)));
 		if (JSON5.parse(arg)["id"]) {
-			e.sender.webContents.send('theme-json-create-complete', "");
+			e.sender.send('theme-json-create-complete', "");
 		} else {
-			e.sender.webContents.send('theme-json-create-complete', "error");
+			e.sender.send('theme-json-create-complete', "error");
 		}
 	})
 	ipc.on('theme-json-delete', function (e, arg) {
-		try{
+		try {
 			var themecss = join(app.getPath("userData"), arg);
 			console.log(themecss);
 			fs.unlink(themecss, function (err) {
-				e.sender.webContents.send('theme-json-delete-complete', "");
+				e.sender.send('theme-json-delete-complete', "");
 			});
 		} catch {
-			e.sender.webContents.send('theme-json-delete-complete', 'cannot delete');
+			e.sender.send('theme-json-delete-complete', 'cannot delete');
 		}
-		
+
 	})
 	ipc.on('theme-json-request', function (e, arg) {
 		try {
@@ -52,15 +52,19 @@ function css(mainWindow) {
 			var raw = fs.readFileSync(themecss, 'utf8')
 			var json = JSON5.parse(raw)
 		}
-		e.sender.webContents.send('theme-json-response', [json, raw]);
+		e.sender.send('theme-json-response', [json, raw]);
 	})
-	ipc.on('theme-css-request', function (e, arg) {
+	ipc.on('theme-css-request', function (e, args) {
-		try {
+		if (args[0] === 'themeCSSPreview') {
-			var themecss = join(app.getAppPath(), '/source/themes', arg)
+			var json = args[1]
-			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
+		} else {
-		} catch {
+			try {
-			var themecss = join(app.getPath("userData"), arg)
+				var themecss = join(app.getAppPath(), '/source/themes', args[1])
-			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
+				var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
+			} catch {
+				var themecss = join(app.getPath("userData"), args[1])
+				var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
+			}
 		}
 
 		try {
@@ -149,7 +153,7 @@ function css(mainWindow) {
 			} else {
 				var css = compatibleTheme(json)
 			}
-			e.sender.webContents.send('theme-css-response', css);
+			e.sender.send('theme-css-response', css);
 		} catch (e) {
 			var css = "";
 		}
@@ -270,7 +274,7 @@ function css(mainWindow) {
 				default: false
 			})
 		}
-		e.sender.webContents.send('theme-json-list-response', themes);
+		e.sender.send('theme-json-list-response', themes);
 	})
 }
 exports.css = css;

app/main/dl.js

@@ -41,19 +41,19 @@ function dl(mainWindow, lang_path, base, dirname) {
 	//アプデDL
 	ipc.on('download-btn', async (e, args) => {
 		function dl(url, file, dir, e) {
-			e.sender.webContents.send('mess', 'Start...')
+			e.sender.send('mess', 'Start...')
 			const opts = {
 				directory: dir,
 				filename: file,
 				openFolderWhenDone: true,
 				onProgress: function(event) {
-					e.sender.webContents.send('prog', [event, args[2]])
+					e.sender.send('prog', [event, args[2]])
 				},
 				saveAs: false
 			}
 			download(updatewin, url, opts)
 				.then(dl => {
-					e.sender.webContents.send('mess', 'ダウンロードが完了しました。')
+					e.sender.send('mess', 'ダウンロードが完了しました。')
 					app.quit()
 				})
 				.catch(console.error)
@@ -111,7 +111,7 @@ function dl(mainWindow, lang_path, base, dirname) {
 			filename: name,
 			openFolderWhenDone: false,
 			onProgress: function(e) {
-				event.sender.webContents.send('general-dl-prog', e)
+				event.sender.send('general-dl-prog', e)
 			},
 			saveAs: false
 		}
@@ -126,7 +126,7 @@ function dl(mainWindow, lang_path, base, dirname) {
 				} else {
 					var name = dir
 				}
-				event.sender.webContents.send('general-dl-message', name)
+				event.sender.send('general-dl-message', name)
 			})
 			.catch(console.error)
 	})

app/main/img.js

@@ -26,14 +26,14 @@ function img(mainWindow, dir) {
 		for (var i = 0; i < fileNames.length; i++) {
 			var path = fileNames[i]
 			var bin = fs.readFileSync(path, 'base64')
-			e.sender.webContents.send('resizeJudgement', [bin, 'new'])
+			e.sender.send('resizeJudgement', [bin, 'new'])
 		}
 	})
 	ipc.on('bmp-image', (e, args) => {
 		Jimp.read(args[0], function (err, lenna) {
 			if (err) throw err
 			lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
-				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
+				e.sender.send('bmp-img-comp', [src, args[1]])
 			})
 		})
 	})
@@ -49,7 +49,7 @@ function img(mainWindow, dir) {
 		Jimp.read(decodedFile, function (err, lenna) {
 			if (err) throw err
 			lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function (err, src) {
-				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
+				e.sender.send('bmp-img-comp', [src, args[1]])
 			})
 		})
 	})
@@ -71,12 +71,12 @@ function img(mainWindow, dir) {
 				var ave = (color.r + color.g + color.b) / 3
 				if (ave > 128) {
 					image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) {
-						e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
+						e.sender.send('bmp-img-comp', [src, args[1], true])
 					})
 				} else {
 					Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then((font) => {
 						image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) {
-							e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
+							e.sender.send('bmp-img-comp', [src, args[1], true])
 						})
 					})
 				}

app/main/language.js

@@ -1,13 +1,11 @@
 // Create the Application's main menu
 function templete(lang, mainWindow, packaged, dir, dirname) {
     //フレーム
-    if(lang !="ja" && lang != "en"){
+    if (lang != "ja" && lang != "en") {
         lang = "en"
     }
-    const electron = require("electron");
+    const electron = require("electron")
-    const ipc = electron.ipcMain;
+    const { Menu, MenuItem, ipcMain, BrowserWindow, app } = electron
-    const app = electron.app;
-    const BrowserWindow = electron.BrowserWindow;
     const join = require('path').join;
     const dict = {
         "application": {
@@ -71,7 +69,7 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
             "en": "Close"
         }
     }
-    if(packaged){
+    if (packaged) {
         var ifDev = [
             {
                 label: dict.reload[lang],
@@ -79,12 +77,12 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
                 click: function () { mainWindow.reload(); }
             }
         ]
-    }else{
+    } else {
         var ifDev = [
             {
                 label: 'Toggle Developer Tools',
                 accelerator: 'Alt+Command+I',
-                click: function () { if (!packaged) { mainWindow.toggleDevTools(); } }
+                click: function () { mainWindow.toggleDevTools(); }
             },
             {
                 label: dict.reload[lang],
@@ -104,7 +102,7 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
                             webviewTag: false,
                             nodeIntegration: false,
                             contextIsolation: true,
-                            preload: join(dirname , "js", "platform", "preload.js")
+                            preload: join(dirname, "js", "platform", "preload.js")
                         },
                         width: 300, height: 500,
                         "transparent": false,    // ウィンドウの背景を透過
@@ -150,6 +148,28 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
         ]
     }
     ];
+    // コピペメニュー
+    const ctxMenu = new Menu()
+    ctxMenu.append(new MenuItem({
+        label: dict.cut[lang],
+        role: 'cut',
+        click: () => { console.log('Cut clicked!') }
+    }))
+    ctxMenu.append(new MenuItem({
+        label: dict.copy[lang],
+        role: 'copy',
+        click: () => { console.log('Copy clicked!') }
+    }))
+    ctxMenu.append(new MenuItem({
+        label: dict.paste[lang],
+        role: 'paste',
+        click: () => { console.log('Paste clicked!') }
+    }))
+
+
+    ipcMain.on('textareaContextMenu', function (e, params) {
+        ctxMenu.popup(mainWindow, params.x, params.y)
+    })
     return menu;
 }
 

app/main/np.js

@@ -16,7 +16,7 @@ function np(mainWindow) {
 				title: title,
 				anynp: true
 			}
-			e.sender.webContents.send('itunes-np', ret)
+			e.sender.send('itunes-np', ret)
 		} else {
 			
 				try {
@@ -27,16 +27,16 @@ function np(mainWindow) {
 						if(artwork) {
 							const base64 = artwork.toString('base64')
 							value.artwork = base64
-							e.sender.webContents.send('itunes-np', value)
+							e.sender.send('itunes-np', value)
 						}
 					} catch (error) {
 						console.error(error)
-						e.sender.webContents.send('itunes-np', value)
+						e.sender.send('itunes-np', value)
 					}
 					
 				} catch (error) {
 					console.error(error)
-					e.sender.webContents.send('itunes-np', error)
+					e.sender.send('itunes-np', error)
 				}
 		}
     })

app/main/system.js

@@ -9,6 +9,7 @@ function system(mainWindow, dir, lang, dirname) {
 	const clipboard = electron.clipboard
 	var tmp_img = join(app.getPath('userData'), 'tmp.png')
 	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
+	var wv_path = join(app.getPath('userData'), 'webview')
 	var ua_path = join(app.getPath('userData'), 'useragent')
 	var lang_path = join(app.getPath('userData'), 'language')
 	var log_dir_path = join(app.getPath('userData'), 'logs')
@@ -35,13 +36,13 @@ function system(mainWindow, dir, lang, dirname) {
 		} catch {
 			var gitHash = null
 		}
-		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash])
+		e.sender.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash])
 	})
 	//言語
 	ipc.on('lang', function (e, arg) {
 		console.log('set:' + arg)
 		fs.writeFileSync(lang_path, arg)
-		e.sender.webContents.send('langres', arg)
+		e.sender.send('langres', arg)
 	})
 	//エクスポートのダイアログ
 	ipc.on('exportSettings', function (e, args) {
@@ -53,7 +54,7 @@ function system(mainWindow, dir, lang, dirname) {
 		if (!savedFiles) {
 			return false
 		}
-		e.sender.webContents.send('exportSettingsFile', savedFiles)
+		e.sender.send('exportSettingsFile', savedFiles)
 	})
 	//インポートのダイアログ
 	ipc.on('importSettings', function (e, args) {
@@ -66,7 +67,7 @@ function system(mainWindow, dir, lang, dirname) {
 		if (!fileNames) {
 			return false
 		}
-		e.sender.webContents.send('config', JSON5.parse(fs.readFileSync(fileNames[0], 'utf8')))
+		e.sender.send('config', JSON5.parse(fs.readFileSync(fileNames[0], 'utf8')))
 	})
 	//保存フォルダのダイアログ
 	ipc.on('savefolder', function (e, args) {
@@ -77,7 +78,7 @@ function system(mainWindow, dir, lang, dirname) {
 				properties: ['openDirectory'],
 			}
 		)
-		e.sender.webContents.send('savefolder', fileNames[0])
+		e.sender.send('savefolder', fileNames[0])
 	})
 	//カスタムサウンドのダイアログ
 	ipc.on('customSound', function (e, arg) {
@@ -92,7 +93,7 @@ function system(mainWindow, dir, lang, dirname) {
 				],
 			}
 		)
-		e.sender.webContents.send('customSoundRender', [arg, fileNames[0]])
+		e.sender.send('customSoundRender', [arg, fileNames[0]])
 	})
 
 	//ハードウェアアクセラレーションの無効化
@@ -100,7 +101,16 @@ function system(mainWindow, dir, lang, dirname) {
 		if (arg == 'true') {
 			fs.writeFileSync(ha_path, arg)
 		} else {
-			fs.unlink(ha_path, function (err) {})
+			fs.unlink(ha_path, function (err) { })
+		}
+		app.relaunch()
+		app.exit()
+	})
+	ipc.on('webview', function (e, arg) {
+		if (arg == 'true') {
+			fs.writeFileSync(wv_path, arg)
+		} else {
+			fs.unlink(wv_path, function (err) { })
 		}
 		app.relaunch()
 		app.exit()
@@ -108,7 +118,7 @@ function system(mainWindow, dir, lang, dirname) {
 	//ユーザーエージェント
 	ipc.on('ua', function (e, arg) {
 		if (arg == '') {
-			fs.unlink(ua_path, function (err) {})
+			fs.unlink(ua_path, function (err) { })
 		} else {
 			fs.writeFileSync(ua_path, arg)
 		}
@@ -124,7 +134,7 @@ function system(mainWindow, dir, lang, dirname) {
 	//スクリーンリーダー
 	ipc.on('acsCheck', function (e, arg) {
 		if (app.accessibilitySupportEnabled) {
-			mainWindow.webContents.send('accessibility', 'true')
+			mainWindow.send('accessibility', 'true')
 		}
 	})
 	ipc.on('quit', (e, args) => {
@@ -188,8 +198,8 @@ function system(mainWindow, dir, lang, dirname) {
 	})
 	function mems() {
 		var mem = os.totalmem() - os.freemem()
-		if (mainWindow && event.webContents) {
+		if (mainWindow && event) {
-			event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem(), os.cpus().length, os.uptime()])
+			event.send('memory', [mem, os.cpus()[0].model, os.totalmem(), os.cpus().length, os.uptime()])
 		}
 	}
 	ipc.on('endmem', (e, arg) => {
@@ -200,7 +210,7 @@ function system(mainWindow, dir, lang, dirname) {
 
 	ipc.on('export', (e, args) => {
 		fs.writeFileSync(args[0], JSON5.stringify(args[1]))
-		e.sender.webContents.send('exportAllComplete', '')
+		e.sender.send('exportAllComplete', '')
 	})
 	//フォント
 	function object_array_sort(data, key, order, fn) {
@@ -239,7 +249,7 @@ function system(mainWindow, dir, lang, dirname) {
 		var SystemFonts = require('system-font-families').default
 		var fm = new SystemFonts()
 		const fontList = fm.getFontsSync()
-		e.sender.webContents.send('font-list', fontList)
+		e.sender.send('font-list', fontList)
 	})
 	//コピー
 	ipc.on('copy', (e, arg) => {
@@ -276,7 +286,7 @@ function system(mainWindow, dir, lang, dirname) {
 				logs = todayLog + yestLog + yest2Log
 			})
 			logs = yest2Log + yestLog + todayLog
-			e.sender.webContents.send('logData', logs)
+			e.sender.send('logData', logs)
 		})
 	})
 
@@ -299,5 +309,28 @@ function system(mainWindow, dir, lang, dirname) {
 			})
 		}
 	})
+
+	ipc.on('twitterLogin', (e, args) => {
+		const window = new BrowserWindow({
+			webPreferences: {
+				webviewTag: false,
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(dirname, 'js', 'platform', 'preload.js'),
+			},
+			width: 414,
+			height: 736,
+		})
+		const login = `https://mobile.twitter.com/login?hide_message=true&redirect_after_login=https%3A%2F%2Ftweetdeck.twitter.com%2F%3Fvia_twitter_login%3Dtrue`
+		const logout = `https://mobile.twitter.com/logout?redirect_after_logout=https%3A%2F%2Ftweetdeck.twitter.com%2F`
+		window.loadURL(args ? logout : login)
+		window.webContents.on('did-navigate', () => {
+			const url = window.webContents.getURL()
+			if (url.match("https://tweetdeck.twitter.com")) {
+				window.close()
+				e.sender.send('twitterLoginComplete', '')
+			}
+		})
+	})
 }
 exports.system = system

app/native.js

@@ -1,4 +1,8 @@
 const { AiScript, parse, values, utils } = require('@syuilo/aiscript')
+const gcc = require('textarea-caret')
+const { v4: uuidv4 } = require('uuid')
+global.uuid = uuidv4
+global.getCaretCoordinates = gcc
 global.sanitizeHtml = require('sanitize-html')
 global.asValue = values
 global.AiScript = AiScript

app/package.json

@@ -1,26 +1,24 @@
 {
     "name": "thedesk",
-    "version": "22.1.1",
+    "version": "22.3.1",
     "codename": "Koume",
     "description": "TheDesk is a Mastodon client for PC.",
     "repository": "https://github.com/cutls/TheDesk",
     "main": "main.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
-        "construct": "cd view/make && node make --automatic && cd ../../ && browserify aiscript.js -o js/platform/aiscript.js",
+        "postinstall": "run-s util:*",
-        "construct:store": "cd view/make && node make --automatic --store && cd ../../ && browserify aiscript.js -o js/platform/aiscript.js",
+        "util:hash": "node gitHash.js",
-        "dev": "npx electron ./ --dev",
+        "util:browserify": "browserify native.js -o js/platform/native.js",
-        "dist": "build --linux snap",
+        "construct": "node view/make/makeCli.js",
-        "watchview": "node view/make/make.js --automatic --watch",
+        "construct:store": "node view/make/makeCli.js --store",
-        "build:js": "node build.js",
+        "dev": "run-p dev:*",
-        "build": "node view/make/make.js --automatic && npx electron-builder",
+        "dev:run": "electron ./ --dev",
-        "build:pwa": "node view/make/make.js --automatic --pwa",
+        "dev:watchview": "node view/make/makeCli.js --watch",
-        "build:win:web": "node view/make/make.js --automatic && npx electron-builder --win",
+        "build": "node buildCli.js",
-        "build:win:msstore": "node view/make/make.js --automatic --store && npx electron-builder --win appx",
+        "build:pwa": "node view/make/makeCli.js --pwa",
-        "build:linux:web": "node view/make/make.js --automatic && npx electron-builder --linux",
+        "build:all:x64": "node buildCli.js --withStore",
-        "build:linux:snapstore": "node view/make/make.js --automatic --store && npx electron-builder --linux",
+        "build:all": "node buildCli.js --withStore --withIa32 --withArm64",
-        "build:mac:web": "node view/make/make.js --automatic && npx electron-builder --mac",
-        "build:mac:homebrew": "node view/make/make.js --automatic --store && npx electron-builder --mac",
         "lint:fix": "eslint js --fix",
         "lint": "eslint js"
     },
@@ -59,85 +57,38 @@
     ],
     "license": "GPL-3.0",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.15.2",
+        "@fortawesome/fontawesome-free": "^5.15.4",
         "@syuilo/aiscript": "^0.11.1",
         "electron-dl": "^3.2.1",
+        "itunes-nowplaying-mac": "https://github.com/cutls/itunes-nowplaying-mac/releases/download/v0.4.0/itunes-nowplaying-mac-0.4.0.tgz",
         "jimp": "^0.16.1",
         "jquery": "^3.6.0",
         "jquery-ui-dist": "^1.12.1",
         "json5": "^2.2.0",
         "lodash": "^4.17.21",
         "materialize-css": "git://github.com/cutls/materialize#v1-dev",
-        "sanitize-html": "^2.3.2",
+        "sanitize-html": "^2.4.0",
         "sumchecker": "^3.0.1",
-        "sweetalert2": "^10.15.7",
+        "sweetalert2": "^11.1.4",
         "system-font-families": "^0.4.1",
-        "vue": "^2.6.12"
+        "textarea-caret": "^3.1.0",
-    },
+        "uuid": "^8.3.2",
-    "optionalDependencies": {
+        "vue": "^2.6.14"
-        "itunes-nowplaying-mac": "0.3.1"
     },
     "devDependencies": {
         "browserify": "^17.0.0",
-        "chokidar": "^3.5.1",
+        "chokidar": "^3.5.2",
-        "electron": "^10.2.0",
+        "dotenv": "^10.0.0",
-        "electron-builder": "^22.10.5",
+        "electron": "^13.2.2",
-        "electron-rebuild": "^2.3.5",
+        "electron-builder": "^22.11.7",
-        "eslint": "^7.23.0",
+        "electron-notarize": "^1.1.0",
+        "electron-rebuild": "^3.2.0",
+        "eslint": "^7.32.0",
+        "npm-run-all": "^4.1.5",
         "readline-sync": "1.4.10"
     },
-    "build": {
+    "resolutions": {
-        "productName": "TheDesk",
+        "@types/fs-extra": "9.0.11",
-        "appId": "top.thedesk",
+        "plist": "3.0.2"
-        "asarUnpack": [
-            "node_modules/itunes-nowplaying-mac",
-            "main/script"
-        ],
-        "directories": {
-            "output": "../build"
-        },
-        "win": {
-            "icon": "build/thedesk.ico",
-            "target": [
-                "nsis",
-                "appx",
-                "portable"
-            ]
-        },
-        "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,
-            "artifactName": "TheDesk-setup.${ext}"
-        },
-        "linux": {
-            "icon": "build/icons",
-            "target": [
-                "zip",
-                "appImage",
-                "snap",
-                "deb"
-            ],
-            "category": "Network"
-        },
-        "mac": {
-            "target": [
-                "dmg",
-                "zip"
-            ]
-        },
-        "electronDownload": {
-            "version": "9.0.5"
-        },
-        "electronVersion": "9.0.5"
     }
 }

app/source/themes/white.thedesktheme

@@ -17,7 +17,7 @@
 		bottom: '#eeeeee',
 		emphasized: '#81c784',
 		postbox: '#fff',
-		active: '#009688',
+		active: '#66dacf',
 		selected: '#c0c0c0',
 		selectedWithShared: '#b2babd',
 	},

app/view/make/acct.sample.html

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

app/view/make/components/bottomBarHtml.html

@@ -0,0 +1,56 @@
+<!--bottom-->
+<div id="bottom" class="reverse hide">
+    <div class="leftside reverse">
+        <div id="dambox">
+            <button id="posttgl" class="btn waves-effect" style="width: 100%; height: 2.5rem; line-height: 0; margin: 0">
+                    <i class="material-icons" style="position: relative; top: 0.38rem; font-size: 1.5rem; text-align: center; margin-right: 0.76rem">edit</i>@@toot@@
+                </button>
+        </div>
+        <div class="leftside reverse" id="group">
+            <div class="btnsgroup">
+                <a href="acct.html" class="nex waves-effect">
+                    <i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)">account_circle</i>
+                </a>
+                <a href="setting.html" class="nex waves-effect">
+                    <i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
+                </a>
+                <a onclick="nano()" class="nex waves-effect pwa">
+                    <i class="material-icons" title="@@nanoDes@@TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
+                </a>
+                <a onclick="menu()" class="nex waves-effect">
+                    <i class="material-icons" title="@@menu@@">apps</i>
+                </a>
+                <span id="fukidashi">@@hereAddColumns@@</span>
+            </div>
+            <a href="https://thedesk.top/bugs/?lang=@@lang@@" target="_blank" class="waves-effect bgReport" draggable="false" title="Feeling unlucky"> @@foundBug@@ </a>
+        </div>
+    </div>
+    <div>
+        <div id="tips-menu">
+            <div class="btnsgroup" style="height: 2.61rem">
+                <span class="grouptitle">Tips:</span>
+                <a onclick="tips('ver')" class="nex waves-effect">
+                    <i class="material-icons nex" title="@@verTips@@" data-trans-title="ver">info</i>
+                </a>
+                <a onclick="tips('clock')" class="nex waves-effect">
+                    <i class="material-icons nex" title="@@clockTips@@" data-trans-title="clock">access_time</i>
+                </a>
+                <a onclick="tips('memory')" class="nex waves-effect pwa">
+                    <i class="material-icons nex" title="@@ramTips@@" data-trans-title="memory">memory</i>
+                </a>
+                <a onclick="tips('trend')" class="nex waves-effect imasonly" style="display: none">
+                    <i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
+                </a>
+                <a onclick="tips('spotify')" class="nex waves-effect">
+                    <i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+                </a>
+            </div>
+        </div>
+        <div id="tips" class="hide">
+            <a onclick="tipsToggle()" class="nex waves-effect">
+                <i class="material-icons nex" title="@@changeTips@@" data-trans-title="tips">bubble_chart</i>
+            </a>
+            <div id="tips-text" style="width: 23rem; line-height: 1rem"></div>
+        </div>
+    </div>
+</div>

app/view/make/components/index.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html lang="@@lang@@">
+	<head>
+		<script type="text/javascript" src="../../js/ui/theme.js"></script>
+		<link href="../../css/themes.css" type="text/css" rel="stylesheet" />
+		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<link href="../../@@node_base@@/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
+		<link href="../../@@node_base@@/jquery-ui-dist/jquery-ui.min.css" type="text/css" rel="stylesheet" />
+		<link href="../../css/tl.css" rel="stylesheet" type="text/css" />
+		<link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
+		<link href="../../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/sweetalert2-material.css" type="text/css" rel="stylesheet" />
+		<link href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet" />
+		<meta charset="utf-8" />
+		@@comment-start@@
+		<script type="text/javascript">
+			var _jipt = []
+			_jipt.push(['project', 'thedesk'])
+		</script>
+		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+		@@comment-end@@ @@pwa@@ @@store@@
+	</head>
+
+	<body class="@@pwaClass@@">
+		<script>
+			var ver = '@@versionLetter@@'
+			var gitHash = '@@gitHash@@'
+			//betaを入れるとバージョンチェックしない
+			//var ver="beta";
+			var acct_id = 0
+			var tlid = 0
+		</script>
+		@@preTL@@ @@starterAndDragHandler@@ @@postBox@@ @@tootModal@@ @@userDataModal@@ @@mediaModal@@ @@releaseNote@@
+		<!--PiP-->
+		<div id="pip" class="hide pip-bottom pip-left">
+			<i class="material-icons pip-horiz pointer" onclick="pipHoriz()">chevron_right</i>
+			<i class="material-icons pip-vert pointer" onclick="pipVert()">expand_less</i>
+			<i class="material-icons pointer" onclick="endPip()">close</i>
+			<div id="pip-content"></div>
+		</div>
+		@@menuHtml@@
+		<div id="main">
+			<!--TLのTL-->
+			<div id="timeline-container">
+				<div id="something-wrong">
+					<img src="../../img/thinking.svg" style="width: 150px; margin: 5px; display: none" draggable="false" />
+					<div class="stw" style="display: none">@@helloTheDesk@@</div>
+				</div>
+			</div>
+		</div>
+		@@bottomBarHtml@@ @@supportMe@@
+		<!--左下メッセージ-->
+		<div id="message"></div>
+		<!--Radio Happy(Yui) Taku Inoue-->
+		<audio src="" id="radio"></audio>
+		<!--JS-->
+		<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
+		<script type="text/javascript" src="../../js/platform/first.js"></script>
+		<script type="text/javascript" src="../../js/platform/native.js"></script>
+		<script type="text/javascript" src="../../js/platform/plugin.js"></script>
+		<script type="text/javascript" src="../../@@node_base@@/materialize-css/dist/js/materialize.js"></script>
+		<script type="text/javascript" src="../../@@node_base@@/grapheme-splitter/index.js"></script>
+		<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
+		<script type="text/javascript" src="main.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="../../@@node_base@@/jquery-ui-dist/jquery-ui.min.js"></script>
+		<script type="text/javascript" src="../../@@node_base@@/sweetalert2/dist/sweetalert2.min.js"></script>
+		<script type="text/javascript" src="../../js/platform/punycode.js"></script>
+		<script type="text/javascript" src="../../js/ui/tips.js"></script>
+		<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
+		<script type="text/javascript" src="../../js/common/about.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/announParse.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/parse.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>
+		<script type="text/javascript" src="../../js/tl/mix.js"></script>
+		<script type="text/javascript" src="../../js/tl/src.js"></script>
+		<script type="text/javascript" src="../../js/tl/directory.js"></script>
+		<script type="text/javascript" src="../../js/tl/filter.js"></script>
+		<script type="text/javascript" src="../../js/tl/tag.js"></script>
+		<script type="text/javascript" src="../../js/tl/list.js"></script>
+		<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>
+		<script type="text/javascript" src="../../js/ui/pip.js"></script>
+		<script type="text/javascript" src="../../js/ui/sort.js"></script>
+		<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+		<script type="text/javascript" src="../../js/post/post.js"></script>
+		<script type="text/javascript" src="../../js/post/use-txtbox.js"></script>
+		<script type="text/javascript" src="../../js/post/secure.js"></script>
+		<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/suggest.js"></script>
+		<script type="text/javascript" src="../../js/post/bb-md.js"></script>
+		<script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>
+		<script type="text/javascript" src="../../js/userdata/his-data.js"></script>
+		<script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
+		<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>
+	</body>
+</html>

app/view/make/components/index.json

@@ -0,0 +1,12 @@
+[
+    "bottomBarHtml",
+    "mediaModal",
+    "menuHtml",
+    "postBox",
+    "preTL",
+    "releaseNote",
+    "starterAndDragHandler",
+    "supportMe",
+    "tootModal",
+    "userDataModal"
+]

app/view/make/components/mediaModal.html

@@ -0,0 +1,54 @@
+<!-- Modal Structure Image-->
+<div id="imagemodal" class="modal modal-fixed-footer">
+    <div class="modal-content">
+        <div id="imagewrap">
+            <img src="" id="imgmodal" />
+        </div>
+        <div class="progress nomargin hide transparent" id="imgmodal-progress">
+            <div class="indeterminate"></div>
+        </div>
+        <br />
+    </div>
+    <div class="modal-footer">
+        <div id="imginfo">
+            <span id="imgprog"></span>% <br />
+            <span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB
+        </div>
+        <a class="waves-effect white-text" onclick="zoom(2)">
+            <i class="material-icons">zoom_in</i>
+        </a>
+        <a class="waves-effect white-text" onclick="zoom(0.5)">
+            <i class="material-icons">zoom_out</i>
+        </a>
+        <a class="waves-effect white-text" onclick="rotate(false)">
+            <i class="material-icons">rotate_90_degrees_ccw</i>
+        </a>
+        <button class="btn waves-effect blue" onclick="copyImgUrl()" title="@@copyURL@@">
+                <i class="material-icons">link</i>
+            </button>
+        <button class="btn waves-effect purple" onclick="dlImg()">
+                <i class="material-icons">file_download</i>
+            </button>
+        <button class="btn waves-effect brown" onclick="detFromImg()" title="@@thisToot@@">
+                <i class="material-icons">pageview</i>
+            </button>
+        <button class="btn waves-effect orange" onclick="imgCont('prev')" id="image-prev">
+                <i class="material-icons">keyboard_arrow_left</i>
+            </button>
+        <button class="btn waves-effect orange" onclick="imgCont('next')" id="image-next">
+                <i class="material-icons">keyboard_arrow_right</i>
+            </button>
+        <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">
+            <i class="material-icons">close</i>
+        </a>
+    </div>
+</div>
+<!-- Modal Structure Video-->
+<div id="videomodal" class="modal modal-fixed-footer">
+    <div class="modal-content">
+        <video src="" id="video" style="max-width: 100%; max-height: 100%" controls loop="true" autoplay="true" />
+    </div>
+    <div class="modal-footer">
+        <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
+    </div>
+</div>

app/view/make/components/menuHtml.html

@@ -0,0 +1,229 @@
+<!--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="@@closeThisBox@@(X)">cancel</i>
+        </span>
+    <div id="menu-wrapper">
+        <div id="left-menu">
+            <a class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"> <i class="material-icons" aria-hidden="true">add</i><span>@@addColumn@@</span> </a>
+            <a class="waves-effect" onclick="sortMenu()" id="sortMenu"> <i class="material-icons" aria-hidden="true">sort</i><span>@@sortColumns@@</span> </a>
+            <a class="waves-effect" onclick="searchMenu()" id="searchMenu"> <i class="material-icons" aria-hidden="true">search</i><span>@@search@@</span> </a>
+            <a class="waves-effect" onclick="listMenu()" id="listMenu"> <i class="material-icons" aria-hidden="true">view_headline</i><span>@@list@@</span> </a>
+            <a class="waves-effect" onclick="dirMenu()" id="dirMenu"> <i class="material-icons" aria-hidden="true">recent_actors</i><span>@@discover@@</span> </a>
+            <a class="waves-effect" onclick="filterMenu()" id="filterMenu"> <i class="material-icons" aria-hidden="true">filter_list</i><span>@@filter@@</span> </a>
+            <a class="waves-effect" onclick="help()" id="helpMenu"> <i class="material-icons" aria-hidden="true">help_outline</i><span>@@helpAndLogs@@</span> </a>
+            <a class="waves-effect" onclick="location.href='index.html'"> <i class="material-icons" aria-hidden="true">refresh</i><span>@@f5@@</span> </a>
+        </div>
+        <div id="right-menu">
+            <!--カラム追加-->
+            <div id="add-box" class="hide menu-content">
+                <div class="input-field">
+                    <span data-trans="your_acct">@@selectAcct@@</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">
+                        <input type="hidden" value="local" id="type-sel" /> @@showThisTL@@
+                        <div id="tltype">
+                            <a class="type waves-effect active" data-type="local" title="@@local@@">
+                                <div><i class="material-icons" aria-hidden="true">people_outline</i></div>
+                                <span>@@local@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="local-media" title="@@localMedia@@">
+                                <div><i class="material-icons" aria-hidden="true">perm_media</i></div>
+                                <span>@@localMedia@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="home" title="@@home@@">
+                                <div><i class="material-icons" aria-hidden="true">home</i></div>
+                                <span>@@home@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="pub" title="@@fed@@">
+                                <div><i class="material-icons" aria-hidden="true">language</i></div>
+                                <span>@@fed@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="pub-media" title="@@fedMedia@@">
+                                <div><i class="material-icons" aria-hidden="true">perm_media</i></div>
+                                <span>@@fedMedia@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="dm" title="@@dm@@">
+                                <div><i class="material-icons" aria-hidden="true">mail_outline</i></div>
+                                <span>@@dm@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="mix" title="@@integratedTLDes@@">
+                                <div><i class="material-icons" aria-hidden="true">merge_type</i></div>
+                                <span>@@integratedTLDes@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="plus" title="@@localPlusDes@@">
+                                <div><i class="material-icons" aria-hidden="true">reply</i></div>
+                                <span>@@localPlusDes@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="notf" title="@@notf@@">
+                                <div><i class="material-icons" aria-hidden="true">notifications</i></div>
+                                <span>@@notf@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="bookmark" title="@@bookmark@@">
+                                <div><i class="material-icons" aria-hidden="true">bookmark</i></div>
+                                <span>@@bookmark@@</span>
+                            </a>
+                        </div>
+                    </div>
+                    <div id="noauth" class="hide">
+                        @@showThisTL@@
+                        <input id="noauth-url" type="text" class="validate" style="width: calc(70% - 3rem)" placeholder="e.g:mstdn.jp" />
+                    </div>
+                    <div id="webview-add" class="hide">@@webviewWarn@@</div>
+                </div>
+                <button class="btn waves-effect blue" style="width: calc(100% - 0.7rem)" onclick="addColumn()" data-trans-i="add"><i class="material-icons left">add</i>@@add@@</button>
+                <br />
+                <br />
+            </div>
+            <!--検索-->
+            <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">
+                    <input id="src" type="text" class="validate" style="width: calc(100% - 150px)" />
+                    <label for="src" data-trans="src">@@search@@</label>
+                    <button class="btn waves-effect indigo" style="width: 36%; padding: 0; padding-left: 1.15rem" onclick="src()" data-trans-i="src">
+                            <i class="material-icons left" style="margin: 0">search</i>@@search@@
+                        </button>
+                    <br />
+                    <br />
+                </div>
+                <div id="search">
+                    <div id="src-contents"></div>
+                </div>
+            </div>
+            <!--ディレクトリ-->
+            <div id="dir-box" class="hide menu-content">
+                <label>
+                        <input class="with-gap" onchange="dirChange('directory')" name="dirsug" type="radio" value="directory" checked />
+                        <span>@@directory@@</span>
+                    </label>
+                <label>
+                        <input class="with-gap" onchange="dirChange('suggest')" name="dirsug" type="radio" value="suggest" />
+                        <span>@@frc@@</span>
+                    </label>
+                <div class="input-field">
+                    <select id="dir-acct-sel" class="acct-sel" onchange="dirselCk()"></select>
+                </div>
+                <div id="dirNoAuth" class="hide">
+                    <input id="dirNoAuth-url" type="text" class="validate" style="width: calc(70% - 3rem)" placeholder="e.g:mastodon.social" />
+                    <button class="btn waves-effect indigo" style="width: 9.23rem; padding: 0; padding-left: 1.15rem" onclick="directory('directory')">
+                            <i class="material-icons left" style="margin: 0">search</i>@@show@@
+                        </button>
+                </div>
+                <div id="directoryConfig">
+                    <label>
+                            <input class="with-gap" onchange="directory('directory')" name="sort" type="radio" value="active" checked />
+                            <span>@@active@@</span>
+                        </label>
+                    <label>
+                            <input class="with-gap" onchange="directory('directory')" name="sort" type="radio" value="new" />
+                            <span>@@newcomer@@</span> </label
+                        ><br />
+                        <label>
+                            <input type="checkbox" class="filled-in" id="local_only" value="true" onchange="directory('directory')" />
+                            <span>@@local_only@@</span>
+                        </label>
+                </div>
+
+                <div id="dir-contents"></div>
+                <button class="btn waves-effect teal disabled" style="width: 100%" id="moreDir" onclick="directory('check', 'more')">@@more@@</button>
+            </div>
+            <!--並べ替え-->
+            <div id="sort-box" class="hide menu-content">
+                <ul id="sort"></ul>
+                <div>
+                    <button onclick="sort()" class="btn waves-effect nex" style="width: 97.5%" data-trans-i="sort"><i class="material-icons left">sort</i>@@sortSet@@</button>
+                </div>
+            </div>
+            <!--リスト-->
+            <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>@@selectAcct@@</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">@@listLocale@@</button>
+                </div>
+                <br /><br />
+                <div id="lists"></div>
+                <div id="lists-user"></div>
+                <input type="text" style="width: calc(100% - 143px)" id="list-add" placeholder="@@name@@" />
+                <button class="btn waves-effect" style="width: 120px" onclick="makeNewList()">@@makeNew@@</button>
+            </div>
+            <!--フィルター-->
+            <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>@@selectAcct@@</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">@@listLocale@@</button>
+                </div>
+                <div id="filtered-words"></div>
+                <input type="hidden" id="filter-edit-id" />
+                <input type="text" style="width: 150px" id="filter-add-word" placeholder="@@filterWord@@" /><br /> @@degree@@
+                <br />
+                <label>
+                        <input type="checkbox" class="filled-in" id="home_filter" value="home" />
+                        <span>@@home@@</span>
+                    </label>
+                <label>
+                        <input type="checkbox" class="filled-in" id="local_filter" value="public" />
+                        <span>@@local@@</span>
+                    </label>
+                <label>
+                        <input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
+                        <span>@@notf@@</span>
+                    </label>
+                <label>
+                        <input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
+                        <span>@@conver@@</span>
+                    </label>
+                <label>
+                        <input type="checkbox" class="filled-in" id="prof_filter" value="profiles" />
+                        <span>@@prof@@</span> </label
+                    ><br />
+                    @@option@@
+                    <br />
+                    <label>
+                        <input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
+                        <span>@@matchWord@@</span>
+                    </label>
+                <br />
+                <span class="sml">@@warnMatchWord@@</span><br />
+                <label>
+                        <input type="checkbox" class="filled-in" id="except_filter" value="1" />
+                        <span>@@except@@</span>
+                    </label>
+                <br />
+                <span class="sml">@@exceptWorn@@</span><br /> @@avalableBefore@@ <span class="sml">@@warnAvBefore@@<b>@@warnAvBefore2@@</b></span
+                    ><br /><br />
+                    <input type="number" style="width: 50px" id="days_filter" placeholder="d" value="0" />@@days@@
+                    <input type="number" style="width: 50px" id="hours_filter" placeholder="h" value="0" />@@hours@@
+                    <input type="number" style="width: 50px" id="mins_filter" placeholder="m" value="0" />@@mins@@<br />
+                    Quick: <a onclick="filterTime(0,0,30)" class="pointer">30@@mins@@</a>/ <a onclick="filterTime(0,1,0)" class="pointer">1@@hours@@</a>/
+                    <a onclick="filterTime(0,6,0)" class="pointer">6@@hours@@</a>/ <a onclick="filterTime(0,12,0)" class="pointer">12@@hours@@</a>/
+                    <a onclick="filterTime(1,0,0)" class="pointer">1@@days@@</a>/ <a onclick="filterTime(7,0,0)" class="pointer">7@@days@@</a>/
+                    <a onclick="filterTime(0,0,0)" class="pointer">@@unlimited@@</a><br />
+                    <button class="btn waves-effect" style="width: 120px" onclick="makeNewFilter()" id="add-filter-btn">@@add@@</button><br />
+                    <span class="sml">@@warnOnIntegratedTL@@</span>
+            </div>
+            <!--ヘルプとログ-->
+            <div id="help-box" class="hide menu-content">
+                <a href="https://docs.thedesk.top" class="btn waves-effect" style="width: 97.5%">@@help@@</a><br /> @@contactwithlog@@
+                <br />
+                <textarea id="logs" style="height: 250px"></textarea><br />
+            </div>
+        </div>
+    </div>
+    <a onclick="about()" class="nex waves-effect pwa"> <i class="material-icons menu-icon">info</i>@@about@@ </a>&nbsp;|&nbsp;
+    <a onclick="bottomReverse()" class="nex waves-effect"> <i class="material-icons menu-icon">swap_horiz</i>@@reverse@@ </a>&nbsp;|&nbsp;
+    <a onclick="openRN()" class="nex waves-effect"> <i class="material-icons menu-icon">new_releases</i>Release Note </a>
+</div>

app/view/make/components/postBox.html

@@ -0,0 +1,247 @@
+<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">
+			<div class="" style="float: left">
+				<a onclick="profShow()" style="vertical-align: -1.7rem" class="pointer mize">
+					<img src="../../img/missing.svg" id="acct-sel-prof" title="@@showSelectProf@@(Ctrl+Shift+P)" data-trans-title="post_box_prof" style="width: 1.8rem" />
+				</a>
+			</div>
+			<div class="input-field mize" style="float: left; width: calc(100% - 1.8rem); margin-top: 0">
+				<select id="post-acct-sel" class="acct-sel" onchange="mdCheck()"></select>
+			</div>
+			<span class="cancel">
+				<i class="material-icons waves-effect" onclick="hide()" title="@@closeThisBox@@(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('i')" title="斜字(Ctrl+I)テキストボックス内を選択してから押すと囲みます。">format_italic</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('s')" title="取り消し(Ctrl+S)テキストボックス内を選択してから押すと囲みます。">strikethrough_s</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="markdown('#','no','yes')" title="見出し">short_text</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="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>
+						<input id="size" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" value="12" />px
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('colorhex')" title="文字色変更　テキストボックス内を選択してから押すと囲みます。">color_lens</i>
+						<input id="colorhex" style="width: calc(50% - 3.8rem); margin: 0; height: 1.8rem" type="color" />
+						<br />
+						<i class="material-icons pointer setting waves-effect" onclick="markdownLink()" title="リンク挿入">link</i>
+						<input id="linkt" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="リンクテキスト" />&nbsp;
+						<input id="link2" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="リンクアドレス" />
+						<br />
+						<i class="material-icons pointer setting waves-effect" onclick="markdownImage()" title="インライン画像挿入">image</i>
+						<input id="image" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="代替テキスト" />&nbsp;
+						<input id="image2" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="画像アドレス" />
+					</div>
+				</div>
+				<div class="input-field col s12" id="preview-field" style="margin-top: 0">
+					<div id="md-preview"></div>
+					<span class="sml gray pointer">
+						<a onclick="previewEdit()">Edit</a>
+					</span>
+				</div>
+				<div class="input-field col s12" id="toot-field" style="margin-top: 0; margin-bottom: 0">
+					<textarea id="textarea" class="materialize-textarea unmize" style="margin-bottom: 0" data-length="500"></textarea>
+
+					<div id="suggest"></div>
+					<label for="textarea" data-trans="toot">@@toot@@</label>
+					<br />
+					<span class="sml gray pointer markdown mize" id="preview-btn">
+						<a onclick="preview()">Preview</a>
+					</span>
+					<span class="sml gray pointer anti-markdown mize">
+						<a onclick="mdToggle()">Markdownエディタを表示</a>
+					</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="@@nsfwDes@@" onclick="nsfw()">visibility_off</i>
+					<i class="waves-effect gray material-icons purple-text dropdown-trigger" data-target="dropdown1" id="vis-icon">public</i>
+					<a class="waves-effect gray" id="cw" onclick="cw()" title="@@cwDes@@">CW</a>
+					<span
+						><span id="imgup"></span><span id="imgsel" class="pwa"><i class="waves-effect material-icons gray" onclick="fileselect()" title="@@selfile@@">photo_library</i></span></span
+					>
+					<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn" title="@@insertEmoji@@">tag_faces</i>
+					<i class="waves-effect gray material-icons dropdown-trigger" data-target="dropdown2">more_vert</i>
+					<i class="material-icons nex gray waves-effect" title="@@clearToot@@(Ctrl+Shit+C)" data-trans-title="post_box_clear" id="clear">clear</i>
+				</div>
+				<div class="col s12 mize" style="margin-bottom: 0.4rem; padding: 0">
+					<div id="taglist"></div>
+					<div id="preview" class="mize"></div>
+					<span class="sml mize"
+						><span>@@replyMode@@</span>: <span id="rec">@@no@@</span>/<span>@@temp@@</span>:
+						<span id="mec">@@nothing@@</span>
+						<a onclick="stamp()" class="pointer pwa" title="@@stampWarn@@">@@stamp@@: <span id="stamp">Off</span></a> /@@poll@@:
+						<span id="pollsta">@@no@@</span>
+						<span id="vis" class="hide">public</span>
+					</span>
+					<br />
+					<input type="text" id="cw-text" placeholder="@@cwtext@@" class="mize" style="margin: 0" />
+					<div id="sch-box">
+						@@postat@@<br /><span class="sml">@@scheduleWarn@@</span><a onclick="expPostMode()">Expire mode(beta)</a><br />
+						<input type="datetime-local" id="sch-date" placeholder="@@schedule@@" class="datepicker" style="margin: 0" />
+					</div>
+				</div>
+			</div>
+			<!-- 公開範囲 Dropdown Structure -->
+			<ul id="dropdown1" class="dropdown-content">
+				<li>
+					<a onclick="vis('public')">@@publicJP@@(Public)</a>
+				</li>
+				<li>
+					<a onclick="vis('unlisted')">@@unlistedJP@@(Unlisted)</a>
+				</li>
+				<li>
+					<a onclick="vis('private')" id="private-button">@@privateJP@@(Private)</a>
+				</li>
+				<li id="limited-button" class="hide">
+					<a onclick="vis('limited')">限定公開(Limited)</a>
+				</li>
+				<li id="local-button" class="hide">
+					<a onclick="vis('local')">@@localJP@@(Local)</a>
+				</li>
+				<li>
+					<a onclick="vis('direct')" class="disabled direct">@@directJP@@(Direct)</a>
+				</li>
+			</ul>
+			<!-- その他 Dropdown Structure -->
+			<ul id="dropdown2" class="dropdown-content">
+				<li>
+					<a onclick="nowplaying('spotify');">NowPlaying (Spotify)</a>
+				</li>
+				<li class="mac">
+					<a onclick="nowplaying('itunes');">NowPlaying (iTunes macOS)</a>
+				</li>
+				<li class="mac hide" id="ccnp">
+					<a onclick="nowplaying('anynp');">NowPlaying (コントロールセンター)</a>
+				</li>
+				<li>
+					<a onclick="nowplaying('lastFm');">NowPlaying (Last.fm)</a>
+				</li>
+				<li>
+					<a onclick="schedule();">@@schedule@@</a>
+				</li>
+				<li>
+					<a onclick="pollToggle();">@@poll@@</a>
+				</li>
+				<li>
+					<a onclick="draftToggle();">@@draft@@</a>
+				</li>
+			</ul>
+			<!--hidden area-->
+			<input type="hidden" id="reply" />
+			<input type="hidden" id="ideKey" />
+			<input type="hidden" id="quote" />
+			<input type="hidden" id="media" />
+			<!--END hidden area-->
+		</div>
+		<div id="toot-btn-field">
+			<button class="btn waves-effect unmize toot-btn-group" onclick="post()" id="toot-post-btn">@@toot@@</button>
+			<button class="btn waves-effect darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn">
+				<i class="material-icons" id="toot-sec-icon" title="@@sectoot@@">lock_open</i>
+			</button>
+		</div>
+	</div>
+	<div id="right-side">
+		<div id="draft" class="hide right-side-content"></div>
+		<!--絵文字ピッカー-->
+		<div id="emoji" class="hide right-side-content">
+			<span class="gray sml"
+				>@@emojiWarn@@
+				<a onclick="emojiGet('true')" class="pointer">@@refreshEmoji@@</a>
+				<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">
+					<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">
+					<i class="material-icons">navigate_next</i>
+				</button>
+			</div>
+			<div id="default-emoji">
+				<span id="now-emoji"></span>@@showThisEmoji@@<br /><span class="gray sml">@@emojiInsertWarn@@</span>
+				<br />
+				<a onclick="customEmoji()" class="pointer waves-effect" title="@@customEmoji@@">
+					<i class="material-icons">add</i>
+				</a>
+				<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="@@peopleEmoji@@">
+					<i class="material-icons">people</i>
+				</a>
+				<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="@@natureEmoji@@">
+					<i class="material-icons">local_florist</i>
+				</a>
+				<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="@@foodEmoji@@">
+					<i class="material-icons">restaurant</i>
+				</a>
+				<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="@@activityEmoji@@">
+					<i class="material-icons">directions_run</i>
+				</a>
+				<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="@@placeEmoji@@">
+					<i class="material-icons">directions_car</i>
+				</a>
+				<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="@@thingsEmoji@@">
+					<i class="material-icons">attach_file</i>
+				</a>
+				<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="@@symbolEmoji@@">
+					<i class="material-icons">gesture</i>
+				</a>
+				<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="@@flagsEmoji@@">
+					<i class="material-icons">flag</i>
+				</a>
+				<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+					<i class="fab fa-fort-awesome"></i>
+				</a>
+			</div>
+		</div>
+		<!--Poll UI-->
+		<div id="poll" class="hide right-side-content">
+			<div id="mastodon-poll" class="poll-provider">
+				<input type="text" class="mastodon-choice" placeholder="@@choice@@1" />
+				<input type="text" class="mastodon-choice" placeholder="@@choice@@2" />
+				<input type="text" class="mastodon-choice" placeholder="@@choice@@3" />
+				<input type="text" class="mastodon-choice" placeholder="@@choice@@4" />
+				<label>
+					<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+					<span>@@pollmulti@@</span>
+				</label>
+				<label>
+					<input type="checkbox" class="filled-in" id="poll-until" value="1" />
+					<span>@@polluntil@@</span>
+				</label>
+				<input type="number" style="width: 50px" id="days_poll" placeholder="d" value="0" />@@days@@
+				<input type="number" style="width: 50px" id="hours_poll" placeholder="h" value="0" />@@hours@@
+				<input type="number" style="width: 50px" id="mins_poll" placeholder="m" value="6" />@@mins@@
+			</div>
+		</div>
+	</div>
+</div>

app/view/make/components/preTL.html

@@ -0,0 +1,17 @@
+<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="pageSrc" class="hide z-depth-2">
+    <div class="srcQ"></div>
+    <div class="pageSrcBtn pointer" onclick="doSrc('web')">@@webSrc@@</div>
+    <div class="pageSrcBtn pointer" onclick="doSrc('ts')">@@tsSrc@@</div>
+    <div class="pageSrcBtn pointer" onclick="doSrc('copy')">@@copy@@</div>
+    <div class="pageSrcBtn pointer lastPSB" onclick="doSrc('toot')">@@toot@@</div>
+</div>
+<div class="hide z-depth-2" id="tagContextMenu">
+    <a onclick="doTShowBox('tl')" class="pointer firstTCM" id="tagCMTL"></a>
+    <a onclick="doTShowBox('toot')" class="pointer" id="tagCMToot"></a>
+    <a onclick="doTShowBox('pin')" class="pointer" id="tagCMPin"></a>
+    <a onclick="doTShowBox('f')" class="pointer lastTCM" title="add it to Featured tags" id="tagCMFeature">Feature</a>
+</div>
+<div id="offline" class="hide">@@nowOffline@@</div>
+<div id="re-online" class="hide">@@reOnline@@</div>

app/view/make/components/releaseNote.html

@@ -0,0 +1,34 @@
+<!-- Modal Structure Release Note-->
+<div id="releasenote" class="modal modal-fixed-footer scr">
+    <div class="modal-content">
+        <h3>TheDesk</h3>
+        <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-22-3-1_Koume" class="release-do" style="display: none">
+            Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br /> 困ったときは、 <a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
+            <h5>Release Note 22.3.1 (Koume)</h5>
+            <!--上のdivのidや1行上のところも変えてね-->
+            ・時限ミュートに対応した
+            <a onclick="udgEx('Cutls@1m.cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png" />cutls</a><br /> ・軽微なバグの修正
+            <a onclick="udgEx('Cutls@1m.cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png" />cutls</a><br />
+        </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>@@supportme@@</h3>
+        @@TheDeskDes@@<br />
+        <a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank"> @@PixivSupport@@ </a>
+        <a class="btn-share btn waves-effect waves-light red darken-2" href="https://www.patreon.com/cutls" target="_blank"> @@PatreonSupport@@ </a>
+        <a class="btn-share btn waves-effect waves-light black-text" href="https://liberapay.com/cutls" target="_blank" style="background-color: #f6c915"> Liberapay </a>
+        <a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank"> @@AWLSupport@@ </a>
+        <br /> @@SendAmazonGift1@@ <a href="mailto:web-pro@cutls.com" target="_blank">web-pro@cutls.com</a>@@SendAmazonGift2@@<br /> Kyash
+        <br />
+        <img src="../../img/kyash.png" width="100" /><br />
+    </div>
+    <div class="modal-footer">
+        <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
+    </div>
+</div>

app/view/make/components/starterAndDragHandler.html

@@ -0,0 +1,50 @@
+<div id="tl">
+    <!--TL-->
+    <!--スターター-->
+    <div id="start" class="scr">
+        <div id="start-content">
+            <h3 class="center">@@demoBottomBtns@@</h3>
+            @@lookAtBottom@@
+            <div id="demobottom">
+                <button class="btn waves-effect" style="width: 23rem; height: 2.5rem; line-height: 0; margin: 0; background-color: var(--active)">
+                        <i class="material-icons" style="position: relative; top: 0.4rem; font-size: 1.5rem; text-align: center; margin-right: 0.7rem">edit</i>@@toot@@
+                    </button>
+                <div class="leftside reverse" id="demogroup">
+                    <div class="btnsgroup" style="margin-left: 0.4rem">
+                        <a href="#" class="nex waves-effect">
+                            <i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)">account_circle</i>
+                        </a>
+                        <a href="#" class="nex waves-effect">
+                            <i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
+                        </a>
+                        <a class="nex waves-effect">
+                            <i class="material-icons" title="@@nanoDes@@TheDesk Nano">remove_from_queue</i>
+                        </a>
+                        <a class="nex waves-effect" id="list-tgl">
+                            <i class="material-icons" title="@@menu@@">apps</i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <br />
+            <i class="material-icons nex big-icon">account_circle</i>: @@acctMan@@<br /> @@acctManDesc@@
+            <hr />
+            <i class="material-icons nex">settings</i>: @@setting@@<br /> @@settingDesc@@
+            <hr />
+            <i class="material-icons nex">remove_from_queue</i>: TheDesk Nano @@nanoDes@@<br /> @@nanoDescPlus@@
+            <hr />
+            <i class="material-icons nex">apps</i>: @@menu@@<br /> @@menuDesc@@
+            <br />
+            <br />
+            <button class="btn waves-effect" onclick="closeStart()" style="width: 300px">@@close@@</button>
+        </div>
+    </div>
+    <!--ドラッグハンドラ-->
+    <div id="drag">
+        <div id="drag-content">
+            @@draghere@@
+            <br />
+            <button class="btn waves-effect" onclick="closedrop()">@@close@@</button>
+        </div>
+    </div>
+</div>

app/view/make/components/supportMe.html

@@ -0,0 +1,33 @@
+<!--Support me-->
+<div id="support-btm" class="z-depth-4 hide scr">
+    <div id="support-btm-ja">
+        <h5>ご支援いただけませんか？</h5>
+        (これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br /> あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。<br /> 乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。
+        <br />
+        <br /> TheDeskになぜ金銭が発生するかについて: 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。
+        <br />
+        <b>全てのユーザーが安心してTheDeskを使っていただける環境のため</b>にも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。<br />
+        <b>@@TheDeskDes@@</b>
+    </div>
+    <div id="support-btm-en" class="hide">
+        <h5>Support me</h5>
+        It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!<br />
+        <b>@@TheDeskDes@@</b>
+    </div>
+    <div id="support-btm-middle">
+        <h5>@@monthly@@</h5>
+        <a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank"> @@PixivSupport@@ </a>
+        <a class="btn-share btn waves-effect waves-light red darken-2" href="https://www.patreon.com/cutls" target="_blank"> @@PatreonSupport@@ </a>
+        <a class="btn-share btn waves-effect waves-light black-text" href="https://liberapay.com/cutls" target="_blank" style="background-color: #f6c915"> Liberapay </a>
+    </div>
+    <div id="support-btm-right">
+        <h5>@@once@@</h5>
+        <a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank"> @@AWLSupport@@ </a>
+        <br /> @@SendAmazonGift1@@ <a href="mailto:web-pro@cutls.com" target="_blank">web-pro@cutls.com</a>@@SendAmazonGift2@@<br /> Kyash
+        <br />
+        <img src="../../img/kyash.png" width="100" /><br />
+    </div>
+    <div id="support-btm-close">
+        <button class="btn waves-effect" style="width: 100%" onclick="closeSupport()" id="add-filter-btn">@@close@@</button>
+    </div>
+</div>

app/view/make/components/tootModal.html

@@ -0,0 +1,96 @@
+<!-- Modal Structure Tootdata-->
+<div id="tootmodal" class="modal modal-fixed-footer">
+    <div class="modal-content">
+        <ul class="collapsible" id="det-col">
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">people_outline</i>@@afterLTL@@</div>
+                <div class="collapsible-body toot-reset" id="ltl-after"></div>
+            </li>
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">person_outline</i>@@afterUTL@@</div>
+                <div class="collapsible-body toot-reset" id="user-after"></div>
+            </li>
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">language</i>@@afterFTL@@</div>
+                <div class="collapsible-body toot-reset" id="ftl-after"></div>
+            </li>
+            <li>
+                <div class="collapsible-header">
+                    <i class="material-icons">arrow_upward</i>@@contextBefore@@
+                    <i class="material-icons red-text hide" id="toot-reply-new">new_releases</i>
+                </div>
+                <div class="collapsible-body toot-reset" id="toot-reply"></div>
+            </li>
+            <li>
+                <div class="collapsible-header" id="activator"><i class="material-icons">more_horiz</i>@@thisToot@@</div>
+                <div class="collapsible-body">
+                    <div class="toot-reset" id="toot-this"></div>
+                </div>
+            </li>
+            <li>
+                <div class="collapsible-header">
+                    <i class="material-icons">arrow_downward</i>@@contextAfter@@
+                    <i class="material-icons red-text hide" id="toot-after-new">new_releases</i>
+                </div>
+                <div class="collapsible-body toot-reset" id="toot-after"></div>
+            </li>
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">people_outline</i>@@beforeLTL@@</div>
+                <div class="collapsible-body toot-reset" id="toot-before"></div>
+            </li>
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">person_outline</i>@@beforeUTL@@</div>
+                <div class="collapsible-body toot-reset" id="user-before"></div>
+            </li>
+            <li>
+                <div class="collapsible-header"><i class="material-icons">star</i>@@favedPeople@@</div>
+                <div class="collapsible-body toot-reset" id="toot-fav"></div>
+            </li>
+            <li class="dm-hide">
+                <div class="collapsible-header"><i class="text-darken-3 false fas fa-retweet"></i>@@btedPeople@@</div>
+                <div class="collapsible-body toot-reset" id="toot-rt"></div>
+            </li>
+        </ul>
+        <div class="dm-hide" style="max-width: 450px">
+            @@useOtherAcct1@@(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>@@useOtherAcct2@@)<br />
+            <div class="row">
+                <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="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="fas fa-retweet"></i>
+                        </button>
+                </div>
+                <div class="col s2">
+                    <button class="dropdown-button btn waves-effect orange" style="width: 100%" onclick="staEx('fav')">
+                            <i class="fas fa-star"></i>
+                        </button>
+                </div>
+            </div>
+            @@btWithVis@@<br />
+            <button class="btn waves-effect darken-3 toot-btn-group purple" onclick="boostWith('public')">
+                    <i class="material-icons">public</i>
+                </button>
+            <button class="btn waves-effect darken-3 toot-btn-group blue" onclick="boostWith('unlisted')">
+                    <i class="material-icons">lock_open</i>
+                </button>
+            <button class="btn waves-effect darken-3 toot-btn-group orange" onclick="boostWith('private')">
+                    <i class="material-icons">lock</i>
+                </button>
+            <div id="toot-tools"></div>
+            <div id="toot-after"></div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">@@openBrowser@@</a>
+        <a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">@@copyURL@@</a>
+        <a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">@@embed@@</a>
+        <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
+    </div>
+</div>

app/view/make/components/userDataModal.html

@@ -0,0 +1,210 @@
+<!-- Modal Structure Userdata -->
+<div id="his-data" class="modal bottom-sheet modal-fixed-footer" style="max-height: 750px; height: 90%">
+	<div id="his-data-content" class="modal-content" style="padding-bottom: 0; overflow-y: hidden">
+		<div id="his-data-show">
+			<div id="his-data-wrap">
+				<div class="his-float" id="his-float-data">
+					<div id="his-leftside">
+						<div id="his-basic-prof">
+							<div>
+								<img src="../../img/loading.svg" id="his-prof" draggable="false" />
+							</div>
+							<div>
+								<span id="his-name">Loading...</span>
+								<span class="gray">@</span><span id="his-acct" class="gray"></span><br />
+								<span class="gray" id="his-relation"></span>
+								<br />
+								<span class="cbadge"> <span id="his-sta"></span>@@toots@@ </span>
+								<span class="cbadge"
+									>@@follow@@:
+									<span id="his-follow"></span>
+								</span>
+								<span class="cbadge">@@follower@@: <span id="his-follower"></span> </span><br />
+								<span class="cbadge" style="max-width: 11.5rem; width: 11.5rem"
+									>Since:
+									<span id="his-since"></span>
+								</span>
+								<span class="cbadge" id="his-bot">[bot]</span>
+							</div>
+						</div>
+						<div id="his-proof-prof"></div>
+						<div id="his-des" data-acct=""></div>
+						<br />
+						<div id="his-table"></div>
+						<br />
+						<div id="his-sign-action">
+							<a href="#!" class="waves-effect waves-green btn" onclick="follow()" style="flex-basis: 100%" id="his-follow-btn"
+								><i class="material-icons">people</i><span id="his-follow-btn-text">@@follow@@</span></a
+							>
+							<a href="#!" class="waves-effect waves-green btn blue shrinker" onclick="muteMenu()" id="his-mute-btn"
+								><i class="material-icons">voice_over_off</i><span id="his-mute-btn-text">@@mute@@</span>
+							</a>
+							<a href="#!" class="waves-effect waves-green btn red shrinker" onclick="block()" id="his-block-btn"
+								><i class="material-icons">block</i><span id="his-block-btn-text">@@block@@</span></a
+							>
+							<a class="dropdown-trigger btn waves-effect grey" href="#" data-target="actiondropdown"> <i class="material-icons">more_vert</i>@@more@@</a>
+						</div>
+						<div id="muteDuration" class="hide">
+							<label>
+								<input type="checkbox" class="filled-in" id="notf_mute" value="1" />
+								<span>@@notfMute@@</span>
+							</label>
+							<br />
+							@@zeroSetToInfinity@@<br />
+							Quick: <a onclick="muteTime(0,0,5)" class="pointer">5@@mins@@</a>/ <a onclick="muteTime(0,0,30)" class="pointer">30@@mins@@</a>/ <a onclick="muteTime(0,1,0)" class="pointer">1@@hours@@</a>/
+							<a onclick="muteTime(0,6,0)" class="pointer">6@@hours@@</a>/ <a onclick="muteTime(1,0,0)" class="pointer">1@@days@@</a>/ 
+                            <a onclick="muteTime(3,0,0)" class="pointer">3@@days@@</a>/ <a onclick="muteTime(7,0,0)" class="pointer">7@@days@@</a>
+							<a onclick="muteTime(0,0,0)" class="pointer">@@unlimited@@</a><br />
+							<input type="number" style="width: 62px" id="days_mute" placeholder="d" value="0" />@@days@@
+							<input type="number" style="width: 62px" id="hours_mute" placeholder="h" value="0" />@@hours@@
+							<input type="number" style="width: 62px" id="mins_mute" placeholder="m" value="0" />@@mins@@
+							<a href="#!" class="waves-effect waves-green btn blue" onclick="muteDo()" id="his-mute-btn"
+								><i class="material-icons">voice_over_off</i><span id="his-mute-btn-text">@@mute@@</span>
+							</a>
+						</div>
+						<!-- Dropdown Structure -->
+						<ul id="actiondropdown" class="dropdown-content">
+							<li onclick="empUser()">
+								<a title="@@empUser@@"><i class="material-icons">highlight</i>@@empUser@@</a>
+							</li>
+							<li onclick="pinUser()" class="only-his-data">
+								<a title="@@endorse@@"><i class="material-icons">thumb_up</i>@@endorse@@</a>
+							</li>
+							<li onclick="profbrws()" id="his-openin">
+								<a title="@@openinbrowser@@"><i class="material-icons">open_in_browser</i>@@openinbrowser@@</a>
+							</li>
+							<li onclick="setMain()" class="only-my-data" id="his-main-acct">
+								<a title="@@mainacct@@"><i class="material-icons">grade</i>@@mainacct@@</a>
+							</li>
+						</ul>
+					</div>
+				</div>
+				<div class="his-float" id="his-float-timeline">
+					<div id="my-data-nav">
+						<a go="#his-tl" title="@@timeline@@" class="btn active-back column-first anc-link waves-effect"><i class="material-icons">timeline</i>@@timeline@@</a>
+						<a go="#his-follow-list" title="@@follow@@" class="btn anc-link waves-effect"><i class="material-icons">people</i>→@@follow@@</a>
+						<a go="#his-follower-list" title="@@follower@@" class="btn anc-link waves-effect"><i class="material-icons">people</i>←@@follower@@</a>
+						<a go="#his-fav-list" title="@@favRegist@@" class="btn only-my-data anc-link waves-effect"> <i class="material-icons">star</i>@@favRegist@@</a>
+						<a class="dropdown-trigger btn waves-effect" href="#" data-target="hisdropdown"><i class="material-icons">more_vert</i>@@more@@</a>
+						<div id="his-data-title-wrap">
+							<span id="his-data-title"><i class="material-icons">timeline</i>@@timeline@@</span>
+							<button class="btn waves-effect grey darken-2" style="width: 180px" id="util-add" onclick="utlAdd()">
+								<i class="material-icons">add</i>
+								@@utlColumn@@
+							</button>
+						</div>
+						<!-- Dropdown Structure -->
+						<ul id="hisdropdown" class="dropdown-content">
+							<li class="anc-link only-his-data" go="#his-list">
+								<a href="#" title="@@list@@"> <i class="material-icons">list</i>@@list@@ </a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-blocking-list">
+								<a href="#" title="@@blocks@@"><i class="material-icons">block</i>@@blocks@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-muting-list">
+								<a href="#" title="@@mute@@"><i class="material-icons">voice_over_off</i>@@mute@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-domain-list">
+								<a href="#" title="@@domainBlock@@"><i class="material-icons">cancel_schedule_send</i>@@domainBlock@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-prof-list">
+								<a href="#" title="@@editProf@@"><i class="material-icons">create</i>@@editProf@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-request-list">
+								<a href="#" title="@@followReq@@"><i class="material-icons">how_to_reg</i>@@followReq@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-follow-recom-list">
+								<a href="#" title="@@frc@@"><i class="material-icons">recent_actors</i>@@frc@@</a>
+							</li>
+							<li class="anc-link only-his-data" go="#his-action">
+								<a href="#" title="@@operateOtherAcct@@"><i class="material-icons">account_box</i>@@operateOtherAcct@@</a>
+							</li>
+						</ul>
+					</div>
+					<div id="his-tl" class="his-var-content">
+						<div id="his-tl-contents" class="cont-series"></div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="utlShow('--now','more')">@@more@@</button>
+					</div>
+					<div id="his-follow-list" class="his-var-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>
+					</div>
+					<div id="his-follower-list" class="his-var-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>
+					</div>
+					<div id="his-action" class="his-var-content">
+						@@useOtherAcct1@@@@revoverJP@@@@follow@@(@@warnUseOtherAcct@@)<br />
+						<div style="max-width: 500px">
+							<select id="user-acct-sel" class="acct-sel"></select>
+						</div>
+						@@revoverJPde@@
+						<a href="#!" class="waves-effect btn" onclick="follow('selector','selector')">@@follow@@</a><br />
+						@@or@@
+						<br />
+						<a href="#!" class="waves-effect btn" onclick="udgEx('selector', 'selector')">@@openProf@@</a><br />
+					</div>
+					<div id="his-list" class="his-var-content">
+						<div id="his-lists-a">@@warnListRegist@@</div>
+
+						<div id="his-lists-b"></div>
+					</div>
+					<div id="his-fav-list" class="his-var-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>
+					</div>
+					<div id="his-blocking-list" class="his-var-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>
+					</div>
+					<div id="his-muting-list" class="his-var-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>
+					</div>
+					<div id="his-domain-list" class="his-var-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>@@blockDomain@@
+						<br />
+						<input type="text" placeholder="example.com" id="domainblock" />
+						<button class="btn waves-effect" onclick="addDomainblock()">@@add@@</button>
+						<br />
+					</div>
+					<div id="his-prof-list" class="his-var-content">
+						@@name@@
+						<br />
+						<input type="text" placeholder="@@name@@" id="his-name-val" style="max-width: 250px" />
+						<br />@@note@@
+						<br />
+						<div class="input-field col s12">
+							<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()">@@change@@</button>
+						<br />@@editProfImg@@:
+						<span id="prof-change">
+							<input type="file" onchange="imgChange(this,'avatar')" />
+						</span>
+						<br />@@editHeader@@:
+						<span id="header-change">
+							<input type="file" onchange="imgChange(this,'header')" />
+						</span>
+					</div>
+					<div id="his-request-list" class="his-var-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>
+					</div>
+					<div id="his-follow-recom-list" class="his-var-content">
+						<div id="his-follow-recom-contents" class="cont-series"></div>
+					</div>
+					<div id="his-float-blocked">
+						<div>@@blocked@@</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="modal-footer">
+		<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn" onclick="historyShow()">@@historyBack@@</button>
+		<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">@@close@@</a>
+	</div>
+</div>

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

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

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

@@ -9,6 +9,7 @@
   "default": "Default",
   "change": "Change",
   "select": "Select",
+  "exec": "Exec",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
@@ -17,6 +18,8 @@
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
+  "webview": "Webview Integration",
+  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
   "theme": "Themes",
   "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
@@ -69,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -116,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

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

@@ -9,6 +9,7 @@
   "default": "Default",
   "change": "Change",
   "select": "Select",
+  "exec": "Exec",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
@@ -17,6 +18,8 @@
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
+  "webview": "Webview Integration",
+  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
   "theme": "Themes",
   "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
@@ -69,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -116,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

app/view/make/language/bg-BG/index.json

@@ -74,6 +74,7 @@
     "openBrowser": "Отваряне в браузъра",
     "screenshot": "Направете снимка на екрана",
     "copyURL": "Копирай URL адреса на този тоот",
+    "copy": "Copy",
     "embed": "Закрепи",
     "toots": "Тоот",
     "follow": "Следвам",
@@ -178,6 +179,7 @@
     "foundBug": "Намерена е грешка",
     "show": "Покажи",
     "directory": "Директория",
+    "discover": "Discover",
     "active": "Наскоро активен",
     "newcomer": "Новодошли",
     "local_only": "Само местно",

app/view/make/language/bg-BG/main.json

@@ -103,6 +103,7 @@
     "lang_details_embed": "Вграденият HTML е изрязан.",
     "lang_details_url": "URL адресът на този toot е изрязан.",
     "lang_details_txt": "Съдържанието на този toot е изрязано.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "Няма данни",
     "lang_filter_errordegree": "Моля, проверете контекстта",
     "lang_list_nodata": "Няма данни",

app/view/make/language/bg-BG/setting.json

@@ -9,6 +9,7 @@
   "default": "По подразбиране",
   "change": "Промяна",
   "select": "Избери",
+  "exec": "Exec",
   "env": "Системни предпочитания",
   "setlang": "Езици",
   "backup": "Внос и износ на предпочитания",
@@ -17,6 +18,8 @@
   "export": "Износ",
   "hardwareAcceleration": "Деактивиране на хардуерното ускорение",
   "hardwareAccelerationWarn": "Автоматичното рестартиране",
+  "webview": "Webview Integration",
+  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
   "theme": "Теми",
   "popup": "Известие с изскачащ прозорец (за Windows)",
   "popupwarn": "Скрито ако е зададено на „0“",
@@ -69,6 +72,7 @@
   "desc": "Относно тази тема",
   "customImport": "Импортиране на персонализирани теми",
   "delete": "Изтрий",
+  "preview": "Preview",
   "timeline": "Предпочитания за времевата линия",
   "timemode": "Времеви формат",
   "relativetime": "Относителен формат: „преди 1 минута“, „преди 3 дни“",
@@ -116,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Звук (Отговор)",
   "favSound": "Звук(Фаворит)",
   "btSound": "Звук(Подсилване)",

app/view/make/language/ca-ES/index.json

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/ca-ES/main.json

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",
@@ -232,6 +233,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/ca-ES/setting.json

@@ -9,6 +9,7 @@
   "default": "Default",
   "change": "Change",
   "select": "Select",
+  "exec": "Exec",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
@@ -17,6 +18,8 @@
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
+  "webview": "Webview Integration",
+  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
   "theme": "Themes",
   "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
@@ -69,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -116,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

app/view/make/language/cs-CZ/index.json

@@ -74,6 +74,7 @@
     "openBrowser": "Otevřít v prohlížeči",
     "screenshot": "Vytvořit snímek obrazovky",
     "copyURL": "Kopírovat URL tohoto tootu",
+    "copy": "Copy",
     "embed": "Vložit",
     "toots": "Tooty",
     "follow": "Sledovat",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/cs-CZ/main.json

@@ -103,6 +103,7 @@
     "lang_details_embed": "HTML pro vložení je zkopírován.",
     "lang_details_url": "URL adresa tohoto tootu je zkopírována.",
     "lang_details_txt": "Obsah tohoto tootu je zkopírován.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "Žádná data",
     "lang_filter_errordegree": "Prosím zkontrolujte kontext",
     "lang_list_nodata": "Žádná data",

app/view/make/language/cs-CZ/setting.json

@@ -9,6 +9,7 @@
   "default": "Default",
   "change": "Změnit",
   "select": "Vybrat",
+  "exec": "Exec",
   "env": "Systémové předvolby",
   "setlang": "Jazyky",
   "backup": "Import a export předvoleb",
@@ -17,6 +18,8 @@
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
+  "webview": "Webview Integration",
+  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
   "theme": "Motivy",
   "popup": "Popupová oznámení (na Windows)",
   "popupwarn": "Hide to set \"0\"",
@@ -69,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Časový formát",
   "relativetime": "Relativní formát: „před 1 minutou“, „před 3 dny“",
@@ -116,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

app/view/make/language/da-DK/index.json

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/da-DK/main.json

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

app/view/make/language/da-DK/setting.json

@@ -9,6 +9,7 @@
   "default": "Default",
   "change": "Change",
   "select": "Select",
+  "exec": "Exec",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
@@ -17,6 +18,8 @@
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
+  "webview": "Webview Integration",
+  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
   "theme": "Themes",
   "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
@@ -69,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -116,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

app/view/make/language/de-DE/index.json

@@ -1,7 +1,7 @@
 {
     "draghere": "Zum Hochladen hier her ziehen",
-    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "nowOffline": "OFFLINE: Ihr gesamter Beiträge befinden sich in Entwürfen und du solltest nach einer erneuten Internetverbindung neu laden",
-    "reOnline": "Now we are in the Internet, you should reload...",
+    "reOnline": "Jetzt haben wir wieder Internet. Du solltest neuladen...",
     "close": "Schließen",
     "webSrc": "Suche im Internet",
     "tsSrc": "Bei Tootsearch suchen",
@@ -74,6 +74,7 @@
     "openBrowser": "Im Browser öffnen",
     "screenshot": "Bildschirmfoto aufnehmen",
     "copyURL": "URL dieses Tröts kopieren",
+    "copy": "Kopieren",
     "embed": "Einbinden",
     "toots": "Tröts",
     "follow": "Folgen",
@@ -178,6 +179,7 @@
     "foundBug": "Ich habe einen Fehler gefunden",
     "show": "Zeige",
     "directory": "Verzeichnis",
+    "discover": "Entdecken",
     "active": "Kürzlich aktiv",
     "newcomer": "Neu eingetroffen",
     "local_only": "Nur lokal",

app/view/make/language/de-DE/main.json

@@ -103,6 +103,7 @@
     "lang_details_embed": "Eingefügtes HTML wurde entfernt.",
     "lang_details_url": "URL dieses Tröts wurde entfernt.",
     "lang_details_txt": "Inhalt dieses Tröts wurde entfernt.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "Keine Daten",
     "lang_filter_errordegree": "Bitte überprüfen Sie den Kontext",
     "lang_list_nodata": "Keine Daten",

app/view/make/language/de-DE/setting.json

@@ -9,6 +9,7 @@
   "default": "Standard",
   "change": "Ändern",
   "select": "Auswahl",
+  "exec": "Exec",
   "env": "Systemeinstellungen",
   "setlang": "Sprachen",
   "backup": "Import und Export von Einstellungen",
@@ -17,6 +18,8 @@
   "export": "Exportieren",
   "hardwareAcceleration": "Hardwarebeschleunigung deaktivieren",
   "hardwareAccelerationWarn": "Automatischer Neustart",
+  "webview": "Webview Integration",
+  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
   "theme": "Designs",
   "popup": "Popup-Benachrichtigung(unter Windows)",
   "popupwarn": "Bei \"0\" Ausgeschaltet.",
@@ -69,6 +72,7 @@
   "desc": "Über dieses Design",
   "customImport": "Import von eigenen Designs",
   "delete": "Löschen",
+  "preview": "Preview",
   "timeline": "Verlaufseinstellungen",
   "timemode": "Zeitformat",
   "relativetime": "Relatives Format:\"vor 1 Minuten\",\"vor 3 Tagen\"",
@@ -116,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Ton bei Antwort",
   "favSound": "Ton bei Favorit",
   "btSound": "Ton bei Verstärkung",

app/view/make/language/el-GR/index.json

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/el-GR/main.json

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

app/view/make/language/el-GR/setting.json

@@ -9,6 +9,7 @@
   "default": "Default",
   "change": "Change",
   "select": "Select",
+  "exec": "Exec",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
@@ -17,6 +18,8 @@
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
+  "webview": "Webview Integration",
+  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
   "theme": "Themes",
   "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
@@ -69,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -116,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",