TheDesk Usamin (18.6.5)

Bump electron-builder from 20.43.0 to 20.44.4 in /app

.github/FUNDING.yml

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

.gitignore

@@ -3,10 +3,7 @@
 *.7z
 *.exe
 TheDesk-*
-app/build
+build/*
-build
-make.js
-make_js.js
 app/.DS_Store
 .DS_Store
 .vs/*
@@ -15,3 +12,4 @@ enq.md
 app/.tkn
 app/node_modules
 app/js/login/tkn.js
+app/package-lock.json

.travis.yml

@@ -1,36 +1,47 @@
-language: objective-c
+os: 
-cache:
+ - windows
-  directories:
+ - linux
-    - node_modules
+ - osx
-env:
+language: node_js
-  - NODE_VERSION="10.15.2"
+node_js:
-before_install:
+- '10.15.2'
-  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
-  - source /tmp/.nvm/nvm.sh
-  - nvm install $NODE_VERSION
-  - nvm use --delete-prefix $NODE_VERSION
-  - node --version
 script: node -v
 before_deploy:
   - npm install electron-builder -g
   - cd app
+  - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
   - npm install
-  - electron-builder --mac --x64 -p never
+  - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
-  - mv ../build/TheDesk*.dmg ../TheDesk.dmg
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
-  - mv ../build/TheDesk*.zip ../TheDesk-darwin-x64.zip
+  - 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:
   provider: releases
   # GitHub にリリースするための API KEY を暗号化した値
   api_key:
     secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
   # Releases ページにアップロードするファイル
+  file_glob: true
   file:
-    - TheDesk.dmg
+    - build/*
-    - TheDesk-darwin-x64.zip
   skip_cleanup: true
   on:
     repo: cutls/TheDesk
-branches:
+    tags: true
-  only:
+    all_branches: true
-  - master

README.md

@@ -1,25 +1,26 @@
+<img src="https://thedesk.top/img/top.png" width="300" align="left">
+<img src="https://thedesk.top/img/desk.png" width="150" align="right">
+
 # TheDesk
  
 [![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
+[![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
+[![Download](https://flat.badgen.net/github/assets-dl/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
+![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
-オープンソースSNSマストドン/MisskeyのWindows/Linuxクライアント  
+オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)  
-Download:[TheDesk](https://thedesk.top)  
   
-Contact me(bug report...):GitHub Issues, mention to [Cutls@kirishima.cloud](https://kirishima.cloud/@Cutls) or toot with #Desk  
+Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)    
 
-バグレポートなど:GitHub Issuesや[Cutls@kirishima.cloud](https://kirishima.cloud/@Cutls)へのリプ,または#Deskでトゥートして下さい.  
+<a href="https://www.patreon.com/cutls"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160"></a>  
+![Screenshots1](https://thedesk.top/img/scr1.png)  
 
-### Contribute/コントリビュート
+## License
-
-Please make a pull request to ***WIP(before CI)*** brunch  
-***WIP(before CI)*** ブランチにプルリクエストをお願いします。
-
-## License/ライセンス
 
 [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  
 
-The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/)/アイコンは[クリエイティブ・コモンズ 表示-非営利-継承](https://creativecommons.org/licenses/by-nc-sa/4.0/)で提供されています。  
+The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [Press Kit](https://dl.thedesk.top/press/TheDesk+PressKit.zip)  
 
 * [PNG](https://dl.thedesk.top/press/TheDesk.png)
@@ -27,25 +28,25 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
 * [ico](https://dl.thedesk.top/press/TheDesk.ico)
 * [icns](https://dl.thedesk.top/press/TheDesk.icns)
 
-## Terms of Use/利用規約
+The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
+
+## Terms of Use
 
 * [利用規約(Terms of Use(ja))](https://thedesk.top/tos.html)
 * [プライバシーポリシー(Privacy Policy(ja))](https://thedesk.top/priv.html)
 
-## Language/言語
+## Language
 
 * 日本語(Japanese)
-* English(英語)
+* English
 
-### Translation/翻訳
+### Translation
 
 Crowdin project is available! Visit: https://translate.thedesk.top
 
-Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.top  
+## Requirement and development
 
-## Requirement/環境
+* Electron 4.2 or above(install yourself)
-
-* Electron 3.0.10(install yourself)
 * electron-dl(in package.json)
 * Jimp(in package.json)
 * font-manager(in package.json)
@@ -56,24 +57,25 @@ Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.
 * sumchecker(in package.json)
 * Ability to read unformated files!(install yourself)
 
-## Contributors/主なコントリビューター
+### Run on developer mode
 
-macOSビルダー  
+`npm run dev` on `app` folder.
 
-* [とねぢ](https://minohdon.jp/@toneji)
+## Contributors
 
-Linuxビルダー  
+Build for macOS  
 
-* [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
+* [toneji](https://minohdon.jp/@toneji)
 
-iTunes NowPlayingにアルバムアートワークを付けてくれた人
+Build for Linux  
+
+* [popn_ja](https://popon.pptdn.jp/@popn_ja)
+
+Fellow coder
 
 * [kPherox](https://www.kr-kp.com/)
 
-## Build/ビルド
+## Build
-
-Misskey(misskey.xyz) application token is not in cutls/TheDesk  
-Misskey(misskey.xyz)のトークンは含まれておりません。
 
 ```sh
 git clone https://github.com/cutls/TheDesk
@@ -82,29 +84,24 @@ npm install
 npm install --only=dev
 ```
 
-### electron-builder(推奨)
+### electron-builder(Recommended)
 Use npm scripts.  
-npm scriptsを利用します
 
 ```sh
 # Build for current platform
-# 実行している環境向けにビルド
 npm run build
 
 # Select build target
-# ターゲットを指定してビルド
 ## Windows
 npm run build:win
 
 ## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
-## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
 npm run build:all
 ```
 
 Config is all on package.json  
-ビルド設定はすべてpackage.jsonに記載しています。  
 
-### electron-packager(非推奨)
+### electron-packager
 `npm install --save-dev electron-rebuild`  
   
 Linux/macOS  
@@ -113,11 +110,8 @@ Windows
 `.\node_modules\.bin\electron-rebuild.cmd`  
   
 To install Python 2.x and Visual C++ for Windows, before running `npm install --save-dev electron-rebuild`  
-WindowsでPython 2.xやVisualC++を一発でインストールできるツールもあります(`npm install --save-dev electron-rebuild`の前に)  
 `npm install --global windows-build-tools`  
 
-日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談)  
-
 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  
@@ -130,9 +124,3 @@ macOS
 Did you find a bug with Pleroma accounts?  
 Pleroma **does not** follow Mastodon API rules completely although Pleroma developers say so.  
 Please write issues to improve TheDesk affinity with Pleroma.  
-Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  
-Issuesに書いてある問題についてはなるべく対処しますので、ぜひお知らせください。
-
-## See also/詳しく
-
-[TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)

README_ja.md

@@ -0,0 +1,132 @@
+<img src="https://thedesk.top/img/top.png" width="300" align="left">
+<img src="https://thedesk.top/img/desk.png" width="150" align="right">
+
+# TheDesk
+ 
+[![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
+[![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
+[![Download](https://flat.badgen.net/github/assets-dl/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
+![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
+Mastodon/Misskey client for PC(Windows/Linux/macOS)  
+オープンソースSNSマストドン/MisskeyのPC向けクライアント  
+Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)    
+
+[Pixiv FANBOX](https://www.pixiv.net/fanbox/creator/28105985)
+
+![Screenshots1](https://thedesk.top/img/scr1.png)  
+
+## ライセンス
+
+[GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  
+
+アイコンは[クリエイティブ・コモンズ 表示-非営利-継承](https://creativecommons.org/licenses/by-nc-sa/4.0/)で提供されています。  
+[プレスキット](https://dl.thedesk.top/press/TheDesk+PressKit.zip)  
+
+* [PNG](https://dl.thedesk.top/press/TheDesk.png)
+* [Monotone SVG](https://dl.thedesk.top/press/TheDesk.svg)
+* [ico](https://dl.thedesk.top/press/TheDesk.ico)
+* [icns](https://dl.thedesk.top/press/TheDesk.icns)
+
+標準の通知音は [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) で提供されています。
+
+## 利用規約
+
+* [利用規約](https://thedesk.top/tos.html)
+* [プライバシーポリシー](https://thedesk.top/priv.html)
+
+## 言語
+
+* 日本語
+* English(英語)
+
+### 翻訳
+  
+Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.top  
+
+## 環境
+
+* Electron 4.2以上(自分で入れて)
+* electron-dl(in package.json)
+* Jimp(in package.json)
+* font-manager(in package.json)
+  * Python 2.x(自分で入れて)
+  * VisualC++(Windows)(自分で入れて)
+* itunes-nowplaying-mac(macOS向け)(in package.json)
+* node-notifier(in package.json)
+* sumchecker(in package.json)
+* Ability to read unformated files!(自分で入れて)
+
+### デベロッパーモード
+
+`npm run dev`を`app`フォルダ内で実行
+
+## 主なコントリビューター
+
+macOSビルダー  
+
+* [とねぢ](https://minohdon.jp/@toneji)
+
+Linuxビルダー  
+
+* [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
+
+iTunes NowPlayingにアルバムアートワークを付けてくれた人
+
+* [kPherox](https://www.kr-kp.com/)
+
+## ビルド
+
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+npm install
+npm install --only=dev
+```
+
+### electron-builder(推奨)
+npm scriptsを利用します
+
+```sh
+# 実行している環境向けにビルド
+npm run build
+
+# ターゲットを指定してビルド
+## Windows
+npm run build:win
+
+## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
+npm run build:all
+```
+
+ビルド設定はすべてpackage.jsonに記載しています。  
+
+### electron-packager(非推奨)
+`npm install --save-dev electron-rebuild`  
+  
+Linux/macOS  
+`./node_modules/.bin/electron-rebuild`  
+Windows  
+`.\node_modules\.bin\electron-rebuild.cmd`  
+  
+WindowsでPython 2.xやVisualC++を一発でインストールできるツールもあります(`npm install --save-dev electron-rebuild`の前に)  
+`npm install --global windows-build-tools`  
+  
+日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談)  
+
+Windows  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite`  
+Linux  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.5 --overwrite`  
+macOS  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  
+
+## Pleromaのサポート
+
+Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  
+Issuesに書いてある問題についてはなるべく対処しますので、ぜひお知らせください。
+
+## 詳しく
+
+[TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)

app/about.html

@@ -1,9 +1,10 @@
 <!doctype html>
 <html lang="ja">
+
 <head>
     <title>TheDesk</title>
     <meta content="width=device-width,initial-scale=1.0" name="viewport">
-<link href="./css/materialize.css" type="text/css" rel="stylesheet">
+    <link href="./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">
@@ -15,9 +16,12 @@ body{
             -webkit-app-region: drag;
             cursor: move;
         }
-a,button{
+
+        a,
+        button {
             -webkit-app-region: no-drag;
         }
+
         .container {
             width: 100%;
             display: grid;
@@ -69,41 +73,50 @@ a,button{
         }
     </style>
 </head>
+
 <body class="center " style="overflow:hidden">
-<script type="text/javascript" src="./js/common/jquery.js"></script>
+    <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
     <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-<script type="text/javascript" src="./js/common/materialize.js"></script>
+    <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
-<img src="./img/desk.png" style="max-width:70%;">
+    <img src="./img/desk.png" style="max-width:62%;">
     <h5>TheDesk</h5>
-<div class='container'>
+    <div class="container">
-    <div class='area-name1'>External version</div>
+        <div class="area-name1">Display version</div>
-    <div class='area-data1' id="now"></div>
+        <div class="area-data1" id="now"></div>
-    <div class='area-name2'>Internal version</div>
+        <div class="area-name2">Internal version</div>
-    <div class='area-data2' id="ver"></div>
+        <div class="area-data2" id="ver"></div>
-    <div class='area-name3'>Chromium</div>
+        <div class="area-name3">Chromium</div>
-    <div class='area-data3' id="chrome"></div>
+        <div class="area-data3" id="chrome"></div>
-    <div class='area-name4'>Electron</div>
+        <div class="area-name4">Electron</div>
-    <div class='area-data4' id="electron"></div>
+        <div class="area-data4" id="electron"></div>
-    <div class='area-name5'>Node.js</div>
+        <div class="area-name5">Node.js</div>
-    <div class='area-data5' id="node"></div>
+        <div class="area-data5" id="node"></div>
     </div>
-  <div class="cp">Copyright &copy; TheDesk 2018 All rights reserved.<br><a href="https://thedesk.top" target="_blank">Web site</a></div>
+    <div class="cp">Copyright &copy; TheDesk 2018<br>
-<button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
+        Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
+        Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a
+            href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pawoo.net/@kPherox"
+            target="_blank">kPherox</a> and all users
+        <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️"
+            title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
+        <br><a href="https://thedesk.top" target="_blank">Web site</a></div>
+    <button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i
+            class="material-icons left">close</i>Close</button>
     <script type="text/javascript" src="./js/ui/theme.js"></script>
     <script>
+        var about = JSON.parse(localStorage.getItem("about"));
         $("#now").text(localStorage.getItem("ver"));
-    var electron = require("electron");
+        $("#node").text(about[0]);
-    var remote=electron.remote;
+        $("#chrome").text(about[1]);
-    //JSON.parse(fs.readFileSync(info_path, 'utf8'));
+        $("#electron").text(about[2]);
-    console.log(process.versions);
-    $("#node").text(process.version);
-    $("#chrome").text(process.versions.chrome);
-    $("#electron").text(process.versions.electron);
         if (location.search) {
             var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/);
             var ver = m[1];
             $("#ver").text(ver);
         }
-    
+        $(document).on('click', 'a', e => {
+            var url = $(e.target).attr('href');
+            postMessage(["openUrl", url], "*")
+            return false;
+        });
     </script>
-<script type="text/javascript" src="./js/platform/end.js"></script>

app/adobe.html

@@ -1,260 +0,0 @@
-<!doctype html>
-<html lang="ja">
-<head>
-<title>Adobe Photo Editor - TheDesk</title>
-<meta content="width=device-width,initial-scale=1.0" name="viewport">
-<link href="./css/materialize.css" type="text/css" rel="stylesheet">
-<link href="./css/themes.css" type="text/css" rel="stylesheet">
-<link href="./css/master.css" type="text/css" rel="stylesheet">
-<link href="./css/auth.css" type="text/css" rel="stylesheet">
-<link href='./css/font-awesome.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="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
-<style>
-    #cb-drag {
-  margin-bottom: 8px;
-  padding: 24px 0;
-  text-align: center;
-}
-#cb-drag p {
-  font-weight: bold;
-  text-align: center;
-}
-#cb-file {
-  cursor: pointer;
-}
-#cb-display {
-  margin-bottom: 0;
-}
-#cb-display p {
-  margin-top: 8px;
-  margin-bottom: 0;
-  line-height: 1.4;
-}
-.cb-div {
-  padding: 16px;
-  margin-bottom: 8px;
-}
-.cb-image {
-  cursor: pointer;
-}
-
-</style>
-<meta charset="utf-8">
-</head>
-<body id="mainView">
-<script type="text/javascript" src="./js/common/jquery.js"></script>
-<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-<script type="text/javascript" src="./js/common/materialize.js"></script>
-<script type="text/javascript" src="./js/ui/tips.js"></script>
-<script type="text/javascript" src="./js/common/time.js"></script>
-<script type="text/javascript" src="./js/common/modal.js"></script>
-<div>
-        <div id="cb-drag">
-        <p>ここに画像ファイルをドラッグし、画像をクリックしてください。</p>
-        <input type="file" id="cb-file">
-        </div>
-        <div id="cb-display"></div>
-    </div>
-<script type="text/javascript" src="https://dme0ih8comzn4.cloudfront.net/imaging/v2/editor.js"></script>
-<script type="text/javascript">
-
- var dragAndDrop = (function (window, document) {
-
-"use strict";
-
-var drag = document.getElementById("mainView");
-var disp = document.getElementById("cb-display");
-var file = document.getElementById("cb-file");
-
-function makeView(data) {
-
-  var div, img, customEvent;
-  var metaData = "<p>■ファイル名: <b>" + data.name + "</b><br>■容量: <b>" + data.size + "</b>バイト</p>";
-
-  div = document.createElement("div");
-  div.setAttribute("class", "cb-div");
-
-  img = document.createElement("img");
-  img.src = data.url;
-  img.setAttribute("class", "cb-image");
-  img.style.maxWidth = "100%";
-  img.style.height = "auto";
-
-  div.appendChild(img);
-  img.insertAdjacentHTML("afterend", metaData);
-  disp.appendChild(div);
-
-  customEvent = document.createEvent("HTMLEvents");
-  customEvent.initEvent("makeView", true, false);
-  div.dispatchEvent(customEvent);
-
-}
-
-function readImage(e) {
-
-  var f = (e.dataTransfer) ? e.dataTransfer.files : e.target.files;
-
-  for (var i = 0, l = f.length; i < l; i++) {
-
-    var reader = new FileReader();
-
-    reader.onload = (function (f) {
-
-      var imageData = {};
-
-      return function (evt) {
-
-        if (f.type === "image/gif" || f.type === "image/png" || f.type === "image/jpeg") {
-
-          imageData.type = f.type;
-          imageData.name = f.name;
-          imageData.size = f.size;
-          imageData.date = f.lastModifiedDate.toLocaleDateString();
-          imageData.url = evt.target.result;
-          makeView(imageData);
-
-        } else {
-          return;
-        }
-
-      };
-
-    })(f[i]);
-
-    reader.readAsDataURL(f[i]);
-
-  }
-
-}
-
-function dragFiles() {
-
-  drag.addEventListener("drop", function (e) {
-    e.stopPropagation();
-    e.preventDefault();
-    readImage(e);
-  }, false);
-
-  drag.addEventListener("dragover", function (e) {
-    e.stopPropagation();
-    e.preventDefault();
-  }, false);
-
-}
-
-function uploadFiles() {
-
-  file.addEventListener("change", function(e) {
-    readImage(e);
-  }, false);
-
-}
-
-return {
-  init: function () {
-    dragFiles();
-    uploadFiles();
-  }
-};
-
-})(this, this.document);
-
-var photoEditor = (function (window, document) {
-
-"use strict";
-
-var featherEditor = new Aviary.Feather({
-  apiKey: "ffee425017ab44b18ce95dab98a5cdc1",
-  onSave: function(imageID, newURL) {
-    var img1 = document.getElementById(imageID);
-    img1.src = newURL;
-    var electron = require("electron");
-    var ipc = electron.ipcRenderer;
-    ipc.send('bmp-image', [newURL,0]);
-    window.close();
-  }
-});
-
-function clearImage() {
-  this.parentNode.style.display = "none";
-}
-
-function launchEditor(id, src) {
-  featherEditor.launch({
-    image: id,
-    url: src
-  });
-  return false;
-}
-
-function editPhoto() {
-  //console.log(this);
-  var id = this.getAttribute("id");
-  var src = this.getAttribute("src");
-  launchEditor(id, src);
-}
-
-function makeButton() {
-  var button = document.createElement("button");
-  button.setAttribute("style",
-    "width: 64px;"
-    + " line-height: 24px;"
-    + " background-color: #37474F;"
-    + " color: #fff;"
-    + " border: none;"
-    + " cursor: pointer;"
-    + " border-radius: 2px;"
-    + " font-size: 14px;"
-    + " position: absolute;"
-    + " text-align: center;"
-    + " top: 16px;"
-    + " right: 8px;"
-    + " padding: 0;"
-    + " z-index: 1000;"
-  );
-  button.innerHTML = "削除";
-  return button;
-}
-
-function listener() {
-
-  var disp = document.getElementById("cb-display");
-
-  disp.addEventListener("makeView", function () {
-
-    var image = document.querySelectorAll(".cb-image");
-    var button = [];
-
-    for (var i = 0, l = image.length; i < l; i++) {
-
-      button[i] = makeButton();
-      image[i].setAttribute("id", "cb-image_" + i);
-      image[i].parentNode.style.position = "relative";
-      image[i].parentNode.appendChild(button[i]);
-
-      button[i].addEventListener("click", clearImage, false);
-      image[i].addEventListener("click", editPhoto, false);
-    }
-
-  }, false);
-
-}
-
-return {
-  init: function () {
-    listener();
-  }
-};
-
-})(this, this.document);
-
-dragAndDrop.init();
-photoEditor.init();
-</script>
-
-<script type="text/javascript" src="./js/ui/theme.js"></script>
-<script type="text/javascript" src="./js/platform/end.js"></script>
-</body>
-</html>

app/build.js

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

app/css/about.css

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

app/css/font-awesome.css

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

app/css/master.css

@@ -1,5 +1,6 @@
 /*共通CSS*/
-html,body{
+html,
+body {
   /*transform: translate3d(0,0,0);*/
   overflow: hidden;
   user-select: none;
@@ -30,6 +31,8 @@ option {
 }
 #mainView {
   padding: 10px;
+  overflow: scroll;
+  height: auto;
 }
 #message {
   display: none;
@@ -40,14 +43,17 @@ option {
   color: white;
   z-index: 9999;
 }
-#imagemodal, #videomodal {
+#imagemodal,
+#videomodal {
   display: none;
   max-width: 100vw;
   max-height: 100vh;
   position: fixed;
   z-index: 9;
+  top: 0 !important;
 }
-#videomodal, #tootmodal {
+#videomodal,
+#tootmodal {
   background-color: var(--modal);
 }
 #imagemodal .modal-content {
@@ -70,7 +76,9 @@ option {
   min-width: 0 !important;
   margin-left: 5px !important;
 }
-.bbcode-pulse-loadings, .bbcode-pulse-loading, .fa-pulse {
+.bbcode-pulse-loadings,
+.bbcode-pulse-loading,
+.fa-pulse {
   display: inline-block;
   animation-duration: 3s;
   animation-fill-mode: both;
@@ -78,10 +86,13 @@ option {
   animation-name: pulse;
 }
 @keyframes pulse {
-  from, 50%, to {
+  from,
+  50%,
+  to {
     opacity: 1;
   }
-  25%, 75% {
+  25%,
+  75% {
     opacity: 0;
   }
 }
@@ -117,7 +128,8 @@ option {
   animation-iteration-count: infinite;
   animation-name: shake;
 }
-code:before, .pre:before {
+code:before,
+.pre:before {
   content: "Code";
   font-size: 1.8rem;
   line-height: 1em;
@@ -127,7 +139,8 @@ code:before, .pre:before {
   right: 0;
   top: 0;
 }
-code, pre {
+code,
+pre {
   color: white;
   display: block;
   border-left: 5px solid;
@@ -143,10 +156,12 @@ code, pre {
   border-bottom-right-radius: 10px;
   border-bottom-left-radius: 10px;
 }
-blockquote, .quote p {
+blockquote,
+.quote p {
   margin: 0;
 }
-blockquote, .quote {
+blockquote,
+.quote {
   color: black;
   background-color: #ddd;
   padding: 1em 1em 1em;
@@ -155,7 +170,8 @@ blockquote, .quote {
   border-bottom-right-radius: 10px;
   border-bottom-left-radius: 10px;
 }
-blockquote:before, .quote:before {
+blockquote:before,
+.quote:before {
   content: "Quote";
   font-size: 1.8rem;
   line-height: 1em;
@@ -220,7 +236,7 @@ blockquote:before, .quote:before {
   font-size: 2rem;
 }
 .radio {
-  font-family:'Baloo Bhai'
+  font-family: "Baloo Bhai";
 }
 #pip {
   z-index: 504;
@@ -250,7 +266,7 @@ blockquote:before, .quote:before {
   background-color: var(--modal);
 }
 #releasenote li {
-  list-style-type: disc
+  list-style-type: disc;
 }
 @media only screen and (min-width: 993px) {
   #toast-container {
@@ -284,7 +300,8 @@ blockquote:before, .quote:before {
     opacity: 0;
   }
 }
-.collapsible-header,.tabs{
+.collapsible-header,
+.tabs {
   background-color: var(--subcolor);
 }
 .modal-footer {
@@ -351,7 +368,6 @@ blockquote:before, .quote:before {
 #tltype {
   display: flex;
   flex-wrap: wrap;
-  
 }
 #tltype .type {
   display: flex;
@@ -375,7 +391,6 @@ blockquote:before, .quote:before {
   position: relative;
   color: var(--beforehover);
   left: -15px;
-
 }
 .drag-bar {
   cursor: move;
@@ -390,7 +405,52 @@ blockquote:before, .quote:before {
   padding: 4px;
 }
 #something-wrong {
-  width:100%; height:100%; position:absolute; display:flex; justify-content: center; align-items:center
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+#support-btm {
+  position: fixed;
+  bottom: -300px;
+  width: 100vw;
+  background-color: var(--box);
+  z-index: 9999;
+  padding: 10px;
+  display: grid;
+  grid-template-columns: 3fr 1fr 1fr;
+  grid-template-rows: 1fr 36px;
+  grid-template-areas: "note middle right" "note close close";
+}
+#support-btm-en,
+#support-btm-ja {
+  grid-area: note;
+}
+#support-btm-middle {
+  grid-area: middle;
+}
+#support-btm-right {
+  grid-area: right;
+}
+#support-btm-close {
+  grid-area: close;
+}
+.select-wrapper .dropdown-content {
+  width: 250px !important;
+}
+input, textarea {
+  color: var(--color);
+  font-size: 1rem !important;
+  font-family: inherit;
+}
+.swal2-popup{
+  background-color: var(--notfbox) !important;
+}
+.swal2-title, .swal2-content{
+  color: var(--color) !important;
 }
 
 /*スクロールバー*/

app/css/post.css

@@ -12,6 +12,10 @@
   padding: 5px;
   border-radius: 5px;
 }
+textarea{
+  min-height: 100px !important;
+  font-family: inherit;
+}
 
 .cancel {
   font-size: 0.5rem;
@@ -20,7 +24,6 @@
   position: absolute;
   right: 2px;
   top: 4px;
-
 }
 .more-show {
   display: none;
@@ -44,7 +47,9 @@
 #sch-box input {
   width: auto;
 }
-.picker__close, .picker__today, .picker__clear {
+.picker__close,
+.picker__today,
+.picker__clear {
   color: #26a69a !important;
 }
 .cw {
@@ -54,7 +59,6 @@
   filter: blur(50px);
 }
 #emoji {
-  
 }
 #suggest {
   max-height: 300px;
@@ -78,7 +82,7 @@
   max-height: 100px;
 }
 #default-emoji a {
-  color:white;
+  color: var(--color);
   margin-right: 2px;
 }
 .character-counter {
@@ -93,10 +97,14 @@
   display: flex;
 }
 #toot-post-btn {
-  width:calc(100% - 10px); padding:0; margin-top:10px;
+  width: calc(100% - 10px);
+  padding: 0;
+  margin-top: 10px;
 }
 #toot-sec-btn {
-  width:30px; padding:0; margin-top:10px;
+  width: 30px;
+  padding: 0;
+  margin-top: 10px;
 }
 #left-side {
   float: left;
@@ -109,7 +117,6 @@
   padding: 5px;
 }
 #poll {
-  
 }
 .poll-provider {
   position: absolute;

app/css/sort.css

@@ -1,4 +1,3 @@
-
 .drag-content {
   text-overflow: ellipsis;
   cursor: move;
@@ -10,7 +9,7 @@
   padding: 3px;
   display: grid;
   grid-template-columns: 43px 1fr 60px;
-    grid-template-areas: 'sorticon sorttitle sorttitle' 'sorticon sortacct sortaction';
+  grid-template-areas: "sorticon sorttitle sorttitle" "sorticon sortacct sortaction";
 }
 .sorticon {
   grid-area: sorticon;

app/css/tl.css

@@ -1,14 +1,13 @@
 /*TL CSS(ただしBBCode pulse:master.css/spin:font-awesome*/
 #main {
-  display:flex;
   width: 100vw;
+  height: calc(100vh - 40px);
 }
 #timeline-container {
   overflow-x: scroll;
   overflow-y: hidden;
   display: flex;
-  height: calc(100vh - 40px);
+  height: 100%;
-  flex-grow:4;
 }
 #bottom {
   position: absolute;
@@ -87,8 +86,13 @@
   font-size: 15px;
 }
 @media screen and (max-width: 890px) {
-  .btnsgroup .grouptitle{ display: none; }
+  .btnsgroup .grouptitle {
-  #tips,#tips-menu{ display: none; }
+    display: none;
+  }
+  #tips,
+  #tips-menu {
+    display: none;
+  }
 }
 iframe {
   max-width: 100%;
@@ -120,34 +124,67 @@ iframe {
 .bbcode_FTL {
   display: none;
 }
+.marquee {
+  width: 100%;
+  padding: .5em 0;
+  overflow: hidden;
+  margin-bottom: 0;
+  position: relative;
+}
+.marquee .bbcode-marq-lateral {
+  margin: 0;
+  padding-left: 100%;
+  display: inline-block;
+  white-space: nowrap;
+  animation-name: marquee;
+  animation-timing-function: linear;
+  animation-duration: 10s;
+  animation-iteration-count: infinite;
+}
+@keyframes marquee {
+0% {
+  -webkit-transform: translate(0);
+  transform: translate(0);
+}
+99%, 100% {
+  -webkit-transform: translate(-100%);
+  transform: translate(-100%);
+}
+}
 .boxIn {
+  display: flex;
+  flex-direction: column;
   height: 100%;
   border: thin solid gray;
   overflow: hidden;
 }
-.box .pin,#his-data .pin{
+.box .pin,
+#his-data .pin {
   display: none;
 }
 .user {
   cursor: text;
   font-size: 1.1rem;
 }
-.emoji,.emoji-img{
+.emoji,
+.emoji-img {
   width: 15px;
 }
-.area-toot .emoji,.area-toot .emoji-img{
+.area-toot .emoji,
+.area-toot .emoji-img {
   width: 20px;
   vertical-align: middle;
-  margin: -3px 0 0;
+  margin: -1px 0;
 }
 .faicon_FTL {
   display: none;
 }
 .tl-box {
   position: relative;
-  height:calc(100% - 40px);
+  flex: 1;
   overflow-y: scroll;
-  overflow-x:hidden }
+  overflow-x: hidden;
+}
 .additional {
   overflow-x: scroll;
   width: 100%;
@@ -170,9 +207,14 @@ iframe {
   width: 100%;
   display: grid;
   grid-template-columns: 43px 2fr 1fr;
-  grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'icon toot toot' 'vis additional additional' 'actions actions side';
+  grid-template-areas: "notice notice notice" "icon display_name display_name" "icon toot toot" "vis additional additional" "actions actions side";
 }
-.cvo h1,.cvo h2,.cvo h3,.cvo h4,.cvo h5,.cvo h6{
+.cvo h1,
+.cvo h2,
+.cvo h3,
+.cvo h4,
+.cvo h5,
+.cvo h6 {
   margin: 0;
 }
 
@@ -199,7 +241,7 @@ text-overflow: ellipsis;
   display: flex;
   justify-content: space-between;
   width: 100%;
-  flex-wrap:nowrap
+  flex-wrap: nowrap;
 }
 .flex-name {
   max-width: calc(100% - 60px);
@@ -249,6 +291,29 @@ grid-area: toot;
   margin: 2px;
   grid-area: side;
 }
+
+.quote-renote {
+  display: grid;
+  grid-template-columns: 43px 2fr 1fr;
+  grid-template-areas: "ricon ruser" "ricon rtext";
+  border: 1px solid;
+  margin-top: 3px;
+  padding: 1px;
+  border-radius: 3px;
+}
+.renote-icon {
+  grid-area: ricon;
+}
+.renote-icon img {
+  width: 43px;
+}
+.renote-user {
+  grid-area: ruser;
+}
+.renote-text {
+  grid-area: rtext;
+}
+
 .btn-flat {
   color: var(--color);
 }
@@ -285,7 +350,6 @@ grid-area: toot;
 .toot-img {
   object-fit: cover;
   width: 100%;
-  margin-right:1px;
 }
 .toot img:not(.emoji-img) {
   max-width: 100%;
@@ -321,6 +385,7 @@ grid-area: toot;
 p {
   margin: 0;
   margin-bottom: 0px;
+  line-height: 20px;
 }
 p:not(:last-child) {
   margin-bottom: 10px;
@@ -347,7 +412,7 @@ p:not(:last-child){
   display: grid;
   grid-template-columns: 40px 48px 1fr 24px;
   grid-template-rows: 30px 30px;
-  grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
+  grid-template-areas: "notice notice_name notice_name a2" "notice a1 sta a3" "notf-box notf-box notf-box notf-box";
 }
 .emp {
   font-weight: bold;
@@ -433,7 +498,9 @@ p:not(:last-child){
   border: thin solid gray;
   border-bottom: 2px solid white;
   grid-area: notf-box;
-  box-shadow:0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.3), 0px -10px 10px 0px rgba(0,0,0,0.3) inset;
+  box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14),
+    0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.3),
+    0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset;
 }
 #src-contents {
   min-height: 100px;
@@ -456,7 +523,7 @@ p:not(:last-child){
   content: "...";
 }
 .toot a:not(.mention) span:last-of-type {
-  display:none;
+  /*display: none;*/
 }
 .tl-box .via-hide {
   display: none;
@@ -470,19 +537,19 @@ p:not(:last-child){
 }
 .fa-2x > .emoji-img {
   width: 36px !important;
-  height: 36px!important
+  height: 36px !important;
 }
 .fa-3x > .emoji-img {
   width: 54px !important;
-  height: 54px!important
+  height: 54px !important;
 }
 .fa-4x > .emoji-img {
   width: 72px !important;
-  height: 72px!important
+  height: 72px !important;
 }
 .fa-5x > .emoji-img {
   width: 90px !important;
-  height: 90px!important
+  height: 90px !important;
 }
 #lists-user {
   overflow-y: scroll;
@@ -506,7 +573,29 @@ p:not(:last-child){
   background-color: var(--color);
 }
 .jump {
-  display: inline-block; animation: jump 0.75s linear infinite;
+  display: inline-block;
+  animation: jump 0.75s linear infinite;
+}
+.img-link {
+  position: relative;
+  display: block;
+  margin-right: 1px;
+  float: left;
+}
+.nsfw-media {
+  position: absolute;
+  top: 0;
+  right: 0;
+  background-color: black;
+  color: white;
+}
+.img-link img {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+audio{
+  height: 2rem;
 }
 @keyframes jump {
   0% {
@@ -560,4 +649,3 @@ p:not(:last-child){
   animation-duration: 0.1s;
   animation-name: fadeInDown;
 }
-

app/css/userdata.css

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

app/dist/builder-effective-config.yaml

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

app/js/common/about.js

@@ -1,6 +1,4 @@
 //このソフトについて
 function about() {
-		var electron = require("electron");
+	postMessage(["sendSinmpleIpc", "about"], "*")
-		var ipc = electron.ipcRenderer;
-		ipc.send('about', 'go');
 }

app/js/common/blurhash.js

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

app/js/common/keyshortcut.js

@@ -20,7 +20,6 @@ $(function($) {
 					return false;
 				}
 			}
-			
 		}
 		//Ctrl+Enter:投稿
 		if (event.metaKey || event.ctrlKey && wv) {
@@ -36,14 +35,6 @@ $(function($) {
 				return false;
 			}
 		}
-		
-		//Shift+Space:Markdownゼロ幅スペース
-		if (event.shiftKey) {
-			if (e.keyCode === 32) {
-				brInsert("​");
-				return false;
-			}
-		}
 		//Esc:消す
 		if (e.keyCode === 27 && wv) {
 			hide();
@@ -54,14 +45,6 @@ $(function($) {
 			location.href = "index.html";
 			return false;
 		}
-		//Ctrl+R:ランキング
-		if ((event.metaKey || event.ctrlKey) && wv) {
-			if (e.keyCode === 82) {
-				if(localStorage.getItem("kirishima")){
-					window.open("https://astarte.thedesk.top");
-				}
-			}
-		}
 		//Ctrl+Sift+C:全消し
 		if (((event.metaKey || event.ctrlKey) && event.shiftKey) && wv) {
 			if (e.keyCode === 67) {

app/js/common/modal.js

@@ -1,8 +1,17 @@
 //モーダル・ドロップダウンの各種設定
 $(document).ready(function () {
   // the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered
-    $('.modal').modal();
+  $('.modal').modal({
-	  $('.dropdown-button').dropdown({
+    inDuration: 300,
+    outDuration: 225,
+    constrainWidth: false, // Does not change width of dropdown to that of the activator
+    hover: false, // Activate on hover
+    gutter: 0, // Spacing from edge
+    belowOrigin: false, // Displays dropdown below the button
+    alignment: 'left', // Displays dropdown with edge aligned to the left of button
+    stopPropagation: false
+  });
+  $('.dropdown-trigger').dropdown({
     inDuration: 300,
     outDuration: 225,
     constrainWidth: false, // Does not change width of dropdown to that of the activator
@@ -13,5 +22,5 @@ $(document).ready(function(){
     stopPropagation: false // Stops event propagation
   }
   );
-     
+  $('.collapsible').collapsible();
 });

app/js/common/sha256.js

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

app/js/common/version.js

@@ -1,9 +1,23 @@
 //バージョンチェッカー
 function verck(ver) {
-	console.log("Welcome")
+	console.log("%c Welcome😊", "color: red;font-size:200%;")
-	if(localStorage.getItem("ver")!=ver){
+	var date = new Date();
+	var show = false
+	if (localStorage.getItem("ver") != ver && localStorage.getItem("winstore")) {
+		//ちょっと削除とリンク解析の都合上アレ(s)
+		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
+		if (!localStorage.getItem("usamin_18_6_5_flag")) {
+			localStorage.setItem("usamin_18_6_5_flag", true)
+			var multi = localStorage.getItem("column");
+			var obj = JSON.parse(multi);
+			for (var i = 0; i < obj.length; i++) {
+				localStorage.removeItem("card_" + i);
+			}
+		}
+		//ちょっと削除とリンク解析の都合上アレ(e)
 		localStorage.setItem("ver", ver);
-		console.log("Thank you for your update");
+		show = true
+		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
 		$(document).ready(function () {
 			$('#releasenote').modal('open');
 			verp = ver.replace('(', '');
@@ -13,76 +27,39 @@ function verck(ver) {
 			verp = verp.replace(']', '');
 			verp = verp.replace(')', '');
 			verp = verp.replace(' ', '_');
-			console.log(verp);
+			console.log("%c " + verp, "color: red;font-size:200%;");
 			if (lang.language == "ja") {
 				$("#release-" + verp).show();
 			} else {
 				$("#release-en").show();
 			}
-			
 		});
 	}
-	var electron = require("electron");
+	if (!show) {
-	var remote=electron.remote;
+		console.log(show)
-	var dialog=remote.dialog;
+		if (date.getMonth() + 1 >= localStorage.getItem("showSupportMe") || !localStorage.getItem("showSupportMe")) {
-	  var platform=remote.process.platform;
+			if (date.getMonth() == 11) {
-	  if(platform=="win32"){
+				var nextmonth = 1
-		const options = {
+			} else {
-			type: 'info',
+				var nextmonth = date.getMonth() + 2
-			title: "Select your platform",
-			message: lang.lang_version_platform,
-			buttons: [lang.lang_no,lang.lang_yesno]
 			}
+			if (lang.language != "ja") {
+				$("#support-btm-ja").addClass("hide");
+				$("#support-btm-en").removeClass("hide");
+			}
+			localStorage.setItem("showSupportMe", nextmonth)
+			$("#support-btm").removeClass("hide")
+			$("#support-btm").animate({
+				'bottom': '0'
+			}, {
+					'duration': 300
+				});
+		}
+	}
+	var platform = localStorage.getItem("platform");
+	console.log("Your platform:" + platform)
 	if (!localStorage.getItem("winstore")) {
-			  
+		storeDialog(platform, ver)
-				dialog.showMessageBox(options, function(arg) {
-				  if(arg==1){
-					  localStorage.setItem("winstore","winstore")
-					}else{
-					  localStorage.setItem("winstore","localinstall")
-					}
-			  });
-		  }
-	  }else if(platform=="linux"){
-		if(localStorage.getItem("winstore")=="unix"){
-			localStorage.removeItem("winstore")
-		}
-		if(!localStorage.getItem("winstore")){
-			const options = {
-				type: 'info',
-				title: "Select your platform",
-				message: lang.lang_version_platform_linux,
-				buttons: [lang.lang_no,lang.lang_yesno]
-			  }
-			  dialog.showMessageBox(options, function(arg) {
-				if(arg==1){
-					localStorage.setItem("winstore","snapcraft")
-				  }else{
-					localStorage.setItem("winstore","localinstall")
-				  }
-			});
-		}
-	  }else if(platform=="darwin"){
-		if(localStorage.getItem("winstore")=="unix"){
-			localStorage.removeItem("winstore")
-		}
-		if(!localStorage.getItem("winstore")){
-			const options = {
-				type: 'info',
-				title: "Select your platform",
-				message: lang.lang_version_platform_mac,
-				buttons: [lang.lang_no,lang.lang_yesno]
-			  }
-			  dialog.showMessageBox(options, function(arg) {
-				if(arg==1){
-					localStorage.setItem("winstore","brewcask")
-				  }else{
-					localStorage.setItem("winstore","localinstall")
-				  }
-			});
-		}
-	}else{
-		  localStorage.setItem("winstore","unix")
 	}
 	if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
 		var winstore = true;
@@ -106,11 +83,9 @@ function verck(ver) {
 		todo(error);
 		console.error(error);
 	}).then(function (mess) {
-		console.log(mess);
+		console.table(mess);
 		if (mess) {
-			var electron = require("electron");
+			var platform = localStorage.getItem("platform");
-			var remote=electron.remote;
-			var platform=remote.process.platform;
 			if (platform == "darwin") {
 				var newest = mess.desk_mac;
 			} else {
@@ -125,15 +100,13 @@ function verck(ver) {
 				localStorage.removeItem("instance")
 				if (localStorage.getItem("new-ver-skip")) {
 					if (localStorage.getItem("next-ver") != newest) {
-						var ipc = electron.ipcRenderer;
+						postMessage(["sendSinmpleIpc", "update"], "*")
-						ipc.send('update', "true");
 					} else {
-						console.log(lang.lang_version_skipver);
+						console.warn(lang.lang_version_skipver);
 						todo(lang.lang_version_skipver);
 					}
 				} else {
-					var ipc = electron.ipcRenderer;
+					postMessage(["sendSinmpleIpc", "update"], "*")
-					ipc.send('update', "true");
 				}
 			}
 		}
@@ -141,9 +114,7 @@ function verck(ver) {
 	if (!localStorage.getItem("last-notice-id")) {
 		localStorage.setItem("last-notice-id", 0)
 	}
-	console.log(localStorage.getItem("last-notice-id"))
 	var start = "https://thedesk.top/notice?since_id=" + localStorage.getItem("last-notice-id");
-	console.log(start);
 	fetch(start, {
 		method: 'GET'
 	}).then(function (response) {
@@ -152,7 +123,6 @@ function verck(ver) {
 		todo(error);
 		console.error(error);
 	}).then(function (mess) {
-		console.log(mess.length);
 		if (mess.length < 1) {
 			return false;
 		} else {
@@ -164,33 +134,33 @@ function verck(ver) {
 					break;
 				} else {
 					var show = true;
-				if(obj.Toot!=""){
+					if (obj.toot != "") {
-					var toot='<button class="btn-flat toast-action" onclick="detEx(\''+obj.Toot+'\',\'main\')">Show</button>';
+						var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + '\',\'main\')">Show</button>';
 					} else {
 						var toot = "";
 					}
-				if(obj.Ver!=""){
+					if (obj.ver != "") {
-					if(obj.Ver==ver){
+						if (obj.ver == ver) {
 							show = true;
 						} else {
 							show = false;
 						}
 					}
-				if(obj.Domain!=""){
+					if (obj.domain != "") {
 						var multi = localStorage.getItem("multi");
 						if (multi) {
 							show = false;
 							var accts = JSON.parse(multi);
 							Object.keys(accts).forEach(function (key) {
 								var acct = accts[key];
-							if(acct.domain==obj.Domain){
+								if (acct.domain == obj.domain) {
 									show = true;
 								}
 							});
 						}
 					}
 					if (show) {
-					Materialize.toast(obj.Text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+						M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
 					}
 				}
 
@@ -202,18 +172,13 @@ var infostreaming=false;
 function infowebsocket() {
 	infows = new WebSocket("wss://thedesk.top/ws/");
 	infows.onopen = function (mess) {
-		console.log(tlid + ":Connect Streaming Info:");
+		console.log([tlid, ":Connect Streaming Info:", mess]);
-		console.log(mess);
 		infostreaming = true;
 	}
 	infows.onmessage = function (mess) {
-		console.log(":Receive Streaming:");
+		console.log([tlid, ":Receive Streaming:", JSON.parse(mess.data)]);
-		console.log(JSON.parse(mess.data));
 		var obj = JSON.parse(mess.data);
 		if (obj.type != "counter") {
-		if(obj.id*1<=localStorage.getItem("last-notice-id")){
-			
-		}else{
 			localStorage.setItem("last-notice-id", obj.id)
 			var show = true;
 			if (obj.toot != "") {
@@ -242,8 +207,7 @@ function infowebsocket(){
 				}
 			}
 			if (show) {
-				Materialize.toast(obj.text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+				M.toast({ html: escapeHTML(obj.Text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
-			}
 			}
 		} else {
 			$("#persons").text(obj.text);
@@ -262,7 +226,77 @@ function infowebsocket(){
 }
 setInterval(function () {
 	if (!infostreaming) {
-		console.log("try to connect")
+		console.log("try to connect to base-streaming")
 		infowebsocket();
 	}
 }, 10000);
+function openRN() {
+	$('#releasenote').modal('open');
+	if (lang.language == "ja") {
+		verp = ver.replace('(', '');
+		verp = verp.replace('.', '-');
+		verp = verp.replace('.', '-');
+		verp = verp.replace('[', '-');
+		verp = verp.replace(']', '');
+		verp = verp.replace(')', '');
+		verp = verp.replace(' ', '_');
+		$("#release-" + verp).show();
+	} else {
+		$("#release-en").show();
+	}
+}
+function closeSupport() {
+	$("#support-btm").animate({
+		'bottom': '-300px'
+	}, {
+			'duration': 300,
+			'complete': function () {
+				$("#support-btm").addClass("hide")
+			}
+		});
+}
+function storeDialog(platform, ver) {
+	if (platform == "win32") {
+		var mes = lang.lang_version_platform;
+	} else if (platform == "linux") {
+		var mes = lang.lang_version_platform_linux;
+	} else if (platform == "darwin") {
+		var mes = lang.lang_version_platform_mac;
+	}
+	Swal.fire({
+		title: "Select your platform",
+		text: mes,
+		type: 'info',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#3085d6',
+		confirmButtonText: lang.lang_no,
+		cancelButtonText: lang.lang_yesno
+	}).then((result) => {
+		//逆にしてる
+		if (!result.value) {
+			localStorage.setItem("winstore", "winstore")
+		} else {
+			localStorage.setItem("winstore", "localinstall")
+		}
+		localStorage.setItem("ver", ver);
+		show = true
+		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
+		$(document).ready(function () {
+			$('#releasenote').modal('open');
+			verp = ver.replace('(', '');
+			verp = verp.replace('.', '-');
+			verp = verp.replace('.', '-');
+			verp = verp.replace('[', '-');
+			verp = verp.replace(']', '');
+			verp = verp.replace(')', '');
+			verp = verp.replace(' ', '_');
+			console.log("%c " + verp, "color: red;font-size:200%;");
+			if (lang.language == "ja") {
+				$("#release-" + verp).show();
+			} else {
+				$("#release-en").show();
+			}
+		});
+	})
+}

app/js/emoji/default-emoji.js

@@ -42,7 +42,6 @@ function defaultEmoji(target){
     });
     $("#emoji-list").html(emojis);
     $("#now-emoji").text(lang.lang_defaultemojis_text.replace("{{cat}}", defaultemojiname[target]));
-    console.log(target);
     $(".emoji-control").addClass("hide");
 }
 function customEmoji() {
@@ -54,7 +53,12 @@ function defEmoji(target){
     var emojiraw = newpack.filter(function (item, index) {
         if (item.short_name == target) return true;
     });
-    emoji=twemoji.convert.fromCodePoint(emojiraw[0].unified);
+    var hex = emojiraw[0].unified.split("-");
+    if (hex.length === 2) {
+        emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1]);
+    } else {
+        emoji = twemoji.convert.fromCodePoint(hex[0]);
+    }
     var now = $("#textarea").val();
     var selin = localStorage.getItem("cursor");
     var now = $("#textarea").val();
@@ -65,7 +69,6 @@ function defEmoji(target){
     } else {
         newt = emoji + now;
     }
-        console.log(emoji);
     $("#textarea").val(newt);
     $("#textarea").focus();
     var selin = $("#textarea").prop('selectionStart');
@@ -76,7 +79,6 @@ function defEmoji(target){
 }
 function faicon() {
     var json = faicons;
-    console.log(json);
     var emojis = "";
     Object.keys(json).forEach(function (key) {
         var emoji = json[key];

app/js/lang/lang.en.js

@@ -21,9 +21,9 @@ var lang={
     //common/version.js
     "lang_version_usever": "No update is found({{ver}})",
     "lang_version_skipver": "Update was ignored.",
-    "lang_version_platform":"Was this software installed at Microsoft Store? When select 'yes', any update was ignored.",
+    "lang_version_platform": "Do you want auto-updates?(users installed on Microsoft Store select 'No')",
-    "lang_version_platform_linux":"Was this software installed at Snapcraft(snapd)? When select 'yes', any update was ignored.",
+    "lang_version_platform_linux": "Do you want auto-updates?(users installed on Snapcraft select 'No')",
-    "lang_version_platform_mac":"Was this software installed at Homebrew Cask? When select 'yes', any update was ignored.",
+    "lang_version_platform_mac": "Do you want auto-updates?(Homebrew Cask users select 'No')",
     //login
     //login/login.js
     "lang_login_noauth": "Show TL of unlogined accounts",
@@ -37,6 +37,7 @@ var lang={
     "lang_manager_def": "Default",
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
+    "lang_manager_logout": "Logout",
     //post/bb-md.js
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     //post/emoji.js
@@ -64,6 +65,7 @@ var lang={
     "lang_status_unblock": "Unblock",
     "lang_status_mute": "Mute",
     "lang_status_unmute": "Unmute",
+    "lang_status_redraftTitle": "Delete & redraft",
     "lang_status_redraft": "Continue to delete & redraft? You lose statuses of this toot. This fanction may contain some bugs. Images of this toot will be deleted on older than Mastodon 2.4.1.",
     "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
     "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
@@ -109,6 +111,8 @@ var lang={
     //tl/tl.js
     "lang_tl_media": "Media",
     "lang_tl_reconnect": "Reconnect to streaming API",
+    //ui/img.js
+    "lang_img_DLDone": "Downloaded:",
     //ui/layout.js
     "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
     "lang_layout_thisacct": "{{notf}} of this account",
@@ -127,6 +131,8 @@ var lang={
     "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
+    "lang_layout_deleteColumn":"Delete this column",
+    "lang_layout_deleteColumnDesc":"Delete this column",
     //ui/sort.js
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
@@ -189,10 +195,13 @@ var lang={
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
     "lang_parse_voted": "Voted",
-    "lang_parse_vote":"Voted",
+    "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
     "lang_parse_thread": "Show thread",
+    "lang_parse_unknown": "Attached file",
+    "lang_parse_nsfw": "NSFW media",
+    "lang_parse_notffilter":"Show this user's notifications",
     //misskey
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/js/lang/lang.ja.js

@@ -21,9 +21,9 @@ var lang={
     //common/version.js
     "lang_version_usever": "お使いのバージョン{{ver}}は最新です。",
     "lang_version_skipver": "アップデートはスキップされました。",
-    "lang_version_platform":"このソフトウェアはMicrosoft Storeからダウンロードされましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
+    "lang_version_platform": "このソフトウェアはMicrosoft Storeからダウンロードされましたか？通常はホームページからインストールするため「いいえ」を選んでください。「はい」を選ぶとMicrosoft Storeからアップデートが提供され、アップデートの通知を出しません。",
-    "lang_version_platform_linux":"このソフトウェアはSnapcraft(snapd)からインストールしましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
+    "lang_version_platform_linux": "このソフトウェアはSnapcraft(snapd)からインストールしましたか？通常はホームページからインストールするため「いいえ」を選んでください。「はい」を選ぶとSnapcraftからアップデートが提供され、アップデートの通知を出しません。",
-    "lang_version_platform_mac":"このソフトウェアはHomebrew Caskからインストールしましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
+    "lang_version_platform_mac": "このソフトウェアはHomebrew Caskからインストールしましたか？通常はホームページからインストールするため「いいえ」を選んでください。「はい」を選ぶとアップデートの通知を出しません。",
     //login
     //login/login.js
     "lang_login_noauth": "認証せずに見る",
@@ -37,6 +37,7 @@ var lang={
     "lang_manager_def": "既定",
     "lang_manager_none": "なし",
     "lang_manager_godev": "MisskeyのDevセンターに移動します。同時に開かれるドキュメントを参考にログインしてください。",
+    "lang_manager_logout": "ログアウト",
     //post/bb-md.js
     "lang_bbmd_misskey": "TheDeskにおけるMisskeyでは、@を返信として扱いますが、全ての@は消去され別パラメータに入力されます。また、「未収載」を「ホーム」として扱います。",
     //post/emoji.js
@@ -64,6 +65,7 @@ var lang={
     "lang_status_unblock": "ブロック解除",
     "lang_status_mute": "ミュート",
     "lang_status_unmute": "ミュート解除",
+    "lang_status_redraftTitle": "削除して再編集",
     "lang_status_redraft": "削除して再編集しますか？そのトゥートの全てのデータがリセットされます。この機能はベータ版です。画像は~v2.4.1で破棄されます。",
     "lang_status_emphas": "を強調します。リロードしてください。",
     "lang_status_unemphas": "を強調解除します。リロードしてください。",
@@ -129,6 +131,8 @@ var lang={
     "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTのみ)",
     "lang_layout_leftFold": "左へ重ねる",
     "lang_layout_leftUnfold": "右へ出す",
+    "lang_layout_deleteColumn":"カラム削除",
+    "lang_layout_deleteColumnDesc":"カラムを削除しますか？",
     //ui/sort.js
     "lang_sort_gothis": "このカラムへ",
     "lang_sort_remthis": "このカラムを削除",
@@ -184,7 +188,7 @@ var lang={
     "lang_parse_det": "詳細(メインアカウント経由)",
     "lang_parse_redraft": "このトゥートを削除して再編集",
     "lang_parse_followed": "フォローされました。",
-    "lang_parse_clientop":"クライアント処理",
+    "lang_parse_clientop": "クライアント操作",
     "lang_parse_clienttxt": " に対する処理を選択してください。",
     "lang_parse_clientno": "何もしない",
     "lang_parse_clientemp": "強調表示/解除",
@@ -195,6 +199,9 @@ var lang={
     "lang_parse_unvoted": "結果だけ見る",
     "lang_parse_endedvote": "終了済み",
     "lang_parse_thread": "会話を表示",
+    "lang_parse_unknown": "添付ファイル",
+    "lang_parse_nsfw": "閲覧注意",
+    "lang_parse_notffilter":"このユーザーの通知のみを表示",
     //misskey
     "lang_misskeyparse_renote": "再投稿",
     "lang_misskeyparse_renoteqt": "引用",

app/js/login/instance.js

@@ -90,16 +90,16 @@ var idata={
 	"dtp-mstdn.jp_bbcode": "disabled",
 	"dtp-mstdn.jp_markdown": "disabled",
 	"dtp-mstdn.jp_glitch": "disabled",
-	"misskey.xyz":"misskey",
+	"misskey.io": "misskey",
-	"misskey.xyz_name":"misskey.xyz",
+	"misskey.io_name": "misskey.io",
-	"misskey.xyz_letters":"1000",
+	"misskey.io_letters": "1000",
-	"misskey.xyz_bbcode":"disabled",
+	"misskey.io_bbcode": "disabled",
-	"misskey.xyz_markdown":"enabled",
+	"misskey.io_markdown": "enabled",
-	"misskey.xyz_public":"Global",
+	"misskey.io_public": "Global",
-	"misskey.xyz_post":"Post",
+	"misskey.io_post": "Post",
-	"misskey.xyz_fav":" reacted your post.",
+	"misskey.io_fav": " reacted your post.",
-	"misskey.xyz_bt":" reposted your post.",
+	"misskey.io_bt": " reposted your post.",
-	"misskey.dev":"misskey",
+	"misskey.dev": "misskey.dev",
 	"misskey.dev_name": "misskey.dev",
 	"misskey.dev_letters": "1024",
 	"misskey.dev_bbcode": "disabled",

app/js/login/login.js

@@ -14,23 +14,6 @@ function ck() {
 	}
 	var domainz = localStorage.getItem("domain_0");
 	var at = localStorage.getItem("acct_0_at");
-	var oldat = localStorage.getItem(domainz + "_at");
-	if(oldat){
-		console.log("Move to New Account Management System")
-		var multi = localStorage.getItem("multi");
-		if (!multi) {
-			var acctlen=1;
-		} else {
-			var obj = JSON.parse(multi);
-			var acctlen=obj.length;
-		}
-		for(i=0;acctlen>i;i++){
-			var domain = localStorage.getItem("domain_"+i);
-			var oldat = localStorage.getItem(domain + "_at");
-			var newat = localStorage.setItem("acct_"+ i + "_at",oldat);
-			localStorage.removeItem(domain + "_at");
-		}
-	}
 	//コード受信
 	if (location.search) {
 		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
@@ -43,6 +26,8 @@ function ck() {
 	}
 	var multi = localStorage.getItem("multi");
 	if (!multi || multi == "[]") {
+		var date = new Date();
+		localStorage.setItem("showSupportMe", date.getMonth() + 2)
 		location.href = "acct.html?mode=first&code=true"
 	} else {
 		var obj = JSON.parse(multi);
@@ -57,10 +42,13 @@ if (obj[0].domain) {
 			ticker();
 			multiSelector();
 			verck(ver);
+			$("#something-wrong img").attr("src", "../../img/thinkingdesk.png")
 		}
 	}
 }
 ck();
+
+
 //ログインポップアップ
 function login(url) {
 	if ($('#linux:checked').val() == "on") {
@@ -83,7 +71,6 @@ function login(url) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
 			var auth = "https://" + url + "/oauth/authorize?client_id=" + json[
 				"client_id"] + "&client_secret=" + json["client_secret"] +
 				"&response_type=code&redirect_uri=" + red + "&scope=read+write+follow";
@@ -92,15 +79,11 @@ function login(url) {
 			localStorage.setItem("client_secret", json["client_secret"]);
 			$("#auth").show();
 			$("#masara").hide();
-		const { shell } = require('electron');
+			postMessage(["openUrl", auth], "*")
-
-		  shell.openExternal(auth);
 
 			if ($('#linux:checked').val() == "on") {
 			} else {
-			var electron = require("electron");
+				postMessage(["sendSinmpleIpc", "quit"], "*")
-			var ipc = electron.ipcRenderer;
-			ipc.send('quit', 'go');
 			}
 		}
 	}
@@ -177,11 +160,9 @@ function getdata() {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
+			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
-				5000);
 			return;
 		}
 		var avatar = json["avatar"];
@@ -199,7 +180,6 @@ function getdata() {
 			vis: json["source"]["privacy"]
 		}];
 		var json = JSON.stringify(obj);
-		console.log(obj);
 		localStorage.setItem("multi", json);
 		localStorage.setItem("name_" + acct_id, json["display_name"]);
 		localStorage.setItem("user_" + acct_id, json["acct"]);
@@ -227,11 +207,9 @@ function getdataAdv(domain, at) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
+			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
-				5000);
 			return;
 		}
 		var avatar = json["avatar"];
@@ -261,7 +239,6 @@ function getdataAdv(domain, at) {
 		localStorage.setItem("user_" + target, json["acct"]);
 		localStorage.setItem("user-id_" + target, json["id"]);
 		localStorage.setItem("prof_" + target, avatar);
-		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
 		location.href = "index.html";
@@ -276,7 +253,6 @@ function refresh(target,loadskip) {
 	}
 	var start = "https://" + obj[target].domain +
 		"/api/v1/accounts/verify_credentials";
-		console.log(start);
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -289,11 +265,9 @@ function refresh(target,loadskip) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
+			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
-				5000);
 			return;
 		}
 		var avatar = json["avatar"];
@@ -313,8 +287,6 @@ function refresh(target,loadskip) {
 		localStorage.setItem("name_" + target, json["display_name"]);
 		localStorage.setItem("user_" + target, json["acct"]);
 		localStorage.setItem("user-id_" + target, json["id"]);
-		console.log("user-id_" + target+":"+json["id"])
-		console.log(localStorage.getItem("user-id_"+target));
 		localStorage.setItem("prof_" + target, avatar);
 		localStorage.setItem("follow_" + target, json["following_count"]);
 		obj[target] = ref;
@@ -374,7 +346,6 @@ function ckdb(acct_id) {
 			localStorage.removeItem("bb_" + acct_id);
 		}
 		if (json[domain + "_home"]) {
-				console.log("unique name:"+json[domain + "_home"]);
 			localStorage.setItem("home_" + acct_id, json[domain + "_home"]);
 		}
 		if (json[domain + "_local"]) {
@@ -411,8 +382,8 @@ function ckdb(acct_id) {
 		}).catch(function (error) {
 			console.error(error);
 		}).then(function (json) {
-			console.log(json);
 			if (json.error) {
+				console.error(json.error);
 				return;
 			}
 			if (json) {
@@ -446,9 +417,13 @@ function multiSelector() {
 		var last = localStorage.getItem("main");
 	} else if (localStorage.getItem("last-use")) {
 		var last = localStorage.getItem("last-use");
-	}else{
+		if (last == "webview" || last == "noauth") {
-		var last=0;
+			last = "0";
 		}
+	} else {
+		var last = "0";
+	}
+	last = last + "";
 	var sel;
 	if (obj.length < 1) {
 		$("#src-acct-sel").html('<option value="tootsearch">Tootsearch</option>');
@@ -457,7 +432,7 @@ function multiSelector() {
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key];
 			var list = key * 1 + 1;
-		if (key == last) {
+			if (key+"" === last) {
 				sel = "selected";
 				var domain = acct.domain;
 				localStorage.setItem("domain_" + key, domain);
@@ -476,12 +451,10 @@ function multiSelector() {
 				}
 				var profimg = acct.prof;
 				localStorage.setItem("prof_" + key, profimg);
-			console.log(profimg);
 				if (!profimg) {
 					profimg = "../../img/missing.svg";
 				}
 				$("#acct-sel-prof").attr("src", profimg);
-			console.log(domain);
 				if (domain) {
 					var cc = "(" + domain + ")";
 				} else {
@@ -516,8 +489,8 @@ function multiSelector() {
 		$("#src-acct-sel").append('<option value="tootsearch">Tootsearch</option>');
 		$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
 	}
-	$('select').material_select('update');
+	$('select').formSelect();
-	parseColumn();
+	parseColumn(true);
 }
 
 //バージョンエンコ

app/js/login/manager.js

@@ -32,7 +32,7 @@ function load() {
 		}
 	}
 
-	console.log(obj);
+	console.table(obj);
 	var templete;
 	Object.keys(obj).forEach(function (key) {
 		var acct = obj[key];
@@ -99,7 +99,6 @@ function data(domain) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (!json.error) {
 			$("#ins-name").text(json.name);
 			$("#ins-upd").text(date(json.checked_at, 'full'));
@@ -110,6 +109,8 @@ function data(domain) {
 			$("#ins-per").text(json.uptime * 100);
 			$("#ins-user").text(json.users);
 			$("#ins-ver").text(json.version);
+		} else {
+			console.error(json.error);
 		}
 	});
 	var start = "https://" + domain + "/api/v1/instance";
@@ -124,7 +125,6 @@ function data(domain) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (!json.error) {
 			$("#ins-title").text(json.title);
 			$("#ins-desc").html(json.description);
@@ -135,6 +135,8 @@ function data(domain) {
 			$("#ins-prof").attr('src', json.thumbnail);
 			$("#ins-admin").text(escapeHTML(json.contact_account.display_name) + "(" + json.contact_account.acct + ")");
 			$("#ins-admin").attr("href", "index.html?mode=user&code=" + json.contact_account.username + "@" + domain);
+		} else {
+			console.error(json.error);
 		}
 	});
 }
@@ -144,13 +146,22 @@ function multiDel(target) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
 	//削除確認ダイアログ
-	if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] +lang.lang_manager_confirm)) {
+	Swal.fire({
+		title: lang.lang_manager_logout,
+		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) => {
+		if (result.value) {
 			Object.keys(obj).forEach(function (key) {
 				var nk = key - 1;
 				//公開範囲(差分のみ)
 				if (key >= target) {
 					var oldvis = localStorage.getItem("vis-memory-" + key);
-				console.log(oldvis);
 					if (oldvis) {
 						localStorage.setItem("vis-memory-" + nk, oldvis);
 					}
@@ -175,7 +186,6 @@ function multiDel(target) {
 			});
 			//とりあえず消す
 			obj.splice(target, 1);
-		console.log(obj);
 			var json = JSON.stringify(obj);
 			localStorage.setItem("multi", json);
 			load();
@@ -205,18 +215,28 @@ function multiDel(target) {
 			localStorage.setItem("column", json);
 
 		}
+	})
 }
 function multiDel2(target) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
-	if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] +lang.lang_manager_confirm)) {
+	Swal.fire({
+		title: lang.lang_manager_logout,
+		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) => {
+		if (result.value) {
 			obj.splice(target, 1);
 			var json = JSON.stringify(obj);
 			localStorage.setItem("multi", json);
 			Object.keys(obj).forEach(function (key) {
 				if (key >= target) {
 					var oldvis = localStorage.getItem("vis-memory-" + key);
-			console.log(oldvis);
 					if (oldvis) {
 						var nk = key - 1;
 						localStorage.setItem("vis-memory-" + nk, oldvis);
@@ -255,6 +275,7 @@ function multiDel2(target) {
 			localStorage.setItem("column", json);
 			load();
 		}
+	})
 }
 
 //サポートインスタンス
@@ -283,11 +304,10 @@ function login(url) {
 		return;
 	}
 	if ($('#linux:checked').val() == "on") {
-		var red = "https://thedesk.top/hello.html"
+		var red = "urn:ietf:wg:oauth:2.0:oob"
 	} else {
 		var red = 'thedesk://manager';
 	}
-	console.log(red);
 	localStorage.setItem("redirect", red);
 	var start = "https://" + url + "/api/v1/apps";
 	var httpreq = new XMLHttpRequest();
@@ -303,7 +323,6 @@ function login(url) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
 			localStorage.setItem("msky", "false");
 			var auth = "https://" + url + "/oauth/authorize?client_id=" + json[
 				"client_id"] + "&client_secret=" + json["client_secret"] +
@@ -313,15 +332,9 @@ function login(url) {
 			localStorage.setItem("client_secret", json["client_secret"]);
 			$("#auth").show();
 			$("#add").hide();
-			const {
+			postMessage(["openUrl", auth], "*")
-				shell
-			} = require('electron');
-			
-			shell.openExternal(auth);
-			var electron = require("electron");
-			var ipc = electron.ipcRenderer;
 			if ($('#linux:checked').val() == "on") { } else {
-				ipc.send('quit', 'go');
+				postMessage(["sendSinmpleIpc", "quit"], "*")
 			}
 		}
 	}
@@ -363,13 +376,32 @@ function misskeyLogin(url) {
 			"reaction-read",
 			"reaction-write",
 			"vote-read",
-				"vote-write"
+			"vote-write",
+			"read:account",
+			"write:account",
+			"read:drive",
+			"write:drive",
+			"read:blocks",
+			"write:blocks",
+			"read:favorites",
+			"write:favorites",
+			"read:following",
+			"write:following",
+			"read:messaging",
+			"write:messaging",
+			"read:mutes",
+			"write:mutes",
+			"write:notes",
+			"read:notifications",
+			"write:notifications",
+			"read:reactions",
+			"write:reactions",
+			"write:votes"
 		]
 	}));
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
 			misskeyAuth(url, json.secret)
 		}
 	}
@@ -391,17 +423,13 @@ function misskeyAuth(url, mkc){
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
-			const {
-				shell
-			} = require('electron');
 			var token = json.token;
 			$("#auth").show();
 			$("#code").val(token);
 			$("#add").hide();
 			$("#misskey").prop("checked", false);
 			localStorage.setItem("domain_tmp", url);
-			shell.openExternal(json.url);
+			postMessage(["openUrl", json.url], "*")
 		}
 	}
 }
@@ -425,7 +453,6 @@ function code(code) {
 	}
 	var url = localStorage.getItem("domain_tmp");
 	localStorage.removeItem("domain_tmp");
-	console.log(localStorage.getItem("msky"));
 	if (localStorage.getItem("msky") == "true") {
 		var start = "https://" + url + "/api/auth/session/userkey";
 		var httpreq = new XMLHttpRequest();
@@ -440,7 +467,6 @@ function code(code) {
 			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
 				var i = sha256(json.accessToken + localStorage.getItem("mkc"));
-				console.log(json);
 				var avatar = json["user"]["avatarUrl"];
 				var priv = "public";
 				var add = {
@@ -462,7 +488,6 @@ function code(code) {
 				localStorage.setItem("user_" + target, json["user"]["username"]);
 				localStorage.setItem("user-id_" + target, json["user"]["id"]);
 				localStorage.setItem("prof_" + target, avatar);
-				console.log(obj);
 				var json = JSON.stringify(obj);
 				localStorage.setItem("multi", json);
 				if ($("body").hasClass("first")) {
@@ -483,7 +508,7 @@ function code(code) {
 		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({
 			grant_type: "authorization_code",
-			redirect_uri: "https://thedesk.top/hello.html",
+			redirect_uri: "urn:ietf:wg:oauth:2.0:oob",
 			client_id: id,
 			client_secret: secret,
 			code: code
@@ -491,7 +516,6 @@ function code(code) {
 		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
-				console.log(json);
 				if (json["access_token"]) {
 					$("#auth").hide();
 					$("#add").show();
@@ -517,11 +541,9 @@ function getdata(domain, at) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
+			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
-				5000);
 			return;
 		}
 		var avatar = json["avatar"];
@@ -552,7 +574,6 @@ function getdata(domain, at) {
 		localStorage.setItem("user_" + target, json["acct"]);
 		localStorage.setItem("user-id_" + target, json["id"]);
 		localStorage.setItem("prof_" + target, avatar);
-		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
 		if ($("body").hasClass("first")) {
@@ -572,7 +593,6 @@ function refresh(target) {
 	}
 	var start = "https://" + obj[target].domain +
 		"/api/v1/accounts/verify_credentials";
-		console.log(start);
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -585,11 +605,9 @@ function refresh(target) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
+			M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
-				5000);
 			return;
 		}
 		var avatar = json["avatar"];
@@ -609,8 +627,6 @@ function refresh(target) {
 		localStorage.setItem("name_" + target, json["display_name"]);
 		localStorage.setItem("user_" + target, json["acct"]);
 		localStorage.setItem("user-id_" + target, json["id"]);
-		console.log("user-id_" + target+":"+json["id"])
-		console.log(localStorage.getItem("user-id_"+target));
 		localStorage.setItem("prof_" + target, avatar);
 		obj[target] = ref;
 		var json = JSON.stringify(obj);
@@ -632,7 +648,6 @@ function misskeyRefresh(obj,target,url){
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-				console.log(json);
 			return;
 			var avatar = json["user"]["avatarURL"];
 			var priv = "public";
@@ -653,7 +668,6 @@ function misskeyRefresh(obj,target,url){
 			localStorage.setItem("user_" + target, json["user"]["username"]);
 			localStorage.setItem("user-id_" + target, json["user"]["id"]);
 			localStorage.setItem("prof_" + target, avatar);
-				console.log(obj);
 			var json = JSON.stringify(obj);
 			localStorage.setItem("multi", json);
 			load();
@@ -674,7 +688,6 @@ function multisel() {
 	var templete;
 	var last = localStorage.getItem("main");
 	var sel;
-	console.log(obj.length)
 	if (obj.length < 1) {
 		$("#src-acct-sel").html('<option value="tootsearch">Tootsearch</option>');
 		$("#add-acct-sel").html('<option value="noauth">' + lang.lang_login_noauth + '</option>');
@@ -702,12 +715,12 @@ function multisel() {
 
 		});
 	}
-	$('select').material_select('update');
+	$('select').formSelect();
 }
 function mainacct() {
 	var acct_id = $("#main-acct-sel").val();
 	localStorage.setItem("main", acct_id);
-	Materialize.toast(lang.lang_manager_mainAcct, 3000);
+	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
 }
 function colorpicker(key) {
 	temp =
@@ -788,16 +801,16 @@ input.addEventListener("focus", function() {
 					todo(error);
 					console.error(error);
 				}).then(function (json) {
-					console.log(json);
 					if (!json.error) {
-
 						var urls = "Suggest:";
 						Object.keys(json.instances).forEach(function (key) {
 							var url = json.instances[key];
 							urls = urls + '　<a onclick="login(\'' + url.name +
-								'\')" class="pointer">' + url.name + '</a>  ';
+								'\')" class="pointer">' + escapeHTML(url.name) + '</a>  ';
 						});
 						$("#ins-suggest").html(urls);
+					} else {
+						console.error(json.error);
 					}
 				});
 			}

app/js/platform/end.js

@@ -21,7 +21,6 @@
 		ats = url.match(
 			/https:\/\/([-a-zA-Z0-9.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
 		);
-		console.log(toot);
 		if (toot) {
 			if (toot[1]) {
 				var acct_id = $a.parent().attr("data-acct");
@@ -42,18 +41,13 @@
 				tl('tag', decodeURI(tags[2]), acct_id, 'add')
 			}
 		} else if (ats) {
-			console.log(ats);
 			if (ats[2]) {
 				//Quesdon判定
 				if (!~ats[2].indexOf("@")) {
 					udgEx(ats[2] + "@" + ats[1], "main");
 					return false
 				} else {
-					const {
+					postMessage(["openUrl", url], "*")
-						shell
-					} = require('electron');
-		  
-					shell.openExternal(url);
 				}
 
 
@@ -62,12 +56,11 @@
 			//hrefがhttp/httpsならブラウザで
 			if (urls) {
 				if (urls[0]) {
-			const {shell} = require('electron');
 					if (~url.indexOf("thedeks.top")) {
 						//alert("If you recieve this alert, let the developer(Cutls@kirishima.cloud) know it with a screenshot.");
 						url = "https://thedesk.top";
 					}
-			shell.openExternal(url);
+					postMessage(["openUrl", url], "*")
 				} else {
 
 					location.href = url;
@@ -81,39 +74,6 @@
 });
 
 //よく使うライブラリ
-  /*マルチバイト用切り出し*/
-  $.isSurrogatePear = function(upper, lower) {
-  	return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <= 0xDFFF;
-  };
-  $.mb_strlen = function(str) {
-  	var ret = 0;
-  	for (var i = 0; i < str.length; i++, ret++) {
-  		var upper = str.charCodeAt(i);
-  		var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
-  		if ($.isSurrogatePear(upper, lower)) {
-  			i++;
-  		}
-  	}
-  	return ret;
-  };
-  $.mb_substr = function(str, begin, end) {
-  	var ret = '';
-  	for (var i = 0, len = 0; i < str.length; i++, len++) {
-  		var upper = str.charCodeAt(i);
-  		var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
-  		var s = '';
-  		if ($.isSurrogatePear(upper, lower)) {
-  			i++;
-  			s = String.fromCharCode(upper, lower);
-  		} else {
-  			s = String.fromCharCode(upper);
-  		}
-  		if (begin <= len && len < end) {
-  			ret += s;
-  		}
-  	}
-  	return ret;
-  };
 
 //コピー
 function execCopy(string) {
@@ -123,16 +83,10 @@
 	var result = document.execCommand('copy');
 	return result;
 }
-  //Nano
-function nano(){
-    var electron = require("electron");
-    var ipc = electron.ipcRenderer;
-    ipc.send('nano', "");
-}
 function progshow(e) {
 	if (e.lengthComputable) {
 		var percent = e.loaded / e.total;
-	  console.log(percent * 100);
+		console.log("Progress: " + percent * 100);
 		$("#imgsel").hide();
 		if (percent < 1) {
 			$("#imgup").text(Math.floor(percent * 100) + "%");
@@ -141,30 +95,6 @@ function progshow(e) {
 		}
 	}
 }
-
-  var electron = require("electron");
-  var ipc = electron.ipcRenderer;
-  ipc.on('reload', function (event, arg) {
-	location.reload();
-})
-ipc.on('mess', function (event, arg) {
-    if(arg=="unzip"){
-		if(lang=="ja"){
-			$("body").text("アップデートを展開中です。");
-		}else{
-			$("body").text("Unzipping...");
-		}
-        
-    }
-})
-//Native Notf
-ipc.on('shownotf', function (event, args) {
-    if(args["type"]=="toot"){
-		details(id, acct_id)
-	}else  if(args["type"]=="userdata"){
-		udg(user, acct_id)
-	}
-})
 function opendev() {
 	var webview = document.getElementById("webview");
 	webview.openDevTools();
@@ -174,11 +104,66 @@ function opendev(){
 	  });
 	  */
 }
-
+function playSound() {
-var webviewDom = document.getElementById('webview');
+	window.AudioContext = window.AudioContext || window.webkitAudioContext;
-const {
+	context = new AudioContext();
-	shell
+	context.createBufferSource().start(0);
-} = require('electron');
+	context.decodeAudioData(request.response, function (buf) {
-webviewDom.addEventListener('new-window', function(e) {
+		console.log("Playing:" + source)
-    shell.openExternal(e.url);
+		source.buffer = buf;
+		source.loop = false;
 	});
+	source = context.createBufferSource();
+	volumeControl = context.createGain();
+	source.connect(volumeControl);
+	volumeControl.connect(context.destination);
+	volumeControl.gain.value = 0.8
+	source.start(0);
+}
+function nano() {
+	postMessage(["nano", null], "*")
+}
+onmessage = function (e) {
+	if (e.data[0] == "details") {
+		details(e.data[1][0], e.data[1][1])
+	} else if (e.data[0] == "udg") {
+		udg(e.data[1][0], e.data[1][1])
+	} else if (e.data[0] == "media") {
+		media(e.data[1][0], e.data[1][1], e.data[1][2])
+	} else if (e.data[0] == "post") {
+		post("pass")
+	} else if (e.data[0] == "toastSaved") {
+		M.toast({ html: lang.lang_img_DLDone + e.data[1][0] + '<button class="btn-flat toast-action" onclick="openFinder(\'' + e.data[1][1] + '\')">Show</button>', displayLength: 5000 })
+	} else if (e.data[0] == "parseColumn") {
+		parseColumn()
+	} else if (e.data[0] == "exportSettingsCore") {
+		exportSettingsCore()
+	} else if (e.data[0] == "fontList") {
+		fontList(e.data[1])
+	} else if (e.data[0] == "customSoundSave") {
+		customSoundSave(e.data[1][0], e.data[1][1])
+	} else if (e.data[0] == "ctLoadCore") {
+		ctLoadCore(e.data[1])
+	} else if (e.data[0] == "ctLoad") {
+		ctLoad()
+	} else if (e.data[0] == "customConnect") {
+		customConnect(e.data[1])
+	} else if (e.data[0] == "clearCustomImport") {
+		clearCustomImport()
+	} else if (e.data[0] == "npCore") {
+		npCore(e.data[1]);
+	} else if (e.data[0] == "renderMem") {
+		renderMem(e.data[1][0], e.data[1][1], e.data[1][2])
+	} else if (e.data[0] == "updateProg") {
+		updateProg(e.data[1]);
+	} else if (e.data[0] == "updateMess") {
+		updateMess(e.data[1]);
+	} else if (e.data[0] == "renderAbout") {
+		renderAbout(e.data[1]);
+	} else if (e.data[0] == "alert") {
+		Swal.fire({
+			type: 'info',
+			title: e.data[1]
+		})
+	}
+}

app/js/platform/first-not-view.js

@@ -1,3 +1 @@
 //jQuery読む
-window.jQuery = window.$ = require('./js/common/jquery.js');
-var Hammer = require('./js/common/hammer.min.js');

app/js/platform/first.js

@@ -1,6 +1,3 @@
-//jQuery読む
-window.jQuery = window.$ = require('../../js/common/jquery.js');
-var Hammer = require('../../js/common/hammer.min.js');
 $.strip_tags = function (str, allowed) {
 	if (!str) {
 		return "";
@@ -62,7 +59,7 @@ function formattime(date){
 	} else {
 		str = str + date.getMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
 function formattimeutc(date) {
 	var str = date.getUTCFullYear() + "-";
@@ -87,29 +84,9 @@ function formattimeutc(date){
 	} else {
 		str = str + date.getUTCMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
-var electron = require("electron");
+postMessage(["sendSinmpleIpc", "custom-css-request"], "*")
-var ipc = electron.ipcRenderer;
-ipc.send('custom-css-request', "");
-ipc.on('custom-css-response', function (event, arg) {
-	if(arg==""){ return false; }
-	var styleNode = document.createElement("style");
-	styleNode.setAttribute("type","text/css")
-
-	var content = document.createTextNode(arg)
-	styleNode.append(content)
-	document.getElementsByTagName("head")[0].append(styleNode)
-})
-ipc.on('theme-css-response', function (event, arg) {
-	if(arg==""){ return false; }
-	var styleNode = document.createElement("style");
-	styleNode.setAttribute("type","text/css")
-
-	var content = document.createTextNode(arg)
-	styleNode.append(content)
-	document.getElementsByTagName("head")[0].append(styleNode)
-})
 function makeCID() {
 	return randomStr(8) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(12);
 }
@@ -123,15 +100,13 @@ function randomStr(l){
 	}
 	return r;
 }
-function rgbToHex(color)
+function rgbToHex(color) {
-{
 	// HEXに変換したものを代入する変数
 	var hex = '';
 
 	// 第1引数がHEXのとき変換処理は必要ないのでそのままreturn
 	// IE8の場合はjQueryのcss()関数でHEXを返すので除外
-  if (color.match(/^#[a-f\d]{3}$|^#[a-f\d]{6}$/i))
+	if (color.match(/^#[a-f\d]{3}$|^#[a-f\d]{6}$/i)) {
-  {
 		return color;
 	}
 
@@ -139,8 +114,7 @@ function rgbToHex(color)
 	var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/);
 
 	// 正規表現でマッチしたとき
-  if (regex)
+	if (regex) {
-  {
 		var rgb =
 			[
 				// RGBからHEXへ変換
@@ -149,12 +123,10 @@ function rgbToHex(color)
 				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桁になる
 			// 1桁のときは前に0を足す
-      if (rgb[i].length == 1)
+			if (rgb[i].length == 1) {
-      {
 				rgb[i] = '0' + rgb[i];
 			}
 			hex += rgb[i];
@@ -165,3 +137,37 @@ function rgbToHex(color)
 
 	console.error(color + ':第1引数はRGB形式で入力');
 }
+/*マルチバイト用切り出し*/
+$.isSurrogatePear = function (upper, lower) {
+	return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <= 0xDFFF;
+};
+$.mb_strlen = function (str) {
+	var ret = 0;
+	for (var i = 0; i < str.length; i++ , ret++) {
+		var upper = str.charCodeAt(i);
+		var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
+		if ($.isSurrogatePear(upper, lower)) {
+			i++;
+		}
+	}
+	return ret;
+};
+$.mb_substr = function (str, begin, end) {
+	var ret = '';
+	for (var i = 0, len = 0; i < str.length; i++ , len++) {
+		var upper = str.charCodeAt(i);
+		var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
+		var s = '';
+		if ($.isSurrogatePear(upper, lower)) {
+			i++;
+			s = String.fromCharCode(upper, lower);
+		} else {
+			s = String.fromCharCode(upper);
+		}
+		if (begin <= len && len < end) {
+			ret += s;
+		}
+	}
+	return ret;
+};
+localStorage.removeItem("errors");

app/js/platform/nano.js

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

app/js/platform/preload.js

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

app/js/platform/screenshot.js

@@ -1,51 +0,0 @@
-var electron = require("electron");
-const fs = require("fs");
-const os = require('os')
-const shell = electron.shell;
-const path = require('path')
-function shot(){
-    //screenshotMsg.textContent = 'Gathering screens...'
-    $(window).height
-	let options = {
-        types: ['screen'],
-        thumbnailSize: {
-            width: window.parent.screen.width,
-            height: window.parent.screen.height
-          }
-	}
-	const desktopCapturer = electron.desktopCapturer;
-	desktopCapturer.getSources(options, function(error, sources) {
-		if (error) return console.log(error)
-
-		sources.forEach(function(source) {
-			if(location.search){
-                var m = location.search.match(/\?id=([a-zA-Z-0-9]+)/);
-                var title=m[1];
-            }else{
-                var title="screenshot";
-            }
-			if (source.name === 'Screen 1' || source.name === 'TheDesk') {
-                var durl=source.thumbnail.toDataURL();
-                var b64 = durl.match(
-                    /data:image\/png;base64,(.+)/
-                );
-                const screenshotPath = path.join(os.tmpdir(), 'screenshot.png');
-                const savePath = path.join(os.tmpdir(), 'screenshot.png');
-                    var ipc = electron.ipcRenderer;
-                    var h = $(window).height()-150;
-                    var w = $(window).width();
-                    ipc.send('shot', ['file://' + screenshotPath,w,h,b64[1],title]);
-                    if($(".img-parsed").length>0){
-                        for(i=0;i<$(".img-parsed").length;i++){
-                            var url=$(".img-parsed").eq(i).attr("data-url");
-                            ipc.send('shot-img-dl', [url,title+"_img"+i+".png"]);
-                        }
-                    }
-                    window.close();
-                    return;
-					const message = `Saved screenshot to: ${screenshotPath}`
-					//screenshotMsg.textContent = message
-			}
-		})
-	})
-      }

app/js/post/bb-md.js

@@ -40,7 +40,7 @@ function mdCheck(){
 		$("#trendtag").html("");
 	}
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		Materialize.toast(lang.lang_bbmd_misskey, 5000);
+		M.toast({ html: lang.lang_bbmd_misskey, displayLength: 5000 })
 	}
 	if (idata[domain + "_letters"]) {
 		$("#textarea").attr("data-length", idata[domain + "_letters"])

app/js/post/emoji.js

@@ -35,7 +35,7 @@ function emojiToggle(reaction) {
 
 //絵文字リスト挿入
 function emojiGet(parse, started) {
-	$('#emoji-list').html('Loading...');
+	$('#emoji-list').text('Loading...');
 	var acct_id = $("#post-acct-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
@@ -52,7 +52,7 @@ function emojiGet(parse, started) {
 			console.error(error);
 		}).then(function (json) {
 			if (parse == "true") {
-				$('#emoji-list').html('Parsing...');
+				$('#emoji-list').text('Parsing...');
 				//絵文字をマストドン公式と同順にソート
 				json.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
@@ -96,7 +96,7 @@ function emojiGet(parse, started) {
 				})
 			});
 			if (parse == "true") {
-				$('#emoji-list').html('Parsing...');
+				$('#emoji-list').text('Parsing...');
 				//絵文字をマストドン公式と同順にソート
 				md.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
@@ -179,7 +179,6 @@ function emojiInsert(code, del) {
 	} else {
 		var brank = " ";
 	}
-	console.log(selin);
 	var now = $("#textarea").val();
 	if (selin > 0) {
 		var before = now.substr(0, selin);
@@ -192,7 +191,7 @@ function emojiInsert(code, del) {
 		$("#textarea").val(newt);
 		//emoji();
 	} else {
-		var regExp = new RegExp(del, "g");
+		var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
 		var now = now.replace(regExp, "");
 		$("#textarea").val(now + brank + code);
 	}

app/js/post/img.js

@@ -36,13 +36,11 @@ $("#drag").on('dragleave', function(e) {
 
 //複数アップ
 function pimg(files) {
-	console.log(files);
+	console.table(files);
 	for (i = 0; i < files.length; i++) {
 		var dot = files[i].path.match(/\.(.+)$/)[1];
 		if (dot == "bmp" || dot == "BMP") {
-			var electron = require("electron");
+			postMessage(["bmpImage", [files[i].path, i]], "*")
-		  	var ipc = electron.ipcRenderer;
-			  ipc.send('bmp-image', [files[i].path,i]);
 			todo(lang.lang_progress);
 
 		} else {
@@ -50,18 +48,13 @@ function pimg(files) {
 		}
 	}
 }
-var electron = require("electron");
-var ipc = electron.ipcRenderer;
-ipc.on('bmp-img-comp', function (event, b64) {
-	media(b64[0],"image/png",b64[1]);
-  });
 //ドラッグ・アンド・ドロップを終了
 function closedrop() {
 	$("#drag").css('display', 'none');
 }
 //ファイル選択
 function fileselect() {
-	ipc.send('file-select', "");
+	postMessage(["sendSinmpleIpc", "file-select"], "*")
 }
 
 //ファイル読み込み
@@ -95,7 +88,6 @@ function media(b64, type, no) {
 	localStorage.setItem("image", "busy");
 	todo("Image Upload...");
 	var media = toBlob(b64, type);
-	console.log(media);
 	var fd = new FormData();
 	fd.append('file', media);
 	var acct_id = $("#post-acct-sel").val();
@@ -128,7 +120,6 @@ function media(b64, type, no) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
 			var img = localStorage.getItem("img");
 			if (json.type.indexOf("image") != -1) {
 				var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';
@@ -151,9 +142,9 @@ function media(b64, type, no) {
 			}
 			todc();
 			$(".toot-btn-group").prop("disabled", false);
-			$('select').material_select();
+			$('select').formSelect();
 			$("#mec").text(lang.lang_there);
-			Materialize.toast(lang.lang_postimg_aftupload, 1000);
+			M.toast({ html: lang.lang_postimg_aftupload, displayLength: 1000 })
 			$("#imgup").text("");
 			$("#imgsel").show();
 			localStorage.removeItem("image");
@@ -182,14 +173,13 @@ function toBlob(base64, type) {
 //画像を貼り付けたら…
 var element = document.querySelector("#textarea");
 element.addEventListener("paste", function (e) {
-	console.log(e)
 	if (!e.clipboardData || !e.clipboardData.items) {
 		return true;
 	}
 	// DataTransferItemList に画像が含まれいない場合は終了する
 	var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'));
 	if (imageItems.length == 0) {
-		console.log("not image")
+		console.warn("it is not image")
 		return true;
 	}
 
@@ -214,19 +204,17 @@ element.addEventListener("paste", function(e){
 
 	// 画像以外がペーストされたときのために、元に戻しておく
 });
-//Adobeフォトエディタ
-function adobe(){
-	var agree = localStorage.getItem("adobeagree");
-	ipc.send('adobe', agree);
-}
-ipc.on('adobeagree', function (event, arg) {
-	localStorage.setItem("adobeagree",arg);
-	});
 function deleteImage(key) {
-	console.log(key);
+	Swal.fire({
-	if(!confirm(lang.lang_postimg_delete)){
+		title: lang.lang_postimg_delete,
-		return false;
+		type: 'warning',
-	}
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
 			var media = $("#media").val();
 			var arr = media.split(",");
 			for (var i = 0; i < media.length; i++) {
@@ -238,3 +226,6 @@ function deleteImage(key){
 			$("#media").val(arr.join(","));
 			$('#preview [data-media=' + key + ']').remove();
 		}
+	})
+
+}

app/js/post/misskeystatus.js

@@ -17,7 +17,7 @@ function renote(id, acct_id, remote) {
     httpreq.onreadystatechange = function () {
         if (httpreq.readyState === 4) {
             var json = httpreq.response;
-            console.log(json);
+            console.log(["Success: renote", json]);
             $("[toot-id=" + id + "]").addClass("rted");
             $(".rt_" + id).toggleClass("teal-text");
         }
@@ -31,7 +31,7 @@ function renoteqt(id, acct_id) {
     $("#rec").text("Renote");
     $("#post-acct-sel").val(acct_id);
     $("#post-acct-sel").prop("disabled", true);
-	$('select').material_select();
+    $('select').formSelect();
     $("#textarea").attr("placeholder", lang.lang_misskeyparse_qt);
     $("#textarea").focus();
 }
@@ -43,7 +43,7 @@ function misskeyreply(id, acct_id) {
     $("#rec").text("Renote");
     $("#post-acct-sel").val(acct_id);
     $("#post-acct-sel").prop("disabled", true);
-	$('select').material_select();
+    $('select').formSelect();
     $("#textarea").attr("placeholder", lang.lang_misskeyparse_qt);
     $("#textarea").focus();
 }
@@ -63,12 +63,12 @@ function reactiontoggle(id,acct_id,tlid){
     httpreq.onreadystatechange = function () {
         if (httpreq.readyState === 4) {
             var json = httpreq.response;
-            console.log(json);
+            console.log(["Success: reaction", json]);
-            if(json.reactionCounts){
+            if (json.reactions) {
-                var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding","star"];
+                var reactions = ["like", "love", "laugh", "hmm", "surprise", "congrats", "angry", "confused", "pudding", "rip"];
                 for (var i = 0; i < reactions.length; i++) {
-                    if(json.reactionCounts[reactions[i]]){
+                    if (json.reactions[reactions[i]]) {
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
+                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
                         $("#pub_" + id + " .re-" + reactions[i]).removeClass("hide")
                     } else {
                         $("#pub_" + id + " .re-" + reactions[i] + "ct").text(0)
@@ -77,7 +77,7 @@ function reactiontoggle(id,acct_id,tlid){
                         } else {
                             $("#pub_" + id + " .re-" + reactions[i]).removeClass("hide")
                         }
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
+                        $("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
                     }
                 }
                 $("#pub_" + id + " .reactions").removeClass("hide");
@@ -102,7 +102,7 @@ function reactioncustom(acct_id,id){
     $("#unreact").hide();
     $("#addreact").removeClass("hide");
     $("#post-acct-sel").val(acct_id);
-	$('select').material_select();
+    $('select').formSelect();
     localStorage.setItem("nohide", true);
     show()
     emojiToggle(true)
@@ -121,7 +121,6 @@ function reactRefresh(acct_id,id){
         method: "POST",
         body: JSON.stringify(req),
     }
-    console.log(req)
     fetch(start, i,
     ).then(function (response) {
         return response.json();
@@ -143,21 +142,20 @@ function reactRefresh(acct_id,id){
 }
 function reactRefreshCore(json) {
     var id = json.id;
-    if(json.reactionCounts){
+    if (json.reactions) {
         $("#pub_" + id + " .reactions").removeClass("hide")
         var regExp = new RegExp(":", "g");
-        Object.keys(json.reactionCounts).forEach(function(keye) {
+        Object.keys(json.reactions).forEach(function (keye) {
             keyeClass = keye.replace(regExp, '');
-            if(json.reactionCounts[keye]){
+            if (json.reactions[keye]) {
-                console.log(json.reactionCounts[keye])
+                $("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
-                $("#pub_" + id +" .re-"+keyeClass+"ct").text(json.reactionCounts[keye])
                 $("#pub_" + id + " .re-" + keyeClass).removeClass("hide")
             } else {
                 $("#pub_" + id + " .re-" + keyeClass + "ct").text(0)
                 if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
                     $("#pub_" + id + " .re-" + keyeClass).addClass("hide")
                 }
-                $("#pub_" + id +" .re-"+keyeClass+"ct").text(json.reactionCounts[keye])
+                $("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
             }
         });
     }
@@ -234,7 +232,7 @@ function voterefresh(acct_id,id){
                     } else {
                         var myvote = "";
                     }
-                    poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
+                    poll = poll + '<div class="pointer vote" onclick="vote(\'' + acct_id + '\',\'' + json.id + '\',' + choice.id + ')">' + escapeHTML(choice.text) + '(' + choice.votes + '' + myvote + ')</div>';
                 });
                 $(".vote_" + json.id).html(poll)
             }

app/js/post/post.js

@@ -17,55 +17,43 @@ function post(mode,postvis) {
 	var acct_id = $("#post-acct-sel").val();
 	localStorage.setItem("last-use", acct_id);
 	var domain = localStorage.getItem("domain_" + acct_id);
-	if(domain=="theboss.tech"){
-		if(~str.indexOf("#")){
-			if(str.indexOf("#theboss_tech")=="-1"){
-				if(!confirm(lang.lang_post_tagTL)){
-					return false;
-				}
-			}
-		}
-	}
-	if(domain=="dtp-mstdn.jp"){
-		if(~str.indexOf("#")){
-			if(str.indexOf("#dtp")=="-1"){
-				if(!confirm(lang.lang_post_tagTL)){
-					return false;
-				}
-			}
-		}
-	}
 	if (!localStorage.getItem("cw_sentence")) {
 		var cw_sent = 500;
 	} else {
 		var cw_sent = localStorage.getItem("cw_sentence");
 	}
 	if (!localStorage.getItem("cw_letters")) {
-		var cw_ltres=500;
+		var cw_ltres = 7000;
 	} else {
 		var cw_ltres = localStorage.getItem("cw_letters");
 	}
 	if (domain != "kirishima.cloud") {
 		if (mode != "pass" && !$("#cw").hasClass("cw-avail") && (str.length > cw_sent || (str.split("\n").length - 1) > cw_ltres)) {
-		var electron = require("electron");
+			console.log("out")
-		var remote=electron.remote;
-		var dialog=remote.dialog;
 			var plus = str.replace(/\n/g, "").slice(0, 10) + "...";
-		const options = {
+			Swal.fire({
-			type: 'info',
 				title: lang.lang_post_cwtitle,
-			message: lang.lang_post_cwtxt+plus,
+				text: lang.lang_post_cwtxt + plus,
-			buttons: [lang.lang_post_btn1,lang.lang_post_btn2, lang.lang_post_btn3]
+				type: 'info',
-	  }
+				showCancelButton: true,
-	  dialog.showMessageBox(options, function(arg) {
+				confirmButtonColor: '#3085d6',
-			if(arg===1){
+				cancelButtonColor: '#3085d6',
+				confirmButtonText: lang.lang_post_btn2,
+				cancelButtonText: lang.lang_post_btn3,
+				showCloseButton: true,
+				focusConfirm: false,
+			}).then((result) => {
+				console.log(result)
+				if (result.dismiss == "cancel") {
+					//btn3:sonomama
+					post("pass")
+				} else if (result.value) {
+					//btn2:auto-CW
 					$("#cw-text").show();
 					$("#cw").addClass("yellow-text");
 					$("#cw").addClass("cw-avail");
 					$("#cw-text").val(plus);
-				post("pass");
+					post("pass")
-			}else if(arg===2){
-				post("pass");
 				}
 			})
 			return false;
@@ -104,21 +92,10 @@ function post(mode,postvis) {
 	} else {
 		var vis = $("#vis").text();
 	}
-	
 	if (vis != "inherit" && vis != "local") {
 		toot.visibility = vis;
 	} else if (vis == "local") {
 		toot.status = str + "👁️";
-	}
-	//ここに非公開・未収載タグについてwarn
-	if(domain!="kirishima.cloud" && domain!="imastodon.net"){
-	if(~str.indexOf("#")){
-		if(vis == "local" || vis=="unlisted" || vis=="direct" || vis=="private"){
-			if(!confirm(lang.lang_post_tagVis)){
-				return false;
-			}
-		}
-	}
 	}
 	if ($("#cw").hasClass("cw-avail")) {
 		var spo = $("#cw-text").val();
@@ -129,7 +106,7 @@ function post(mode,postvis) {
 	}
 	if ($("#sch-box").hasClass("sch-avail")) {
 		var scheduled = formattimeutc(new Date(Date.parse($("#sch-date").val())))
-		console.log(scheduled)
+		console.log("This toot will be posted at:" + scheduled)
 		schedule();
 		toot.scheduled_at = scheduled;
 	} else {
@@ -164,7 +141,7 @@ function post(mode,postvis) {
 			hide_totals: htt
 		}
 	}
-	console.log(toot);
+	console.table(toot);
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
@@ -218,9 +195,9 @@ function misskeyPost(){
 	}
 	var vis = $("#vis").text();
 	if (vis == "unlisted") {
-		vis=="home"
+		vis = "home"
 	} else if (vis == "direct") {
-		vis=="specified";
+		vis = "specified";
 		toot.visibleUserIds = str.match(/@([a-zA-Z0-9_@.-]+)(\s|$)/g).join('').split("@");
 	}
 	if (vis != "inherit") {
@@ -245,7 +222,7 @@ function misskeyPost(){
 				localStorage.removeItem("stable")
 			}
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: toot", json]);
 			var box = localStorage.getItem("box");
 			if (box == "yes") {
 				hide();
@@ -298,7 +275,7 @@ function clear() {
 	$("#post-acct-sel").prop("disabled", false);
 	$("#days_poll").val(0);
 	$("#hours_poll").val(0);
-	$("#mins_poll").val(0);
+	$("#mins_poll").val(6);
 	$(".mastodon-choice").map(function () {
 		$(this).val("");
 	});
@@ -306,7 +283,7 @@ function clear() {
 	if (localStorage.getItem("mainuse") == "main") {
 		$("#post-acct-sel").val(localStorage.getItem("main"));
 	}
-	$('select').material_select();
+	$('select').formSelect();
 	$("#left-side").show();
 	$("#default-emoji").show();
 	$("#unreact").show();

app/js/post/secure.js

@@ -45,11 +45,13 @@ function vis(set){
 		var acct_id = $("#post-acct-sel").val();
 		localStorage.setItem("vis-memory-" + acct_id, set);
 	}
-	$('.dropdown-button').dropdown('close');
+	var ins = M.Dropdown.getInstance($('#dropdown1'))
+	if(ins){
+		ins.close();
+	}
 }
 function loadVis() {
 	var vist = localStorage.getItem("vis");
-		console.log(vist);
 	if (!vist) {
 		vis("public");
 	} else {
@@ -123,7 +125,6 @@ function schedule(){
 
 		$("#sch-box").show();
 		$("#sch-date").val(formattime(date));
-		console.log(formattime(date));
 		$("#sch-box").addClass("sch-avail");
 	}
 }

app/js/post/status.js

@@ -43,7 +43,7 @@ function fav(id, acct_id, remote) {
 					$(".fav_" + id).addClass("yellow-text");
 				}
 			} else {
-					Materialize.toast(lang.lang_status_favWarn, 1000);
+				M.toast({ html: lang.lang_status_favWarn, displayLength: 1000 })
 			}
 		}
 	}
@@ -68,7 +68,7 @@ function rt(id, acct_id, remote) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: boost", json]);
 			if (remote != "remote") {
 				$("[toot-id=" + id + "] .fav_ct").text(json.favourites_count);
 				if (!json.reblog) {
@@ -90,7 +90,7 @@ function rt(id, acct_id, remote) {
 					$(".rt_" + id).addClass("teal-text");
 				}
 			} else {
-				Materialize.toast(lang.lang_status_btWarn, 1000);
+				M.toast({ html: lang.lang_status_btWarn, displayLength: 1000 })
 			}
 		}
 	}
@@ -128,7 +128,6 @@ function follow(acct_id,remote) {
 		var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
 		var ent = {}
 	}
-	console.log(ent);
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
@@ -138,7 +137,7 @@ function follow(acct_id,remote) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: folllow", json]);
 			if ($("#his-data").hasClass("following")) {
 				$("#his-data").removeClass("following");
 				$("#his-follow-btn").text(lang.lang_status_follow);
@@ -184,7 +183,7 @@ function block(acct_id) {
 }
 
 //ミュート
-function mute(acct_id) {
+function muteDo(acct_id) {
 	if (!acct_id) {
 		var acct_id = $('#his-data').attr("use-acct");
 	}
@@ -254,7 +253,17 @@ function del(id, acct_id) {
 }
 //redraft
 function redraft(id, acct_id) {
-	if(confirm(lang.lang_status_redraft)){
+	Swal.fire({
+		title: lang.lang_status_redraftTitle,
+		text: lang.lang_status_redraft,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
 			show();
 			del(id, acct_id);
 			$("#post-acct-sel").prop("disabled", true);
@@ -266,7 +275,7 @@ function redraft(id, acct_id){
 			$("[toot-id=" + id + "] img.toot-img").each(function (i, elem) {
 				if (i < ct) {
 					var url = $(elem).attr("src");
-				console.log(url);
+					console.log("Play back image data:" + url);
 					$('#preview').append('<img src="' + url + '" style="width:50px; max-height:100px;">');
 				}
 			});
@@ -287,6 +296,7 @@ function redraft(id, acct_id){
 				$("#cw-text").val(cwtxt);
 			}
 		}
+	})
 }
 //ピン留め
 function pin(id, acct_id) {
@@ -307,7 +317,7 @@ function pin(id, acct_id) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: pinned", json]);
 			if ($("[toot-id=" + id + "]").hasClass("pined")) {
 				$("[toot-id=" + id + "]").removeClass("pined");
 				$(".pin_" + id).removeClass("blue-text");
@@ -333,7 +343,7 @@ function request(id, flag, acct_id) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: request", "type:" + flag, json]);
 			showReq();
 		}
 	}
@@ -356,7 +366,7 @@ function domainblock(add, flag, acct_id) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
+			console.log(["Success: domain block", json]);
 			showDom();
 		}
 	}
@@ -371,11 +381,10 @@ function empUser(){
 	var usr = localStorage.getItem("user_emp");
 	var obj = JSON.parse(usr);
 	var id = $("#his-acct").attr("fullname");
-	console.log(id);
 	if (!obj) {
 		var obj = [];
 		obj.push(id);
-		Materialize.toast(id+lang.lang_status_emphas, 4000);
+		M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
 	} else {
 		var can;
 		Object.keys(obj).forEach(function (key) {
@@ -385,7 +394,7 @@ function empUser(){
 			} else {
 				can = true;
 				obj.splice(key, 1);
-				Materialize.toast(id+lang.lang_status_unemphas, 4000);
+				M.toast({ html: id + lang.lang_status_unemphas, displayLength: 4000 })
 			}
 		});
 	}
@@ -413,7 +422,6 @@ function pinUser(){
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			console.log(json);
 			if ($("#his-end-btn").hasClass("endorsed")) {
 				$("#his-end-btn").removeClass("endorsed")
 				$("#his-end-btn").text(lang.lang_status_endorse)
@@ -428,7 +436,7 @@ function pinUser(){
 //URLコピー
 function tootUriCopy(url) {
 	execCopy(url);
-	Materialize.toast(lang.lang_details_url, 1500);
+	M.toast({ html: lang.lang_details_url, displayLength: 1500 })
 }
 
 //他のアカウントで…

app/js/post/suggest.js

@@ -68,7 +68,7 @@ input.addEventListener("focus", function() {
 			var at = localStorage.getItem("acct_" + acct_id + "_at");
 			suggest = "https://" + domain + "/api/v1/search?q=" + q
 			if (suggest != oldSuggest) {
-				console.log(suggest)
+				console.log("Try to get suggest at " + suggest)
 				fetch(suggest, {
 					method: 'GET',
 					headers: {
@@ -131,7 +131,7 @@ function tagInsert(code, del) {
 	var selin = $("#textarea").prop('selectionStart');
 	if (!del) {
 	} else {
-		var regExp = new RegExp(del, "g");
+		var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
 		var now = now.replace(regExp, "");
 		selin = selin - del.length;
 	}
@@ -152,7 +152,7 @@ function tagInsert(code, del) {
 function cgNPs(q) {
 	suggest = "https://cg.toot.app/api/v1/search/light?q=" + q
 	if (suggest != oldSuggest) {
-				console.log(suggest)
+		console.log("Try to get suggest at " + suggest)
 		fetch(suggest, {
 			method: 'GET',
 			headers: {
@@ -164,12 +164,11 @@ function cgNPs(q){
 			todo(error);
 			console.error(error);
 		}).then(function (json) {
-					console.log(json);
 			if (json[0]) {
 				var tags = "";
 				Object.keys(json).forEach(function (key4) {
 					var tag = json[key4];
-							tags = tags + '<a onclick="cgNP(\''+json[key4]+'\')" class="pointer">' + json[key4] + '</a>  ';
+					tags = tags + '<a onclick="cgNP(\'' + json[key4] + '\')" class="pointer">' + escapeHTML(json[key4]) + '</a>  ';
 				});
 				$("#suggest").html("Cinderella NowPlaying:" + tags);
 			} else {

app/js/post/use-txtbox.js

@@ -15,7 +15,7 @@ function re(id,ats_cm,acct_id,mode){
 	$("#rec").text(lang.lang_yesno);
 	$("#post-acct-sel").val(acct_id);
 	$("#post-acct-sel").prop("disabled", true);
-	$('select').material_select();
+	$('select').formSelect();
 	$("#textarea").attr("placeholder", lang.lang_usetxtbox_reply);
 	$("#textarea").focus();
 	var profimg = localStorage.getItem("prof_" + acct_id);
@@ -60,5 +60,5 @@ function qt(id,acct_id,at,url){
 	}
 	$("#textarea").focus();
 	$("#post-acct-sel").val(acct_id);
-	$('select').material_select();
+	$('select').formSelect();
 }

app/js/tl/card.js

@@ -63,8 +63,8 @@ function additional(acct_id, tlid) {
 				}).then(function (json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
+							"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
-							json.description + "</span>");
+							escapeHTML(json.description) + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
 					}
@@ -80,8 +80,7 @@ function additional(acct_id, tlid) {
 		var dom = $(this);
 		var start = "./js/emoji/emoji-map.json";
 		var xmlHttpRequest = new XMLHttpRequest();
-	 xmlHttpRequest.onreadystatechange = function()
+		xmlHttpRequest.onreadystatechange = function () {
-	 {
 			if (this.readyState === 4 && this.status === 200) {
 				if (this.response) {
 					var json = this.response;
@@ -148,8 +147,8 @@ function additionalIndv(tlid, acct_id, id) {
 			}).then(function (json) {
 				if (json.title) {
 					$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
+						"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
-							json.description + "</span>");
+						escapeHTML(json.description) + "</span>");
 					$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 					$("[toot-id=" + id + "]").addClass("parsed");
 				}
@@ -170,9 +169,7 @@ function additionalIndv(tlid, acct_id, id) {
 				todo(error);
 				console.error(error);
 			}).then(function (json) {
-					console.log(json);
 				//このリンク鳥やんけ、ってとき
-					console.log(json.provider_name);
 				if (json.provider_name == "Twitter") {
 					if (json.image) {
 						var twiImg = '<br><img src="' + json.image + '" style="max-width:100%" onclick="imgv(\'twi_' + id + '\', 0, \'twitter\');" id="twi_' + id + '-image-0" data-url="' + json.image + '" data-type="image">';
@@ -243,7 +240,6 @@ function mov(id,tlid,type){
 	} else {
 		var tlide = "[tlid=" + tlid + "]";
 	}
-	console.log(tlid)
 	var mouseover = localStorage.getItem("mouseover");
 	if (!mouseover) {
 		mouseover = "";

app/js/tl/datails.js

@@ -40,7 +40,7 @@ function details(id, acct_id, tlid, mode) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
+		console.log(["Toot data:", json]);
 		if (!$("#timeline_" + tlid + " #pub_" + id).length) {
 			var html = parse([json], '', acct_id);
 			$("#toot-this").html(html);
@@ -91,6 +91,9 @@ function details(id, acct_id, tlid, mode) {
 		}
 		beforeToot(id, acct_id, dom);
 		userToot(id, acct_id, uid);
+		afterToot(id, acct_id, dom);
+		afterUserToot(id, acct_id, uid);
+		afterFTLToot(id, acct_id, dom);
 		faved(id, acct_id);
 		rted(id, acct_id);
 		if ($("#toot-this div").hasClass("cvo")) {
@@ -99,7 +102,7 @@ function details(id, acct_id, tlid, mode) {
 			$("#toot-this").addClass("cvo");
 		}
 		if (!$("#activator").hasClass("active")) {
-			$('#det-col').collapsible('open', 1);
+			$('#det-col').collapsible('open', 4);
 		}
 
 	});
@@ -205,7 +208,6 @@ function context(id, acct_id) {
 	}).then(function (json) {
 		if (localStorage.getItem("mode_" + domain) == "misskey") {
 			json.reverse();
-			console.log(json);
 			var templete = misskeyParse(json, '', acct_id, "", "", []);
 			$("#toot-reply").html(templete);
 			$("#toot-reply .hide").html(lang.lang_details_filtered);
@@ -332,6 +334,81 @@ function userToot(id, acct_id, user) {
 	}
 
 }
+//後のLTL
+function afterToot(id, acct_id, domain) {
+	//var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain +
+		"/api/v1/timelines/public?local=true&min_id=" + id;
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var templete = parse(json, 'noauth', acct_id);
+		if (templete != "") {
+			$("#ltl-after .no-data").hide();
+		}
+		$("#ltl-after").html(templete);
+		jQuery("time.timeago").timeago();
+	});
+}
+//後のUTL
+function afterUserToot(id, acct_id, user) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses?min_id=" + id;
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var templete = parse(json, '', acct_id);
+		if (templete != "") {
+			$("#user-after .no-data").hide();
+		}
+		$("#user-after").html(templete);
+		jQuery("time.timeago").timeago();
+	});
+}
+//後のFTL
+function afterFTLToot(id, acct_id, domain) {
+	//var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain +
+		"/api/v1/timelines/public?min_id=" + id;
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		var templete = parse(json, 'noauth', acct_id);
+		if (templete != "") {
+			$("#ftl-after .no-data").hide();
+		}
+		$("#ftl-after").html(templete);
+		jQuery("time.timeago").timeago();
+	});
+}
 
 //ふぁぼ一覧
 function faved(id, acct_id) {
@@ -389,10 +466,10 @@ function cbCopy(mode){
 	if (mode == "emb") {
 		var emb = '<iframe src="' + url + '/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe><script src="https://' + domain + '/embed.js" async="async"></script>';
 		execCopy(emb)
-		Materialize.toast(lang.lang_details_embed, 1500);
+		M.toast({ html: lang.lang_details_embed, displayLength: 1500 })
 	} else {
 		if (execCopy(url)) {
-			Materialize.toast(lang.lang_details_url, 1500);
+			M.toast({ html: lang.lang_details_url, displayLength: 1500 })
 		}
 
 	}
@@ -404,11 +481,11 @@ function staCopy(id){
 	html = html.replace(/<br\s?\/?>/, "\n");
 	html = html.replace(/<p>/, "\n");
 	html = html.replace(/<\/p>/, "\n");
-	console.log(html);
+	console.log("Copy it:\n" + html);
 	html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, "$1");
 	html = $.strip_tags(html);
 	if (execCopy(html)) {
-		Materialize.toast(lang.lang_details_txt, 1500);
+		M.toast({ html: lang.lang_details_txt, displayLength: 1500 })
 	}
 
 }
@@ -427,7 +504,7 @@ function trans(tar,to){
 	}
 	$("#toot-this .additional").text("Loading...(Powered by Google Translate)");
 	var exec = 'https://script.google.com/macros/s/AKfycbxhwW5tjjop9Irg-y1zr_WsXlCKEzwWG6KuoOt_vVRDfEbRv0c/exec?format=json&text=' + encodeURIComponent(html) + '&source=' + tar + '&target=' + to
-	console.log(exec);
+	console.log("Try to translate from " + tar + " to " + to + " at " + exec);
 	fetch(exec, {
 		method: 'GET',
 	}).then(function (response) {
@@ -442,11 +519,7 @@ function trans(tar,to){
 //ブラウザで開く
 function brws() {
 	var url = $("#tootmodal").attr("data-url");
-	const {
+	postMessage(["openUrl", url], "*")
-		shell
-	} = require('electron');
-
-	shell.openExternal(url);
 }
 //外部からトゥート開く
 function detEx(url, acct_id) {
@@ -469,11 +542,7 @@ function detEx(url,acct_id){
 		console.error(error);
 	}).then(function (json) {
 		if (!json.statuses) {
-			const {
+			postMessage(["openUrl", url], "*")
-				shell
-			} = require('electron');
-  
-			shell.openExternal(url);
 		} else {
 			var id = json.statuses[0].id;
 			$(".loadp").text($(".loadp").attr("href"));

app/js/tl/dm.js

@@ -57,7 +57,6 @@ function dmmore(tlid){
 }
 //DMオブジェクトパーサー(トゥート)
 function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
-	console.log(obj);
 	var templete = '';
 	if (obj[0]) {
 		localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, 'unix'));
@@ -251,7 +250,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var via = '';
 			viashow = "hide";
 		} else {
-			var via = toot.application.name;
+			var via = escapeHTML(toot.application.name);
 			//強調チェック
 			Object.keys(emp).forEach(function (key6) {
 				var cli = emp[key6];
@@ -432,7 +431,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				if (word) {
 					var word = word.tag;
 					var regExp = new RegExp(word, "g");
-					content=content.replace(regExp,'<span class="emp">'+word+"</span>");
+					content = content.replace(regExp, '<span class="emp">' + escapeHTML(word) + "</span>");
 				}
 			});
 		}
@@ -483,7 +482,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				for (var i = 0; i < tickerdata.length; i++) {
 					var value = tickerdata[i];
 					if (value.domain == thisdomain) {
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+						var tickerdom = '<div style="background:linear-gradient(to left,transparent, ' + value.bg + ' 96%) !important; color:' + value.text + ';width:100%; height:0.9rem; font-size:0.8rem;"><img src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + '</span></div>';
 						break;
 					}
 				}

app/js/tl/filter.js

@@ -114,7 +114,6 @@ function filter(){
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/filters"
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -127,7 +126,6 @@ function filter(){
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json) {
 			var filters = "";
 			Object.keys(json).forEach(function (key) {
@@ -167,7 +165,6 @@ function makeNewFilter(){
 	if ($("#conv_filter:checked").val()) {
 		cont.push("thread");
 	}
-	console.log(cont);
 	if (!cont.length) {
 		$("#filtered-words").html('Error:' + lang.lang_filter_errordegree);
 	}
@@ -235,7 +232,6 @@ function filterEdit(id,acct_id){
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/filters/" + id
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -248,7 +244,6 @@ function filterEdit(id,acct_id){
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json) {
 			var now = new Date();
 			now = now.getTime();
@@ -297,7 +292,6 @@ function getFilter(acct_id){
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
 		var start = "https://" + domain + "/api/v1/filters"
-	console.log(start)
 		fetch(start, {
 			method: 'GET',
 			headers: {
@@ -341,7 +335,6 @@ function filterUpdate(acct_id){
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/filters"
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -377,7 +370,7 @@ function filterUpdateInternal(json,type){
 			var text = $(elem).find('.toot').html();
 			Object.keys(home).forEach(function (key8) {
 				var word = home[key8];
-						var regExp = new RegExp( word, "g" );
+				var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
 				if ($.strip_tags(text).match(regExp)) {
 					$("[toot-id=" + id + "]").addClass("hide");
 				}
@@ -393,45 +386,34 @@ function filterUpdateInternal(json,type){
 */
 //通知フィルター
 function exclude(key) {
-	var excludetxt="";
+	localStorage.setItem("exclude-" + key, "")
+	var excludetxt = localStorage.getItem("exclude-" + key);
 	if ($('#exc-reply-' + key + ':checked').val()) {
 		excludetxt = "?exclude_types[]=mention"
-		var reply=true
-	}else{
-		var reply=false;
 	}
 	if ($('#exc-fav-' + key + ':checked').val()) {
-		if(reply){
+		if (excludetxt || excludetxt !="") {
 			excludetxt = excludetxt + "&exclude_types[]=favourite"
 		} else {
 			excludetxt = "?exclude_types[]=favourite"
 		}
-		var fav=true
-	}else{
-		var fav=false;
 	}
 	if ($('#exc-bt-' + key + ':checked').val()) {
-		if(reply || fav){
+		if (excludetxt || excludetxt !="") {
 			excludetxt = excludetxt + "&exclude_types[]=reblog"
 		} else {
 			excludetxt = "?exclude_types[]=reblog"
 		}
-		var bt=true
-	}else{
-		var bt=false;
 	}
 	if ($('#exc-follow-' + key + ':checked').val()) {
-		if(reply || bt || fav){
+		if (excludetxt || excludetxt !="") {
 			excludetxt = excludetxt + "&exclude_types[]=follow"
 		} else {
 			excludetxt = "?exclude_types[]=follow"
 		}
-		var follow=true;
-	}else{
-		var follow=false;
 	}
 	if ($('#exc-poll-' + key + ':checked').val()) {
-		if(reply || bt || fav || follow){
+		if (excludetxt || excludetxt !="") {
 			excludetxt = excludetxt + "&exclude_types[]=poll"
 		} else {
 			excludetxt = "?exclude_types[]=poll"
@@ -452,3 +434,25 @@ function excludeCk(key,target){
 		return "";
 	}
 }
+function checkNotfFilter(tlid){
+	var excludetxt = localStorage.getItem("exclude-" + tlid);
+	if(!excludetxt || excludetxt != ""){
+		return true;
+	}else{
+		return false;
+	}
+}
+function resetNotfFilter(tlid){
+	localStorage.setItem("exclude-" + tlid, "")
+	parseColumn();
+}
+function notfFilter(id,tlid,acct_id){
+	var excludetxt = localStorage.getItem("exclude-" + tlid);
+	if (excludetxt || excludetxt !="") {
+		excludetxt = excludetxt + "&account_id="+id
+	} else {
+		excludetxt = "?account_id="+id
+	}
+	localStorage.setItem("exclude-" + tlid, excludetxt)
+	parseColumn();
+}

app/js/tl/list.js

@@ -30,7 +30,7 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function (key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+					lists = lists + escapeHTML(list.title) + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
 						'\')" class="pointer">' + lang.lang_list_show + '</a><br>';
 				});
 				$("#lists").html(lists);
@@ -40,7 +40,6 @@ function list(){
 		});
 	} else {
 		var start = "https://" + domain + "/api/v1/lists"
-		console.log(start)
 		fetch(start, {
 			method: 'GET',
 			headers: {
@@ -57,7 +56,7 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function (key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+					lists = lists + escapeHTML(list.title) + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
 						'\')" class="pointer">' + lang.lang_list_show + '</a>/<a onclick="listUser(\'' + list.id + '\',' + acct_id +
 						')" class="pointer">' + lang.lang_list_users + '</a><br>';
 				});
@@ -75,7 +74,6 @@ function makeNewList(){
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
 		var start = "https://" + domain + "/api/v1/lists"
-	console.log(start)
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
@@ -93,7 +91,6 @@ function makeNewList(){
 		}
 	} else {
 		var start = "https://" + domain + "/api/users/lists/create"
-	console.log(start)
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
@@ -119,7 +116,6 @@ function listUser(id,acct_id){
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -149,7 +145,6 @@ function hisList(user,acct_id){
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
 		var start = "https://" + domain + "/api/v1/lists"
-	console.log(start)
 		fetch(start, {
 			method: 'GET',
 			headers: {
@@ -175,7 +170,6 @@ function hisList(user,acct_id){
 			}
 		});
 		var start = "https://" + domain + "/api/v1/accounts/" + user + "/lists"
-	console.log(start)
 		fetch(start, {
 			method: 'GET',
 			headers: {
@@ -193,7 +187,7 @@ function hisList(user,acct_id){
 				Object.keys(json).forEach(function (key) {
 					var list = json[key];
 					lists = lists + '<a onclick="listRemove(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
-					'\')" class="pointer">'+list.title+'</a><br> ';
+						'\')" class="pointer">' + escapeHTML(list.title) + '</a><br> ';
 				});
 				$("#his-lists-b").html(lists);
 			} else {
@@ -217,7 +211,7 @@ function hisList(user,acct_id){
 				var lists = "";
 				Object.keys(json).forEach(function (key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+					lists = lists + list.title + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
 						'\')" class="pointer">' + lang.lang_list_show + '</a>/<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
 						'\')" class="pointer">' + lang.lang_list_add + lang.lang_list_add_misskey + '</a><br>';
 				});
@@ -245,7 +239,6 @@ function listAdd(id,user,acct_id){
 			account_ids: [user]
 		}
 	}
-	console.log(start)
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
@@ -277,7 +270,6 @@ function listRemove(id,user,acct_id){
 			account_ids: [user]
 		}
 	}
-	console.log(start)
 	var httpreq = new XMLHttpRequest();
 	httpreq.open(method, start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');

app/js/tl/misskeyparse.js

@@ -50,14 +50,18 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		native = "yes";
 	}
 	//クライアント強調
-	var emp = localStorage.getItem("client_emp");
+	var empCli = localStorage.getItem("client_emp");
-	if(emp){
+	if (empCli) {
-		var emp = JSON.parse(emp);
+		var empCli = JSON.parse(empCli);
+	} else {
+		var empCli = [];
 	}
 	//クライアントミュート
-	var mute = localStorage.getItem("client_mute");
+	var muteCli = localStorage.getItem("client_mute");
-	if(mute){
+	if (muteCli) {
-		var mute = JSON.parse(mute);
+		var muteCli = JSON.parse(muteCli);
+	} else {
+		var muteCli = [];
 	}
 	//ユーザー強調
 	var useremp = localStorage.getItem("user_emp");
@@ -65,17 +69,19 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		var useremp = JSON.parse(useremp);
 	}
 	//ワード強調
-	var wordemp = localStorage.getItem("word_emp");
+	var wordempList = localStorage.getItem("word_emp");
-	if(wordemp){
+	if (wordempList) {
-		var wordemp = JSON.parse(wordemp);
+		var wordempList = JSON.parse(wordempList);
 	}
 	//ワードミュート
-	var wordmute = localStorage.getItem("word_mute");
+	var wordmuteList = localStorage.getItem("word_mute");
-	if(wordmute){
+	if (wordmuteList) {
-		var wordmute = JSON.parse(wordmute);
+		var wordmuteList = JSON.parse(wordmuteList);
-		wordmute = wordmute.concat(mutefilter);
+		if (wordmuteList) {
+			wordmuteList = wordmuteList.concat(mutefilter);
+		}
 	} else {
-		wordmute = mutefilter;
+		wordmuteList = mutefilter;
 	}
 	//Ticker
 	var tickerck = localStorage.getItem("ticker_ok");
@@ -203,8 +209,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					"congrats": "🎉",
 					"amgry": "💢",
 					"confused": "😥",
-					"pudding":"🍮",
+					"rip": "😇"
-					"star":"⭐"
 				}
 				var icon = reactions[toot.reaction];
 				var emojisData = JSON.parse(localStorage.getItem("emoji_" + acct_id));
@@ -255,12 +260,10 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 				var domain = localStorage.getItem("domain_" + acct_id);
 				if (popup > 0) {
-					Materialize.toast("["+domain+"]"+escapeHTMLtemp(toot.user.name)+what, popup * 1000);
+					M.toast({ html: "[" + domain + "]" + escapeHTMLtemp(toot.user.name) + what, displayLength: popup * 1000 })
 				}
 				if (native == "yes") {
-					var electron = require("electron");
+					var os = localStorage.getItem("platform");
-					var ipc = electron.ipcRenderer;
-					var os = electron.remote.process.platform;
 					var options = {
 						body: toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
 						icon: toot.user.avatarUrl
@@ -268,14 +271,15 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					if (os == "darwin") {
 						var n = new Notification('TheDesk:' + domain, options);
 					} else {
-						ipc.send('native-notf', [
+						var nativeNotfOpt = [
 							'TheDesk:' + domain,
 							toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
 							toot.user.avatarUrl,
 							"toot",
 							acct_id,
 							toot.note.id
-						]);
+						]
+						postMessage(["nativeNotf", nativeNotfOpt], "*")
 					}
 				}
 				if (localStorage.getItem("hasNotfC_" + acct_id) != "true") {
@@ -286,7 +290,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			}
 			var if_notf = 'data-notfIndv="' + acct_id + "_" + toot.id + '"';
 			var toot = toot.note;
-			var dis_name=escapeHTMLtemp(toot.user.name);
+			var dis_name = escapeHTML(toot.user.name);
 		} else {
 			var if_notf = "";
 			if (toot.renote) {
@@ -296,8 +300,10 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					")<br>";
 				var boostback = "shared";
 				var uniqueid = toot.id;
+				if (!toot.text) {
 					var toot = toot.renote;
-				var dis_name=escapeHTMLtemp(toot.user.name);
+				}
+				var dis_name = escapeHTML(toot.user.name);
 				var uniqueid = toot.id;
 				var actemojick = false
 			} else {
@@ -340,27 +346,31 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			if (toot.viaMobile) {
 				var via = '<span style="font-style: italic;">Mobile</span>';
 			} else {
-                var via = '<span style="font-style: italic;">Unknown</span>';
+				var via = '';
+				viashow = "via-hide";
 			}
 		} else {
-			var via = toot.app.name;
+			var via = escapeHTML(toot.app.name);
+			if (!toot.app.name) {
+				viashow = "via-hide";
+			}
 			//強調チェック
-			Object.keys(emp).forEach(function(key6) {
+			Object.keys(empCli).forEach(function (key6) {
-				var cli = emp[key6];
+				var empCliList = empCli[key6];
-				if(cli == via){
+				if (empCliList == via) {
 					boostback = "emphasized";
 				}
 			});
 			//ミュートチェック
-			Object.keys(mute).forEach(function(key7) {
+			Object.keys(muteCli).forEach(function (key7) {
-				var cli = mute[key7];
+				var muteCliList = muteCli[key7];
-				if(cli == via){
+				if (muteCliList == via) {
 					boostback = "hide";
 				}
 			});
 		}
 		if ((toot.cw || toot.cw == "") && cw) {
-			var content = toot.text;
+			var content = escapeHTML(toot.text);
 			var spoil = escapeHTMLtemp(toot.cw);
 			var spoiler = "cw cw_hide_" + toot.id;
 			var api_spoil = "gray";
@@ -491,6 +501,10 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						'" data-type="video" class="img-parsed"><video src="' +
 						purl + '" class="' + sense +
 						' toot-img pointer" style="max-width:100%;"></a></span>';
+				} else if (media.type.indexOf("audio") !== -1) {
+					viewer = viewer + '<audio src="' +
+						purl + '" class="' + sense +
+						' toot-img pointer" style="width:100%;" controls></span>';
 				} else {
 					viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',' +
 						acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
@@ -512,7 +526,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			mentions = '<div style="float:right"><a onclick="udg(\'' + menck.user.id + '\',' +
 				acct_id + ')" class="pointer">@' + menck.user.username + '</a></div>';
 		}
-		var tagck = toot.tags[0];
+		var tagck = toot.tags;
 		var tags = "";
 		//タグであれば
 		if (tagck) {
@@ -577,16 +591,16 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		//アバター
 		var avatar = toot.user.avatarUrl;
 		//ワードミュート
-		if(wordmute){
+		if (wordmuteList) {
-			Object.keys(wordmute).forEach(function(key8) {
+			Object.keys(wordmuteList).forEach(function (key8) {
-				var worde = wordmute[key8];
+				var worde = wordmuteList[key8];
 				if (worde) {
 					if (worde.tag) {
-						var word=worde.tag;
+						var wordList = worde.tag;
 					} else {
-						var word=worde
+						var wordList = worde
 					}
-					var regExp = new RegExp( word, "g" ) ;
+					var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
 					if ($.strip_tagstemp(content).match(regExp)) {
 						boostback = "hide by_filter";
 					}
@@ -594,13 +608,13 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 		}
 		//ワード強調
-		if(wordemp){
+		if (wordempList) {
-			Object.keys(wordemp).forEach(function(key9) {
+			Object.keys(wordempList).forEach(function (key9) {
-				var word = wordemp[key9];
+				var wordList = wordempList[key9];
-				if(word){
+				if (wordList) {
-					var word=word.tag;
+					var wordList = wordList.tag;
-					var regExp = new RegExp( word, "g" ) ;
+					var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
-					content=content.replace(regExp,'<span class="emp">'+word+"</span>");
+					content = content.replace(regExp, '<span class="emp">' + wordList + "</span>");
 				}
 			});
 		}
@@ -616,7 +630,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			for (var i = 0; i < tickerdata.length; i++) {
 				var value = tickerdata[i];
 				if (value.domain == thisdomain) {
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					var tickerdom = '<div style="background:linear-gradient(to left,transparent, ' + value.bg + ' 96%) !important; color:' + value.text + ';width:100%; height:0.9rem; font-size:0.8rem;"><img src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + '</span></div>';
 					break;
 				}
 			}
@@ -632,23 +646,25 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				} else {
 					var myvote = "";
 				}
-				poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+toot.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
+				poll = poll + '<div class="pointer vote" onclick="vote(\'' + acct_id + '\',\'' + toot.id + '\',' + choice.id + ')">' + escapeHTML(choice.text) + '(' + choice.votes + '' + myvote + ')</div>';
 			});
 			poll = '<div class="vote_' + toot.id + '">' + poll + '</div>';
 		}
-		/*
+		//引用Renote
-		
+		if (toot.renote) {
-			*/
+			poll = poll + '<div class="quote-renote"><div class="renote-icon"><a onclick="udg(\'' + toot.renote.user.id +
+				'\',' + acct_id + ');" user="' + toot.renote.user.username + '" class="udg"><img src="' + toot.renote.user.avatarUrl + '"></a></div><div class="renote-user">' + escapeHTML(toot.renote.user.name) + '</div><div class="renote-text">' + escapeHTML(toot.renote.text) + '</div></div>'
+		}
 		if (localStorage.getItem("emojiReaction_" + acct_id) == "disabled") {
 			var freeReact = "hide";
 		} else {
 			var freeReact = "";
 		}
 		//Reactions
-        if(toot.reactionCounts){
 		var addReact = "";
-			Object.keys(toot.reactionCounts).forEach(function(keye) {
+		if (toot.reactions) {
-				var thisReact=toot.reactionCounts[keye];
+			Object.keys(toot.reactions).forEach(function (keye) {
+				var thisReact = toot.reactions[keye];
 				if (keye == "like") { var defaultEmoji = true; }
 				else if (keye == "love") { var defaultEmoji = true; }
 				else if (keye == "laugh") { var defaultEmoji = true; }
@@ -657,7 +673,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				else if (keye == "congrats") { var defaultEmoji = true; }
 				else if (keye == "angry") { var defaultEmoji = true; }
 				else if (keye == "confused") { var defaultEmoji = true; }
-				else if(keye=="pudding"){ var defaultEmoji=true; }
+				else if (keye == "star") { var defaultEmoji = true; }
 				else {
 					var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
 					if (obj) {
@@ -676,76 +692,76 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					}
 				}
 			});
-        if(toot.reactionCounts.like){
+			if (toot.reactions.like) {
-            var like=toot.reactionCounts.like;
+				var like = toot.reactions.like;
 				var likehide = "";
 			} else {
 				var like = 0;
 				var likehide = "hide";
 			}
-        if(toot.reactionCounts.love){
+			if (toot.reactions.love) {
-            var love=toot.reactionCounts.love;
+				var love = toot.reactions.love;
 				var lovehide = "";
 			} else {
 				var love = 0;
 				var lovehide = "hide";
 			}
-        if(toot.reactionCounts.laugh){
+			if (toot.reactions.laugh) {
-            var laugh=toot.reactionCounts.laugh;
+				var laugh = toot.reactions.laugh;
 				var laughhide = "";
 			} else {
 				var laugh = 0;
 				var laughhide = "hide";
 			}
-        if(toot.reactionCounts.hmm){
+			if (toot.reactions.hmm) {
-            var hmm=toot.reactionCounts.hmm;
+				var hmm = toot.reactions.hmm;
 				var hmmhide = "";
 			} else {
 				var hmm = 0;
 				var hmmhide = "hide";
 			}
-        if(toot.reactionCounts.surprise){
+			if (toot.reactions.surprise) {
-            var surprise=toot.reactionCounts.surprise;
+				var surprise = toot.reactions.surprise;
 				var suphide = "";
 			} else {
 				var suphide = "hide";
 				var surprise = 0;
 			}
-        if(toot.reactionCounts.congrats){
+			if (toot.reactions.congrats) {
-            var congrats=toot.reactionCounts.congrats;
+				var congrats = toot.reactions.congrats;
 				var conghide = "";
 			} else {
 				var congrats = 0;
 				var conghide = "hide";
 			}
-        if(toot.reactionCounts.angry){
+			if (toot.reactions.angry) {
-            var angry=toot.reactionCounts.angry;
+				var angry = toot.reactions.angry;
 				var anghide = "";
 			} else {
 				var angry = 0;
 				var anghide = "hide";
 			}
-        if(toot.reactionCounts.confused){
+			if (toot.reactions.confused) {
 				var confhide = "";
-            var confused=toot.reactionCounts.confused;
+				var confused = toot.reactions.confused;
 			} else {
 				var confused = 0;
 				var confhide = "hide";
 			}
-        if(toot.reactionCounts.pudding){
+			if (toot.reactions.rip) {
-            var pudding=toot.reactionCounts.pudding;
+				var riphide = "";
-            var pudhide="";
+				var rip = toot.reactions.rip;
 			} else {
-            var pudding=0;
+				var rip = 0;
-            var pudhide="hide";
+				var riphide = "hide";
 			}
 			var fullhide = "";
 		} else {
 			var like = 0; var love = 0; var laugh = 0; var hmm = 0; var surprise = 0; var congrats = 0; var angry = 0; var confused = 0; var pudding = 0;
-            var likehide="hide";var lovehide="hide";var laughhide="hide";var hmmhide="hide";var suphide="hide";var conghide="hide";var anghide="hide";var confhide="hide";var pudhide="hide";
+			var likehide = "hide"; var lovehide = "hide"; var laughhide = "hide"; var hmmhide = "hide"; var suphide = "hide"; var conghide = "hide"; var anghide = "hide"; var confhide = "hide"; var riphide = "hide"
 			var fullhide = "hide";
 		}
-		if(!addReact && likehide=="hide"&& lovehide=="hide"&& laughhide=="hide"&&  hmmhide=="hide"&&  suphide=="hide"&& conghide=="hide"&&  anghide=="hide"&&  confhide=="hide"&& pudhide=="hide"){
+		if (!addReact && likehide == "hide" && lovehide == "hide" && laughhide == "hide" && hmmhide == "hide" && suphide == "hide" && conghide == "hide" && anghide == "hide" && confhide == "hide" && riphide == "hide") {
 			var fullhide = "hide";
 		}
 		if (toot.myReaction) {
@@ -804,8 +820,8 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">' + twemoji.parse("💢") + '</a><span class="re-angryct">' + angry +
 			'</span></span><span class="' + confhide + ' reaction re-confused"><a onclick="reaction(\'confused\',\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">' + twemoji.parse("😥") + '</a><span class="re-confusedct">' + confused +
-            '</span></span><span class="'+pudhide+' reaction re-pudding"><a onclick="reaction(\'pudding\',\'' + toot.id + '\',' + acct_id +
+			'</span></span><span class="' + riphide + ' reaction re-confused"><a onclick="reaction(\'confused\',\'' + toot.id + '\',' + acct_id +
-            ',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">'+twemoji.parse("🍮")+'</a><span class="re-puddingct">'+pudding+
+			',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">' + twemoji.parse("😇") + '</a><span class="re-confusedct">' + rip +
 			'</span></span>' + addReact +
 			'<i class="material-icons pointer hide freeReact ' + freeReact + '" style="font-size:1.0rem; padding-left:5px;position: relative;top: 3px;" onclick="reactioncustom(\'' + acct_id + '\',\'' + id + '\')">add_box</i></div>'
 			+ poll + mentions + tags + '</div>' +
@@ -850,15 +866,23 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 
 //オブジェクトパーサー(ユーザーデータ)
 function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
+	console.log(["Parse them ", obj])
 	if (popup > 0 || popup == -1) {
 
 	} else {
+		if (obj.users) {
 			var obj = obj.users;
 		}
+	}
 	var templete = '';
 	var datetype = localStorage.getItem("datetype");
 	Object.keys(obj).forEach(function (key) {
 		var toot = obj[key];
+		if (toot.followee) {
+			toot = toot.followee
+		} else if (toot.follower) {
+			toot = toot.follower
+		}
 		var locked = "";
 		if (auth) {
 			var auth = '<i class="material-icons gray pointer" onclick="misskeyRequest(\'' +
@@ -878,7 +902,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		}
 		var memory = localStorage.getItem("notice-mem");
 		if (popup >= 0 && obj.length < 5 && notftext != memory) {
-				Materialize.toast(escapeHTMLtemp(toot.name)+":"+ftxt, popup * 1000);
+			M.toast({ html: escapeHTMLtemp(toot.name) + ":" + ftxt, displayLength: popup * 1000 })
 			$(".notf-icon_" + tlid).addClass("red-text");
 			localStorage.setItem("notice-mem", notftext);
 			notftext = "";
@@ -887,9 +911,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 				native = "yes";
 			}
 			if (native == "yes") {
-					var electron = require("electron");
+				var os = localStorage.getItem("platform");
-					var ipc = electron.ipcRenderer;
-					var os = electron.remote.process.platform;
 				var options = {
 					body: toot.display_name + "(" + toot.acct + ")" + ftxt,
 					icon: toot.avatar
@@ -898,14 +920,15 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 				if (os == "darwin") {
 					var n = new Notification('TheDesk:' + domain, options);
 				} else {
-						ipc.send('native-notf', [
+					var nativeNotfOpt = [
 						'TheDesk:' + domain,
 						toot.display_name + "(" + toot.acct + ")" + ftxt,
 						toot.avatar,
 						"userdata",
 						acct_id,
 						toot.id
-						]);
+					]
+					postMessage(["nativeNotf", nativeNotfOpt], "*")
 				}
 			}
 		}
@@ -913,7 +936,17 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 			var dis_name = escapeHTMLtemp(toot.name);
 			dis_name = twemoji.parse(dis_name);
 		} else {
-				var dis_name=toot.name;
+			var dis_name = toot.username;
+		}
+		if (toot.followersCount) {
+			var ferct = toot.followersCount
+		} else {
+			var ferct = "unknown"
+		}
+		if (toot.followingCount) {
+			var fingct = toot.followingCount
+		} else {
+			var fingct = "unknown"
 		}
 		templete = templete +
 			'<div class="cvo" style="padding-top:5px;" user-id="' + toot.id + '"><div class="area-notice">' +
@@ -929,8 +962,8 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 			'</div>' +
 			'</div>' +
 			'<div style="justify-content:space-around" class="area-toot"> <div class="cbadge" style="width:100px;">Follows:' +
-			toot.followingCount +
+			fingct +
-			'</div><div class="cbadge" style="width:100px;">Followers:' + toot.followersCount +
+			'</div><div class="cbadge" style="width:100px;">Followers:' + ferct +
 			'</div>' +
 			'</div>' +
 			'</div>' +
@@ -942,9 +975,102 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 function goGoogle(id) {
 	var val = $("#srcbox_" + id).val();
 	var url = "https://google.com/search?q=" + val;
-	const {
+	postMessage(["openUrl", url], "*")
-		shell
+}
-	} = require('electron');
+var misskeyws = []
-
+var misskeywsstate = []
-	shell.openExternal(url);
+function connectMisskey(acct_id) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "wss://" + domain +
+		"/streaming?i=" + at;
+	var wsid = misskeyws.length;
+	localStorage.setItem("misskey_wss_" + acct_id, wsid);
+	misskeyws[wsid] = new WebSocket(start);
+	misskeyws[wsid].onopen = function (mess) {
+		console.table({ "tlid": tlid, "type": "Connect Streaming API", "domain": domain, "message": [mess] })
+		misskeywsstate[wsid] = true
+		//$("#notice_icon_" + tlid).removeClass("red-text");
+		var send = '{"type":"connect","body":{"channel":"main","id":"notf:' + acct_id + '"}}'
+		misskeyws[wsid].send(send)
+	}
+	misskeyws[wsid].onmessage = function (mess) {
+		console.log([domain + ":Receive Streaming API:", data]);
+		var data = JSON.parse(mess.data)
+		var obj = data.body.body
+		var mute = [];
+		if (data.body.id.indexOf("notf:") !== -1) {
+			var obj = JSON.parse(mess.data).body;
+			console.log(obj);
+			var popup = localStorage.getItem("popup");
+			if (!popup) {
+				popup = 0;
+			}
+			if (JSON.parse(mess.data).body.type != "follow") {
+
+				templete = misskeyParse([obj.body], 'notf', acct_id, 'notf', popup);
+			} else {
+				templete = misskeyUserparse([obj.body], 'notf', acct_id, 'notf', popup);
+			}
+			if (JSON.parse(mess.data).body.type == "reaction") {
+				console.log("reaction refresh")
+				reactRefresh(acct_id, obj.body.note.id)
+			}
+			if (!$("div[data-notfIndv=" + acct_id + "_" + obj.body.id + "]").length) {
+				$("div[data-notf=" + acct_id + "]").prepend(templete);
+				$("div[data-const=notf_" + acct_id + "]").prepend(templete);
+			}
+			jQuery("time.timeago").timeago();
+		} else if (data.body.type == "note") {
+			var tlid = data.body.id * 1
+			var multi = localStorage.getItem("column");
+			var col = JSON.parse(multi)[tlid];
+			if (localStorage.getItem("voice_" + tlid)) {
+				var voice = true;
+			} else {
+				var voice = false;
+			}
+			if (voice) {
+				say(obj.text)
+			}
+			var templete = misskeyParse([obj], col.type, acct_id, tlid, "", mute);
+			misskeyws[wsid].send(JSON.stringify({
+				type: 'sn',
+				body: {
+					id: obj.id
+				}
+			}))
+			var pool = localStorage.getItem("pool_" + tlid);
+			if (pool) {
+				pool = templete + pool;
+			} else {
+				pool = templete
+			}
+			localStorage.setItem("pool_" + tlid, pool);
+			scrollck();
+			jQuery("time.timeago").timeago();
+		} else if (data.type == "noteUpdated") {
+			if (data.body.type == "reacted") {
+				reactRefresh(acct_id, data.body.id)
+			} else if (data.body.type == "deleted") {
+				$("#pub_" + data.body.id).hide();
+				$("#pub_" + data.body.id).remove();
+			}
+
+		}
+	}
+	misskeyws[wsid].onerror = function (error) {
+		console.error("Error closing " + tlid);
+		console.error(error);
+		misskeywsstate[wsid] = false
+		connectMisskey(acct_id)
+		return false;
+	};
+	misskeyws[wsid].onclose = function () {
+		console.warn("Closing " + tlid);
+		misskeywsstate[wsid] = false
+		connectMisskey(acct_id)
+		return false;
+	};
+
 }

app/js/tl/mix.js

@@ -1,6 +1,5 @@
 //Integrated TL
 function mixtl(acct_id, tlid, type, delc, voice) {
-	console.log(delc);
 	localStorage.removeItem("morelock")
 	localStorage.setItem("now", type);
 	todo("Integrated TL Loading...(Local)");
@@ -44,15 +43,15 @@ function mixtl(acct_id, tlid, type,delc,voice) {
 				timeline.splice(20);
 			}
 			var templete = "";
-            Object.keys(timeline).forEach(function(key) {
-                var pkey=key*1+1;
-                if(pkey<timeline.length){
-                    if(date(timeline[key].created_at,"unix")!=date(timeline[pkey].created_at,"unix")){
 			if (localStorage.getItem("filter_" + acct_id) != "undefined") {
 				var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "mix");
 			} else {
 				var mute = [];
 			}
+			Object.keys(timeline).forEach(function (key) {
+				var pkey = key * 1 + 1;
+				if (pkey < timeline.length) {
+					if (date(timeline[key].created_at, "unix") != date(timeline[pkey].created_at, "unix")) {
 						if (type == "integrated") {
 							templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
 						} else if (type == "plus") {
@@ -94,19 +93,18 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 	websocketLocal[wslid] = new WebSocket(startLocal);
 	websocketHome[wshid].onopen = function (mess) {
 		localStorage.setItem("wssH_" + tlid, wshid);
-		console.log("Connect Streaming API(Integrated:Home)");
+		console.table({ "tlid": tlid, "type": "Connect Streaming API(Integrated:Home)", "domain": domain, "message": mess })
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onopen = function (mess) {
 		localStorage.setItem("wssL_" + tlid, wslid);
-		console.log("Connect Streaming API(Integrated:Local)");
+		console.table({ "tlid": tlid, "type": "Connect Streaming API(Integrated:Local)", "domain": domain, "message": mess })
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onmessage = function (mess) {
-		console.log("Receive Streaming API:(Integrated:Local)");
+		console.log(["Receive Streaming API:(Integrated:Local)", obj]);
 
 		var obj = JSON.parse(JSON.parse(mess.data).payload);
-		console.log(obj);
 		var type = JSON.parse(mess.data).event;
 		if (type == "delete") {
 			if (delc == "true") {
@@ -143,10 +141,8 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 		}
 	}
 	websocketHome[wshid].onmessage = function (mess) {
-		console.log("Receive Streaming API:(Integrated:Home)");
+		console.log(["Receive Streaming API:(Integrated:Home)", obj]);
-
 		var obj = JSON.parse(JSON.parse(mess.data).payload);
-		console.log(obj);
 		var type = JSON.parse(mess.data).event;
 		if (type == "delete") {
 			if (del > 10) {
@@ -195,40 +191,57 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 		}
 	}
 	websocketLocal[wslid].onerror = function (error) {
-		console.error('WebSocket Error ' + error);
+		console.error('WebSocketLocal Error')
+		console.error(error);
 		if (mode == "error") {
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Error ' + error);
 		} else {
+			var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
+			localStorage.setItem("wserror_" + tlid, errorct);
+			if (errorct < 3) {
 				reconnector(tlid, TLtype, acct_id, "", "error");
 			}
+		}
 	};
 	websocketLocal[wslid].onclose = function () {
-		console.error('WebSocketLocal Closing by error:' + tlid);
+		console.warn('WebSocketLocal Closing:' + tlid);
 		if (mode == "error") {
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
 		} else {
+			var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
+			localStorage.setItem("wserror_" + tlid, errorct);
+			if (errorct < 3) {
 				reconnector(tlid, TLtype, acct_id, "", "error");
 			}
+		}
 	};
 	websocketHome[wshid].onerror = function (error) {
-		console.error('WebSocket Error ' + error);
+		console.error(['WebSocketHome Error', error])
 		if (mode == "error") {
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Error ' + error);
 		} else {
+			var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
+			localStorage.setItem("wserror_" + tlid, errorct);
+			if (errorct < 3) {
 				reconnector(tlid, TLtype, acct_id, "", "error");
 			}
+		}
 	};
 	websocketHome[wshid].onclose = function () {
-		console.error('WebSocketHome Closing by error:' + tlid);
+		console.warn('WebSocketHome Closing:' + tlid);
 		if (mode == "error") {
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
 		} else {
+			var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
+			localStorage.setItem("wserror_" + tlid, errorct);
+			if (errorct < 3) {
 				reconnector(tlid, TLtype, acct_id, "", "error");
 			}
+		}
 
 	};
 

app/js/tl/notification.js

@@ -15,12 +15,11 @@ function notfColumn(acct_id, tlid, sys){
 		native = "yes";
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
-	console.log(start)
 	var httpreq = new XMLHttpRequest();
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
 		var misskey = true;
 		var start = "https://" + domain + "/api/i/notifications";
-		httpreq.open(POST, start, true);
+		httpreq.open("POST", start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
 		var body = JSON.stringify({
 			i: at
@@ -44,7 +43,10 @@ function notfColumn(acct_id, tlid, sys){
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
-			var max_id = httpreq.getResponseHeader("link").match(/[?&]{1}max_id=([0-9]+)/)[1];
+			var max_id = httpreq.getResponseHeader("link");
+			if (max_id) {
+				max_id = max_id.match(/[?&]{1}max_id=([0-9]+)/)[1]
+			}
 			if (json[0]) {
 				var templete = "";
 				var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
@@ -56,9 +58,7 @@ function notfColumn(acct_id, tlid, sys){
 						if (key > 14) {
 							ct = "15+";
 						}
-						var electron = require("electron");
+						var os = localStorage.getItem("platform");
-						var ipc = electron.ipcRenderer;
-						var os = electron.remote.process.platform;
 						var options = {
 							body: ct + lang.lang_notf_new,
 							icon: localStorage.getItem("prof_" + acct_id)
@@ -66,7 +66,8 @@ function notfColumn(acct_id, tlid, sys){
 						if (os == "darwin") {
 							var n = new Notification('TheDesk:' + domain, options);
 						} else {
-								ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new,localStorage.getItem("prof_"+acct_id)]);
+							var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
+							postMessage(["nativeNotf", nativeNotfOpt], "*")
 						}
 
 					}
@@ -77,15 +78,15 @@ function notfColumn(acct_id, tlid, sys){
 					}
 					if (obj.type != "follow") {
 						if (misskey) {
-							templete = templete+misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
+							templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute);
 						} else {
-							templete = templete+parse([obj], 'notf', acct_id, 'notf', -1, mute);
+							templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute);
 						}
 					} else {
 						if (misskey) {
-							templete = templete+misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
+							templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute);
 						} else {
-							templete = templete+userparse([obj.account], 'notf', acct_id, 'notf', -1);
+							templete = templete + userparse([obj.account], 'notf', acct_id, tlid, -1);
 						}
 
 					}
@@ -112,73 +113,6 @@ function notfColumn(acct_id, tlid, sys){
 			at;
 	}
 
-	console.log(start);
-	var wsid = websocketNotf.length;
-	websocketNotf[acct_id] = new WebSocket(start);
-	console.log(websocketNotf);
-	websocketNotf[acct_id].onopen = function(mess) {
-		console.log("Connect Streaming API(Notf):");
-		console.log(mess);
-		$("i[data-notf=" + acct_id +"]").removeClass("red-text");
-
-	}
-	websocketNotf[acct_id].onmessage = function(mess) {
-		console.log("Receive Streaming API(Notf):"+acct_id);
-		var popup = localStorage.getItem("popup");
-			if (!popup) {
-				popup = 0;
-			}
-			console.log(domain)
-		if(misskey){
-			console.log("misskey")
-			console.log(JSON.parse(mess.data));
-			if (JSON.parse(mess.data).type == "notification") {
-				var obj = JSON.parse(mess.data).body;
-				console.log(obj);
-				if(obj.type!="follow"){
-					
-					templete = misskeyParse([obj], 'notf', acct_id, 'notf', popup);
-				}else{
-					templete = misskeyUserparse([obj], 'notf', acct_id, 'notf', popup);
-				}
-				if(obj.type=="reaction"){
-					console.log("refresh")
-					reactRefresh(acct_id,obj.note.id)
-				}
-				if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-					$("div[data-notf=" + acct_id +"]").prepend(templete);
-				}
-				jQuery("time.timeago").timeago();
-			}else if(JSON.parse(mess.data).type == "note-updated"){
-				var obj = JSON.parse(mess.data).body.note;
-				reactRefreshCore(obj)
-			}
-		}else{
-		var obj = JSON.parse(JSON.parse(mess.data).payload);
-		console.log(obj);
-		var type = JSON.parse(mess.data).event;
-		if (type == "notification") {
-			var templete="";
-			localStorage.setItem("lastnotf_" + acct_id,obj.id);
-			if(obj.type!="follow"){
-				templete = parse([obj], 'notf', acct_id, 'notf', popup);
-			}else{
-				templete = userparse([obj], 'notf', acct_id, 'notf', popup);
-			}
-			if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-				$(".tl[data-notf=" + acct_id +"]").prepend(templete);
-			}
-			$(".notf-timeline[data-acct=" + acct_id +"]").prepend(templete);
-			jQuery("time.timeago").timeago();
-		} else if (type == "delete") {
-			$("[toot-id=" + obj + "]").hide();
-			$("[toot-id=" + obj + "]").remove();
-		}
-		}
-	}
-	websocketNotf[acct_id].onerror = function(error) {
-		console.error('WebSocket Error ' + error);
-	};
 }
 function notfCommon(acct_id, tlid, sys) {
 	todo("Notifications Loading...");
@@ -212,7 +146,7 @@ function notfCommon(acct_id, tlid, sys) {
 		}
 	}
 	fetch(start, i).then(function (response) {
-		console.log(response.headers.get('link'));
+		console.log("header to get param:" + response.headers.get('link'));
 		return response.json();
 	}).catch(function (error) {
 		todo(error);
@@ -229,9 +163,7 @@ function notfCommon(acct_id, tlid, sys) {
 					if (key > 14) {
 						ct = "15+";
 					}
-				var electron = require("electron");
+					var os = localStorage.getItem("platform");
-				var ipc = electron.ipcRenderer;
-				var os = electron.remote.process.platform;
 					var options = {
 						body: ct + lang.lang_notf_new,
 						icon: localStorage.getItem("prof_" + acct_id)
@@ -239,7 +171,8 @@ function notfCommon(acct_id, tlid, sys) {
 					if (os == "darwin") {
 						var n = new Notification('TheDesk:' + domain, options);
 					} else {
-						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new,localStorage.getItem("prof_"+acct_id)]);
+						var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
+						postMessage(["nativeNotf", nativeNotfOpt], "*")
 					}
 
 				}
@@ -269,7 +202,11 @@ function notfCommon(acct_id, tlid, sys) {
 		}
 		$("#notf-box").addClass("fetched");
 		todc();
+		notfWS(misskey, acct_id, tlid, domain, at)
 	});
+
+}
+function notfWS(misskey, acct_id, tlid, domain, at) {
 	if (!misskey) {
 		if (localStorage.getItem("streaming_" + acct_id)) {
 			var wss = localStorage.getItem("streaming_" + acct_id)
@@ -278,55 +215,21 @@ function notfCommon(acct_id, tlid, sys) {
 		}
 		var start = wss + "/api/v1/streaming/?stream=user&access_token=" +
 			at;
-	}else{
-		var start = "wss://" + domain + "/?i=" +
-		at;
-	}
 
-	console.log(start);
 		var wsid = websocketNotf.length;
 		websocketNotf[acct_id] = new WebSocket(start);
-	console.log(websocketNotf);
 		websocketNotf[acct_id].onopen = function (mess) {
-		console.log("Connect Streaming API(Notf):");
+			console.table({ "acct_id": acct_id, "type": "Connect Streaming API(Notf)", "domain": domain, "message": [mess] })
-		console.log(mess);
 			$("i[data-notf=" + acct_id + "]").removeClass("red-text");
 
 		}
 		websocketNotf[acct_id].onmessage = function (mess) {
-		console.log("Receive Streaming API(Notf):"+acct_id);
+			console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
 			var popup = localStorage.getItem("popup");
 			if (!popup) {
 				popup = 0;
 			}
-			console.log(domain)
-		if(misskey){
-			console.log("misskey")
-			console.log(JSON.parse(mess.data));
-			if (JSON.parse(mess.data).type == "notification") {
-				var obj = JSON.parse(mess.data).body;
-				console.log(obj);
-				if(obj.type!="follow"){
-					
-					templete = misskeyParse([obj], 'notf', acct_id, 'notf', popup);
-				}else{
-					templete = misskeyUserparse([obj], 'notf', acct_id, 'notf', popup);
-				}
-				if(obj.type=="reaction"){
-					console.log("refresh")
-					reactRefresh(acct_id,obj.note.id)
-				}
-				if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-					$("div[data-notf=" + acct_id +"]").prepend(templete);
-				}
-				jQuery("time.timeago").timeago();
-			}else if(JSON.parse(mess.data).type == "note-updated"){
-				var obj = JSON.parse(mess.data).body.note;
-				reactRefreshCore(obj)
-			}
-		}else{
 			var obj = JSON.parse(JSON.parse(mess.data).payload);
-		console.log(obj);
 			var type = JSON.parse(mess.data).event;
 			if (type == "notification") {
 				var templete = "";
@@ -338,6 +241,7 @@ function notfCommon(acct_id, tlid, sys) {
 				}
 				if (!$("div[data-notfIndv=" + acct_id + "_" + obj.id + "]").length) {
 					$("div[data-notf=" + acct_id + "]").prepend(templete);
+					$("div[data-const=notf_" + acct_id + "]").prepend(templete);
 				}
 				jQuery("time.timeago").timeago();
 			} else if (type == "delete") {
@@ -345,15 +249,15 @@ function notfCommon(acct_id, tlid, sys) {
 				$("[toot-id=" + obj + "]").remove();
 			}
 		}
-	}
 		websocketNotf[acct_id].onerror = function (error) {
 			console.error('WebSocket Error ' + error);
+			notfWS(misskey, acct_id, tlid, domain, at)
 		};
 	}
+}
 //一定のスクロールで発火
 function notfmore(tlid) {
-	console.log(moreloading);
+	console.log({ "status": "kicked", "status": moreloading });
-	console.log("kicked");
 	var multi = localStorage.getItem("column");
 	var obj = JSON.parse(multi);
 	var acct_id = obj[tlid].domain;
@@ -396,7 +300,7 @@ function notfmore(tlid) {
 		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
-			console.log(json);
+				console.log(["More notifications on " + tlid, json]);
 				var max_id = httpreq.getResponseHeader("link").match(/[?&]{1}max_id=([0-9]+)/)[1];
 				if (json[0]) {
 					var templete = "";
@@ -480,12 +384,10 @@ function notfCanceler(acct){
 	$(".notf-icon_" + acct).removeClass("red-text");
 }
 function allNotfRead() {
-	console.log(localStorage.getItem("notf-fav_2"));
 	var multi = localStorage.getItem("multi");
 	if (multi) {
 		var obj = JSON.parse(multi);
 		Object.keys(obj).forEach(function (key) {
-		console.log(key);
 			notfCanceler(key)
 		});
 	}

app/js/tl/parse.js

@@ -3,7 +3,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	var templete = '';
 	if (obj[0]) {
 		if (tlid === 1) {
-			console.log("testalive:"+"lastunix_"+ tlid+":"+date(obj[0].created_at, 'unix'))
+
 		}
 		localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, 'unix'));
 	}
@@ -52,14 +52,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		native = "yes";
 	}
 	//クライアント強調
-	var emp = localStorage.getItem("client_emp");
+	var empCli = localStorage.getItem("client_emp");
-	if(emp){
+	if (empCli) {
-		var emp = JSON.parse(emp);
+		var empCli = JSON.parse(empCli);
 	}
 	//クライアントミュート
-	var mute = localStorage.getItem("client_mute");
+	var muteCli = localStorage.getItem("client_mute");
-	if(mute){
+	if (muteCli) {
-		var mute = JSON.parse(mute);
+		var muteCli = JSON.parse(muteCli);
 	}
 	//ユーザー強調
 	var useremp = localStorage.getItem("user_emp");
@@ -67,17 +67,19 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		var useremp = JSON.parse(useremp);
 	}
 	//ワード強調
-	var wordemp = localStorage.getItem("word_emp");
+	var wordempList = localStorage.getItem("word_emp");
-	if(wordemp){
+	if (wordempList) {
-		var wordemp = JSON.parse(wordemp);
+		var wordempList = JSON.parse(wordempList);
 	}
 	//ワードミュート
-	var wordmute = localStorage.getItem("word_mute");
+	var wordmuteList = localStorage.getItem("word_mute");
-	if(wordmute){
+	if (wordmuteList) {
-		var wordmute = JSON.parse(wordmute);
+		var wordmuteList = JSON.parse(wordmuteList);
-		wordmute = wordmute.concat(mutefilter);
+		if (wordmuteList) {
+			wordmuteList = wordmuteList.concat(mutefilter);
+		}
 	} else {
-		wordmute = mutefilter;
+		wordmuteList = mutefilter;
 	}
 	//Ticker
 	var tickerck = localStorage.getItem("ticker_ok");
@@ -235,7 +237,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var what = lang.lang_parse_polled;
 				var icon = "fa-tasks  purple-text";
 			}
-			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at,
+			if (tlid == "notf") {
+				var notfFilHide = "hide"
+			} else {
+				var notfFilHide = ""
+			}
+			var noticetext = '<i class="fas fa-filter pointer big-text ' + notfFilHide + '" onclick="notfFilter(\'' + toot.account.id +
+				'\',\'' + tlid + '\');" title="' + lang.lang_parse_notffilter + '"></i><span class="cbadge cbadge-hover"title="' + date(toot.created_at,
 					'absolute') + '(' + lang.lang_parse_notftime + ')"><i class="far fa-clock"></i>' + date(toot.created_at,
 						datetype) +
 				'</span><i class="big-text fas ' + icon + '"></i><a onclick="udg(\'' + toot.account.id +
@@ -251,27 +259,54 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						$(".notf-reply_" + acct_id).text(replyct * 1 - (-1));
 						localStorage.setItem("notf-reply_" + acct_id, replyct * 1 - (-1))
 						$(".notf-reply_" + acct_id).removeClass("hide")
+						var sound = localStorage.getItem("replySound");
+						if (sound == "default") {
+							var file = "../../source/notif3.wav"
+						}
 					} else if (toot.type == "reblog") {
 						var btct = localStorage.getItem("notf-bt_" + acct_id)
 						$(".notf-bt_" + acct_id).text(btct * 1 - (-1));
 						localStorage.setItem("notf-bt_" + acct_id, btct * 1 - (-1))
 						$(".notf-bt_" + acct_id).removeClass("hide")
+						var sound = localStorage.getItem("btSound");
+						if (sound == "default") {
+							var file = "../../source/notif2.wav"
+						}
 					} else if (toot.type == "favourite") {
 						var favct = localStorage.getItem("notf-fav_" + acct_id)
 						$(".notf-fav_" + acct_id).text(favct * 1 - (-1));
 						localStorage.setItem("notf-fav_" + acct_id, favct * 1 - (-1))
 						$(".notf-fav_" + acct_id).removeClass("hide")
+						var sound = localStorage.getItem("favSound");
+						if (sound == "default") {
+							var file = "../../source/notif.wav"
+						}
 					}
 				}
 
 				var domain = localStorage.getItem("domain_" + acct_id);
 				if (popup > 0) {
-					Materialize.toast("["+domain+"]"+escapeHTML(toot.account.display_name)+what, popup * 1000);
+					M.toast({ html: "[" + domain + "]" + escapeHTML(toot.account.display_name) + what, displayLength: popup * 1000 })
+				}
+				//通知音
+				if (sound == "c1") {
+					var file = localStorage.getItem("custom1");
+				} else if (sound == "c2") {
+					var file = localStorage.getItem("custom2");
+				} else if (sound == "c3") {
+					var file = localStorage.getItem("custom3");
+				} else if (sound == "c4") {
+					var file = localStorage.getItem("custom4");
+				}
+				if (file) {
+					request = new XMLHttpRequest();
+					request.open("GET", file, true);
+					request.responseType = "arraybuffer";
+					request.onload = playSound;
+					request.send();
 				}
 				if (native == "yes") {
-					var electron = require("electron");
+					var os = localStorage.getItem("platform");
-					var ipc = electron.ipcRenderer;
-					var os = electron.remote.process.platform;
 					var options = {
 						body: toot.account.display_name + "(" + toot.account.acct + ")" + what + "\n\n" + $.strip_tags(toot.status.content),
 						icon: toot.account.avatar
@@ -279,14 +314,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					if (os == "darwin") {
 						var n = new Notification('TheDesk:' + domain, options);
 					} else {
-						ipc.send('native-notf', [
+						var nativeNotfOpt = [
 							'TheDesk:' + domain,
 							toot.account.display_name + "(" + toot.account.acct + ")" + what + "\n\n" + $.strip_tags(toot.status.content),
 							toot.account.avatar,
 							"toot",
 							acct_id,
 							toot.status.id
-						]);
+						]
+						postMessage(["nativeNotf", nativeNotfOpt], "*")
 					}
 				}
 				if (localStorage.getItem("hasNotfC_" + acct_id) != "true") {
@@ -395,22 +431,26 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var via = '';
 			viashow = "hide";
 		} else {
-			var via = toot.application.name;
+			var via = escapeHTML(toot.application.name);
+			if (empCli) {
 				//強調チェック
-			Object.keys(emp).forEach(function(key6) {
+				Object.keys(empCli).forEach(function (key6) {
-				var cli = emp[key6];
+					var empCliList = empCli[key6];
-				if(cli == via){
+					if (empCliList == via) {
 						boostback = "emphasized";
 					}
 				});
+			}
+			if (muteCli) {
 				//ミュートチェック
-			Object.keys(mute).forEach(function(key7) {
+				Object.keys(muteCli).forEach(function (key7) {
-				var cli = mute[key7];
+					var muteCliList = muteCli[key7];
-				if(cli == via){
+					if (muteCliList == via) {
 						boostback = "hide";
 					}
 				});
 			}
+		}
 		if (mix == "pinned") {
 			boostback = "emphasized";
 		}
@@ -452,6 +492,39 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		var viewer = "";
 		var hasmedia = "";
 		var youtube = "";
+		//Poll
+		var poll = "";
+		if (toot.poll) {
+			var choices = toot.poll.options;
+			if (toot.poll.voted) {
+				var myvote = lang.lang_parse_voted;
+				var result_hide = "";
+			} else if (toot.poll.expired) {
+				var myvote = lang.lang_parse_endedvote;
+				var result_hide = "";
+			} else {
+				var myvote = '<a onclick="voteMastodon(\'' + acct_id + '\',\'' + toot.poll.id + '\')" class="votebtn">' + lang.lang_parse_vote + '</a><br>';
+				if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
+					myvote = myvote + '<a onclick="showResult(\'' + acct_id + '\',\'' + toot.poll.id + '\')" class="pointer">' + lang.lang_parse_unvoted + "</a>";
+				}
+				var result_hide = "hide";
+			}
+			var ended = date(toot.poll.expires_at, datetype);
+			Object.keys(choices).forEach(function (keyc) {
+				var choice = choices[keyc];
+				if (!toot.poll.voted && !toot.poll.expired) {
+					var votesel = 'voteSelMastodon(\'' + acct_id + '\',\'' + toot.poll.id + '\',' + keyc + ',' + toot.poll.multiple + ')';
+					var voteclass = "pointer waves-effect waves-light";
+				} else {
+					var votesel = "";
+					var voteclass = "";
+				}
+				poll = poll + '<div class="' + voteclass + ' vote vote_' + acct_id + '_' + toot.poll.id + '_' + keyc + '" onclick="' + votesel + '">' + escapeHTML(choice.title) + '<span class="vote_' + acct_id + '_' + toot.poll.id + '_result ' + result_hide + '">(' + choice.votes_count + ')</span></div>';
+			});
+			poll = '<div class="vote_' + acct_id + '_' + toot.poll.id + '">' + poll + myvote + '<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
+				'"><i class="far fa-calendar-times"></i>' +
+				ended + '</span></div>';
+		}
 		if (toot.emojis) {
 			var emojick = toot.emojis[0];
 		} else {
@@ -467,6 +540,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
+				poll = poll.replace(regExp, emoji_url);
 			});
 		}
 		//ニコフレ絵文字
@@ -485,6 +559,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
+				poll = poll.replace(regExp, emoji_url);
 			});
 		}
 		//デフォ絵文字
@@ -501,6 +576,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		if (notice) {
 			notice = twemoji.parse(notice);
 		}
+		if (poll) {
+			poll = twemoji.parse(poll);
+		}
 		var mediack = toot.media_attachments[0];
 		//メディアがあれば
 		var media_ids = "";
@@ -512,16 +590,40 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var purl = media.preview_url;
 				media_ids = media_ids + media.id + ",";
 				var url = media.url;
+				var nsfwmes = ""
 				if (toot.sensitive && nsfw) {
 					var sense = "sensitive"
-				} else {
+					var blur = media.blurhash
+					if (blur) {
+						nsfwmes = '<div class="nsfw-media">' + lang.lang_parse_nsfw + '</div>'
+						purl = parseBlur(blur)
 						var sense = ""
 					}
+				} else {
+					var sense = ""
+					var blur = null
+				}
+				if (media.pleroma && media.pleroma.mime_type.indexOf("video") !== -1) {
+					viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',' +
+						acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
+						'" data-type="video" class="img-parsed"><video src="' +
+						purl + '" class="' + sense +
+						' toot-img pointer" style="max-width:100%;"></a></span>';
+				} else {
+					if (media.type == "unknown") {
+						viewer = viewer + '<a href="' + media.remote_url + '" title="' + media.remote_url + '">[' + lang.lang_parse_unknown + ']</a> '
+					} else if (media.type == "audio") {
+						viewer = viewer + '<audio src="' +
+							url + '" class="pointer" style="width:100%;" controls></span>';
+					} else {
 						viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
 							acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
-					'" data-type="' + media.type + '" class="img-parsed"><img draggable="false" src="' +
+							'" data-type="' + media.type + '" class="img-parsed img-link" style="width:calc(' + cwdt + '% - 1px); height:' + imh + ';"><img draggable="false" src="' +
 							purl + '" class="' + sense +
-					' toot-img pointer" style="width:calc(' + cwdt + '% - 1px); height:'+imh+';"></a></span>';
+							' toot-img pointer">' + nsfwmes + '</a>';
+					}
+				}
+
 			});
 			media_ids = media_ids.slice(0, -1);
 		} else {
@@ -619,7 +721,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}
 		if (toot.pinned) {
 			var if_pin = "blue-text";
-			var pin_app = "pinned";
+			var pin_app = "pinnedToot";
 		} else {
 			var if_pin = "";
 			var pin_app = "";
@@ -631,16 +733,17 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var avatar = toot.account.avatar_static;
 		}
 		//ワードミュート
-		if(wordmute){
+		if (wordmuteList) {
-			Object.keys(wordmute).forEach(function(key8) {
+			Object.keys(wordmuteList).forEach(function (key8) {
-				var worde = wordmute[key8];
+				var worde = wordmuteList[key8];
+				console.log(worde)
 				if (worde) {
 					if (worde.tag) {
-						var word=worde.tag;
+						var wordList = worde.tag;
 					} else {
-						var word=worde
+						var wordList = worde
 					}
-					var regExp = new RegExp( word, "g" ) ;
+					var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
 					if ($.strip_tags(content).match(regExp)) {
 						boostback = "hide by_filter";
 					}
@@ -648,13 +751,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			});
 		}
 		//ワード強調
-		if(wordemp){
+		if (wordempList) {
-			Object.keys(wordemp).forEach(function(key9) {
+			Object.keys(wordempList).forEach(function (key9) {
-				var word = wordemp[key9];
+				var wordList = wordempList[key9];
-				if(word){
+				if (wordList) {
-					var word=word.tag;
+					var wordList = wordList.tag;
-					var regExp = new RegExp( word, "g" ) ;
+					var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
-					content=content.replace(regExp,'<span class="emp">'+word+"</span>");
+					content = content.replace(regExp, '<span class="emp">' + wordList + "</span>");
 				}
 			});
 		}
@@ -698,45 +801,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				for (var i = 0; i < tickerdata.length; i++) {
 					var value = tickerdata[i];
 					if (value.domain == thisdomain) {
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+						var tickerdom = '<div style="background:linear-gradient(to left,transparent, ' + value.bg + ' 96%) !important; color:' + value.text + ';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + '</span></div>';
 						break;
 					}
 				}
 			}
 		}
-		//Poll
+		//Quote
-		var poll="";
+		if (toot.quote) {
-		if(toot.poll){
+			poll = poll + '<div class="quote-renote"><div class="renote-icon"><img src="' + toot.quote.account.avatar + '"></div><div class="renote-user">' + escapeHTML(toot.quote.account.display_name) + '</div><div class="renote-text">' + toot.quote.content + '</div></div>'
-			var choices=toot.poll.options;
-			if(toot.poll.voted){
-				var myvote=lang.lang_parse_voted;
-				var result_hide="";
-			}else{
-				myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
-				if(choices[0].votes_count===0 || choices[0].votes_count>0){
-					myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>";
-				}
-				var result_hide="hide";
-			}
-			if(toot.poll.expired){
-				var ended=lang.lang_parse_endedvote;
-			}else{
-				var ended=date(toot.poll.expires_at, datetype);
-			}
-			Object.keys(choices).forEach(function(keyc) {
-				var choice = choices[keyc];
-				if(!toot.poll.voted && !toot.poll.expired){
-					var votesel='voteSelMastodon(\''+acct_id+'\',\''+toot.poll.id+'\','+keyc+','+toot.poll.multiple+')';
-					var voteclass="pointer waves-effect waves-light";
-				}else{
-					var votesel="";
-					var voteclass="";
-				}
-				poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+escapeHTML(choice.title)+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
-			});
-			poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
-			'"><i class="far fa-calendar-times"></i>' +
-			 ended+ '</span></div>';
 		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
@@ -760,8 +833,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'</div></div>' +
 			'<div class="area-toot">' + tickerdom + '<span class="' +
 			api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
-			'</span><span class="toot ' + spoiler + '">' + content +poll+
+			'</span><span class="toot ' + spoiler + '">' + content +
-			'</span>' +
+			'</span>' + poll +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
 			'</span>' +
@@ -791,7 +864,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'</a></span></div>' +
 			'<div class="' + if_mine + ' action ' + disp["del"] + ' ' + noauth + '"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="far fa-trash"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_del + '"><i class="fas fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin ' + disp["pin"] + ' ' + noauth + '"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_pin + '"><i class="fas fa-map-pin pin_' + toot.id + ' ' + if_pin + '"></i></a></div>'
@@ -825,6 +898,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	var datetype = localStorage.getItem("datetype");
 	Object.keys(obj).forEach(function (key) {
 		var toot = obj[key];
+		console.log(["Parsing", toot])
 		if (!toot.username) {
 			var raw = toot;
 			toot = toot.account;
@@ -837,11 +911,12 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 		} else {
 			var locked = "";
 		}
-		if (auth) {
+		if (auth == "request") {
-			var auth = '<i class="material-icons gray pointer" onclick="request(\'' +
+			var authhtml = '<i class="material-icons gray pointer" onclick="request(\'' +
-				toot.id + '\',\'authorize\',' + acct_id + ')">person_add</i>';
+				toot.id + '\',\'authorize\',' + acct_id + ')" title="Accept">person_add</i>　<i class="material-icons gray pointer" onclick="request(\'' +
+				toot.id + '\',\'reject\',' + acct_id + ')" title="Reject">person_add_disabled</i>';
 		} else {
-			var auth = "";
+			var authhtml = "";
 		}
 		var ftxt = lang.lang_parse_followed;
 		if (!locale && localStorage.getItem("followlocale_" + acct_id)) {
@@ -854,7 +929,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 		}
 		var memory = localStorage.getItem("notice-mem");
 		if (popup >= 0 && obj.length < 5 && notftext != memory) {
-				Materialize.toast(escapeHTML(toot.display_name)+":"+ftxt, popup * 1000);
+			M.toast({ html: escapeHTML(toot.display_name) + ":" + ftxt, displayLength: popup * 1000 })
 			$(".notf-icon_" + tlid).addClass("red-text");
 			localStorage.setItem("notice-mem", notftext);
 			notftext = "";
@@ -863,9 +938,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				native = "yes";
 			}
 			if (native == "yes") {
-				var electron = require("electron");
+				var os = localStorage.getItem("platform");
-				var ipc = electron.ipcRenderer;
-				var os = electron.remote.process.platform;
 				var options = {
 					body: toot.display_name + "(" + toot.acct + ")" + ftxt,
 					icon: toot.avatar
@@ -874,14 +947,15 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				if (os == "darwin") {
 					var n = new Notification('TheDesk:' + domain, options);
 				} else {
-					ipc.send('native-notf', [
+					var nativeNotfOpt = [
 						'TheDesk:' + domain,
 						toot.display_name + "(" + toot.acct + ")" + ftxt,
 						toot.avatar,
 						"userdata",
 						acct_id,
 						toot.id
-					]);
+					]
+					postMessage(["nativeNotf", nativeNotfOpt], "*")
 				}
 			}
 		}
@@ -927,13 +1001,13 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			'<div class="area-display_name"><div class="flex-name"><span class="user">' +
 			dis_name + '</span>' +
 			'<span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' +
-			toot.acct + locked + auth +'</span>' +
+			toot.acct + locked + '</span>' +
 			'</div>' +
 			'</div>' +
 			'<div style="justify-content:space-around" class="area-toot"> <div class="cbadge" style="width:100px;">Follows:' +
 			toot.following_count +
 			'</div><div class="cbadge" style="width:100px;">Followers:' + toot.followers_count +
-			'</div>' +
+			'</div>' + authhtml +
 			'</div>' +
 			'</div>' +
 			'</div>';
@@ -945,24 +1019,27 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 function client(name) {
 	if (name != "Unknown") {
 		//聞く
-	localStorage.removeItem("client_mute");
+		Swal.fire({
-	var electron = require("electron");
-	var remote=electron.remote;
-	var dialog=remote.dialog;
-	const options = {
-		type: 'info',
 			title: lang.lang_parse_clientop,
-		message: name+lang.lang_parse_clienttxt,
+			text: name + lang.lang_parse_clienttxt,
-		buttons: [lang.lang_parse_clientno,lang.lang_parse_clientemp, lang.lang_parse_clientmute]
+			type: 'info',
-	  }
+			showCancelButton: true,
-	  dialog.showMessageBox(options, function(arg) {
+			confirmButtonColor: '#3085d6',
-		if(arg===1){
+			cancelButtonColor: '#3085d6',
+			confirmButtonText: lang.lang_parse_clientmute,
+			cancelButtonText: lang.lang_parse_clientemp,
+			showCloseButton: true,
+			focusConfirm: false,
+		}).then((result) => {
+			console.log(result)
+			if (result.dismiss == "cancel") {
+				//Emp
 				var cli = localStorage.getItem("client_emp");
 				var obj = JSON.parse(cli);
 				if (!obj) {
 					var obj = [];
 					obj.push(name);
-				Materialize.toast(name+lang.lang_status_emphas, 2000);
+					M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
 				} else {
 					var can;
 					Object.keys(obj).forEach(function (key) {
@@ -972,33 +1049,32 @@ function client(name) {
 						} else {
 							can = true;
 							obj.splice(key, 1);
-					Materialize.toast(name+lang.lang_status_unemphas, 2000);
+							M.toast({ html: escapeHTML(name) + lang.lang_status_unemphas, displayLength: 2000 })
 						}
 					});
 					if (!can) {
 						obj.push(name);
-				Materialize.toast(name+lang.lang_status_emphas, 2000);
+						M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
 					} else {
 
-			}
 					}
 					var json = JSON.stringify(obj);
 					localStorage.setItem("client_emp", json);
-		}else if(arg===2){
+					parseColumn()
+				}
+			} else if (result.value) {
+				//Mute
 				var cli = localStorage.getItem("client_mute");
 				var obj = JSON.parse(cli);
 				if (!obj) {
-				var obj=[];
+					obj = [];
 				}
 				obj.push(name);
 				var json = JSON.stringify(obj);
 				localStorage.setItem("client_mute", json);
-			Materialize.toast(name+lang.lang_parse_mute, 2000);
+				M.toast({ html: escapeHTML(name) + lang.lang_parse_mute, displayLength: 2000 })
-		}else{
+				parseColumn()
-			return;
 			}
-		parseColumn();
 		})
-	
 	}
 }

app/js/tl/poll.js

@@ -25,13 +25,12 @@ function pollCalc(){
     var days = $("#days_poll").val();
     var hrs = $("#hours_poll").val();
     var mins = $("#mins_poll").val();
-    console.log(days*86400+hrs*3600+mins*60)
+    console.log("Poll calc:" + days * 86400 + hrs * 3600 + mins * 60)
     return days * 86400 + hrs * 3600 + mins * 60;
 
 }
 //Vote
 function voteSelMastodon(acct_id, id, to, mul) {
-    console.log('.vote_'+acct_id+'_'+id+'_'+to);
     if ($('.vote_' + acct_id + '_' + id + '_' + to).hasClass("sel")) {
         $('.vote_' + acct_id + '_' + id + '_' + to).css("background-color", "transparent")
         $('.vote_' + acct_id + '_' + id + '_' + to).removeClass("sel");
@@ -95,7 +94,7 @@ function voteMastodonrefresh(acct_id,id){
     httpreqd.onreadystatechange = function () {
         if (httpreqd.readyState == 4) {
             var json = httpreqd.response;
-            console.log(json);
+            console.log(["Refresh vote", json]);
             if (!json) {
                 return false;
             }
@@ -108,7 +107,7 @@ function voteMastodonrefresh(acct_id,id){
                 if (!json.voted) {
                     votesel = 'voteSelMastodon(\'' + acct_id + '\',\'' + json.id + '\',' + keyc + ',' + json.multiple + ')';
                 }
-				poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+json.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
+                poll = poll + '<div class="pointer vote vote_' + acct_id + '_' + json.id + '_' + keyc + '" onclick="' + votesel + '">' + escapeHTML(choice.title) + '<span class="vote_' + acct_id + '_' + json.id + '_result ' + result_hide + '">(' + choice.votes_count + ')</span></div>';
             });
             poll = poll + myvote + '<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
                 '"><i class="far fa-calendar-times"></i>' +

app/js/tl/speech.js

@@ -33,7 +33,6 @@ $repeat  = setInterval(function() {
             var obj = JSON.parse(voice);
             if (obj[0]) {
                 $synthes.text = obj[0];
-                console.log($synthes);
                 speechSynthesis.speak($synthes);
                 obj.splice(0, 1);
                 var json = JSON.stringify(obj);
@@ -91,7 +90,7 @@ function voiceSettings(){
     localStorage.setItem("voice_speed", $("#voicespeed").val() / 10);
     localStorage.setItem("voice_pitch", $("#voicepitch").val() / 50);
     localStorage.setItem("voice_vol", $("#voicevol").val() / 100);
-    Materialize.toast(lang.lang_speech_refresh, 3000);
+    M.toast({ html: lang.lang_speech_refresh, displayLength: 3000 })
 }
 function voiceSettingLoad() {
     var speed = localStorage.getItem("voice_speed");

app/js/tl/src.js

@@ -31,7 +31,7 @@ function src(mode) {
 	} else {
 		var start = "https://" + domain + "/api/v1/search?q=" + q
 	}
-	console.log(start)
+	console.log("Try to search at " + start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -44,7 +44,7 @@ function src(mode) {
 		src("v1")
 		return false;
 	}).then(function (json) {
-		console.log(json);
+		console.log(["Search", json]);
 		//ハッシュタグ
 		if (json.hashtags[0]) {
 			var tags = "";
@@ -52,9 +52,9 @@ function src(mode) {
 				var tag = json.hashtags[key4];
 				if (mode) {
 					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
-					'\',\'add\')" class="pointer">#' + tag + '</a><br> ';
+						'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
 				} else {
-					tags=tags+graphDraw(tag);
+					tags = tags + graphDraw(tag, acct_id);
 				}
 
 			});
@@ -63,12 +63,12 @@ function src(mode) {
 		//トゥート
 		if (json.statuses[0]) {
 			var templete = parse(json.statuses, '', acct_id);
-			$("#src-contents").append("Mentions<br>" + templete);
+			$("#src-contents").append("<br>Mentions<br>" + templete);
 		}
 		//アカウント
 		if (json.accounts[0]) {
 			var templete = userparse(json.accounts, '', acct_id);
-			$("#src-contents").append("Accounts<br>" + templete);
+			$("#src-contents").append("<br>Accounts<br>" + templete);
 		}
 		jQuery("time.timeago").timeago();
 	});
@@ -83,14 +83,13 @@ function tsAdd(q){
 	var obj = JSON.parse(multi);
 	localStorage.setItem("card_" + obj.length, "true");
 	obj.push(add);
-		console.log(obj);
 	var json = JSON.stringify(obj);
 	localStorage.setItem("column", json);
 	parseColumn();
 }
 function tootsearch(tlid, q) {
 	var start = "https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=" + q
-	console.log(start)
+	console.log("Toot srrach at " + start)
 	$("#notice_" + tlid).text("tootsearch(" + q + ")");
 	$("#notice_icon_" + tlid).text("search");
 	fetch(start, {
@@ -106,13 +105,10 @@ function tootsearch(tlid,q){
 	}).then(function (raw) {
 		var templete = "";
 		var json = raw.hits.hits;
-			console.log(json);
 		var max_id = raw["hits"].length;
 		for (var i = 0; i < json.length; i++) {
 			var toot = json[i]["_source"];
-				console.log(lastid)
 			if (lastid != toot.uri) {
-					console.log(toot);
 				if (toot && toot.account) {
 					templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
 				}
@@ -133,7 +129,6 @@ function moreTs(tlid,q){
 	var sid = $("#timeline_" + tlid + " .ts-marker").last().attr("data-maxid");
 	moreloading = true;
 	var start = "https://tootsearch.chotto.moe/api/v1/search?from=" + sid + "&sort=created_at%3Adesc&q=" + q
-	console.log(start)
 	$("#notice_" + tlid).text("tootsearch(" + q + ")");
 	$("#notice_icon_" + tlid).text("search");
 	fetch(start, {
@@ -149,13 +144,10 @@ function moreTs(tlid,q){
 	}).then(function (raw) {
 		var templete = "";
 		var json = raw.hits.hits;
-			console.log(json);
 		var max_id = raw["hits"].length;
 		for (var i = 0; i < json.length; i++) {
 			var toot = json[i]["_source"];
-				console.log(lastid)
 			if (lastid != toot.uri) {
-					console.log(toot);
 				if (toot && toot.account) {
 					templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
 				}
@@ -172,10 +164,9 @@ function moreTs(tlid,q){
 		jQuery("time.timeago").timeago();
 	});
 }
-function graphDraw(tag){
+function graphDraw(tag, acct_id) {
 	var tags = "";
 	var his = tag.history;
-		console.log(his);
 	var max = Math.max.apply(null, [his[0].uses, his[1].uses, his[2].uses, his[3].uses, his[4].uses, his[5].uses, his[6].uses]);
 	var six = 50 - (his[6].uses / max * 50);
 	var five = 50 - (his[5].uses / max * 50);
@@ -186,13 +177,13 @@ function graphDraw(tag){
 	var zero = 50 - (his[0].uses / max * 50);
 	if (max === 0) {
 		tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
-	'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
+			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
-			'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
 	} else {
 		tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
 			'<g><path d="M0,' + six + ' L10,' + five + ' 20,' + four + ' 30,' + three + ' 40,' + two + ' 50,' + one + ' 60,' + zero + '" style="stroke: #9e9e9e; stroke-width: 1;fill: none;"></path></g>' +
-		'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
+			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
-				'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
 	}
 
 	return tags;

app/js/tl/tag.js

@@ -58,13 +58,14 @@ function favTag(){
     Object.keys(obj).forEach(function (key) {
         var tag = obj[key];
         if (nowPT != tag) {
-            console.log(nowPT+"/"+tag);
+            console.log("stable tags:" + nowPT + "/" + tag);
             var ptt = lang.lang_tags_realtime;
             var nowon = "";
         } else {
             var ptt = lang.lang_tags_unrealtime;
             var nowon = "(" + lang.lang_tags_realtime + ")";
         }
+        tag = escapeHTML(tag);
         tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a>' + nowon + '<span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a>　' +
             '<a onclick="autoToot(\'' + tag + '\');" class="pointer" title="' + lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">' + ptt + '</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' + lang.lang_tags_tagunpin.replace("{{tag}}", '#' + tag) + '">' + lang.lang_del + '</a></span> ';
     });
@@ -79,7 +80,6 @@ function trendTag(){
     var domain = "imastodon.net"
     var at = localStorage.getItem("acct_" + acct_id + "_at");
     var start = "https://" + domain + "/api/v1/trend_tags"
-	console.log(start)
     fetch(start, {
         method: 'GET',
         headers: {
@@ -96,6 +96,7 @@ function trendTag(){
             var tags = "";
             json = json.score;
             Object.keys(json).forEach(function (tag) {
+                tag = escapeHTML(tag);
                 tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span> ';
             });
             $("#taglist").append('<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags + '</div>');
@@ -115,13 +116,14 @@ function tagTL(a,b,c,d){
     tl(a, b, acct_id, d);
 }
 function autoToot(tag) {
+    tag = escapeHTML(tag)
     var nowPT = localStorage.getItem("stable")
     if (nowPT == tag) {
         localStorage.removeItem("stable");
-        Materialize.toast(lang.lang_tags_unrealtime,3000);
+        M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
     } else {
         localStorage.setItem("stable", tag);
-        Materialize.toast(lang.lang_tags_tagwarn.replace("{{tag}}" ,tag).replace("{{tag}}" ,tag),3000);
+        M.toast({ html: lang.lang_tags_tagwarn.replace("{{tag}}", tag).replace("{{tag}}", tag), displayLength: 3000 })
         brInsert('#' + tag + " ")
     }
     favTag();

app/js/tl/tl.js

@@ -7,7 +7,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	var domain = localStorage.getItem("domain_" + acct_id);
 	//タグとかの場合はカラム追加して描画
 	if (tlid == "add") {
-		console.log("add");
+		console.log("add new column");
 		var newtab = $(".box").length;
 		var add = {
 			domain: acct_id,
@@ -18,7 +18,6 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var obj = JSON.parse(multi);
 		localStorage.setItem("card_" + obj.length, "true");
 		obj.push(add);
-		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("column", json);
 		parseColumn();
@@ -125,14 +124,14 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		};
 	}
 
-	console.log(start);
+	console.log(["Try to get timeline of " + tlid, start])
 	fetch(start, i).then(function (response) {
 		return response.json();
 	}).catch(function (error) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json)
+		console.log(["Result of getting timeline of " + tlid, json])
 		$("#landing_" + tlid).hide();
 		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
 			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
@@ -164,34 +163,14 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 	localStorage.setItem("now", type);
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
 		var misskey = true;
-		console.log(type);
+		var key = localStorage.getItem("misskey_wss_" + acct_id)
-		if (type == "home") {
+		var send = '{"type":"connect","body":{"channel":"' + typePs(type) + '","id":"' + tlid + '"}}'
-			var start = "wss://" + domain +
+		var mskyset = setInterval(function () {
-				"/?i=" + at;
+			if (misskeywsstate[key]) {
-		} else if (type == "pub") {
+				misskeyws[key].send(send)
-			var start = "wss://" + domain +
+				clearInterval(mskyset)
-				"/global-timeline?i=" + at;
-		} else if (type == "pub-media") {
-			var start = "wss://" + domain +
-			"/global-timeline?i=" + at;
-		} else if (type == "local") {
-			var start = "wss://" + domain +
-			"/local-timeline?i=" + at;
-		} else if (type == "local-media") {
-			var start = "wss://" + domain +
-			"/local-timeline?i=" + at;
-		} else if (type == "mix") {
-			var start = "wss://" + domain +
-			"/hybrid-timeline?i=" + at;
-		} else if (type == "tag") {
-			Materialize.toast(lang.lang_misskeyparse_tagnostr, 3000);
-		} else if (type == "noauth") {
-			var start = "wss://" + acct_id +
-			"/local-timeline?i=" + at;
-		} else if (type=="list"){
-			var start = "wss://" + domain +
-			"/user-list?i=" + at+"&listId="+data;
 			}
+		}, 100);
 	} else {
 		var misskey = false;
 		if (localStorage.getItem("streaming_" + acct_id)) {
@@ -233,20 +212,15 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			var start = wss +
 				"/api/v1/streaming/?stream=direct&access_token=" + at;
 		}
-	}
-	
-	console.log(start);
 		var wsid = websocket.length;
 		localStorage.setItem("wss_" + tlid, wsid);
 		websocket[wsid] = new WebSocket(start);
 		websocket[wsid].onopen = function (mess) {
-		console.log(tlid + ":Connect Streaming API:" + type);
+			console.table({ "tlid": tlid, "type": "Connect Streaming API" + type, "domain": domain, "message": [mess] })
-		console.log(mess);
 			$("#notice_icon_" + tlid).removeClass("red-text");
 		}
 		websocket[wsid].onmessage = function (mess) {
-		console.log(tlid + ":Receive Streaming API:");
+			console.log([tlid + ":Receive Streaming API:", JSON.parse(mess.data)]);
-		console.log(JSON.parse(mess.data));
 			if (misskey) {
 				if (JSON.parse(mess.data).type == "note") {
 					var obj = JSON.parse(mess.data).body;
@@ -289,7 +263,6 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				} else if (typeA == "update" || typeA == "conversation") {
 					localStorage.removeItem("delete");
 					var obj = JSON.parse(JSON.parse(mess.data).payload);
-				console.log(obj);
 					if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
 						if (voice) {
 							say(obj.content)
@@ -337,8 +310,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			return false;
 		};
 		websocket[wsid].onclose = function () {
-		console.error("Closing");
+			console.warn("Closing " + tlid);
-		console.error(tlid);
 			if (mode == "error") {
 				$("#notice_icon_" + tlid).addClass("red-text");
 				todo('WebSocket Closed');
@@ -351,7 +323,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			}
 			return false;
 		};
-
+	}
 }
 
 //一定のスクロールで発火
@@ -453,7 +425,11 @@ function moreload(type, tlid) {
 			todo(error);
 			console.error(error);
 		}).then(function (json) {
-			console.log(json);
+			if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+				var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+			} else {
+				var mute = [];
+			}
 			if (misskey) {
 				var templete = misskeyParse(json, '', acct_id, tlid, "", mute);
 			} else {
@@ -469,7 +445,7 @@ function moreload(type, tlid) {
 }
 //TL差分取得
 function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
-	console.log("sabun")
+	console.log("Get diff of TL" + tlid)
 	var multi = localStorage.getItem("column");
 	var obj = JSON.parse(multi);
 	var acct_id = obj[tlid].domain;
@@ -562,7 +538,7 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 			todo(error);
 			console.error(error);
 		}).then(function (json) {
-			console.log(json);
+			console.log(["Result diff of TL" + tlid, json]);
 			if (misskey) {
 				var templete = misskeyParse(json, '', acct_id, tlid, "", mute);
 			} else {
@@ -586,12 +562,12 @@ function tlCloser() {
 	Object.keys(websocket).forEach(function (tlid) {
 		if (websocketOld[tlid]) {
 			websocketOld[tlid].close();
-			console.log("Close Streaming API: Old" + tlid);
+			console.log("%c Close Streaming API: Old" + tlid, "color:blue");
 		}
 		if (websocket[0]) {
 			console.log(websocket[0]);
 			websocket[tlid].close();
-			console.log("Close Streaming API:" + tlid);
+			console.log("%c Close Streaming API:" + tlid, "color:blue");
 		}
 
 	});
@@ -599,7 +575,7 @@ function tlCloser() {
 	Object.keys(websocketHome).forEach(function (tlid) {
 		if (websocketHome[tlid]) {
 			websocketHome[tlid].close();
-			console.log("Close Streaming API:MixHome" + tlid);
+			console.log("%c Close Streaming API:Integrated Home" + tlid, "color:blue");
 		}
 
 	});
@@ -607,7 +583,7 @@ function tlCloser() {
 	Object.keys(websocketLocal).forEach(function (tlid) {
 		if (websocketLocal[tlid]) {
 			websocketLocal[tlid].close();
-			console.log("Close Streaming API:MixLocal" + tlid);
+			console.log("%c Close Streaming API:Integrated Local" + tlid, "color:blue");
 		}
 
 	});
@@ -615,11 +591,17 @@ function tlCloser() {
 	Object.keys(websocketNotf).forEach(function (tlid) {
 		if (websocketNotf[tlid]) {
 			websocketNotf[tlid].close();
-			console.log("Close Streaming API:Notf" + tlid);
+			console.log("%c Close Streaming API:Notf" + tlid, "color:blue");
 		}
 
 	});
-	websocketNotf = [];
+	Object.keys(misskeyws).forEach(function (tlid) {
+		if (misskeyws[tlid]) {
+			misskeyws[tlid].close();
+			console.log("%c Close Streaming API:Misskey" + tlid, "color:blue");
+		}
+	});
+	misskeyws = {}
 }
 
 //TLのタイトル
@@ -660,7 +642,7 @@ function cap(type, data, acct_id) {
 			var response = "Federated TL(Media)";
 		}
 	} else if (type == "tag") {
-		var response= "#" + data
+		var response = "#" + escapeHTML(data)
 	} else if (type == "list") {
 		var ltitle = localStorage.getItem("list_" + data + "_" + acct_id);
 		var response = "List(" + ltitle + ")"
@@ -685,7 +667,7 @@ function cap(type, data, acct_id) {
 	} else if (type == "webview") {
 		var response = "Twitter"
 	} else if (type == "tootsearch") {
-		var response="tootsearch(" + data + ")";
+		var response = "tootsearch(" + escapeHTML(data) + ")";
 	}
 	return response;
 }
@@ -710,6 +692,24 @@ function com(type, data) {
 		return "direct?"
 	}
 }
+//Misskey
+function typePs(type) {
+	if (type == "home") {
+		return "homeTimeline"
+	} else if (type == "local" || type == "noauth") {
+		return "localTimeline"
+	} else if (type == "local-media") {
+		return "localTimeline"
+	} else if (type == "pub") {
+		return "globalTimeline"
+	} else if (type == "mix") {
+		return "hybridTimeline"
+	} else if (type == "tag") {
+		return "hashtag"
+	} else if (type == "list") {
+		return "userList"
+	}
+}
 function misskeycom(type, data) {
 	if (type == "home") {
 		return "timeline"
@@ -787,8 +787,8 @@ function strAliveInt(){
 	setTimeout(strAlive, 10000);
 }
 function reconnector(tlid, type, acct_id, data, mode) {
-	console.log("Reconnector:"+mode)
+	console.log("%c Reconnector:" + mode + "(timeline" + tlid + ")", "color:pink")
-	if(type=="mix" || type=="plus"){
+	if (type == "mix" || type == "integrated" || type == "plus") {
 		if (localStorage.getItem("voice_" + tlid)) {
 			var voice = true;
 		} else {
@@ -801,10 +801,11 @@ function reconnector(tlid,type,acct_id,data,mode){
 		}
 		var wssh = localStorage.getItem("wssH_" + tlid);
 		websocketHome[wssh].close();
-		var wssh=localStorage.getItem("wssL_" + tlid);
+		var wssl = localStorage.getItem("wssL_" + tlid);
 		websocketLocal[wssl].close();
 		mixre(acct_id, tlid, type, mute, "", voice, mode);
 	} else if (type == "notf") {
+		notfColumn(acct_id, tlid, "")
 	} else {
 		var wss = localStorage.getItem("wss_" + tlid);
 		websocket[wss].close();
@@ -820,6 +821,7 @@ function reconnector(tlid,type,acct_id,data,mode){
 		}
 		reload(type, '', acct_id, tlid, data, mute, "", voice, mode);
 	}
-	Materialize.toast(lang.lang_tl_reconnect, 2000);
+	M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
+	
 }
 strAliveInt()

app/js/ui/img.js

@@ -59,7 +59,6 @@ function imgv(id, key, acct_id) {
 					$("#imagemodal").css("width", width + "px")
 				}
 			} else {
-				console.log("long")
 				$("#imagemodal img").css("width", "auto")
 				var widthS = windowH / height * width;
 				if (widthS < windowW) {
@@ -149,7 +148,6 @@ function imgCont(type) {
 						$("#imagemodal").css("width", width + "px")
 					}
 				} else {
-				console.log("long")
 					$("#imagemodal img").css("width", "auto")
 					var widthS = windowH / height * width;
 					if (widthS < windowW) {
@@ -167,7 +165,6 @@ function imgCont(type) {
 			} else {
 				$("#image-next").prop("disabled", false);
 			}
-		console.log("#" + id + "-image-" + (key * 1 - 1));
 			if ($("#" + id + "-image-" + (key * 1 - 1)).length === 0) {
 				$("#image-prev").prop("disabled", true);
 			} else {
@@ -231,7 +228,6 @@ function zoom(z) {
 		$(this).on('touchmove', function (event) {
 			if ($(target).data('down') === true) {
 				// スクロール
-				console.log($(target).data('x'));
 				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') -
 					getX(event));
 				target.scrollTop($(target).data('scrollTop') + $(target).data('y') -
@@ -275,22 +271,14 @@ function detFromImg(){
 //画像保存
 function dlImg() {
 	var url = $("#imgmodal").attr("src");
-	var electron = require("electron");
-	var ipc = electron.ipcRenderer;
 	if (localStorage.getItem("savefolder")) {
 		var save = localStorage.getItem("savefolder");
 	} else {
 		var save = "";
 	}
-	ipc.send('general-dl', [url,save,false]);
+	postMessage(["generalDL", [url, save, false]], "*")
-	ipc.on('general-dl-prog', function (event, arg) {
+
-		console.log(arg);
-	})
-	ipc.on('general-dl-message', function (event, arg) {
-		var argC=arg.replace(/\\/g,"\\\\")+"\\\\.";
-		Materialize.toast(lang.lang_img_DLDone+arg+'<button class="btn-flat toast-action" onclick="openFinder(\''+argC+'\')">Show</button>', 5000);
-	})
 }
 function openFinder(dir) {
-	ipc.send('open-finder', dir);
+	postMessage(["openFinder", dir], "*")
 }

app/js/ui/layout.js

@@ -20,15 +20,21 @@ $('.type').click(function() {
 	$("#type-sel").val($(this).attr("data-type"))
 })
 //最初、カラム変更時に発火
-function parseColumn() {
+function parseColumn(dontclose) {
-	console.log("parse");
+	console.log("%c Parse column", "color:red;font-size:125%");
 	var size = localStorage.getItem("size");
 	if (size) {
 		$("#timeline-container").css("font-size", size + "px");
 		$(".toot-reset").css("font-size", size + "px");
 		$(".cont-series").css("font-size", size + "px");
 	}
+	if (localStorage.getItem("menu-done")) {
+		$("#fukidashi").addClass("hide")
+	}
+	if (!dontclose) {
 		tlCloser();
+	}
+
 	var multi = localStorage.getItem("multi");
 	if (multi) {
 		var obj = JSON.parse(multi);
@@ -46,10 +52,15 @@ function parseColumn() {
 			ckdb(key);
 			//フィルターデータ読もう
 			getFilter(key);
+			var domain = localStorage.getItem("domain_" + key);
+			if (localStorage.getItem("mode_" + domain) == "misskey") {
+				localStorage.removeItem("misskey_wss_" + key)
+				connectMisskey(key)
+			}
 		});
 	}
 	var acctlist = obj;
-	console.log(obj);
+	console.table(obj);
 	/*var xed=localStorage.getItem("xed");
 	if(xed){
 		xpand();
@@ -153,12 +164,16 @@ function parseColumn() {
 				var animecss = "";
 			}
 			if (acct.type == "notf") {
-			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fas fa-share exc-icons"></i></label> '+
+				var exclude = lang.lang_excluded + ':<br><label><input type="checkbox" class="filled-in" id="exc-reply-' + key + '" ' + excludeCk(key, "mention") + ' /><span><i class="fas fa-share exc-icons"></i></span></label> ' +
-			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fas fa-star exc-icons"></i></label> '+
+					'<label><input type="checkbox" class="filled-in" id="exc-fav-' + key + '"  ' + excludeCk(key, "favourite") + ' /><span><i class="fas fa-star exc-icons"></i></span></label> ' +
-			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fas fa-retweet exc-icons"></i></label> '+
+					'<label><input type="checkbox" class="filled-in" id="exc-bt-' + key + '" ' + excludeCk(key, "reblog") + ' /><span><i class="fas fa-retweet exc-icons"></i></span></label> ' +
-			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fas fa-users exc-icons"></i></label> '+
+					'<label><input type="checkbox" class="filled-in" id="exc-follow-' + key + '" ' + excludeCk(key, "follow") + ' /><span><i class="fas fa-users exc-icons"></i></span></label> ' +
-			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fas fa-tasks exc-icons"></i></label> '+
+					'<label><input type="checkbox" class="filled-in" id="exc-poll-' + key + '" ' + excludeCk(key, "poll") + ' /><span><i class="fas fa-tasks exc-icons"></i></span></label> ' +
-			'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>';
+					'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude(' + key + ')">Filter</button>';
+				if (checkNotfFilter(key)) {
+					exclude = exclude + '<button class="btn red waves-effect" style="width:60px; padding:0;" onclick="resetNotfFilter(' + key + ')">Clear all</button>'
+				}
+				exclude = exclude + "<br>";
 			} else if (acct.type == "home") {
 				var exclude = '<a onclick="ebtToggle(' + key +
 					')" class="setting nex"><i class="fas fa-retweet waves-effect nex" title="' + lang.lang_layout_excludingbt + '" style="font-size:24px"></i><span id="sta-bt-' +
@@ -177,9 +192,17 @@ function parseColumn() {
 			if (key === 0) {
 				left_hold = '';
 			}
+			if (localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct.domain)) == "misskey") {
+				var isMisRed = ""
+				exclude = ""
+				var if_misskey_hide = "hide"
+			} else {
+				var isMisRed = "red-text"
+				var if_misskey_hide = ""
+			}
 			var html = '<div class="boxIn" id="timeline_box_' + key + '_box" tlid="' + key +
 				'" data-acct="' + acct.domain + '"><div class="notice-box z-depth-2" id="menu_' + key + '" style="' + insert + ' ">' +
-			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="checkStr(\''+acct.type+'\', \''+data+'\', \''+acct.domain+'\', \''+key+'\', \''+delc+'\',\''+voice+'\',null)" title="'+lang.lang_layout_gotop +'"></i></div>'+
+				'<div class="area-notice"><i class="material-icons waves-effect ' + isMisRed + '" id="notice_icon_' + key + '"' + notf_attr + ' style="font-size:40px; padding-top:25%;" onclick="checkStr(\'' + acct.type + '\', \'' + data + '\', \'' + acct.domain + '\', \'' + key + '\', \'' + delc + '\',\'' + voice + '\',null)" title="' + lang.lang_layout_gotop + '"></i></div>' +
 				'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>' +
 				'<div class="area-a1"><a onclick="notfToggle(' + acct.domain + ',' + key +
 				')" class="setting nex ' + if_notf + '" title="' + unique_notf + '"' + icnsert + '><i class="material-icons waves-effect nex notf-icon_' +
@@ -198,8 +221,8 @@ function parseColumn() {
 				key + '">On</span></a>' + lang.lang_layout_linkana + '<br><a onclick="voiceToggle(' + key +
 				')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_tts + '">hearing</i><span id="sta-voice-' +
 				key + '">On</span></a>' + lang.lang_layout_tts + 'TL<br><a onclick="reconnector(' + key +
-		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+				',\'' + acct.type + '\',\'' + acct.domain + '\',\'' + escapeHTML(acct.data) + '\')" class="setting nex ' + if_notf + ' ' + if_misskey_hide + '"><i class="material-icons waves-effect nex ' + if_notf + '" title="' + lang.lang_layout_reconnect + '">low_priority</i></a><span class="' + if_notf + '">' + lang.lang_layout_reconnect + '</span><br>' + lang.lang_layout_headercolor + '<br><div id="picker_' + key + '" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
-			'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
+				'" class="tl ' + acct.type + '-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="' + acct.domain + '" data-const="' + acct.type + '_' + acct.domain + '"><div id="landing_' + key + '" style="text-align:center">' + lang.lang_layout_nodata + '</div></div></div>'
 			$('#timeline_box_' + basekey + '_parentBox').append(html);
 			localStorage.removeItem("pool_" + key);
 			if (acct.data) {
@@ -253,7 +276,6 @@ function parseColumn() {
 }
 function checkStr(type, data, acct_id, key, delc, voice) {
 	if ($('#notice_icon_' + key).hasClass("red-text") && type != "notf" && type != "mix") {
-		console.log("sabun-get")
 		goTop(key);
 		tlDiff(type, data, acct_id, key, delc, voice, "");
 	} else {
@@ -286,7 +308,9 @@ function secvis(set){
 //カラム追加
 function addColumn() {
 	var acct = $("#add-acct-sel").val();
+	if (acct != "webview" && acct != "noauth") {
 		localStorage.setItem("last-use", acct);
+	}
 	var type = $("#type-sel").val();
 	if (acct == "noauth") {
 		acct = $("#noauth-url").val();
@@ -340,27 +364,28 @@ function addselCk(){
 function removeColumn(tlid) {
 	$("#sort-box").addClass("hide");
 	$("#sort-box").removeClass("show");
+	Swal.fire({
+		title: lang.lang_layout_deleteColumn,
+		text: lang.lang_layout_deleteColumnDesc,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
 			var multi = localStorage.getItem("column");
 			var obj = JSON.parse(multi);
-	//聞く
-	var electron = require("electron");
-	var ipc = electron.ipcRenderer;
-	ipc.send('column-del', "");
-	ipc.on('column-del-reply', function (event, arg) {
-		console.log(arg);
-		if(arg===1){
-			localStorage.removeItem("card_" + tlid);
 			obj.splice(tlid, 1);
-			for(var i=0;i<obj.length;i++){
-				localStorage.setItem("card_" + i,"true");
-				localStorage.removeItem("catch_" + i);
-			}
 			var json = JSON.stringify(obj);
 			localStorage.setItem("column", json);
-			parseColumn();
+			parseColumn()
-			sortload()
+			sortLoad()
 		}
-	})
+		$("#sort-box").removeClass("hide");
+		$("#sort-box").addClass("show");
+	});
 }
 
 //設定トグル
@@ -447,7 +472,7 @@ function webviewParse(url,key,insert,icnsert,css){
 		'" style="' + css + '"><div class="notice-box z-depth-2" id="menu_' + key + '" style="' + insert + '">' +
 		'<div class="area-notice"><i class="fab fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>' +
 		'<div class="area-notice_name tl-title">WebView(' + url + ')</div>' +
-			'<div class="area-sta"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">'+lang.lang_layout_webviewmode +'</label></div>'+
+		'<div class="area-sta"></div>' +
 		'<div class="area-a2"><a onclick="removeColumn(' + key +
 		')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_delthis + '"' + icnsert + '>cancel</i></a></div>' +
 		'<div class="area-a3"><a onclick="setToggle(' + key +
@@ -456,7 +481,6 @@ function webviewParse(url,key,insert,icnsert,css){
 		'"></div><div class="column-hide notf-indv-box" id="util-box_' + key +
 		'" style="padding:5px;">' + lang.lang_layout_headercolor + '<br><div id="picker_' + key + '" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:100%;"><div id="timeline_' + key +
 		'" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;"><webview src="' + url + '" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js"></webview></div></div></div>';
-	
 	return html;
 }
 function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, animecss, q) {

app/js/ui/menu.js

@@ -1,4 +1,6 @@
 function menu() {
+  localStorage.setItem("menu-done", true);
+  $("#fukidashi").addClass("hide")
   if (!$("#menu").hasClass("appear")) {
     $("#menu").addClass("appear")
     var left = localStorage.getItem("menu-left");
@@ -28,7 +30,8 @@ function menu(){
 
 }
 $(function () {
-    $( "#menu" ).draggable({handle: "#menu-bar",
+  $("#menu").draggable({
+    handle: "#menu-bar",
     stop: function () {
       var left = $('#menu').offset().left;
       if (left > $('body').width() - $('#menu').width()) {
@@ -48,6 +51,5 @@ $(function() {
   });
 });
 function help() {
-    const {shell} = require('electron');
+  postMessage(["openUrl", "https://docs.thedesk.top"], "*")
-	shell.openExternal("https://docs.thedesk.top");
 }

app/js/ui/post-box.js

@@ -39,10 +39,12 @@ function show() {
 	$('#post-box').css("left", left + "px")
 	$('#post-box').css("top", top + "px")
 	$('#post-box').fadeIn();
+	$('#textarea').characterCounter();
 }
 
 $(function () {
-  $( "#post-box" ).draggable({handle: "#post-bar",
+	$("#post-box").draggable({
+		handle: "#post-bar",
 		stop: function () {
 			var left = $('#post-box').offset().left;
 			if (left > $('body').width() - $('#post-box').width()) {

app/js/ui/scroll.js

@@ -28,7 +28,7 @@ function scrollck() {
 		var scrt = $(this).find(".tl").height() - $(window).height();
 		var scr = $(this).scrollTop();
 		if (scr > scrt) {
-			console.log("kicked");
+			console.log("kicked more loading:" + tlid);
 			moreload('', tlid);
 		}
 	});
@@ -44,7 +44,6 @@ function goColumn(key){
 	$("#sort-box").addClass("hide");
 	$("#sort-box").removeClass("show");
 	if ($('[tlid=' + key + ']').length) {
-		console.log($('[tlid='+key+']').offset().left);
 		$("#timeline-container").animate({ scrollLeft: $("#timeline-container").scrollLeft() + $('[tlid=' + key + ']').offset().left });
 	}
 }

app/js/ui/settings.js

@@ -5,7 +5,7 @@ var envView = new Vue({
 	methods: {
 		complete: function (i, val) {
 			var ls = envView.config[i].storage;
-			Materialize.toast("Complete", 3000);
+			M.toast({ html: 'Complete', displayLength: 3000 })
 			if (!val) {
 				var id = envView.config[i].id;
 				var val = $("#" + id).val()
@@ -23,13 +23,22 @@ var tlView = new Vue({
 	data: { config: tlConstruction },
 	methods: {
 		complete: function (i, val) {
-			var ls=tlView.config[i].storage;
+			var ls = tlView.config[i];
-			if(!val){
+			if (val) {
-				var id=tlView.config[i].id;
+				localStorage.setItem(ls.storage, val)
-				var val=$("#"+id).val()
+			} else {
+				if (!ls.data) {
+					ls = [ls]
+				} else {
+					ls = ls.data
+				}
+				for (var j = 0; j < ls.length; j++) {
+					M.toast({ html: 'Complete', displayLength: 3000 })
+					var id = ls[j].id;
+					var val = $("#" + id).val()
+					localStorage.setItem(ls[j].storage, val)
+				}
 			}
-			Materialize.toast("Complete", 3000);
-			localStorage.setItem(ls,val)
 			return true
 		}
 	}
@@ -39,13 +48,22 @@ var postView = new Vue({
 	data: { config: postConstruction, kirishima: localStorage.getItem('kirishima') },
 	methods: {
 		complete: function (i, val) {
-			var ls=postView.config[i].storage;
+			var ls = postView.config[i];
-			Materialize.toast("Complete", 3000);
+			if (val) {
-			if(!val){
+				localStorage.setItem(ls.storage, val)
-				var id=postView.config[i].id;
+			} else {
-				var val=$("#"+id).val()
+				if (!ls.data) {
+					ls = [ls]
+				} else {
+					ls = ls.data
+				}
+				for (var j = 0; j < ls.length; j++) {
+					M.toast({ html: 'Complete', displayLength: 3000 })
+					var id = ls[j].id;
+					var val = $("#" + id).val()
+					localStorage.setItem(ls[j].storage, val)
+				}
 			}
-			localStorage.setItem(ls,val)
 			return true
 		}
 	}
@@ -62,7 +80,7 @@ function settings() {
 		$("#" + theme).prop("checked", true);
 	} else {
 		if (cd != localStorage.getItem("theme")) {
-			Materialize.toast(lang.lang_setting_theme.replace("{{set}}" ,ct), 3000);
+			M.toast({ html: lang.lang_setting_theme.replace("{{set}}", ct), displayLength: 3000 })
 		}
 		//テーマはこの場で設定
 		themes(cd);
@@ -71,14 +89,14 @@ function settings() {
 	var fontd = $("#font").val();
 	if (fontd) {
 		if (fontd != localStorage.getItem("font")) {
-			Materialize.toast(lang.lang_setting_font.replace("{{set}}" ,fontd), 3000);
+			M.toast({ html: lang.lang_setting_font.replace("{{set}}", ct), displayLength: 3000 })
 		}
 		localStorage.setItem("font", fontd);
 		themes();
 	} else {
 		if (localStorage.getItem("font")) {
 			localStorage.removeItem("font");
-			Materialize.toast(lang.lang_setting_font.replace("{{set}}" ,lang.lang_setting_default), 3000);
+			M.toast({ html: lang.lang_setting_font.replace("{{set}}", ct), displayLength: 3000 })
 			themes();
 		}
 	}
@@ -95,17 +113,30 @@ function load() {
 	}
 	var max = tlView.config.length;
 	for (var i = 0; i < max; i++) {
-		var ls=tlView.config[i].storage;
+		if (ls) {
 			if (localStorage.getItem(ls)) {
 				tlView.config[i].setValue = localStorage.getItem(ls)
 			}
+		} else {
+			ls = tlView.config[i].data
+			for (var j = 0; j < ls.length; j++) {
+				tlView.config[i].data[j].setValue = localStorage.getItem(ls[j].storage)
+			}
+		}
 	}
 	var max = postView.config.length;
 	for (var i = 0; i < max; i++) {
 		var ls = postView.config[i].storage;
+		if (ls) {
 			if (localStorage.getItem(ls)) {
 				postView.config[i].setValue = localStorage.getItem(ls)
 			}
+		} else {
+			ls = postView.config[i].data
+			for (var j = 0; j < ls.length; j++) {
+				postView.config[i].data[j].setValue = localStorage.getItem(ls[j].storage)
+			}
+		}
 	}
 	if (localStorage.getItem("imas")) {
 		$(".imas").removeClass("hide");
@@ -123,6 +154,11 @@ function load() {
 		var font = "";
 	}
 	$("#font").val(font);
+	$("#c1-file").text(localStorage.getItem("custom1"))
+	$("#c2-file").text(localStorage.getItem("custom2"));
+	$("#c3-file").text(localStorage.getItem("custom3"));
+	$("#c4-file").text(localStorage.getItem("custom4"));
+	//$("#log").val(localStorage.getItem("errors"))
 }
 
 function climute() {
@@ -142,7 +178,7 @@ function climute(){
 			var list = key * 1 + 1;
 			templete = '<div class="acct" id="acct_' + key + '">' + list +
 				'.' +
-			cli + '<button class="btn waves-effect red disTar" onclick="cliMuteDel(' +
+				escapeHTML(cli) + '<button class="btn waves-effect red disTar" onclick="cliMuteDel(' +
 				key + ')">' + lang.lang_del + '</button><br></div>';
 			$("#mute-cli").append(templete);
 		});
@@ -154,18 +190,19 @@ function cliMuteDel(key){
 	obj.splice(key, 1);
 	var json = JSON.stringify(obj);
 	localStorage.setItem("client_mute", json);
-	mute();
+	climute();
 }
 
 function wordmute() {
 	var word = localStorage.getItem("word_mute");
 	var obj = JSON.parse(word);
-	$('#wordmute').material_chip({
+	if (!obj) { obj = [] }
+	$('#wordmute').chips({
 		data: obj,
 	});
 }
 function wordmuteSave() {
-	var word=$('#wordmute').material_chip('data');
+	var word = M.Chips.getInstance($("#wordmute")).chipsData;
 	var json = JSON.stringify(word);
 	localStorage.setItem("word_mute", json);
 }
@@ -173,19 +210,18 @@ function wordmuteSave(){
 function wordemp() {
 	var word = localStorage.getItem("word_emp");
 	var obj = JSON.parse(word);
-	$('#wordemp').material_chip({
+	if (!obj) { obj = [] }
+	$('#wordemp').chips({
 		data: obj,
 	});
 }
 function wordempSave() {
-	var word=$('#wordemp').material_chip('data');
+	var word = M.Chips.getInstance($("#wordemp")).chipsData;
 	var json = JSON.stringify(word);
 	localStorage.setItem("word_emp", json);
 }
 function notftest() {
-		var electron = require("electron");
+	var os = localStorage.getItem("platform");
-		var ipc = electron.ipcRenderer;
-		var os = electron.remote.process.platform;
 	var options = {
 		body: lang.lang_setting_notftest + '(' + lang.lang_setting_notftestprof + ')',
 		icon: localStorage.getItem("prof_0")
@@ -193,14 +229,15 @@ function notftest(){
 	if (os == "darwin") {
 		var n = new Notification('TheDesk' + lang.lang_setting_notftest, options);
 	} else {
-			ipc.send('native-notf', ['TheDesk'+lang.lang_setting_notftest,lang.lang_setting_notftest+'('+lang.lang_setting_notftestprof+')',localStorage.getItem('prof_0'),"",""]);
+		var nativeNotfOpt = ['TheDesk' + lang.lang_setting_notftest, lang.lang_setting_notftest + '(' + lang.lang_setting_notftestprof + ')', localStorage.getItem('prof_0'), "", ""]
+		postMessage(["nativeNotf", nativeNotfOpt], "*")
 	}
 
 }
 function oks(no) {
 	var txt = $("#oks-" + no).val();
 	localStorage.setItem("oks-" + no, txt);
-	Materialize.toast(lang.lang_setting_ksref, 3000);
+	M.toast({ html: lang.lang_setting_ksref, displayLength: 3000 })
 }
 function oksload() {
 	if (localStorage.getItem("oks-1")) { $("#oks-1").val(localStorage.getItem("oks-1")) }
@@ -208,30 +245,24 @@ function oksload(){
 	if (localStorage.getItem("oks-3")) { $("#oks-3").val(localStorage.getItem("oks-3")) }
 }
 function changelang(lang) {
-	var electron = require("electron");
+	postMessage(["lang", lang], "*")
-	var ipc = electron.ipcRenderer;
-	ipc.send('lang',lang);
-	ipc.on('langres', function (event, arg) {
-		location.href="../"+lang+"/setting.html"
-	});
 }
 function exportSettings() {
-	if(!confirm(lang.lang_setting_exportwarn)){
+	Swal.fire({
-		return false;
+		title: lang.lang_setting_exportwarn,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			postMessage(["exportSettings", ""], "*")
 		}
-	var electron = require("electron");
+	})
-	var remote=electron.remote;
-	var dialog=remote.dialog;
-	var ipc = electron.ipcRenderer;
-	dialog.showSaveDialog(null, {
-		title: 'Export',
-		properties: ['openFile', 'createDirectory'],
-		defaultPath: "export.thedeskconfigv2"
-	}, (savedFiles) => {
-		console.log(savedFiles);
-		if(!savedFiles){
-			return false;
 }
+function exportSettingsCore() {
 	var exp = {};
 	//Accounts
 	var multi = localStorage.getItem("multi");
@@ -289,34 +320,24 @@ function exportSettings(){
 	var tagarr = localStorage.getItem("tag");
 	var favtag = JSON.parse(tagarr);
 	exp.favoriteTags = favtag;
-		console.log(exp);
+	return exp;
-		ipc.send('export', [savedFiles,JSON.stringify(exp)]);
-		alert("Done.")
-		//cards
-		//lang
-	});
 }
 function importSettings() {
-	if(!confirm(lang.lang_setting_importwarn)){
+	Swal.fire({
-		return false;
+		title: lang.lang_setting_importwarn,
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			postMessage(["importSettings", ""], "*")
 		}
-	var electron = require("electron");
+	})
-	var remote=electron.remote;
-	var dialog=remote.dialog;
-	var ipc = electron.ipcRenderer;
-	dialog.showOpenDialog(null, {
-		title: 'Import',
-		properties: ['openFile'],
-		filters: [
-			{name: 'TheDesk Config', extensions: ['thedeskconfig','thedeskconfigv2']},
-		]
-	}, (fileNames) => {
-		console.log(fileNames);
-		if(!fileNames){
-			return false;
 }
-		ipc.send('import', fileNames[0]);
+function importSettingsCore(arg) {
-		ipc.on('config', function (event, arg) {
 	var obj = JSON.parse(arg);
 	if (obj) {
 		localStorage.clear();
@@ -358,7 +379,6 @@ function importSettings(){
 			//Version 1
 			localStorage.setItem("theme", obj.theme);
 			if (obj.width) {
-						console.log(obj.width)
 				localStorage.setItem("width", obj.width);
 			}
 			if (obj.font) {
@@ -404,36 +424,25 @@ function importSettings(){
 		}
 		location.href = "index.html";
 	} else {
-				alert("Error.")
+		Swal.fire({
-			}
+			type: 'error',
+			title: 'Error'
 		})
-		//cards
+	}
-		//lang
-	});
 }
 function savefolder() {
-	var electron = require("electron");
+	postMessage(["sendSinmpleIpc", "savefolder"], "*")
-	var remote=electron.remote;
-	var dialog=remote.dialog;
-	dialog.showOpenDialog(null, {
-		title: 'Save folder',
-		properties: ['openDirectory'],
-	}, (fileNames) => {
-		localStorage.setItem("savefolder",fileNames[0]);
-	});
 }
 
 function font() {
-	var electron = require("electron");
+	postMessage(["sendSinmpleIpc", "fonts"], "*")
-	var ipc = electron.ipcRenderer;
+}
-	ipc.send('fonts', []);
+function fontList(arg) {
-	ipc.on('font-list', function (event, arg) {
 	$("#fonts").removeClass("hide");
 	for (var i = 0; i < arg.length; i++) {
 		var font = arg[i];
 		$("#fonts").append('<div class="font pointer" style="font-family:' + font.family + '" onclick="insertFont(\'' + font.family + '\')">' + font.family + "</div>")
 	}
-	});
 }
 function insertFont(name) {
 	$("#font").val(name);
@@ -519,7 +528,7 @@ function customComp(){
 	pickerDefine(1, "fff");
 	pickerDefine(2, "fff");
 	pickerDefine(3, "fff");
-	  ipc.send('theme-json-create', JSON.stringify(json));
+	postMessage(["themeJsonCreate", JSON.stringify(json)], "*")
 }
 function deleteIt() {
 	var id = $("#custom-sel-sel").val();
@@ -539,15 +548,12 @@ function deleteIt(){
 	pickerDefine(1, "fff");
 	pickerDefine(2, "fff");
 	pickerDefine(3, "fff");
-	ipc.on('theme-json-delete-complete', function (event, args) {
+	postMessage(["themeJsonDelete", id], "*")
-		ctLoad()
-	});
-	ipc.send('theme-json-delete', id);
 }
 function ctLoad() {
-	ipc.send('theme-json-list', "");
+	postMessage(["sendSinmpleIpc", "theme-json-list"], "*")
-	ipc.on('theme-json-list-response', function (event, args) {
+}
-		console.log(args);
+function ctLoadCore(args) {
 	var templete = "";
 	Object.keys(args).forEach(function (key) {
 		var theme = args[key];
@@ -560,8 +566,7 @@ function ctLoad(){
 	$("#custom-sel-sel").html(templete);
 	templete = '<option value="add_new">' + $("#edit-selector").attr("data-add") + '</option>' + templete;
 	$("#custom-edit-sel").html(templete);
-		$('select').material_select('update');
+	$('select').formSelect();
-	});
 }
 function customSel() {
 	var id = $("#custom-sel-sel").val();
@@ -589,9 +594,10 @@ function custom(){
 		$("#delTheme").addClass("disabled")
 	} else {
 		$("#delTheme").removeClass("disabled")
-		ipc.send('theme-json-request', id);
+		postMessage(["themeJsonRequest", id], "*")
-		ipc.on('theme-json-response', function (event, args) {
+	}
-			console.log(args);
+}
+function customConnect(args) {
 	$("#custom_name").val(args.name);
 	$("#custom_desc").val(args.desc);
 	$("#" + args.base).prop("checked", true);
@@ -616,26 +622,31 @@ function custom(){
 	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
 	pickerDefine(3, rgbToHex(accent))
 	$("#custom_json").val(JSON.stringify(args));
-		});
-	}
 }
 function customImp() {
 	var json = $("#custom_import").val();
 	if (JSON5.parse(json)) {
-		ipc.send('theme-json-create', json);
+		postMessage(["themeJsonCreate", json], "*")
 	} else {
-		alert("Error")
+		Swal.fire({
+			type: 'error',
+			title: 'Error'
+		})
 	}
 }
+function clearCustomImport() {
+	$("#custom_import").val("");
+}
 function hardwareAcceleration(had) {
-	console.log("ha");
+	postMessage(["ha", had], "*")
-	ipc.send('ha', had);
+}
+function customSound(key) {
+	postMessage(["customSound", key], "*")
+}
+function customSoundSave(key, file) {
+	localStorage.setItem("custom" + key, file);
+	$("#c1-file").text(file)
 }
-
-ipc.on('theme-json-create-complete', function (event, args) {
-	$("#custom_import").val("");
-	ctLoad()
-});
 window.onload = function () {
 	//最初に読む
 	load();
@@ -648,3 +659,4 @@ oksload();
 	npprovider();
 	ctLoad()
 };
+

app/js/ui/settings.old.js

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

app/js/ui/sort.js

@@ -32,7 +32,7 @@ function sortload(){
 			var acctdata = user + "@" + domain;
 		}
 
-			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><div class="sorticon"><i class="material-icons">'+icon(acct.type)+'</i></div><div class="sorttitle">'+cap(acct.type, acct.data,acct.domain)+'</div><div class="sortaction"><a onclick="goColumn(' + key +
+		var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, escapeHTML(acct.data), acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_sort_gothis + '">forward</i></a> <a onclick="removeColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>';
 		$("#sort").append(html);
@@ -61,7 +61,7 @@ function Scap(type, data) {
 	} else if (type == "tootsearch") {
 		return "tootsearch(" + data + ")"
 	} else {
-		console.log(type);
+		console.error("unknown timeline type: " + type);
 	}
 }
 
@@ -103,7 +103,7 @@ function sort(){
 	var json = JSON.stringify(newobj);
 	localStorage.setItem("column", json);
 	$("#sort").html("");
-	Materialize.toast("並べ替え完了。", 3000);
+	M.toast({ html: "Sorted", displayLength: 3000 })
 	sortload();
 	parseColumn();
 	sortMenu()

app/js/ui/spotify.js

@@ -1,21 +1,13 @@
 function spotifyConnect() {
     var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing";
-		const {
+    var platform = localStorage.getItem("platform");
-  			shell
-  		} = require('electron');
-
-		  
-          var electron = require("electron");
-          var remote=electron.remote;
-          var platform=remote.process.platform;
     if (platform == "win32") {
-            shell.openExternal(auth);
+        postMessage(["openUrl", auth], "*")
-		  var ipc = electron.ipcRenderer;
+        postMessage(["sendSinmpleIpc", "quit"], "*")
-                ipc.send('quit', 'go');
     } else {
         auth = auth + "&state=code";
         $("#spotify-code-show").removeClass("hide");
-            shell.openExternal(auth);
+        postMessage(["openUrl", auth], "*")
     }
 
 
@@ -57,10 +49,10 @@ function spotifyFlagSave(){
     var awk = $("[name=awk]:checked").val();
     if (awk == "yes") {
         localStorage.setItem("artwork", "yes");
-        Materialize.toast(lang.lang_spotify_img, 3000);
+        M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
     } else {
         localStorage.removeItem("artwork");
-        Materialize.toast(lang.lang_spotify_imgno, 3000);
+        M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
     }
 }
 function nowplaying(mode) {
@@ -79,17 +71,15 @@ function nowplaying(mode){
                 todo(error);
                 console.error(error);
             }).then(function (json) {
-            console.log(json);
+                console.table(json);
                 if (json.length < 1) {
                     return false;
                 }
                 var item = json.item;
                 var img = item.album.images[0].url;
-            var electron = require("electron");
-             var ipc = electron.ipcRenderer;
                 var flag = localStorage.getItem("artwork");
                 if (flag) {
-                ipc.send('bmp-image', [img,0]);
+                    postMessage(["bmpImage", [img, 0]], "*")
                 }
                 var content = localStorage.getItem("np-temp");
                 if (!content || content == "" || content == "null") {
@@ -118,29 +108,27 @@ function nowplaying(mode){
                 $("#textarea").val(content);
             });
         } else {
-            alert(lang.lang_spotify_acct);
+            Swal.fire({
+                type: 'info',
+                title: lang.lang_spotify_acct
+            })
         }
     } else if (mode == "itunes") {
-        var electron = require("electron");
+        postMessage(["itunes", ""], "*")
-	    var ipc = electron.ipcRenderer;
-        if (ipc.listenerCount('itunes-np') > 0) {
-            return false;
     }
-
+}
-	    ipc.send('itunes', "");
+function npCore(arg) {
-	    ipc.once('itunes-np', function (event, arg) {
     if (arg.cmd) {
         console.error(arg);
         return;
     }
-            console.log(arg);
+    console.table(arg);
     var content = localStorage.getItem("np-temp");
     if (!content || content == "" || content == "null") {
         var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
     }
     var flag = localStorage.getItem("artwork");
-            var remote=electron.remote;
+    var platform = localStorage.getItem("platform");
-            var platform=remote.process.platform;
     if (platform == "win32") {
         if (flag && arg.path) {
             media(arg.path, "image/png", "new");
@@ -171,14 +159,11 @@ function nowplaying(mode){
     var regExp = new RegExp("{genre}", "g");
     content = content.replace(regExp, arg.genre);
     $("#textarea").val(content);
-	    })
-    }
-    
 }
 function spotifySave() {
     var temp = $("#np-temp").val();
     localStorage.setItem("np-temp", temp);
-    Materialize.toast(lang.lang_spotify_np, 3000);
+    M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
 }
 function npprovider() {
     var provd = $("[name=npp]:checked").val();
@@ -191,12 +176,11 @@ function npprovider(){
         }
     } else {
         if (provd != localStorage.getItem("np_provider")) {
-            Materialize.toast(lang.lang_setting_npprovide.replace("{{set}}" ,provd), 3000);
+            M.toast({ html: lang.lang_setting_npprovide.replace("{{set}}", provd), displayLength: 3000 })
         }
         localStorage.setItem("np_provider", provd);
-        var electron = require("electron");
+        postMessage(["itunes", ["set", provd]], "*")
-        var ipc = electron.ipcRenderer;
+
-        ipc.send('itunes', ["set",provd]);
     }
 }
 if (location.search) {

app/js/ui/theme.js

@@ -21,7 +21,7 @@ function themes(theme) {
 	}
 	if (theme == "custom") {
 		if (localStorage.getItem("customtheme-id")) {
-			ipc.send('theme-css-request', localStorage.getItem("customtheme-id"));
+			postMessage(["themeCSSRequest", localStorage.getItem("customtheme-id")], "*")
 		}
 	}
 }

app/js/ui/tips.js

@@ -20,9 +20,7 @@ function bottomReverse(){
 	}
 }
 function tips(mode) {
-	var electron = require("electron");
+	postMessage(["sendSinmpleIpc", "endmem"], "*")
-	var ipc = electron.ipcRenderer;
-	ipc.send('endmem', "");
 	clearInterval(clockint);
 	clearInterval(spotStart);
 	if (mode == "ver") {
@@ -50,15 +48,10 @@ function tips(mode){
 }
 //メモリ
 function startmem() {
-	var electron = require("electron");
+	postMessage(["sendSinmpleIpc", "startmem"], "*")
-	var ipc = electron.ipcRenderer;
+}
-	ipc.send('startmem', "");
+function renderMem(use, cpu, total){
-	ipc.on('memory', function (event, arg) {
+	$("#tips-text").html(escapeHTML(cpu) + "<br>Memory:" + Math.floor(use / 1024 / 1024 / 102.4) / 10 + "/" + Math.floor(total / 1024 / 1024 / 102.4) / 10 + "GB(" + Math.floor(use / total * 100) + "%)")
-		var use=arg[0];
-		var cpu=arg[1];
-		var total=arg[2]
-		$("#tips-text").html(cpu+"<br>Memory:"+Math.floor(use/1024/1024/102.4)/10+"/"+Math.floor(total/1024/1024/102.4)/10+"GB("+Math.floor(use/total*100)+"%)")
-	})
 }
 //トレンドタグ
 function trendTagonTip() {
@@ -66,7 +59,6 @@ function trendTagonTip(){
 	var domain = "imastodon.net"
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/trend_tags"
-	console.log(start)
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -83,7 +75,7 @@ function trendTagonTip(){
 			var tags = "";
 			json = json.score;
 			Object.keys(json).forEach(function (tag) {
-                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
+				tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + escapeHTML(tag) + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
 			});
 			$("#tips-text").html('<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTagonTip()" style="font-size:12px">refresh</i>:<br>' + tags + '</div>');
 			trendTagonTipInterval()
@@ -109,7 +101,6 @@ function spotifytips(){
 			todo(error);
 			console.error(error);
 		}).then(function (json) {
-            console.log(json);
 			var ms = json.progress_ms;
 			var last = 1000 - ms % 1000;
 			var item = json.item;
@@ -142,7 +133,10 @@ function spotifytips(){
 			spotint = setInterval(spotStart, 1000);
 		});
 	} else {
-            alert(lang.lang_spotify_acct);
+		Swal.fire({
+			type: 'info',
+			title: lang.lang_spotify_acct
+		})
 	}
 }
 function spotStart() {
@@ -200,4 +194,3 @@ function tipsToggle(){
 if (localStorage.getItem("tips")) {
 	tips(localStorage.getItem("tips"));
 }
-	

app/js/userdata/his-data.js

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

app/js/userdata/prof-edit.js

@@ -30,7 +30,7 @@ function imgChange(imgfile, target) {
 	var acct_id = $('#his-data').attr("use-acct");
 	todo("アップロードしています")
 	if (!imgfile.files.length) {
-		console.log("No Img");
+		console.warn("No Image to upload");
 		return;
 	}
 	var file = imgfile.files[0];
@@ -52,7 +52,6 @@ function imgChange(imgfile, target) {
 		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
-				console.log(json);
 				$('#his-data').modal('close');
 				todc();
 				localStorage.removeItem("image");

app/js/userdata/showOnTL.js

@@ -19,7 +19,7 @@ function udgEx(user,acct_id){
 	if (acct_id == "main") {
 		acct_id = localStorage.getItem("main");
 	}
-	console.log(user);
+	console.log("Get user data of " + user);
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) == "misskey") { return false; }
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
@@ -36,14 +36,11 @@ function udgEx(user,acct_id){
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		if (json.accounts) {
 			var id = json.accounts[0].id;
 			udg(id, acct_id);
 		} else {
-			var url="https://"+user.split('@')[1]+"/@"+user.split('@')[0];
+			postMessage(["openUrl", url], "*")
-			const {shell} = require('electron');
-			shell.openExternal(url);
 		}
 	});
 	return true;
@@ -52,7 +49,6 @@ function udg(user, acct_id) {
 	reset();
 	if (!user) {
 		user = localStorage.getItem("user-id_" + acct_id);
-		console.log(user);
 	}
 	todo("User Data Loading...");
 	var domain = localStorage.getItem("domain_" + acct_id);
@@ -62,7 +58,6 @@ function udg(user, acct_id) {
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/accounts/" + user;
-	console.log(start);
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -75,7 +70,6 @@ function udg(user, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		//一つ前のユーザーデータ
 		if (!localStorage.getItem("history")) {
 			$("#his-history-btn").prop("disabled", true);
@@ -85,9 +79,8 @@ function udg(user, acct_id) {
 		}
 		//moved設定時
 		if (json.moved) {
-			Materialize.toast(
+			M.toast({ html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' +
-				lang.lang_showontl_movetxt+'<button class="btn-flat toast-action" onclick="udg(\'' +
+			json.moved.id + '\',\'' + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>', displayLength: 4000 })
-				json.moved.id + '\',\''+acct_id+'\')">'+lang.lang_showontl_movebtn+'</button>', 4000)
 		}
 		$('#his-data').modal('open');
 		$('#his-data').attr("user-id", user);
@@ -128,7 +121,6 @@ function udg(user, acct_id) {
 		//var tags =  '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
 		//var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
 		//note=note.replace(/#(\S+)/gi, tags)
-			console.log(note)
 		//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
 		$("#his-name").html(dis_name);
 		$("#his-acct").text(json.acct);
@@ -157,8 +149,7 @@ function udg(user, acct_id) {
 						var when = "";
 						var color = "inherit"
 					}
-						fval=twemoji.parse(fval);
+					note = note + '<tr><td class="his-field-title">' + twemoji.parse(escapeHTML(fname)) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + twemoji.parse(fval) + '</td></tr>';
-						note=note+'<tr><td class="his-field-title">'+fname+'</td><td class="his-field-content" title="'+when+'" style="background-color:'+color+'">'+fval+'</td></tr>';
 				}
 				note = note + '</table>'
 				$("#his-des").html(twemoji.parse(note));
@@ -185,10 +176,10 @@ function udg(user, acct_id) {
 			showFrl('', acct_id);
 			$("#his-name-val").val(json.display_name);
 			if (json.fields.length > 0) {
-					$("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value));
+				if (json.fields[0]) { $("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value)); }
-					$("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value));
+				if (json.fields[1]) { $("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value)); }
-					$("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value));
+				if (json.fields[2]) { $("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value)); }
-					$("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value));
+				if (json.fields[3]) { $("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value)); }
 			}
 			var des = json.note;
 			des = des.replace(/<br \/>/g, "\n")
@@ -216,7 +207,6 @@ function misskeyUdg(user, acct_id) {
 	reset();
 	if (!user) {
 		user = localStorage.getItem("user-id_" + acct_id);
-		console.log(user);
 	}
 	todo("User Data Loading...");
 	var domain = localStorage.getItem("domain_" + acct_id);
@@ -226,7 +216,6 @@ function misskeyUdg(user, acct_id) {
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/users/show";
-	console.log(user);
 	fetch(start, {
 		method: 'POST',
 		headers: {
@@ -242,7 +231,6 @@ function misskeyUdg(user, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		console.log(json);
 		//一つ前のユーザーデータ
 		if (!localStorage.getItem("history")) {
 			$("#his-history-btn").prop("disabled", true);
@@ -279,7 +267,7 @@ function misskeyUdg(user, acct_id) {
 		$("#his-follow").text(json.followingCount);
 		$("#his-follower").text(json.followersCount);
 		$("#his-since").text(crat(json.createdAt));
-			var note=json.description;
+		var note = escapeHTML(json.description);
 		$("#his-des").html(twemoji.parse(note));
 		if (json.isCat) {
 			$("#his-bot").html("Cat" + twemoji.parse("😺"));
@@ -341,7 +329,6 @@ function historyShow(){
 function profShow() {
 	var acct_id = $("#post-acct-sel").val();
 	var user = localStorage.getItem("user-id_" + acct_id);
-	console.log("user-id_"+acct_id+":"+user);
 	udg(user, acct_id)
 	hide();
 }
@@ -419,9 +406,8 @@ function relations(user, acct_id) {
 	});
 }
 function profbrws() {
-	const {shell} = require('electron');
 	var url = $("#his-openin").attr("data-href")
-	shell.openExternal(url);
+	postMessage(["openUrl", url], "*")
 }
 //オールリセット
 function hisclose() {
@@ -480,9 +466,9 @@ function reset(){
 	$("#his-float-blocked").hide();
 	$("#his-proof-prof").html("")
 }
-$('#my-data-nav .custom-tab').on('click',function(){
+$('#my-data-nav .tab').on('click', function () {
 	var target = $(this).find("a").attr("go");
-	$("#my-data-nav .custom-tab").removeClass("active-back");
+	$("#my-data-nav .tab").removeClass("active-back");
 	$(this).addClass("active-back");
 	$(target).show();
 	$(".tab-content:not(" + target + ")").hide();

app/main.js

@@ -1,4 +1,4 @@
-
+var dirname = __dirname;
 var dir = 'file://' + __dirname;
 var base = dir + '/view/';
 // Electronのモジュール
@@ -94,11 +94,35 @@ function createWindow() {
 	var platform = process.platform;
 	var bit = process.arch;
 	if (platform == "linux") {
-		var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,icon: __dirname + '/desk.png'}
+		var arg = {
+			webPreferences: {
+				webviewTag: true,
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(__dirname, "js", "platform", "preload.js")
+			},
+			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png'
+		}
 	} else if (platform == "win32") {
-		var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,simpleFullscreen:true}
+		var arg = {
+			webPreferences: {
+				webviewTag: true,
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(__dirname, "js", "platform", "preload.js")
+			},
+			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true
+		}
 	} else if (platform == "darwin") {
-		var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,simpleFullscreen:true}
+		var arg = {
+			webPreferences: {
+				webviewTag: true,
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(__dirname, "js", "platform", "preload.js")
+			},
+			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true
+		}
 	}
 	mainWindow = new BrowserWindow(arg);
 	electron.session.defaultSession.clearCache(() => { })
@@ -149,19 +173,22 @@ function createWindow() {
 
 	var platform = process.platform;
 	var bit = process.arch;
-	if(platform=="darwin"){
+	if (process.argv.indexOf("--dev") === -1) {
-		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang,mainWindow,false,dir)));
+		packaged = true;
+	} else {
+		packaged = false;
 	}
+	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir)));
 	//CSS
 	css.css(mainWindow);
 	//アップデータとダウンロード
-	dl.dl(mainWindow,lang_path,base);
+	dl.dl(mainWindow, lang_path, base, dirname);
 	//画像選択と画像処理
 	img.img(mainWindow, dir);
 	//NowPlaying
 	np.TheDeskNowPlaying(mainWindow);
 	//その他system
-	systemFunc.system(mainWindow,dir,lang);
+	systemFunc.system(mainWindow, dir, lang, dirname);
 }
 // Electronの初期化完了後に実行
 app.on('ready', createWindow);

app/main/css.js

@@ -10,7 +10,7 @@ function css(mainWindow) {
 
 	ipc.on('custom-css-create', function (e, arg) {
 		fs.writeFileSync(customcss, arg);
-		mainWindow.webContents.send('custom-css-create-complete', "");
+		e.sender.webContents.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 = "";
 		}
-		mainWindow.webContents.send('custom-css-response', css);
+		e.sender.webContents.send('custom-css-response', css);
 	})
 	ipc.on('theme-json-create', function (e, arg) {
 		var themecss = join(app.getPath("userData"), JSON5.parse(arg)["id"] +
 			".thedesktheme");
 		fs.writeFileSync(themecss, JSON.stringify(JSON5.parse(arg)));
 		if (JSON5.parse(arg)["id"]) {
-			mainWindow.webContents.send('theme-json-create-complete', "");
+			e.sender.webContents.send('theme-json-create-complete', "");
 		} else {
-			mainWindow.webContents.send('theme-json-create-complete', "error");
+			e.sender.webContents.send('theme-json-create-complete', "error");
 		}
 	})
 	ipc.on('theme-json-delete', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
 		console.log(themecss);
 		fs.unlink(themecss, function (err) {
-			mainWindow.webContents.send('theme-json-delete-complete', "");
+			e.sender.webContents.send('theme-json-delete-complete', "");
 		});
 	})
 	ipc.on('theme-json-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
 		var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
-		mainWindow.webContents.send('theme-json-response', json);
+		e.sender.webContents.send('theme-json-response', json);
 	})
 	ipc.on('theme-css-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
@@ -76,7 +76,7 @@ function css(mainWindow) {
 				";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
 				primary +
 				";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}";
-			mainWindow.webContents.send('theme-css-response', css);
+			e.sender.webContents.send('theme-css-response', css);
 		} catch (e) {
 			var css = "";
 		}
@@ -98,7 +98,7 @@ function css(mainWindow) {
 					id: json.id
 				})
 			}
-			mainWindow.webContents.send('theme-json-list-response', themes);
+			e.sender.webContents.send('theme-json-list-response', themes);
 		});
 	})
 }

app/main/dl.js

@@ -1,4 +1,4 @@
-function dl(mainWindow,lang_path,base) {
+function dl(mainWindow, lang_path, base, dirname) {
 	const electron = require("electron");
 	const shell = electron.shell;
 	const fs = require("fs");
@@ -15,13 +15,19 @@ function dl(mainWindow,lang_path,base) {
 		var bit = process.arch;
 		if (platform != "others") {
 			updatewin = new BrowserWindow({
+				webPreferences: {
+					webviewTag: false,
+					nodeIntegration: false,
+					contextIsolation: true,
+					preload: join(dirname,"js", "platform", "preload.js")
+				},
 				width: 600,
 				height: 400,
 				"transparent": false, // ウィンドウの背景を透過
 				"frame": false, // 枠の無いウィンドウ
-					"resizable": false,
+				"resizable": false
-					"modal": true
 			});
+			//updatewin.openDevTools()
 			var lang = fs.readFileSync(lang_path, 'utf8');
 			updatewin.loadURL(base + lang + '/update.html');
 
@@ -32,7 +38,25 @@ function dl(mainWindow,lang_path,base) {
 	})
 	//アプデDL
 	ipc.on('download-btn', (e, args) => {
+		function dl(url, file, dir, e) {
 
+			e.sender.webContents.send('mess', "ダウンロードを開始します。");
+			const opts = {
+				directory: dir,
+				openFolderWhenDone: true,
+				onProgress: function (event) {
+					e.sender.webContents.send('prog', event);
+				},
+				saveAs: false
+			};
+			download(updatewin,
+				url, opts)
+				.then(dl => {
+					e.sender.webContents.send('mess', "ダウンロードが完了しました。");
+					app.quit();
+				})
+				.catch(console.error);
+		}
 		var platform = process.platform;
 		var bit = process.arch;
 		dialog.showSaveDialog(null, {
@@ -52,7 +76,7 @@ function dl(mainWindow,lang_path,base) {
 			if (isExistFile(savedFiles)) {
 				fs.unlinkSync(savedFiles);
 			}
-			dl(args[0], args[1], m[1]);
+			dl(args[0], args[1], m[1], e);
 		});
 	});
 
@@ -65,27 +89,8 @@ function dl(mainWindow,lang_path,base) {
 		}
 	}
 
-	function dl(url, file, dir) {
 
-		updatewin.webContents.send('mess', "ダウンロードを開始します。");
+	ipc.on('general-dl', (event, args) => {
-		const opts = {
-			directory: dir,
-			openFolderWhenDone: true,
-			onProgress: function(e) {
-				updatewin.webContents.send('prog', e);
-			},
-			saveAs: false
-		};
-		download(BrowserWindow.getFocusedWindow(),
-				url, opts)
-			.then(dl => {
-				updatewin.webContents.send('mess', "ダウンロードが完了しました。");
-				app.quit();
-
-			})
-			.catch(console.error);
-	}
-	ipc.on('general-dl', (e, args) => {
 
 		var name = "";
 		var platform = process.platform;
@@ -104,14 +109,14 @@ function dl(mainWindow,lang_path,base) {
 			filename: name,
 			openFolderWhenDone: false,
 			onProgress: function (e) {
-				mainWindow.webContents.send('general-dl-prog', e);
+				event.sender.webContents.send('general-dl-prog', e);
 			},
 			saveAs: false
 		};
 		download(BrowserWindow.getFocusedWindow(),
 			args[0], opts)
 			.then(dl => {
-				mainWindow.webContents.send('general-dl-message', dir);
+				event.sender.webContents.send('general-dl-message', dir);
 			})
 			.catch(console.error);
 	});

app/main/img.js

@@ -24,45 +24,17 @@ function img(mainWindow,dir){
             for (var i = 0; i < fileNames.length; i++) {
                 var path = fileNames[i];
                 var bin = fs.readFileSync(path, 'base64');
-                mainWindow.webContents.send('bmp-img-comp', [bin,'new']);
+                e.sender.webContents.send('bmp-img-comp', [bin, 'new']);
             }
         });
     });
-    ipc.on('adobe', (e, arg) => {
-        
-        if(!arg){
-           const options = {
-               type: 'info',
-               title: 'Adobeフォトエディタ',
-               message: "「許可」または「永続的に許可」をクリックするとTheDeskとAdobeで情報を共有します。\n次のウィンドウを開いている時以外は一切提供しません。",
-               buttons: ['拒否', '許可','永続的に許可']
-             }
-             dialog.showMessageBox(options, function(index) {
-               if(index===2){
-                   mainWindow.webContents.send('adobeagree', "true");
-               }
-               if(index>0){
-                   adobeWindow();
-               }
-             })
-        }else{
-           adobeWindow();
-        }
-   });
-   function adobeWindow(){
-       var window = new BrowserWindow({
-           width: 1000,
-           height: 750
-       });
-       window.loadURL(dir + '/adobe.html');
-   }
     ipc.on('bmp-image', (e, args) => {
 
         var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
         Jimp.read(args[0], function (err, lenna) {
             if (err) throw err;
             lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
-			mainWindow.webContents.send('bmp-img-comp', [src,args[1]]);
+                e.sender.webContents.send('bmp-img-comp', [src, args[1]]);
             });
         });
 

app/main/language.js

@@ -65,21 +65,54 @@ function templete(lang,mainWindow,packaged,dir){
             "en": "Close"
         }
     }
+    if(packaged){
+        var ifDev = [
+            {
+                label: dict.reload[lang],
+                accelerator: 'CmdOrCtrl+R',
+                click: function () { mainWindow.reload(); }
+            }
+        ]
+    }else{
+        var ifDev = [
+            {
+                label: 'Toggle Developer Tools',
+                accelerator: 'Alt+Command+I',
+                click: function () { if (!packaged) { mainWindow.toggleDevTools(); } }
+            },
+            {
+                label: dict.reload[lang],
+                accelerator: 'CmdOrCtrl+R',
+                click: function () { mainWindow.reload(); }
+            }
+        ]
+    }
     const menu = [{
         label: dict.application[lang],
         submenu: [
-            { label: dict.about[lang], click: function() {
+            {
+                label: dict.about[lang], click: function () {
                     var ver = app.getVersion()
-	            var window = new BrowserWindow({width: 300, height: 460,
+                    var window = new BrowserWindow({
+                        webPreferences: {
+                            webviewTag: false,
+                            nodeIntegration: false,
+                            contextIsolation: true,
+                            preload: "../js/platform/preload.js"
+                        },
+                        width: 300, height: 460,
                         "transparent": false,    // ウィンドウの背景を透過
                         "frame": false,     // 枠の無いウィンドウ
-			        "resizable": false });
+                        "resizable": false
+                    });
                     window.loadURL(dir + '/about.html?ver=' + ver);
-             } },
+                }
+            },
             { type: "separator" },
             { label: dict.quit[lang], accelerator: "Command+Q", click: function () { app.quit(); } }
 
-        ]}, {
+        ]
+    }, {
         label: dict.edit[lang],
         submenu: [
             { label: dict.undo[lang], accelerator: "CmdOrCtrl+Z", selector: "undo:" },
@@ -89,20 +122,10 @@ function templete(lang,mainWindow,packaged,dir){
             { label: dict.copy[lang], accelerator: "CmdOrCtrl+C", selector: "copy:" },
             { label: dict.paste[lang], accelerator: "CmdOrCtrl+V", selector: "paste:" },
             { label: dict.selall[lang], accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
-        ]},{
-        label: dict.view[lang],
-        submenu: [
-            {
-                label: 'Toggle Developer Tools',
-                accelerator: 'Alt+Command+I',
-                click: function() { if(!packaged){mainWindow.toggleDevTools();} }
-              },
-          {
-            label: dict.reload[lang],
-            accelerator: 'CmdOrCtrl+R',
-            click: function() { mainWindow.webContents.send('reload', " "); }
-          }
         ]
+    }, {
+        label: dict.view[lang],
+        submenu: ifDev
     },
     {
         label: dict.window[lang],
@@ -123,33 +146,5 @@ function templete(lang,mainWindow,packaged,dir){
     ];
     return menu;
 }
-function delsel(lang){
-    const dict={
-        "delete":{
-            "ja":"カラム削除",
-            "en":"Delete this column"
-        },
-        "mess":{
-            "ja":"カラムを削除しますか？(すべてのカラムのリンク解析がOFFになります。)",
-            "en":"Delete this column(URL analyzes of all windows will be disabled.)"
-        },
-        "yes":{
-            "ja":"はい",
-            "en":"Yes"
-        },
-        "no":{
-            "ja":"いいえ",
-            "en":"No"
-        }
-    }
-    const options = {
-        type: 'info',
-        title: dict.delete[lang],
-        message: dict.mess[lang],
-        buttons: [dict.no[lang], dict.yes[lang]]
-      }
-      return options;
-}
 
 exports.template = templete;
-exports.delsel = delsel;

app/main/np.js

@@ -28,11 +28,11 @@ function np(mainWindow){
                 try {
                     const nowplaying = require("itunes-nowplaying-mac");
                     const value = await nowplaying.getRawData();
-                mainWindow.webContents.send('itunes-np', value);
+                    e.sender.webContents.send('itunes-np', value);
                 } catch (error) {
                     // エラーを返す
                     console.error(error);
-                mainWindow.webContents.send('itunes-np', error);
+                    e.sender.webContents.send('itunes-np', error);
                 }
             } else {
                 var { NowPlaying, PlayerName } = require("nowplaying-node");
@@ -62,7 +62,7 @@ function np(mainWindow){
                     album: myAIMP.getAlbum(),
                     path: bin
                 }
-                mainWindow.webContents.send('itunes-np', value);
+                e.sender.webContents.send('itunes-np', value);
             }
         }
 

app/main/system.js

@@ -1,4 +1,4 @@
-function system(mainWindow, dir, lang) {
+function system(mainWindow, dir, lang, dirname) {
 	const electron = require("electron");
 	const app = electron.app;
 	const join = require('path').join;
@@ -40,13 +40,68 @@ function system(mainWindow, dir, lang) {
 			});
 		}
 	});
+	//プラットフォーム
+	ipc.on('getPlatform', function (e, arg) {
+		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron]);
+	})
 	//言語
 	ipc.on('lang', function (e, arg) {
 
 		console.log("set:" + arg);
 		fs.writeFileSync(lang_path, arg);
-			mainWindow.webContents.send('langres', "");
+		e.sender.webContents.send('langres', "");
 	})
+	//エクスポートのダイアログ
+	ipc.on('exportSettings', function (e, args) {
+		dialog.showSaveDialog(null, {
+			title: 'Export',
+			properties: ['openFile', 'createDirectory'],
+			defaultPath: "export.thedeskconfigv2"
+		}, (savedFiles) => {
+			if (!savedFiles) {
+				return false;
+			}
+			e.sender.webContents.send('exportSettingsFile', savedFiles);
+		})
+	})
+	//インポートのダイアログ
+	ipc.on('importSettings', function (e, args) {
+		dialog.showOpenDialog(null, {
+			title: 'Import',
+			properties: ['openFile'],
+			filters: [
+				{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2'] },
+			]
+		}, (fileNames) => {
+			if (!fileNames) {
+				return false;
+			}
+			e.sender.webContents.send('config', fs.readFileSync(arg, 'utf8'));
+		})
+	})
+	//保存フォルダのダイアログ
+	ipc.on('savefolder', function (e, args) {
+		dialog.showOpenDialog(null, {
+			title: 'Save folder',
+			properties: ['openDirectory'],
+		}, (fileNames) => {
+			e.sender.webContents.send('savefolder', fileNames[0]);
+		});
+	})
+	//カスタムサウンドのダイアログ
+	ipc.on('customSound', function (e, arg) {
+		dialog.showOpenDialog(null, {
+			title: 'Custom sound',
+			properties: ['openFile'],
+			filters: [
+				{ name: 'Audio', extensions: ['mp3', 'aac', 'wav', 'flac', 'm4a'] },
+				{ name: 'All', extensions: ['*'] },
+			]
+		}, (fileNames) => {
+			e.sender.webContents.send('customSoundRender', [arg, fileNames[0]]);
+		});
+	})
+
 	//ハードウェアアクセラレーションの無効化
 	ipc.on('ha', function (e, arg) {
 
@@ -60,20 +115,20 @@ function system(mainWindow, dir, lang) {
 	})
 
 	ipc.on('quit', (e, args) => {
-        
 		app.quit();
 	});
 	ipc.on('about', (e, args) => {
-        
 		about();
 	});
-
 	function about() {
-        
 		var ver = app.getVersion()
 		var window = new BrowserWindow({
+			webPreferences: {
+				webviewTag: false,
+				nodeIntegration: false
+			},
 			width: 300,
-			height: 460,
+			height: 480,
 			"transparent": false, // ウィンドウの背景を透過
 			"frame": false, // 枠の無いウィンドウ
 			"resizable": false
@@ -81,14 +136,6 @@ function system(mainWindow, dir, lang) {
 		window.loadURL(dir + '/about.html?ver=' + ver);
 		return "true"
 	}
-	ipc.on('column-del', (e, args) => {
-         
-		console.log(lang);
-		var options = language.delsel(lang)
-		dialog.showMessageBox(options, function(index) {
-			mainWindow.webContents.send('column-del-reply', index);
-		})
-	});
 	ipc.on('nano', function (e, x, y) {
 
 		var nano_info_path = join(app.getPath("userData"),
@@ -100,6 +147,12 @@ function system(mainWindow, dir, lang) {
 			window_pos = [0, 0]; // デフォルトバリュー
 		}
 		var nanowindow = new BrowserWindow({
+			webPreferences: {
+				webviewTag: false,
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(dirname,"js", "platform", "preload.js")
+			},
 			width: 350,
 			height: 200,
 			"transparent": false, // ウィンドウの背景を透過
@@ -115,29 +168,27 @@ function system(mainWindow, dir, lang) {
 		});
 		return true;
 	})
-
 	var cbTimer1;
 	ipc.on('startmem', (e, arg) => {
+		event = e.sender
 		cbTimer1 = setInterval(mems, 1000);
 	});
+	function mems() {
+		var mem = os.totalmem() - os.freemem();
+		if (mainWindow) {
+			event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()]);
+		}
+	}
 	ipc.on('endmem', (e, arg) => {
 		if (cbTimer1) {
 			clearInterval(cbTimer1);
 		}
 	});
 
-	function mems() {
+
-		var mem = os.totalmem() - os.freemem();
-		if (mainWindow) {
-			mainWindow.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()]);
-		}
-	}
 	ipc.on('export', (e, args) => {
 		fs.writeFileSync(args[0], args[1]);
 	});
-	ipc.on('import', (e, arg) => {
-		mainWindow.webContents.send('config', fs.readFileSync(arg, 'utf8'));
-	});
 	//フォント
 	function object_array_sort(data, key, order, fn) {
 		//デフォは降順(DESC)
@@ -174,7 +225,7 @@ function system(mainWindow, dir, lang) {
 		const fm = require('font-manager');
 		var fonts = fm.getAvailableFontsSync();
 		object_array_sort(fonts, 'family', 'asc', function (fonts_sorted) {
-			mainWindow.webContents.send('font-list', fonts_sorted);
+			e.sender.webContents.send('font-list', fonts_sorted);
 		});
 	});
 }

app/nano.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
 	<meta charset="utf-8">
 	<link href="./css/themes.css" type="text/css" rel="stylesheet">
@@ -15,38 +16,58 @@ html{
 			overflow: hidden;
 			font-family: sans-serif;
 		}
+
 		body {
 			background-color: rgba(0, 0, 0, 0.1);
 			font-size: 11px;
 		}
+
 		#timeline_nano {
 			overflow-y: scroll;
 			overflow-x: hidden;
 			-webkit-app-region: no-drag;
 			max-height: 100px;
 		}
-.user{font-size:12px;}
+
+		.user {
+			font-size: 12px;
+		}
+
 		select {
 			-webkit-app-region: no-drag;
 		}
+
 		button {
 			-webkit-app-region: no-drag;
 		}
+
 		textarea {
 			-webkit-app-region: no-drag;
 		}
+
 		::-webkit-scrollbar {
 			width: 5px;
 			height: 10px;
 			background: rgba(0, 0, 0, 0.05);
 		}
+
 		::-webkit-scrollbar-track {
 			-webkit-border-radius: 5px;
 			border-radius: 5px;
 		}
- .area-actions{display:none !important;}
+
- .area-date_via{display:none !important;}
+		.area-actions {
- .area-side{display:none !important;}
+			display: none !important;
+		}
+
+		.area-date_via {
+			display: none !important;
+		}
+
+		.area-side {
+			display: none !important;
+		}
+
 		/* Handle */
 		::-webkit-scrollbar-thumb {
 			-webkit-border-radius: 5px;
@@ -54,27 +75,32 @@ textarea {
 			background: rgba(0, 0, 0, 0.8);
 			-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
 		}
+
 		.blacktheme body {
 			color: white;
 			background-color: #212121;
 		}
+
 		.blacktheme button {
 			background-color: black;
 			color: white;
 		}
-.blacktheme textarea, .blacktheme select{
+
+		.blacktheme textarea,
+		.blacktheme select {
 			color: white;
 		}
-.blacktheme select,.blacktheme option{
+
+		.blacktheme select,
+		.blacktheme option {
 			background-color: black;
 		}
 	</style>
 </head>
+
 <body>
+	<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
 	<script>
-//jQuery読む
-window.jQuery = window.$ = require('./js/common/jquery.js');
-var Hammer = require('./js/common/hammer.min.js');
 		$.strip_tags = function (str, allowed) {
 			if (!str) {
 				return "";

app/package.json

@@ -1,25 +1,33 @@
 {
   "name": "thedesk",
-  "version": "18.2.3",
+  "version": "18.6.5",
   "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",
+    "dev": "electron ./ --dev",
     "dist": "build --linux snap",
+    "build:js": "node build.js",
     "build": "electron-builder",
     "build:all": "electron-builder --win --linux",
     "build:win": "electron-builder --win"
   },
-  "keywords": [],
+  "keywords": [
+    "mastodon",
+    "client",
+    "electron",
+    "thedesk"
+  ],
   "bugs": {
     "url": "https://github.com/cutls/TheDesk/issues",
-    "email": "mstdn@thedesk.top"
+    "email": "web-pro@cutls.com"
   },
   "homepage": "https://thedesk.top",
   "author": {
     "name": "Cutls",
-    "url": "https://kirishima.clooud/@Cutls",
+    "url": "https://cutls.com/@Cutls",
     "email": "web-pro@cutls.com"
   },
   "contributor": [
@@ -35,24 +43,32 @@
     },
     {
       "name": "kPherox",
-      "url": "https://www.kr-kp.com/",
+      "url": "https://pawoo.net/@kPherox",
       "email": "admin@mail.kr-kp.com"
     }
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "electron-dl": "^1.11.0",
+    "electron-dl": "^1.14.0",
-    "jimp": "^0.2.28",
+    "jimp": "^0.6.4",
+    "jquery": "^3.4.1",
     "json5": "^2.1.0",
-    "node-notifier": "^5.2.1",
+    "materialize-css": "^1.0.0",
-    "sumchecker": "^2.0.2",
+    "node-notifier": "^5.4.0",
-    "vue": "^2.6.9"
+    "sumchecker": "^3.0.0",
+    "sweetalert2": "^8.13.0",
+    "vue": "^2.6.10"
   },
   "optionalDependencies": {
-    "nowplaying-node": "^0.1.3",
+    "nowplaying-node": "git+https://github.com/cutls/nowplaying-node",
     "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/4/head",
     "font-manager": "^0.3.0"
   },
+  "devDependencies": {
+    "electron": "^5.0.4",
+    "electron-builder": "^20.44.4",
+    "readline-sync": "1.4.9"
+  },
   "build": {
     "productName": "TheDesk",
     "appId": "top.thedesk",
@@ -94,15 +110,14 @@
       "category": "Network"
     },
     "mac": {
-      "target": ["dmg","zip"]
+      "target": [
+        "dmg",
+        "zip"
+      ]
     },
     "electronDownload": {
-      "version": "4.1.4"
+      "version": "5.0.1"
     },
-    "electronVersion": "4.1.4"
+    "electronVersion": "5.0.1"
-  },
-  "devDependencies": {
-    "electron": "^4.1.4",
-    "electron-builder": "^20.39.0"
   }
 }

app/view/en/acct.html

@@ -1,28 +1,64 @@
 <!doctype html>
 <html lang="en">
+
 <head>
       <title>Account Manager - TheDesk</title>
       <meta content="width=device-width,initial-scale=1.0" name="viewport">
-<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+      <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
       <link href="../../css/themes.css" type="text/css" rel="stylesheet">
       <link href="../../css/master.css" type="text/css" rel="stylesheet">
       <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
       <link href='../../css/tl.css' rel='stylesheet' type='text/css'>
       <link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
       <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
-<style>.acct{display:flex; justify-content:space-around;}
+      <style>
-.card{width:400px; background-color: #9e9e9e; margin:10px; }
+            .acct {
-body,html{overflow-y: scroll;}
+                  display: flex;
-#acct-list{display:flex; flex-wrap:wrap; color:white; align-items: flex-start}
+                  justify-content: space-around;
-.lts{font-size:150%}
+            }
-.colorsel{ display:flex; }
+
-.card .colorsel div:not(.exc){width:20px;height:20px;}
+            .card {
-.card .colorsel div.exc{width:40px;height:20px;}
+                  width: 400px;
+                  background-color: #9e9e9e;
+                  margin: 10px;
+            }
+
+            body,
+            html {
+                  overflow-y: scroll;
+            }
+
+            #acct-list {
+                  display: flex;
+                  flex-wrap: wrap;
+                  color: white;
+                  align-items: flex-start
+            }
+
+            .lts {
+                  font-size: 150%
+            }
+
+            .colorsel {
+                  display: flex;
+            }
+
+            .card .colorsel div:not(.exc) {
+                  width: 20px;
+                  height: 20px;
+            }
+
+            .card .colorsel div.exc {
+                  width: 40px;
+                  height: 20px;
+            }
+
             .first {
                   display: flex;
                   justify-content: center;
                   align-items: center
             }
+
             .first .hide-first {
                   display: none;
             }
@@ -36,11 +72,13 @@ body,html{overflow-y: scroll;}
       <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
       -->
 </head>
+
 <body id="mainView">
-<script type="text/javascript" src="../../js/common/jquery.js"></script>
+      <script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
       <script type="text/javascript" src="../../js/platform/first.js"></script>
-<script type="text/javascript" src="../../js/common/materialize.js"></script>
+      <script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
       <script type="text/javascript" src="../../js/lang/lang.en.js"></script>
+      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
       <script>
             var misskeytoken = false;
       </script>
@@ -48,7 +86,8 @@ body,html{overflow-y: scroll;}
       <script type="text/javascript" src="../../js/common/time.js"></script>
       <script type="text/javascript" src="../../js/common/modal.js"></script>
       <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 of accounts</h5>
             <div id="acct-list"></div>
             <div class="divider"></div>
@@ -61,17 +100,23 @@ body,html{overflow-y: scroll;}
                               <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
                               <div id="ins-suggest"></div>
                               Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)<br>
+                              <label>
                                     <input type="checkbox" class="filled-in" id="linux" />
-                  <label for="linux">Code setup</label><br>
+                                    <span>Code setup</span>
+                              </label>
+                              <br>
+                              <label>
                                     <input type="checkbox" class="filled-in" id="misskey" />
-                  <label for="misskey">Login as Misskey</label><br>
+                                    <span>Login as Misskey</span>
+                              </label><br>
                               <button class="btn waves-effect" onclick="instance()">Login</button><br>
                         </div>
                         <div class="col s4">
                               <span style="font-family:Open Sans;">Supports</span>
                               <div id="support" class="collection transparent"></div>
                         </div>
-</div></div>
+                  </div>
+            </div>
             <div id="auth" style="display:none">
                   Paste the code and close browser.<br>
                   <input type="text" id="code" placeholder="Code">

app/view/en/index.html

@@ -1,10 +1,12 @@
 <!doctype html>
 <html lang="en">
+
 <head>
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
-	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css"
+		integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
 	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
@@ -21,18 +23,21 @@
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 	-->
 </head>
+
 <body>
-<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
 	<script type="text/javascript" src="../../js/platform/first.js"></script>
-<script type="text/javascript" src="../../js/common/materialize.js"></script>
+	<script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
 	<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
 	<script type="text/javascript" src="../../js/common/time.js"></script>
+	<script type="text/javascript" src="../../js/common/blurhash.js"></script>
 	<script type="text/javascript" src="../../js/common/version.js"></script>
 	<script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script>
-var ver="Usamin (18.2.3)";
+		var ver = "Usamin (18.6.5)";
 		//betaを入れるとバージョンチェックしない
 		//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 		//var ver="beta";
@@ -41,6 +46,7 @@ var acct_id=0;
 		var tlid = 0;
 	</script>
 	<textarea id="copy" style="top:-100px; position:fixed;"></textarea>
+	<canvas id="canvas" style="top:-100px; position:fixed;width:32px;height:32px" width="32" height="32"></canvas>
 	<div id="tl">
 		<!--TL-->
 		<!--ドラッグハンドラ-->
@@ -52,57 +58,85 @@ var tlid=0;
 		</div>
 	</div>
 	<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="post-bar" class="drag-bar"><span id="unreact">Post new</span><span id="addreact"
+				class="hide">Reaction</span></div>
 		<!--トゥートボックス-->
 		<div id="left-side">
 			<div class="row" style="margin-bottom:0;">
 				</span>
 				<div class="" style="float:left;">
 					<a onclick="profShow()" style="vertical-align:-2.5rem;" class="pointer mize">
-	<img src="../../img/missing.svg" id="acct-sel-prof" title="Show profile of the selecting account(Ctrl+Shift+P)" data-trans-title="post_box_prof" width="24px">
+						<img src="../../img/missing.svg" id="acct-sel-prof" title="Show profile of the selecting account(Ctrl+Shift+P)"
+							data-trans-title="post_box_prof" width="24px">
 					</a>
 				</div>
 				<div class="input-field mize" style="float:left; width:calc(100% - 24px)">
 					<select id="post-acct-sel" class="acct-sel" onchange="mdCheck()"></select>
 				</div>
 				<span class="cancel">
-		<i class="material-icons waves-effect" onclick="hide()" title="Close this box(X)" data-trans-title="post_box_close">cancel</i>
+					<i class="material-icons waves-effect" onclick="hide()" title="Close this box(X)"
+						data-trans-title="post_box_close">cancel</i>
 				</span>
 				<!--Markdown-->
 				<div class="row" style="margin-bottom:0">
 					<div class="markdown mize hide">
 						<div class="col s12">
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('b')" title="太字(Ctrl+B)テキストボックス内を選択してから押すと囲みます。">format_bold</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('b')"
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('i')" title="斜字(Ctrl+I)テキストボックス内を選択してから押すと囲みます。">format_italic</i>
+								title="太字(Ctrl+B)テキストボックス内を選択してから押すと囲みます。">format_bold</i>
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('u')" title="下線(Ctrl+U)テキストボックス内を選択してから押すと囲みます。">format_underlined</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('i')"
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('s')" title="取り消し(Ctrl+S)テキストボックス内を選択してから押すと囲みます。">strikethrough_s</i>
+								title="斜字(Ctrl+I)テキストボックス内を選択してから押すと囲みます。">format_italic</i>
-<i class="material-icons pointer setting waves-effect" onclick="markdown('>','no','yes')" title="引用">format_quote</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('u')"
-<i class="material-icons pointer setting waves-effect" onclick="markdown('#','no','yes')" title="見出し">short_text</i>
+								title="下線(Ctrl+U)テキストボックス内を選択してから押すと囲みます。">format_underlined</i>
-<i class="material-icons pointer setting waves-effect" onclick="markdown('`','yes','no')" title="コード挿入　テキストボックス内を選択してから押すと囲みます。">code</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('s')"
-<i class="material-icons pointer setting waves-effect" onclick="markdown('- ','yes','yes')" title="箇条書きリスト">format_list_bulleted</i>
+								title="取り消し(Ctrl+S)テキストボックス内を選択してから押すと囲みます。">strikethrough_s</i>
-<i class="material-icons pointer setting waves-effect" onclick="markdown('1. ','yes','yes')" title="番号付きリスト">format_list_numbered</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('>','no','yes')"
-<i class="pointer setting fa fa-subscript waves-effect" onclick="markdown('__','yes','no','before')" title="下付き文字　テキストボックス内を選択してから押すと囲みます。" style="font-size:1.5rem"></i>
+								title="引用">format_quote</i>
-<i class="pointer setting fa fa-superscript waves-effect" onclick="markdown('_','yes','no','before')" title="上付き文字　テキストボックス内を選択してから押すと囲みます。" style="font-size:1.5rem"></i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('#','no','yes')"
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('spin')" title="回転　テキストボックス内を選択してから押すと囲みます。">autorenew</i>
+								title="見出し">short_text</i>
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('pulse')" title="点滅　テキストボックス内を選択してから押すと囲みます。">flare</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('`','yes','no')"
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=vertical')" title="上下反転　テキストボックス内を選択してから押すと囲みます。">swap_vert</i>
+								title="コード挿入　テキストボックス内を選択してから押すと囲みます。">code</i>
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=horizontal')" title="左右反転　テキストボックス内を選択してから押すと囲みます。">swap_horiz</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('- ','yes','yes')"
+								title="箇条書きリスト">format_list_bulleted</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdown('1. ','yes','yes')"
+								title="番号付きリスト">format_list_numbered</i>
+							<i class="pointer setting fa fa-subscript waves-effect"
+								onclick="markdown('__','yes','no','before')" title="下付き文字　テキストボックス内を選択してから押すと囲みます。"
+								style="font-size:1.5rem"></i>
+							<i class="pointer setting fa fa-superscript waves-effect"
+								onclick="markdown('_','yes','no','before')" title="上付き文字　テキストボックス内を選択してから押すと囲みます。"
+								style="font-size:1.5rem"></i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('spin')"
+								title="回転　テキストボックス内を選択してから押すと囲みます。">autorenew</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('pulse')"
+								title="点滅　テキストボックス内を選択してから押すと囲みます。">flare</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=vertical')"
+								title="上下反転　テキストボックス内を選択してから押すと囲みます。">swap_vert</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=horizontal')"
+								title="左右反転　テキストボックス内を選択してから押すと囲みます。">swap_horiz</i>
 							<span class="sml gray pointer waves-effect">
 								<a onclick="mdToggle()">Markdownエディタを隠す</a>
 							</span>
 							<br>
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('size')" title="文字サイズ変更　テキストボックス内を選択してから押すと囲みます。">format_size</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('size')"
+								title="文字サイズ変更　テキストボックス内を選択してから押すと囲みます。">format_size</i>
 							<input id="size" style="width: calc(50% - 20px); margin: 0; height: 24px;" value="12">px
-<i class="material-icons pointer setting waves-effect" onclick="tagsel('colorhex')" title="文字色変更　テキストボックス内を選択してから押すと囲みます。">color_lens</i>
+							<i class="material-icons pointer setting waves-effect" onclick="tagsel('colorhex')"
+								title="文字色変更　テキストボックス内を選択してから押すと囲みます。">color_lens</i>
 							<input id="colorhex" style="width: calc(50% - 50px); margin: 0; height: 24px;" type="color">
 							<br>
-<i class="material-icons pointer setting waves-effect" onclick="markdownLink()" title="リンク挿入">link</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdownLink()"
-<input id="linkt" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="リンクテキスト">&nbsp;
+								title="リンク挿入">link</i>
-<input id="link2" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="リンクアドレス">
+							<input id="linkt" style="width: calc(50% - 20px); margin: 0; height: 24px;"
+								placeholder="リンクテキスト">&nbsp;
+							<input id="link2" style="width: calc(50% - 20px); margin: 0; height: 24px;"
+								placeholder="リンクアドレス">
 							<br>
-<i class="material-icons pointer setting waves-effect" onclick="markdownImage()" title="インライン画像挿入">image</i>
+							<i class="material-icons pointer setting waves-effect" onclick="markdownImage()"
-<input id="image" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="代替テキスト">&nbsp;
+								title="インライン画像挿入">image</i>
-<input id="image2" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="画像アドレス">
+							<input id="image" style="width: calc(50% - 20px); margin: 0; height: 24px;"
+								placeholder="代替テキスト">&nbsp;
+							<input id="image2" style="width: calc(50% - 20px); margin: 0; height: 24px;"
+								placeholder="画像アドレス">
 						</div>
 					</div>
 					<div class="input-field col s12" id="preview-field" style="margin-top: 0;">
@@ -114,7 +148,8 @@ var tlid=0;
 					</div>
 					<div class="input-field col s12" id="toot-field" style="margin-top: 10px;">
 
-<textarea id="textarea" class="materialize-textarea unmize" style="margin-bottom:0;" data-length="500"></textarea>
+						<textarea id="textarea" class="materialize-textarea unmize" style="margin-bottom:0;"
+							data-length="500"></textarea>
 						<label for="textarea" data-trans="toot">Toot</label>
 						<br>
 						<span class="sml gray pointer markdown mize" id="preview-btn">
@@ -125,13 +160,19 @@ var tlid=0;
 						</span>
 					</div>
 					<div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
-		<i class="waves-effect gray material-icons" id="nsfw" title="Mark media as sensitive" onclick="nsfw()">visibility_off</i>
+						<i class="waves-effect gray material-icons" id="nsfw" title="Mark media as sensitive"
-		<i class="waves-effect gray material-icons purple-text dropdown-button" data-activates='dropdown1' id="vis-icon">public</i>
+							onclick="nsfw()">visibility_off</i>
+						<i class="waves-effect gray material-icons purple-text dropdown-trigger" data-target="dropdown1"
+							id="vis-icon">public</i>
 						<a class="waves-effect gray" id="cw" onclick="cw()" title="Hide text behind warning">CW</a>
-		<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray" onclick="fileselect()" title="Attach..">photo_library</i></span></span>
+						<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray"
-		<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn" title="Emojis">tag_faces</i>
+									onclick="fileselect()" title="Attach..">photo_library</i></span></span>
-		<i class="waves-effect gray material-icons dropdown-button" data-activates='dropdown2'>more_vert</i>
+						<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn"
-		<i class="material-icons nex gray waves-effect" title="Clear toot box(Ctrl+Shit+C)" data-trans-title="post_box_clear" id="clear">clear</i>
+							title="Emojis">tag_faces</i>
+						<i class="waves-effect gray material-icons dropdown-trigger"
+							data-target="dropdown2">more_vert</i>
+						<i class="material-icons nex gray waves-effect" title="Clear toot box(Ctrl+Shit+C)"
+							data-trans-title="post_box_clear" id="clear">clear</i>
 					</div>
 					<div class="col s12 mize" style="margin-bottom:5px; padding:0;">
 						<div id="taglist"></div>
@@ -144,13 +185,15 @@ var tlid=0;
 						<br>
 						<input type="text" id="cw-text" placeholder="Warning text" class="mize" style="margin:0">
 						<div id="sch-box">Post at<br><span class="sml">2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)</span><br>
-	<input type="datetime-local" id="sch-date" placeholder="Scheduled toot" class="datepicker" style="margin:0">
+							<input type="datetime-local" id="sch-date" placeholder="Scheduled toot" class="datepicker"
+								style="margin:0">
 						</div>
 					</div>
 				</div>
 				<!-- 公開範囲 Dropdown Structure -->
-<ul id='dropdown1' class='dropdown-content'>
+				<ul id="dropdown1" class="dropdown-content">
-<li style="font-size: 16px; display: block; line-height: 22px; padding: 14px 16px;">Adjust status privacy</li>
+					<li style="font-size: 16px; display: block; line-height: 22px; padding: 14px 16px;">Adjust status privacy
+					</li>
 					<li>
 						<a onclick="vis('public')">(Public)</a>
 					</li>
@@ -171,10 +214,7 @@ var tlid=0;
 					</li>
 				</ul>
 				<!-- その他 Dropdown Structure -->
-<ul id='dropdown2' class='dropdown-content'>
+				<ul id="dropdown2" class="dropdown-content">
-	<li>
-		<a onclick="adobe()">Adobe Photo Editor</a>
-	</li>
 					<li>
 						<a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a>
 					</li>
@@ -194,8 +234,11 @@ var tlid=0;
 				<!--END hidden area-->
 			</div>
 			<div id="toot-btn-field">
-	<button class="btn waves-effect indigo unmize toot-btn-group" onclick="post()" id="toot-post-btn">Toot</button>
+				<button class="btn waves-effect indigo unmize toot-btn-group" onclick="post()"
-	<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="Secondary Toot">lock_open</i></button>
+					id="toot-post-btn">Toot</button>
+				<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()"
+					id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon"
+						title="Secondary Toot">lock_open</i></button>
 			</div>
 		</div>
 		<div id="right-side">
@@ -209,12 +252,14 @@ var tlid=0;
 				<div id="emoji-list" class="" style="">
 				</div>
 				<div class="emoji-control center">
-			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
+					<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')"
+						id="emoji-before">
 						<i class="material-icons">navigate_before</i>
 					</button>
 					<span id="emoji-count"></span>/
 					<span id="emoji-sum"></span>
-			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')" id="emoji-next">
+					<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')"
+						id="emoji-next">
 						<i class="material-icons">navigate_next</i>
 					</button>
 				</div>
@@ -264,13 +309,17 @@ var tlid=0;
 					<input type="text" class="mastodon-choice" placeholder="Choice2">
 					<input type="text" class="mastodon-choice" placeholder="Choice3">
 					<input type="text" class="mastodon-choice" placeholder="Choice4">
+					<label>
 						<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
-			<label for="poll-multiple">Multiple select</label><br>
+						<span>Multiple select</span>
+					</label>
+					<label>
 						<input type="checkbox" class="filled-in" id="poll-until" value="1" />
-			<label for="poll-until">Hide 'votes' count until people vote it.</label><br>
+						<span>Hide 'votes' count until people vote it.</span>
+					</label>
 					<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">day(s)
 					<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hour(s)
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">minute(s)
+					<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">minute(s)
 				</div>
 			</div>
 		</div>
@@ -278,7 +327,28 @@ var tlid=0;
 	<!-- Modal Structure Tootdata-->
 	<div id="tootmodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
-	<ul class="collapsible" data-collapsible="accordion" id="det-col">
+			<ul class="collapsible" id="det-col">
+				<li class="dm-hide">
+					<div class="collapsible-header">
+						<i class="material-icons">people_outline</i>Local TL after this toot)
+					</div>
+					<div class="collapsible-body toot-reset" id="ltl-after">
+					</div>
+				</li>
+				<li class="dm-hide">
+					<div class="collapsible-header">
+						<i class="material-icons">person_outline</i>User TL before this toot
+					</div>
+					<div class="collapsible-body toot-reset" id="user-after">
+					</div>
+				</li>
+				<li class="dm-hide">
+					<div class="collapsible-header">
+						<i class="material-icons">language</i>Federated TL after this toot
+					</div>
+					<div class="collapsible-body toot-reset" id="ftl-after">
+					</div>
+				</li>
 				<li>
 					<div class="collapsible-header">
 						<i class="material-icons">arrow_upward</i>Context before this toot
@@ -337,13 +407,16 @@ var tlid=0;
 						<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>
+						<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>
+						<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>
+						<button class="dropdown-button btn waves-effect orange" style="width:100%;"
+							onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 					</div>
 				</div>
 				<div id="toot-tools">
@@ -387,9 +460,12 @@ var tlid=0;
 					</div>
 					<div id="his-des" data-acct=""></div><br>
 					<div id="his-plus-action">
-					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">Emphasize this user</a>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn"
-					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
+							onclick="empUser()">Emphasize this user</a>
-					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin" onclick="profbrws()">Open in browser</a><br>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data"
+							id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
+							onclick="profbrws()">Open in browser</a><br>
 					</div><br>
 					<div id="his-matching-list">
 						Get people resembling this user.<br>
@@ -400,66 +476,77 @@ var tlid=0;
 				</div>
 				<div class="his-float" id="his-float-timeline">
 					<div id="my-data-nav">
-			<ul class="custom-tabs transparent">
+						<ul class="tabs transparent">
-				<li class="custom-tab col my-data-width active-back column-first">
+							<li class="tab col my-data-width active-back column-first">
 								<a go="#his-tl" title="Timeline"><i class="material-icons">timeline</i></a>
 							</li>
-				<li class="custom-tab col my-data-width">
+							<li class="tab col my-data-width">
 								<a go="#his-follow-list" title="Follow"><i class="material-icons">people</i>→</a>
 							</li>
-				<li class="custom-tab col my-data-width">
+							<li class="tab col my-data-width">
-					<a go="#his-follower-list" title="Follower"><i class="material-icons">people</i>←</a>
+								<a go="#his-follower-list" title="Follower"><i
+										class="material-icons">people</i>←</a>
 							</li>
-				<li class="custom-tab col my-data-width only-his-data">
+							<li class="tab col my-data-width only-his-data">
-					<a go="#his-action" title="Cross-account"><i class="material-icons">account_box</i></a>
+								<a go="#his-action" title="Cross-account"><i
+										class="material-icons">account_box</i></a>
 							</li>
-				<li class="custom-tab col my-data-width only-his-data">
+							<li class="tab col my-data-width only-his-data">
 								<a go="#his-list" title="List"><i class="material-icons">list</i></a>
 							</li>
-				<li class="custom-tab col my-data-width only-my-data">
+							<li class="tab col my-data-width only-my-data">
 								<a go="#his-fav-list" title="Favourite"><i class="material-icons">star</i></a>
 							</li>
-				<li class="custom-tab col my-data-width only-my-data">
+							<li class="tab col my-data-width only-my-data">
 								<a go="#his-blocking-list" title="Blocks"><i class="material-icons">block</i></a>
 							</li>
-				<li class="custom-tab col my-data-width only-my-data">
+							<li class="tab col my-data-width only-my-data">
-						<a go="#his-blocking-list" title="Blocks"><i class="material-icons">voice_over_off</i></a>
+								<a go="#his-blocking-list" title="Blocks"><i
+										class="material-icons">voice_over_off</i></a>
 							</li>
-				<li class="custom-tab col my-data-width only-my-data">
+							<li class="tab col my-data-width only-my-data">
-					<a go="#his-domain-list" title="Domain block"><i class="material-icons">language</i><i class="material-icons">block</i></a>
+								<a go="#his-domain-list" title="Domain block"><i
+										class="material-icons">language</i><i class="material-icons">block</i></a>
 							</li>
-				<li class="custom-tab col my-data-width only-my-data">
+							<li class="tab col my-data-width only-my-data">
 								<a go="#his-prof-list" title="Edit profile"><i class="material-icons">create</i></a>
 							</li>
-				<li class="custom-tab col my-data-width only-my-data">
+							<li class="tab col my-data-width only-my-data">
-					<a go="#his-request-list" title="Follow requests"><i class="material-icons">how_to_reg</i></a>
+								<a go="#his-request-list" title="Follow requests"><i
+										class="material-icons">how_to_reg</i></a>
 							</li>
-				<li class="custom-tab col my-data-width only-my-data">
+							<li class="tab col my-data-width only-my-data">
-					<a go="#his-follow-recom-list" title="Suggest"><i class="material-icons">recent_actors</i></a>
+								<a go="#his-follow-recom-list" title="Suggest"><i
+										class="material-icons">recent_actors</i></a>
 							</li>
 						</ul>
 					</div>
 					<div id="his-tl" class="tab-content">
 						<div id="his-tl-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="utl('--now','more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="utl('--now','more')">More</button>
 					</div>
 					<div id="his-follow-list" class="tab-content">
 						<div id="his-follow-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="flw('--now','more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="flw('--now','more')">More</button>
 					</div>
 					<div id="his-follower-list" class="tab-content">
 						<div id="his-follower-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="fer('--now','more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="fer('--now','more')">More</button>
 					</div>
 					<div id="his-action" class="tab-content">
 						Use other account to Follow((Unable to unfollow))<br>
 						<div style="max-width:500px;"><select id="user-acct-sel" class="acct-sel"></select></div>
+						
 						<a href="#!" class="waves-effect btn" onclick="follow('selector','true')">Follow</a><br>
 						or<br>
-				<a href="#!" class="waves-effect btn" onclick="udgEx('selector', 'selector')">Show profile</a><br>
+						<a href="#!" class="waves-effect btn"
+							onclick="udgEx('selector', 'selector')">Show profile</a><br>
 					</div>
 					<div id="his-list" class="tab-content">
 						<div id="his-lists-a">Follow to add this user to lists.</div>
@@ -469,22 +556,26 @@ var tlid=0;
 					<div id="his-fav-list" class="tab-content">
 						<div id="his-fav-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect" style="width:100%; padding:0;" onclick="showFav('more')">More</button>
+						<button class="btn waves-effect" style="width:100%; padding:0;"
+							onclick="showFav('more')">More</button>
 					</div>
 					<div id="his-blocking-list" class="tab-content">
 						<div id="his-blocking-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showBlo('more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="showBlo('more')">More</button>
 					</div>
 					<div id="his-muting-list" class="tab-content">
 						<div id="his-muting-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showMut('more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="showMut('more')">More</button>
 					</div>
 					<div id="his-domain-list" class="tab-content">
 						<div id="his-domain-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showDom('more')">More</button>Add blocking domain
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="showDom('more')">More</button>Add blocking domain
 						<br>
 						<input type="text" placeholder="example.com" id="domainblock">
 						<button class="btn waves-effect" onclick="addDomainblock()">Add</button>
@@ -499,7 +590,8 @@ var tlid=0;
 							<textarea placeholder="Note" id="his-des-val" class="materialize-textarea"></textarea>
 							<label for="his-des-val">Note</label>
 						</div>
-			<button class="btn waves-effect" style="width:100%; padding:0;" onclick="profedit()">Save</button>
+						<button class="btn waves-effect" style="width:100%; padding:0;"
+							onclick="profedit()">Save</button>
 						<br>Change avataor:
 						<span id="prof-change">
 							<input type="file" onchange="imgChange(this,'avatar')">
@@ -512,7 +604,8 @@ var tlid=0;
 					<div id="his-request-list" class="tab-content">
 						<div id="his-request-list-contents" class="cont-series">
 						</div>
-			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showReq('more')">More</button>
+						<button class="btn waves-effect " style="width:100%; padding:0;"
+							onclick="showReq('more')">More</button>
 					</div>
 					<div id="his-follow-recom-list" class="tab-content">
 						<div id="his-follow-recom-contents" class="cont-series">
@@ -525,10 +618,14 @@ var tlid=0;
 			</div>
 		</div>
 		<div class="modal-footer">
-			<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn" onclick="historyShow()">Back</button>
+			<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
-			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn" onclick="follow()">Follow</a>
+				onclick="historyShow()">Back</button>
-			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn" onclick="mute()">Mute</a>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
-			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn" onclick="block()">Block</a>
+				onclick="follow()">Follow</a>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
+				onclick="muteDo()">Mute</a>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
+				onclick="block()">Block</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">Close</a>
 		</div>
 	</div>
@@ -580,43 +677,46 @@ var tlid=0;
 			<a href="https://thedesk.top" target="_blank">HP</a><br>
 			<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 			<br>
-			<div id="release-Usamin_18-2-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-6-5" class="release-do" style="display:none; ">
 				<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
-					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
+				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.2.0)</h5>
+				<h5>Release Note Usamin (18.6.5)</h5>
-					・<b>緊急の脆弱性修正</b>
+				・ダイアログのデザインを変更<br>
-					<h5>Release Note Usamin (18.2.0)</h5>
+				・コードセットアップログイン時のリダイレクトを廃止<br>
-・tootsearchをひとつのカラムにしてエゴサが捗る<br>
+				・Misskeyでタイムラインが見れないバグを修正<br>
-・イントロダクション(初回起動時)の挙動修正<br>
+				・TheDesk Nanoが使えない不具合を修正<br>
-・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
+				・一部設定項目が保存されない不具合を修正<br>
-・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
+				・カラム削除時にURL解析がオフになる不具合の修正。<b>これに伴い、一度全てのカラムのURL解析がオンになります。</b><br>
-・(Misskey)MFM追加flipやjumpなど<br>
+				<br>
-・(Misskey)リストに対応<br>
+				<h5>ThinkingDeskラベル</h5>
-・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
+				<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>
-・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
+				手作りマットラベル。貼ってはがせる。300円なのでポイントの余りでどうぞ。<br>
-・一部機能の統廃合とバグの修正<br>
+				<a href="https://item.mercari.com/jp/m822743330" target="_blank">メルカリ</a>へ。
-・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
 			</div>
-			<div id="release-en">
+			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>
 				<a href="https://translate.thedesk.top">Crowdin translation project</a>
 			</div>
 			<br><br>
 			<h3>Support TheDesk!</h3>
 			TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
+			<a class="btn-share btn waves-effect waves-light red lighten-2"
-  				Support on Enty
+				href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
-			</a>
-			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
 				Support on Pixiv FANBOX
 			</a>
-			<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
+			<a class="btn-share btn waves-effect waves-light red darken-2" href="https://www.patreon.com/cutls"
+				target="_blank">
+				Support on Patreon
+			</a>
+			<a class="btn-share btn waves-effect waves-light blue"
+				href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
 				Amazon Wish List
 			</a>
 			<br>
-			Give me Amazon Gift Card:<a href="mailto:mstdn@thedesk.top" target="_blank">mstdn@thedesk.top</a><br>
+			Give me Amazon Gift Card:<a href="mailto:web-pro@cutls.com"
+				target="_blank">web-pro@cutls.com</a><br>
 			Kyash<br>
 			<img src="../../img/kyash.png" width="100"><br>
 		</div>
@@ -640,13 +740,20 @@ var tlid=0;
 		</span>
 		<div id="menu-wrapper">
 			<div id="left-menu">
-			<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"><i class="material-icons">add</i><span>Add a column</span></div>
+				<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"><i
-			<div class="waves-effect" onclick="sortMenu()" id="sortMenu"><i class="material-icons">sort</i><span>Sort</span></div>
+						class="material-icons">add</i><span>Add a column</span></div>
-			<div class="waves-effect" onclick="searchMenu()" id="searchMenu"><i class="material-icons">search</i><span>Search</span></div>
+				<div class="waves-effect" onclick="sortMenu()" id="sortMenu"><i
-			<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>List</span></div>
+						class="material-icons">sort</i><span>Sort</span></div>
-			<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>Filter</span></div>
+				<div class="waves-effect" onclick="searchMenu()" id="searchMenu"><i
-			<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>Help</span></div>
+						class="material-icons">search</i><span>Search</span></div>
-			<div class="waves-effect" onclick="location.href='index.html'"><i class="material-icons">refresh</i><span>Reload TL</span></div>
+				<div class="waves-effect" onclick="listMenu()" id="listMenu"><i
+						class="material-icons">view_headline</i><span>List</span></div>
+				<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i
+						class="material-icons">filter_list</i><span>Filter</span></div>
+				<div class="waves-effect" onclick="help()"><i
+						class="material-icons">help_outline</i><span>Help</span></div>
+				<div class="waves-effect" onclick="location.href='index.html'"><i
+						class="material-icons">refresh</i><span>Reload TL</span></div>
 			</div>
 			<div id="right-menu">
 				<!--カラム追加-->
@@ -661,24 +768,50 @@ var tlid=0;
 							<input type="hidden" value="local" id="type-sel">
 							Show this TL:
 							<div id="tltype">
-		<div class="type waves-effect active" data-type="local"><div><i class="material-icons">people_outline</i></div><span>Local</span></div>
+								<div class="type waves-effect active" data-type="local">
-		<div class="type waves-effect" data-type="local-media"><div><i class="material-icons">people_outline</i><i class="material-icons sub-icon">perm_media</i></div><span>Local(Media)</span></div>
+									<div><i class="material-icons">people_outline</i></div><span>Local</span>
-		<div class="type waves-effect" data-type="home"><div><i class="material-icons">home</i></div><span>Home</span></div>
+								</div>
-		<div class="type waves-effect" data-type="pub"><div><i class="material-icons">language</i></div><span>Federated</span></div>
+								<div class="type waves-effect" data-type="local-media">
-		<div class="type waves-effect" data-type="pub-media"><div><i class="material-icons">language</i><i class="material-icons sub-icon">perm_media</i></div><span>Federated(Media)</span></div>
+									<div><i class="material-icons">people_outline</i><i
-		<div class="type waves-effect" data-type="dm"><div><i class="material-icons">mail_outline</i></div><span>Direct Message</span></div>
+											class="material-icons sub-icon">perm_media</i>
-		<div class="type waves-effect" data-type="mix"><div><i class="material-icons">merge_type</i></div><span>Integrated(Local/Home)</span></div>
+									</div><span>Local(Media)</span>
-		<div class="type waves-effect" data-type="plus"><div><i class="material-icons">merge_type</i><i class="material-icons sub-icon">reply</i></div><span>LTL+Reply+BT</span></div>
+								</div>
-		<div class="type waves-effect" data-type="notf"><div><i class="material-icons">notifications</i></div><span>Notifications</span></div>
+								<div class="type waves-effect" data-type="home">
+									<div><i class="material-icons">home</i></div><span>Home</span>
+								</div>
+								<div class="type waves-effect" data-type="pub">
+									<div><i class="material-icons">language</i></div><span>Federated</span>
+								</div>
+								<div class="type waves-effect" data-type="pub-media">
+									<div><i class="material-icons">language</i><i
+											class="material-icons sub-icon">perm_media</i></div>
+									<span>Federated(Media)</span>
+								</div>
+								<div class="type waves-effect" data-type="dm">
+									<div><i class="material-icons">mail_outline</i></div><span>Direct Message</span>
+								</div>
+								<div class="type waves-effect" data-type="mix">
+									<div><i class="material-icons">merge_type</i></div><span>Integrated(Local/Home)</span>
+								</div>
+								<div class="type waves-effect" data-type="plus">
+									<div><i class="material-icons">merge_type</i><i
+											class="material-icons sub-icon">reply</i></div>
+									<span>LTL+Reply+BT</span>
+								</div>
+								<div class="type waves-effect" data-type="notf">
+									<div><i class="material-icons">notifications</i></div><span>Notifications</span>
+								</div>
 							</div>
 						</div>
 						<div id="noauth" class="hide">Show this TL:
-		<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);" placeholder="e.g:mstdn.jp">
+							<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);"
+								placeholder="e.g:mstdn.jp">
 						</div>
 						<div id="webview-add" class="hide">TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.
 						</div>
 					</div>
-	<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()" data-trans-i="add">
+					<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()"
+						data-trans-i="add">
 						<i class="material-icons left">add</i>Add
 					</button>
 					<br>
@@ -688,10 +821,12 @@ var tlid=0;
 				<div id="src-box" class="hide menu-content">
 					<div class="input-field">
 						<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
-	</div><div class="input-field">
+					</div>
+					<div class="input-field">
 						<input id="src" type="text" class="validate" style="width:60%">
 						<label for="src" data-trans="src">Search</label>
-	<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;" onclick="src()" data-trans-i="src">
+						<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;"
+							onclick="src()" data-trans-i="src">
 							<i class="material-icons left" style="margin:0">search</i>Search
 						</button>
 						<br>
@@ -718,7 +853,8 @@ var tlid=0;
 						<label>Account(Scroll to show all)</label>
 					</div>
 					<div style="float:left; padding-top:8px; padding-bottom:28px;">
-			<button class="btn waves-effect indigo" style="width:80px;" onclick="list()" data-trans-i="lists">
+						<button class="btn waves-effect indigo" style="width:80px;" onclick="list()"
+							data-trans-i="lists">
 							List
 						</button>
 					</div>
@@ -735,7 +871,8 @@ var tlid=0;
 						<label>Account(Scroll to show all)</label>
 					</div>
 					<div style="float:left; padding-top:8px; padding-bottom:28px;">
-			<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()" data-trans-i="filters">
+						<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()"
+							data-trans-i="filters">
 							List
 						</button>
 					</div>
@@ -743,20 +880,34 @@ var tlid=0;
 					<input type="hidden" id="filter-edit-id">
 					<input type="text" style="width:150px" id="filter-add-word" placeholder="Filtering words"><br>
 					Filter contexts<br>
+					<label>
 						<input type="checkbox" class="filled-in" id="home_filter" value="home" />
-			<label for="home_filter">Home</label>
+						<span>Home</span>
+					</label>
+					<label>
 						<input type="checkbox" class="filled-in" id="local_filter" value="public" />
-			<label for="local_filter">Local</label>
+						<span>Local</span>
+					</label>
+					<label>
 						<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
-			<label for="notf_filter">Notifications</label>
+						<span>Notifications</span>
+					</label>
+					<label>
 						<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
-			<label for="conv_filter">Conversations</label><br>
+						<span>Conversations</span>
+					</label>
 					Options<br>
+					<label>
 						<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
-			<label for="wholeword_filter">Whole word</label><br>
+						<span>Whole word</span>
+					</label>
+					<br>
 					<span class="sml">Nice for Latin language</span><br>
+					<label>
 						<input type="checkbox" class="filled-in" id="except_filter" value="1" />
-			<label for="except_filter">Drop instead of hide</label><br>
+						<span>Drop instead of hide</span>
+					</label>
+					<br>
 					<span class="sml">Filtered toots will disappear irreversibly, even if filter is later removed</span><br>
 					Expire after<span class="sml">Unset or "0" means "Never"<b>This value may contain some error</b></span><br><br>
 					<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">day(s)
@@ -769,7 +920,8 @@ var tlid=0;
 					<a onclick="filterTime(1,0,0)" class="pointer">1day(s)</a>/
 					<a onclick="filterTime(7,0,0)" class="pointer">7day(s)</a>/
 					<a onclick="filterTime(0,0,0)" class="pointer">Never</a><br>
-		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">Add</button><br>
+					<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()"
+						id="add-filter-btn">Add</button><br>
 					<span class="sml">Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.</span>
 				</div>
 			</div>
@@ -779,12 +931,16 @@ var tlid=0;
 		</a>&nbsp;|&nbsp;
 		<a onclick="bottomReverse()" class="nex waves-effect">
 			<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>Toot button layout reverse
+		</a>&nbsp;|&nbsp;
+		<a onclick="openRN()" class="nex waves-effect">
+			<i class="material-icons" style="font-size: 1rem;">new_releases</i>Release Note
 		</a>
 	</div>
 	<div id="main">
 		<!--TLのTL-->
 		<div id="timeline-container">
 			<div id="something-wrong">
+				<img src="" style="width:150px;margin:5px;display:none;" draggable="false">
 				<div>Internal error: please clear all data(at setting page) <b>All data will be deleted.</b></div>
 			</div>
 		</div>
@@ -794,8 +950,10 @@ var tlid=0;
 	<div id="bottom" class="reverse">
 		<div class="leftside reverse">
 			<div id="dambox">
-								<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
+				<button id="posttgl" class="btn waves-effect indigo"
-									<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>Toot
+					style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
+					<i class="material-icons"
+						style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>Toot
 				</button>
 			</div>
 			<div class="leftside reverse" id="group">
@@ -807,13 +965,16 @@ var tlid=0;
 						<i class="material-icons nex" title="Preferences(Ctrl+Shift+S)">settings</i>
 					</a>
 					<a onclick="nano()" class="nex waves-effect">
-									<i class="material-icons" title="The smallest Mastodon,TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
+						<i class="material-icons" title="The smallest Mastodon,TheDesk Nano"
+							data-trans-title="nano_desp">remove_from_queue</i>
 					</a>
 					<a onclick="menu()" class="nex waves-effect" id="list-tgl">
 						<i class="material-icons" title="List">apps</i>
 					</a>
+					<span id="fukidashi"><- Add TL</span>
+				</div>
+			</div>
 		</div>
-    </div></div>
 		<div>
 			<div id="tips-menu">
 				<div class="btnsgroup" style="height:34px"><span class="grouptitle">Tips:</span>
@@ -842,6 +1003,56 @@ var tlid=0;
 			</div>
 		</div>
 	</div>
+	<!--Support me-->
+	<div id="support-btm" class="z-depth-4 hide">
+		<div id="support-btm-ja">
+			<h5>ご支援いただけませんか？</h5>
+			(これは支援の有無に関わらず定期的に出ます。)<br>
+			あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。<br>
+			乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。<br>
+			<br>
+			あなたはMastodon, MisskeyクライアントにTheDeskを選びました。これは奇跡的なことです。今考えればブラウザからアクセスした方が良かったのではと感じることかと存じます。<br>
+			それでも、あなたはTheDeskを使っています。<br>
+			TheDeskは2018年1月13日に最初のバージョンが出ました。それから圧倒的な機能数でゴリ押しするクライアントになっています。<br>
+			新機能に追従を図るためのモチベーションもさることながら、安全対策上TheDeskは開発者の緊急メッセージを表示できる機能が備わっており、開発者が送信ボタンを押すとすべてのTheDeskユーザーに通知が行くようになっています。<br>
+			かつてこれによってバグ報告を行い、使用を自粛していただくこともありました。<br>
+			そのような機能を実装するために、Mastodonなどのインスタンスを運営するのと同じく有料のサーバーを運用しています。<br>
+			<b>全てのユーザーが安心してTheDeskを使っていただける環境のため</b>にも、ぜひご支援をご検討ください。<br>
+			<b>TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!</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>TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!</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">
+				Support on Pixiv FANBOX
+			</a>
+			<a class="btn-share btn waves-effect waves-light red darken-2" href="https://www.patreon.com/cutls"
+				target="_blank">
+				Support on Patreon
+			</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">
+				Amazon Wish List
+			</a>
+			<br>
+			Give me Amazon Gift Card:<a href="mailto:web-pro@cutls.com"
+				target="_blank">web-pro@cutls.com</a><br>
+			Kyash<br>
+			<img src="../../img/kyash.png" width="100"><br>
+		</div>
+		<div id="support-btm-close">
+			<button class="btn waves-effect" style="width:100%;" onclick="closeSupport()"
+				id="add-filter-btn">Close</button>
+		</div>
+	</div>
 	<!--左下メッセージ-->
 	<div id="message">
 	</div>

app/view/en/oss.html

@@ -15,7 +15,7 @@
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
 <a href="setting.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>Back</a>
-LICENSE of TheDesk:<a href="https://github.com/cutls/TheDesk/blob/master/LICENSE.md">TheDesk LICENSE (Latest Ver.)</a><br>
+LICENSE of TheDesk:<a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">TheDesk LICENSE (Latest Ver.)</a><br>
 <article style="width:500px; max-width:100%; margin:15px; font-family:Arial,Helvetica">
 	<h5>TheDesk</h5>
 <i class="fa fa-github"></i><a href="https://github.com/cutls/TheDesk" target="_blank">cutls/TheDesk</a><br>
@@ -842,13 +842,6 @@ SOFTWARE.<br>
 <h5>itunes-nowplaying-mac</h5>
 <i class="fa fa-github"></i><a href="https://github.com/rinsuki/itunes-nowplaying-mac" target="_blank">rinsuki/itunes-nowplaying-mac</a><br>
 MIT LICENSE
-<h5>Adobe Creative SDK</h5>
-Please visit:
-<a href="http://wwwimages.adobe.com/www.adobe.com/content/dam/acom/jp/legal/servicetou/Creative_SDK_API_and_Developer_Additional_TOU-ja_JP-20140602_1513.pdf" target="_blank">
-	This file
-	<i class="material-icons">
-	picture_as_pdf
-	</i></a>
 <h5>Google Fonts</h5>
 <ul>
     <li>Open Sans:<a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0"> Apache License, Version 2.0 </a></li>

app/view/en/setting.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" style="overflow:scroll">
 
 <head>
 	<title>Settings - TheDesk</title>
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 	-->
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
-	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
@@ -30,13 +30,14 @@
 </head>
 
 <body id="mainView" style="overflow-y:scroll">
-	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
 	<script type="text/javascript" src="../../js/platform/first.js"></script>
-	<script type="text/javascript" src="../../js/common/materialize.js"></script>
+	<script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
 	<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
 	<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
 	<script src="../../node_modules/vue/dist/vue.min.js"></script>
 	<script type="text/javascript" src="setting.vue.js"></script>
+	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
 
 	<h4>Preferences</h4>
 	<ul class="collapsible" data-collapsible="accordion">
@@ -47,7 +48,7 @@
 			<div class="collapsible-body">
 				<h5>Languages</h5>
 				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
-				<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
+				<a onclick="changelang('ja')" class="pointer" style="margin-right:5px;">日本語</a><a onclick="changelang('en')" class="pointer" style="margin-right:5px;">English</a><a onclick="changelang('ps')" class="pointer" style="margin-right:5px;">Crowdin translate system(beta)</a>
 				<h5>Import and export of preferences</h5>
 				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
 					style="width:100%; max-width:200px;">Export</button>
@@ -56,16 +57,18 @@
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
+						<template v-if="item.text.desc">
-							<templete v-html=item.text.desc></templete><br>
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.id=='notf'"><a onclick="notftest()"
 								class="pointer">Notification test</a><br></template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
+								<label>
 									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
 										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-								<label v-bind:for="item.id+check.value">{{check.text}}</label>
+									<span>{{check.text}}</span>
+								</label>
 							</template>
 						</template>
 						<template v-else>
@@ -85,7 +88,7 @@
 					</template>
 				</div>
 				<h5>Font</h5>
-				Select your favorite font to 'Select'<br>
+				Select your favorite font to 'Select'(Windows/ macOS only)<br>
 				<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
 				<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
 				<br>
@@ -104,18 +107,32 @@
 			</div>
 			<div class="collapsible-body">
 				<h4>Select theme</h4>
+				<label>
 					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
-				<label for="black">Black</label>
+					<span>Black</span>
+				</label>
+				<label>
 					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
-				<label for="white">White</label>
+					<span>White</span>
-				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
+				</label>
-				<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo"
+						value="indigo" />
+					<span>Indigo<span class="imas hide">(エンドレスナイト)</span></span>
+				</label>
+				<label>
 					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
-				<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
+					<span>Brown<span class="imas hide">(ビタースイート・タイム)</span></span>
+				</label>
+				<label>
 					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
-				<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
+					<span>Green<span class="imas hide">(ユースフルロマンス)</span></span>
-				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
+				</label>
-				<label for="custom">Custom</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom"
+						value="custom" />
+					<span>custom</span>
+				</label>
 				<div style="width:300px" id="sel-selector">
 					<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
 				</div>
@@ -131,10 +148,16 @@
 				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
 						placeholder="About this theme..."></textarea></div>
 				<h5>Color scheme</h5>
-				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
+				<label>
-				<label for="dark">Dark</label>
+					<input class="with-gap" onchange="settings()" name="direction" type="radio" id="dark" value="dark"
-				<input class="with-gap" name="derection" type="radio" id="light" value="light" />
+						checked="true" />
-				<label for="light">Light</label>
+					<span>Dark</span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="settings()" name="direction" type="radio" id="light"
+						value="light" />
+					<span>Light</span>
+				</label>
 				<div id="pickers">
 					<div>
 						<h5>Primary</h5>Background of components
@@ -167,12 +190,12 @@
 				</div>
 				<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button
 					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">Delete</button><br><br>
-				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+				<input type="text" style="width:300px;height:40px;" id="custom_json" class="materialize-textarea"
 					placeholder="JSON style" readonly><br>
 				Share this code with other TheDesk. Do not share this code with MiAS.
 				<h4>Import of custom themes</h4>
 				Get more themes on <a href="https://assets.msky.cafe/" target="_blank">MiAS</a><br>
-				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+				<input type="text" style="width:300px;height:40px;" id="custom_import" class="materialize-textarea"
 					placeholder="JSON/JSON5 style">
 				<button class="btn waves-effect" onclick="customImp()">Import</button><br>
 		</li>
@@ -184,14 +207,16 @@
 				<div id="tlView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
+						<template v-if="item.text.desc">
-							<templete v-html=item.text.desc></templete><br>
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
+								<label>
 									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
 										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-								<label v-bind:for="item.id+check.value">{{check.text}}</label>
+									<span>{{check.text}}</span>
+								</label>
 							</template>
 						</template>
 						<template v-else>
@@ -210,6 +235,15 @@
 						</template><br>
 					</template>
 				</div>
+				<h5>Custom sound</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span
+					id="c1-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span
+					id="c2-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span
+					id="c3-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span
+					id="c4-file"></span><br>
 			</div>
 		</li>
 		<li>
@@ -220,15 +254,16 @@
 				<div id="postView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
+						<template v-if="item.text.desc">
-							<templete v-html=item.text.desc></templete><br>
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
 								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									<label><input class="with-gap" v-on:click="complete(i,check.value)"
-										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+											v-model="item.setValue" type="radio" v-bind:id="item.id+check.value"
-									<label v-bind:for="item.id+check.value">{{check.text}}</label>
+											v-bind:value="check.value" />
+										<span>{{check.text}}</span></label>
 									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
 								</template>
 							</template>
@@ -253,7 +288,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="material-icons">Fkeyboard</i>Keyboard shortcut Preferences
+				<i class="material-icons">keyboard</i>Keyboard shortcut Preferences
 			</div>
 			<div class="collapsible-body">
 				<h5>Easy inserter</h5>
@@ -296,20 +331,38 @@
 			<div class="collapsible-body">
 				<h5>NowPlaying Provider(Windows)</h5>
 				macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
+				<label>
 					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
-				<label for="aimp">AIMP</label>
+					<span>AIMP</span>
-				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+				</label>
-				<label for="itunes">iTunes</label>
+				<label>
-				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
-				<label for="npmm">MediaMonkey</label>
+						value="ITUNES" />
-				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+					<span>iTunes</span>
-				<label for="winamp">Winamp</label>
+				</label>
+				<label>
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
+						value="MEDIAMONKEY" />
+					<span>MediaMonkey</span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
+						value="WINAMP" />
+					<span>Winamp</span>
+				</label>
+				<label>
 					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
-				<label for="wmp">WMP</label>
+					<span>WMP</span>
+				</label>
+				<label>
 					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
-				<label for="wlm">WLM</label>
+					<span>WLM</span>
+				</label>
+				<label>
 					<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
-				<label for="cad">CAD</label><br><br>
+					<span>CAD</span>
+				</label>
+				<br><br>
 				Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
 				<h5>Account Connection</h5>
 				TheDesk save your data on thedesk.top server.<br>
@@ -330,10 +383,17 @@
 				Windows:{song}:Song name/{album}:Album name/{artist}:Artist name<br>
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
 				<h5>Attach an Artwork of Spotify</h5>
-				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+				<label>
-				<label for="awk_yes">Yes</label>
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes"
-				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+						value="yes" />
-				<label for="awk_no">No</label>
+					<span>Yes</span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no"
+						value="no" />
+					<span>No</span>
+				</label>
+
 				<br>
 			</div>
 		</li>
@@ -388,8 +448,6 @@
 		以下Markdownに対応したインスタンスのみ。
 		<br>
 		<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
-		<li>Shift+Enter:全角スペースを入れて改行</li>
-		<li>Shift+Space:ゼロ幅スペース</li>
 		以下アスタルテにログインしている場合のみ
 		<br>
 		<li>Ctrl+R:
@@ -403,33 +461,34 @@
 			class="material-icons left">info</i>About TheDesk</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>Website</a>
-	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-			class="material-icons left">trending_up</i>Support(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Pixiv FANBOX)</a>
+	<a href="https://www.patreon.com/cutls" class="btn waves-effect red darken-2"
+		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Patreon)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>Help/Docs(Constructing)</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
 		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
-	<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2"
+	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
-			style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
+			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
 	<br>
 	Kyash<br>
 	<img src="../../img/kyash.png" width="100"><br>
 	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer">Check update</a><br>
 	<a href="oss.html">OSS License</a><br>
-	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018
 		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>
 		<br>Developer: Cutls P(
-		<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+		<a href="index.html?mode=user&code=Cutls@cutls.com">@Cutls@cutls.com</a>)
 		<br>
 	</span><br>
 	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
 	タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/common/about.js"></script>
 	<script type="text/javascript" src="../../js/platform/end.js"></script>
 	<script type="text/javascript" src="../../js/login/logout.js"></script>