Merge pull request #31 from cutls/WIP-(before-CI)

TheDesk Usamin (18.0.2)

.gitignore

@@ -4,7 +4,9 @@
 *.exe
 TheDesk-*
 app/build
+build
 make.js
+make_js.js
 app/.DS_Store
 .DS_Store
 .vs/*

.travis.yml

@@ -0,0 +1,33 @@
+os: windows
+language: node_js
+node_js:
+- '10.15.2'
+script: node -v
+before_deploy:
+  - cd app
+  - npm install electron-builder -g
+  - npm install
+  - electron-builder --win --ia32
+  - mv ../build/TheDesk-setup.exe ../TheDesk-setup-ia32.exe
+  - mv ../build/TheDesk*.exe ../TheDesk-ia32.exe
+  - electron-builder --win --x64
+  - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe
+  - mv ../build/TheDesk*.exe ../TheDesk.exe
+  - cd ../
+  - ls
+after_deploy: ls
+deploy:
+  skip_cleanup: true
+  provider: releases
+  api_key:
+    secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
+  file: 
+    - TheDesk.exe
+    - TheDesk-setup.exe
+    - TheDesk-ia32.exe
+    - TheDesk-setup-ia32.exe
+  on:
+    repo: cutls/TheDesk
+branches:
+  only:
+  - master

LICENSE.md

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

README.md

@@ -1,5 +1,8 @@
 # TheDesk
 
+[![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)  
+[![Server-up time](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com/)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのWindows/Linuxクライアント  
 Download:[TheDesk](https://thedesk.top)  
@@ -10,60 +13,97 @@ Contact me(bug report...):GitHub Issues, mention to [Cutls@kirishima.cloud](http
 
 ## License/ライセンス
 
-[GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/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/)で提供されています。  
+[Press Kit](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)
 
 ## Terms of Use/利用規約
 
-[TOS.md](https://github.com/cutls/TheDesk/blob/master/TOS.md)
+* [利用規約(Terms of Use(ja))](https://thedesk.top/tos.html)
+* [プライバシーポリシー(Privacy Policy(ja))](https://thedesk.top/priv.html)
 
 ## Language/言語
 
-- 日本語(Japanese)
+* 日本語(Japanese)
-- English(英語)
+* English(英語)
 
 ### Translation/翻訳
 
-Crowdin project was started! Visit: https://crowdin.com/project/thedesk  
+Crowdin project is available! Visit: https://translate.thedesk.top  
   
-Crowdinから翻訳に参加してみませんか？: https://crowdin.com/project/thedesk  
+Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.top  
-
-## Component/構成
-
-app:Raw files(you can download to modify or check)  
-
-app:そのままのファイル.ダウンロード→テスト用  
-
-desk.icns: If you build yourself on macOS, you can use this .icns file as icon.  
-desk.icns: macOS向けアイコン.セルフビルドにどうぞ.  
 
 ## Requirement/環境
 
-- Electron 2.0.7
+* Electron 3.0.10(install yourself)
-- electron-dl
+* electron-dl(in package.json)
-- Jimp
+* Jimp(in package.json)
-- adm-zip
+* font-manager(in package.json)
-- itunes-nowplaying-mac(for macOS)
+  * Python 2.x(install yourself)
-- node-notifier
+  * VisualC++(Windows)(install yourself)
-- Ability to read unformated files!
+* itunes-nowplaying-mac(for macOS)(in package.json)
+* node-notifier(in package.json)
+* sumchecker(in package.json)
+* Ability to read unformated files!(install yourself)
 
 ## Contributors/コントリビューター
 
 macOSビルダー  
 
-- [とねぢ](https://minohdon.jp/@toneji)
+* [とねぢ](https://minohdon.jp/@toneji)
+
+Linuxビルダー  
+
+* [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
 
 ## Build/ビルド
 
 Misskey(misskey.xyz) application token is not in cutls/TheDesk  
 Misskey(misskey.xyz)のトークンは含まれておりません。  
+`git clone https://github.com/cutls/TheDesk`  
+`npm install electron -g`  
+`cd TheDesk/app`  
+`npm install`  
+`npm install --save-dev electron-rebuild`  
   
-electron-packager is required. electron-packagerが必要です.  
+Linux/macOS  
+`./node_modules/.bin/electron-rebuild`  
 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=2.0.7 --icon=.\app\thedesk.ico --overwrite`  
+`.\node_modules\.bin\electron-rebuild.cmd`  
+  
+To install Python 2.x and Visual C++ for Windows, before running `npm install --save-dev electron-rebuild`  
+WindowsでPython 2.xやVisualC++を一発でインストールできるツールもあります(`npm install --save-dev electron-rebuild`の前に)  
+`npm install --global windows-build-tools`  
+  
+日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談)  
+
+### electron-packager
+
+Windows  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=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=2.0.7 --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.5 --overwrite`  
 macOS  
-`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=2.0.7 --icon=./app/icon.icns --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  
+
+### electron-builder
+
+Config is all on package.json  
+ビルド設定はすべてpackage.jsonに記載しています。  
+
+## Pleroma support
+
+Did you find a bug with Pleroma accounts?  
+Pleroma **does not** follow Mastodon API rules completely although Pleroma developers say so.  
+Please write issues to improve TheDesk affinity with Pleroma.  
+Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  
+Issuesに書いてある問題についてはなるべく対処しますので、ぜひお知らせください。
 
 ## See also/詳しく
 

TOS.md

@@ -1,108 +0,0 @@
-# Terms of Use
-
-## Copyright
-
-(C)TheDesk 2018 all rights reserved. Website:[https://thedesk.top](https://thedesk.top)
-
-## 利用規約
-
-利用規約とは __禁止行為__ と、 __規約__ を含めたものを指します。
-
-### 禁止行為
-
- - 同一内容の連投行為
- - 複数インスタンスやSNSへの同時投稿
- - misskey.xyzへのthedesk-misskeyからの投稿
-
-## 規約
-
- - このソフトウェアを通じて投稿される内容やAPIを通じたアクションは全て投稿者が権利を主張でき、責務を負うことになります。
- - MastodonのAPIを通じたアクションは、全てそのインスタンスの規約に従っていなければなりません。特記無き場合、法的責任はそのインスタンスのホストの所在国の法律に従って下さい。
- - その他API(Adobe,Spotify,マストドンユーザーマッチング,instances.social)へのアクセスは、各サービスの規約・プライバシーポリシーを遵守してください。
- - Spotifyのログイン情報はTheDeskのサーバーに保存されますが、EUにおける「一般データ保護規則（General Data Protection Regulation:GDPR）」を遵守できていないため、EU内ユーザーは利用できません。
- - 改変、翻訳に関わらず、利用しているインスタンスに関わらないTheDeskに起因する法的責任は日本国の法律に従います。  
- - TheDeskの開発者からの情報を送信するため、使用時には常に開発者のサーバー(thedesk.top)と接続しています。
-
-
-この規約はTheDesk Akane (16.1.3)以降に効力を持ちます。  
-   
-## Terms of Use
-
-
-### Prohibited
-
- - Posting toots which have the same contents each other in moments.
- - Posting toots which have the same contents each other to several instances at once.
- - Posting to misskey.xyz via thedesk-misskey.
-
-## Terms
-
- - You are immediately responsible to all actions through this software.
- - You have to follow the instance's rules or laws of the hosted country.
- - You have to follow the rules of other API(Adobe,Spotify,マストドンユーザーマッチング,instances.social) if you use them.
- - Your Spotify login data is stored in TheDesk server, however TheDesk isn't following General Data Protection Regulation:GDPR which allows users in EU to use TheDesk.
- - The developer of TheDesk follows Japanese laws.
- - TheDesk is always connected to its server, in order to receive infomation from the developer.
-
- TheDesk Akane (16.1.3) and above is under this TOS.
-
- 
-　
-  
-以下バージョンとコードネームの比較です。  
-_斜字_ はTheDeskには採用していません。前作等に使用されています。  
-__太字__ は2018年9月17日現在のTheDeskで使用されたコードネームです。  
-[カッコ囲み]は飛ばされることが確定しています。バージョンの番号も飛ばされます。  
-52以降が必要になったときに使用します。  
-
-1. _Rin_
-1. _Anzu_
-1. _Kanako_
-1. _Kaede_
-1. _Rika_
-1. _Ranko_
-1. __Miku__
-1. _Kirari_
-1. __Mika__
-1. __Uzuki__
-1. __Miho__
-1. __Riina__
-1. __Airi__
-1. __Mizuki__
-1. __Mio__
-1. __Akane__
-1. Miria
-1. Nana
-1. [Minami]
-1. Sachiko
-1. Mayu
-1. Koume
-1. Chieri
-1. Anastasia
-1. Aiko
-1. Shoko
-1. Nao
-1. Karen
-1. Sae
-1. Yuko
-1. Fumika
-1. Yuki
-1. Frederica
-1. Kanade
-1. Nina
-1. Arisu
-1. Sanae
-1. Shiki
-1. Syuko
-1. Momoka
-1. Yui
-1. Yuka
-1. Asuka
-1. Yumi
-1. Kyoko
-1. Yuuki
-1. Ryo
-1. Yoshino
-1. Hiromi
-1. Miyu
-1. Tomoe

app/build/README.md

@@ -0,0 +1 @@
+

app/css/master.css

@@ -9,6 +9,9 @@ html,body{
   background-color: var(--bg);
   color: var(--color);
 }
+body{
+  border: thin solid gray;
+}
 .btn {
   margin: 5px;
   text-transform: none;
@@ -41,21 +44,21 @@ option {
   display: none;
   max-width: 100vw;
   max-height: 100vh;
-  top:0;
-  background-color: var(--modal);
   position: fixed;
   z-index: 9;
 }
-#imagemodal, #videomodal, #tootmodal {
+#videomodal, #tootmodal {
   background-color: var(--modal);
 }
 #imagemodal .modal-content {
   overflow: hidden;
+  padding:0;
 }
 #imagemodal .modal-footer{
   overflow-x:scroll;
   overflow-y:hidden;
 }
+
 #imagewrap {
   width: 100%;
   height: 100%;
@@ -269,14 +272,123 @@ blockquote:before, .quote:before {
       opacity: 1;
   }
 }
+.hide-anime{
+  animation: hide 0.2s linear 0s;
+  display:none;
+}
+@keyframes hide{
+  from{
+      opacity: 1;
+  }
+  to{
+      opacity: 0;
+  }
+}
 .collapsible-header,.tabs{
   background-color: var(--subcolor);
 }
 .modal-footer{
   background-color: var(--modalfooter) !important;
 }
+.font{
+  font-size:1.5rem;
+  margin-bottom:5px;
+}
+.font:hover{
+  background-color: #999;
+}
+.release-do{
+  border: solid 2px;
+  border-color:var(--color);
+  padding:5px;
+}
+#pickers{
+  display:flex;
+  flex-wrap: wrap;
+}
+#menu{
+  position:fixed;
+  z-index:9999;
+  background-color: var(--box);
+  width:540px;
+  top:calc(50% - 150px);
+  left:calc(50% - 250px);
+  padding: 5px;
+  border: thin solid gray;
+  border-radius:5px;
+}
+#menu-wrapper{
+  margin-left:-5px;
+  display:flex;
+}
+#left-menu{
+  width:170px;
+}
+#left-menu div{
+  padding-left:5px;
+  width:100%;
+  height:50px;
+  display:flex;
+  align-items:center;
+  cursor:pointer;
+}
+#left-menu div:hover {
+  background-color: var(--beforehover);
+}
+#left-menu span{
+  margin-left:5px;
+}
+#left-menu div.active{
+  background-color: var(--emphasized);
+}
+#right-menu{
+  width:380px;
+  max-height:375px;
+  overflow-y:scroll;
+  overflow-x:hidden;
+  padding:5px;
+}
+#tltype{
+  display:flex;
+  flex-wrap: wrap;
+  
+}
+#tltype .type{
+  display:flex;
+  flex-wrap: wrap;
+  align-items:center;
+  width:170px;
+  height:40px;
+  cursor:pointer;
+}
+#tltype .type:hover {
+  background-color: var(--beforehover);
+}
+#tltype .active{
+  background-color: var(--emphasized);
+}
+#tltype i{
+  font-size:30px;
+}
+#tltype i.sub-icon{
+  font-size: 20px;
+  position: relative;
+  color: var(--beforehover);
+  left: -15px;
 
-
+}
+.drag-bar{
+  cursor:move;
+  text-align:center;
+  width:calc(100% + 10px);
+  border-radius: 5px;
+  background-color: var(--bg);
+  margin-left:-5px;
+  margin-right:-5px;
+  margin-top:-5px;
+  font-size:16px;
+  padding:4px;
+}
 
 /*スクロールバー*/
 ::-webkit-scrollbar {

app/css/post.css

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

app/css/sort.css

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

app/css/themes.css

@@ -2,6 +2,7 @@
     --bg:white;
     --drag:rgba(255, 255, 255, 0.8);
     --color:black;
+    --beforehover:#757575;
     --modal:white;
     --subcolor:#e0e0e0;
     --box:white;
@@ -14,10 +15,14 @@
     --postbox:white;
     --modalfooter:#fafafa;
 }
+#imagemodal{
+    background: url("../img/pixel.white.svg");
+}
 .blacktheme {
     --bg:#212121;
     --drag:rgba(0, 0, 0, 0.8);
     --color:white;
+    --beforehover:#9e9e9e;
     --modal:black;
     --subcolor:#212121;
     --box:#424242;
@@ -30,10 +35,14 @@
     --postbox:#424242;
     --modalfooter:#212121;
 }
+.blacktheme #imagemodal{
+    background: url("../img/pixel.svg");
+}
 .indigotheme {
     --bg:#031833;
     --drag:rgba(0, 0, 0, 0.8);
     --color:white;
+    --beforehover:#9e9e9e;
     --modal:#0d1351;
     --subcolor:#0d1351;
     --shared:#004d40;
@@ -46,10 +55,14 @@
     --postbox:#1a237e;
     --modalfooter:#031833;
 }
+.indigotheme #imagemodal{
+    background: url("../img/pixel.svg");
+}
 .browntheme {
     --bg:#261411;
     --drag:rgba(0, 0, 0, 0.8);
     --color:white;
+    --beforehover:#9e9e9e;
     --modal:#261411;
     --subcolor:#4e342e;
     --shared:#004d40;
@@ -62,10 +75,14 @@
     --postbox:#4e342e;
     --modalfooter:#261411;
 }
+.browntheme #imagemodal{
+    background: url("../img/pixel.svg");
+}
 .greentheme{
     --bg:#c8e6c9;
     --drag:rgba(255, 255, 255, 0.8);
     --color:black;
+    --beforehover:#757575;
     --modal:#81c784;
     --subcolor:#a5d6a7;
     --box:#81c784;
@@ -77,4 +94,7 @@
     --active:#e6ee9c;
     --postbox:#a5d6a7;
     --modalfooter:#81c784;
+}
+.greentheme #imagemodal{
+    background: url("../img/pixel.white.svg");
 }

app/css/tl.css

@@ -57,6 +57,12 @@
 #bottom i{
   font-size:30px;
 }
+.exc-icons{
+  font-size:20px;
+}
+.exc-chb{
+  padding-left:24px !important;
+}
 #bottom .btnsgroup{
   border:1px solid;
   padding:1px;
@@ -80,7 +86,7 @@
   font-family:Open Sans;
   font-size:15px;
 }
-@media screen and (max-width: 1344px) {
+@media screen and (max-width: 890px) {
   .btnsgroup .grouptitle{ display: none; }
   #tips,#tips-menu{ display: none; }
 }
@@ -105,6 +111,7 @@ iframe {
   height: 100vh;
   flex: 1;
   border: thin solid gray;
+  border-top:none;
 }
 .box .pin,#his-data .pin{
   display:none;
@@ -132,11 +139,18 @@ iframe {
 .media-filter .nomedia{
   display:none;
 }
+.bt-filter .shared{
+  display:none;
+}
+.except-bt-filter .unshared{
+  display:none;
+}
 .cvo {
+  user-select: text;
   padding-left: 5px;
   border-bottom:0.5px solid;
   padding-right: 2px;
-  word-break: break-all;
+  word-break: break-word;
   width: 100%;
   display: grid;
   grid-template-columns: 43px 2fr 1fr;
@@ -158,7 +172,7 @@ grid-area: icon;
 }
 
 .area-display_name {
-  user-select: auto;
+  user-select: text;
 height:1.5em;
 margin:2px;
 margin-left:5px;
@@ -208,7 +222,6 @@ grid-area: toot;
 }
 .area-vis {
   margin:2px;
-  font-size:0.5rem !important;
   grid-area: vis;
   }
 .area-side {
@@ -217,6 +230,9 @@ grid-area: toot;
   margin:2px;
   grid-area: side;
 }
+.btn-flat{
+  color:var(--color);
+}
 .area-side i{
   margin-left:10px;
 }
@@ -224,8 +240,20 @@ grid-area: toot;
   margin-top:10px;
 }
 .action i{
-font-size:1rem;
+  font-size:1.2rem;
+  margin-right:2px;
 }
+.action .fa-quote-right{
+  margin-top: 2px;
+}
+.actct{
+  color:var(--beforehover);
+}
+.actct:hover{
+  color:var(--color);
+  transition: 0.5s;
+}
+
 .gray {
   color: gray;
 }
@@ -407,9 +435,6 @@ p:not(:last-child){
   bottom:0px;
   right:0px;
 }
-.btn-flat{
-  color:var(--color);
-}
 .toot a span.ellipsis:after{
   content:"...";
 }
@@ -446,4 +471,57 @@ p:not(:last-child){
   overflow-y: scroll;
 	overflow-x: hidden;
 	max-height: 200px;
-}
+}
+.votebtn{
+  border: 1px solid;
+  color: var(--bg);
+  background-color: var(--beforehover);
+  cursor:pointer;
+  width: 50px;
+  padding: 2px;
+  display: inline-block;
+  text-align: center;
+  margin-top: 5px;
+  border-radius: 10px;
+  transition-duration: 0.5s;
+}
+.votebtn:hover{
+  background-color:var(--color);
+}
+
+@keyframes fadeInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+@keyframes fadeInLeft {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+.box-anime {
+  animation-duration: 1s;
+  animation-name: fadeInLeft;
+}
+
+.cvo-anime {
+  animation-duration: 0.1s;
+  animation-name: fadeInDown;
+}
+

app/css/userdata.css

@@ -1,7 +1,7 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
 #his-data {
   background-repeat: no-repeat;
-  background-image: url('/img/loading.svg');
+  background-image: url('../../loading.svg');
   overflow-y: hidden;
 }
 #his-name{

app/img/pixel.svg

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

app/img/pixel.white.svg

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

app/js/common/keyshortcut.js

@@ -29,6 +29,13 @@ $(function($) {
 				return false;
 			}
 		}
+		//Alt+Enter:セカンダリー
+		if (event.metaKey || event.altKey && wv) {
+			if (e.keyCode === 13) {
+				sec();
+				return false;
+			}
+		}
 		
 		//Shift+Space:Markdownゼロ幅スペース
 		if (event.shiftKey) {

app/js/common/version.js

@@ -1,5 +1,6 @@
 //バージョンチェッカー
 function verck(ver) {
+	console.log("Welcome")
 	if(localStorage.getItem("ver")!=ver){
 		localStorage.setItem("ver", ver);
 		console.log("Thank you for your update");
@@ -13,12 +14,63 @@ function verck(ver) {
 			verp=verp.replace( ')', '');
 			verp=verp.replace( ' ', '_');
 			console.log(verp);
-			$("#release-"+verp).show();
+			if(lang.language=="ja"){
+				$("#release-"+verp).show();
+			}else{
+				$("#release-en").show();
+			}
+			
 		  });
 	}
-	
+	var electron = require("electron");
+	var remote=electron.remote;
+	var dialog=remote.dialog;
+	  var platform=remote.process.platform;
+	  if(platform=="win32"){
+		const options = {
+			type: 'info',
+			title: "Select your platform",
+			message: lang.lang_version_platform,
+			buttons: [lang.lang_no,lang.lang_yesno]
+		  }
+		  if(!localStorage.getItem("winstore")){
+			  
+				dialog.showMessageBox(options, function(arg) {
+				  if(arg==1){
+					  localStorage.setItem("winstore","winstore")
+					}else{
+					  localStorage.setItem("winstore","localinstall")
+					}
+			  });
+		  }
+	  }else if(platform=="linux"){
+		if(localStorage.getItem("winstore")=="unix"){
+			localStorage.removeItem("winstore")
+		}
+		if(!localStorage.getItem("winstore")){
+			const options = {
+				type: 'info',
+				title: "Select your platform",
+				message: lang.lang_version_platform_linux,
+				buttons: [lang.lang_no,lang.lang_yesno]
+			  }
+			  dialog.showMessageBox(options, function(arg) {
+				if(arg==1){
+					localStorage.setItem("winstore","snapcraft")
+				  }else{
+					localStorage.setItem("winstore","localinstall")
+				  }
+			});
+		}
+	}else{
+		  localStorage.setItem("winstore","unix")
+	  }
+	  if(localStorage.getItem("winstore")=="snapcraft" || localStorage.getItem("winstore")=="winstore"){
+		var winstore=true;
+	  }else{
+		  var winstore=false;
+	  }
 	var l = 5;
-
 	// 生成する文字列に含める文字セット
 	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
 	var cl = c.length;
@@ -46,16 +98,19 @@ function verck(ver) {
 				var newest=mess.desk;
 			}
 			if (newest == ver) {
-				todo(lang_version_usever[lang].replace("{{ver}}" ,mess.desk));
+				todo(lang.lang_version_usever.replace("{{ver}}" ,mess.desk));
-				//betaかWInstoreならアプデチェックしない
+				//betaかWinstoreならアプデチェックしない
-			} else if (ver.indexOf("beta")==-1 || winstore) {
+			} else if (ver.indexOf("beta")!=-1 || winstore) {
+				
+			}else{
 				localStorage.removeItem("instance")
 				if(localStorage.getItem("new-ver-skip")){
 					if(localStorage.getItem("next-ver")!=newest){
 						var ipc = electron.ipcRenderer;
 						ipc.send('update', "true");
 					}else{
-						todo(lang_version_skipver[lang]);
+						console.log(lang.lang_version_skipver);
+						todo(lang.lang_version_skipver);
 					}
 				}else{
 					var ipc = electron.ipcRenderer;

app/js/emoji/default-emoji.js

@@ -20,8 +20,7 @@ if(lang=="ja"){
         place:"場所",
         symbol:"記号"
     };
-    var lang_defaultemojis_text="{{cat}}の絵文字";
+}else{
-}else if(lang=="en"){
     var defaultemojiname={
         activity:"Activities",
         flag:"Flags",
@@ -32,7 +31,6 @@ if(lang=="ja"){
         place:"Places",
         symbol:"Symbols"
     };
-    var lang_defaultemojis_text="Emojis of {{cat}}";
 }
 
 function defaultEmoji(target){
@@ -43,7 +41,8 @@ function defaultEmoji(target){
         emojis = emojis + '<a onclick="defEmoji(\''+emoji["shortcode"]+'\')" class="pointer"><span style="width: 20px; height: 20px; display: inline-block; background-image: url(\'../../img/sheet.png\'); background-size: 4900%; background-position: '+emoji["css"]+';"></span></a>';
     });
     $("#emoji-list").html(emojis);
-    $("#now-emoji").text(lang_defaultemojis_text.replace("{{cat}}" ,defaultemojiname[target]));
+    $("#now-emoji").text(lang.lang_defaultemojis_text.replace("{{cat}}" ,defaultemojiname[target]));
+    console.log(target);
     $(".emoji-control").addClass("hide");
 }
 function customEmoji(){
@@ -71,7 +70,7 @@ function defEmoji(target){
         $("#textarea").focus();
         var selin = $("#textarea").prop('selectionStart');
 	    if(!selin){
-	    	selin=0;
+            selin=0;
 	    }
 	   localStorage.setItem("cursor", selin);
 }

app/js/lang/lang.en.js

@@ -0,0 +1,241 @@
+//commonError
+var lang={
+    "language":"en",
+    "lang_toot":"Toot",
+    "lang_there":"Yes",
+    "lang_nothing":"None",
+    "lang_yesno":"Yes",
+    "lang_no":"No",
+    "lang_progress":"Wait...",
+    "lang_edit":"Edit",
+    "lang_del":"Delete",
+    "lang_add":"Add",
+    "lang_fatalerroroccured":"Some errors are occured, please restart TheDesk.",
+    "lang_speech":"Google US English",
+    //language.html
+    "lang_lang":"Language",
+    "lang_langlocale":"English",
+    "lang_back":"Back",
+    "lang_set":"Set",
+    "lang_langadd":"Translate TheDesk to other languages or proofread TheDesk on <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk needs your help.",
+    //common/version.js
+    "lang_version_usever":"No update is found({{ver}})",
+    "lang_version_skipver":"Update was ignored.",
+    "lang_version_platform":"Was this software installed at Microsoft Store? When select 'yes', any update was ignored.",
+    "lang_version_platform_linux":"Was this software installed at Snapcraft(snapd)? When select 'yes', any update was ignored.",
+    //login
+    //login/login.js
+    "lang_login_noauth":"Show TL of unlogined accounts",
+    //login/manager.js
+    "lang_manager_info":"About this instance",
+    "lang_manager_refresh":"Refresh",
+    "lang_manager_delete":"Logout",
+    "lang_manager_color":"Account Color",
+    "lang_manager_confirm":"is about to logout. Continue?",
+    "lang_manager_mainAcct":"Done:choose main account",
+    "lang_manager_def":"Default",
+    "lang_manager_none":"None",
+    "lang_manager_godev":"Open DevCenter of Misskey. We show also an official documents to refer.",
+    //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
+    "lang_emoji_get":"Get emojis",
+    "lang_emoji_custom":"Custom emojis",
+    "lang_defaultemojis_text":"Emojis about {{cat}}",
+    //post/img.js
+    "lang_postimg_previewdis":"cannot preview",
+    "lang_postimg_aftupload":"You cannot change accounts after uploading.",
+    //post/post.js
+    "lang_post_tagTL":"This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
+    "lang_post_tagVis":"This toot(not 'public' toot) is not shown on this tag's TL.",
+    "lang_post_cwtitle":"Auto CW Alert",
+    "lang_post_cwtxt":"You are about to post longer toot than you set.\nWarning text:",
+    "lang_post_btn1":"Cancel (will not post)",
+    "lang_post_btn2":"Make text hidden automatically",
+    "lang_post_btn3":"Continue to post",
+    //post/status.js
+    "lang_status_favWarn":"It will take a miunte to favourite a remote toot.",
+    "lang_status_btWarn":"It will take a miunte to boost a remote toot.",
+    "lang_status_follow":"Follow",
+    "lang_status_unfollow":"Unfollow",
+    "lang_status_block":"Block",
+    "lang_status_unblock":"Unblock",
+    "lang_status_mute":"Mute",
+    "lang_status_unmute":"Unmute",
+    "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.",
+    "lang_status_unendorse":"Not feature on profile",
+    "lang_status_endorse":"Feature on profile",
+    //post/suggest.js
+    "lang_suggest_nodata":"Please get emojis list in order to show suggestion.",
+    //post/use-txtbox.js
+    "lang_usetxtbox_reply":"Reply Mode. Ctrl+Shift+C to clear.",
+    //tl/card.js
+    "lang_cards_check":" check",
+    "lang_cards_pip":"PiP mode",
+    //tl/details.js
+    "lang_details_nodata":"No data",
+    "lang_details_filtered":"Filtered toot",
+    "lang_details_embed":"Embed HTML is cliped.",
+    "lang_details_url":"URL of this toot is cliped.",
+    "lang_details_txt":"Content of this toot is cliped.",
+    //tl/filter.js
+    "lang_filter_nodata":"No data",
+    "lang_filter_errordegree":"Please check a context",
+    //tl/list.js
+    "lang_list_nodata":"No data",
+    "lang_list_show":"Show",
+    "lang_list_users":"Users list",
+    "lang_list_nouser":"No users in this list.",
+    "lang_list_add":"Add to the list",
+    "lang_list_remove":"Remove from the list",
+    //tl/notification.js
+    "lang_notf_new":" new notifications",
+    //tl/speech.js
+    "lang_speech_refresh":"Save value about TTS config",
+    //tl/src.js
+    "lang_src_ts":"chronological order",
+    "lang_src_people":" people toot",
+    //tl/tag.js
+    "lang_tags_always":"Always toots with ",
+    "lang_tags_realtime":"Tag-stream toot",
+    "lang_tags_tagunpin":"Unpin {{tag}}",
+    "lang_tags_unrealtime":"Disable TsT",
+    "lang_tags_tagwarn":"Auto complete {{tag}}, if toot without {{tag}}",
+    //tl/tl.js
+    "lang_tl_media":"Media",
+    "lang_tl_reconnect":"Reconnect to streaming API",
+    //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",
+    "lang_layout_delthis":"Remove this column",
+    "lang_layout_setthis":"Preferences of this column",
+    "lang_layout_mediafil":"Media filtering",
+    "lang_layout_linkana":"Auto Link Analyzer",
+    "lang_layout_linkanades":"Auto link analyzer",
+    "lang_layout_tts":"Text to speech ",
+    "lang_layout_reconnect":"Reconnect to streaming API",
+    "lang_layout_headercolor":"Header color of this column",
+    "lang_layout_nodata":"[No data]<br>F5/⌘+R to reload",
+    "lang_layout_dm":"Direct Message",
+    "lang_layout_webviewmode":"Prefer WebView",
+    "lang_excluded":"Excluded type of notification",
+    "lang_layout_excludingbt":"Show BT mode(OFF/Exclude BT/Only BT)",
+    //ui/sort.js
+    "lang_sort_gothis":"Go to this column",
+    "lang_sort_remthis":"Delete this column",
+    //ui/spotify.js
+    "lang_spotify_img":"Attach an album artwork",
+    "lang_spotify_imgno":"Not attach an album artwork",
+    "lang_spotify_acct":"Connect TheDesk to Spotify",
+    "lang_spotify_np":"Done:templete of NowPlaying",
+    "lang_setting_npprovide":"NowPlaying provider:{{set}}",
+    //userdata/his-data.js
+    "lang_hisdata_frcreq":"Required Mastodon 2.4.3 and above",
+    "lang_hisdata_frcwarn":"Unfollow accounts will be shown.",
+    "lang_hisdata_taketime":"It will take 30s ~ several minutes",
+    "lang_hisdata_notonmisskey":"Misskey is unable to request.",
+    //userdata/showOnTL.js
+    "lang_showontl_movetxt":"This account was moved",
+    "lang_showontl_movebtn":"Continue on the new account",
+    "lang_showontl_botacct":"[bot]",
+    "lang_showontl_followed":"Following you",
+    "lang_showontl_notf":"Notification ",
+    "lang_showontl_domain":"Domain ",
+    "lang_showontl_listwarn":"Follow to add this user to lists.",
+//parse
+    "lang_parse_mentioned":" replied to you",
+    "lang_parse_faved":" favourited your toot",
+    "lang_parse_bted":" boosted your toot",
+    "lang_parse_btedsimple":" boosted",
+    "lang_parse_notftime":"Actioned at",
+    "lang_parse_cwshow":"Show",
+    "lang_parse_fulltext":"Full size text:",
+    "lang_parse_autofold":"Auto folded",
+    "lang_parse_more":"More",
+    "lang_parse_url":"URL Analyzer",
+    "lang_parse_tagTL":"Timeline of {{tag}}",
+    "lang_parse_tagtoot":"Toot with {{tag}}",
+    "lang_parse_tagpin":"Pin {{tag}}",
+    "lang_parse_public":"Public",
+    "lang_parse_unlisted":"Unlisted",
+    "lang_parse_private":"Private",
+    "lang_parse_direct":"Direct",
+    "lang_parse_clickcopy":"Click to copy text of this toot",
+    "lang_parse_clickcopyurl":"Click to copy URL of this toot",
+    "lang_parse_trans":"Translate to Japanese",
+    "lang_parse_replyto":"Reply to this toot",
+    "lang_parse_bt":"Boost this toot",
+    "lang_parse_fav":"Favourite this toot",
+    "lang_parse_quote":"Quote this toot",
+    "lang_parse_del":"Delete this toot",
+    "lang_parse_pin":"Pin this toot",
+    "lang_parse_det":"Details via your main account.",
+    "lang_parse_redraft":"Delete & re-draft",
+    "lang_parse_followed":"Followed you",
+    "lang_parse_clientop":"Operation of this client",
+    "lang_parse_clienttxt":" will be",
+    "lang_parse_clientno":"done nothing",
+    "lang_parse_clientemp":"emphasized(/not emphasized)",
+    "lang_parse_clientmute":"muted",
+    "lang_parse_mute":" will be muted. You can remove on preferences.",
+    "lang_parse_voted":"Voted",
+    "lang_parse_vote":"Voted",
+    "lang_parse_unvoted":"Show the result without voting",
+    "lang_parse_endedvote":"Expired",
+    //misskey
+    "lang_misskeyparse_renote":"Repost",
+    "lang_misskeyparse_renoteqt":"Renote",
+    "lang_misskeyparse_reaction":"Reaction",
+    "lang_misskeyparse_tagnostr":"No streaming API on Tag TLs",
+    "lang_misskeyparse_listnostr":"No streaming API on List TLs",
+    "lang_misskeyparse_home":"Home",
+    "lang_misskeyparse_followers":"Follower",
+    "lang_misskeyparse_specified":"Specified User",
+    "lang_misskeyparse_qt":"Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
+    "lang_misskeyparse_renoted":" renoted your following post.",
+    "lang_misskeyparse_quoted":" quoted your following post.",
+    "lang_misskeyparse_reacted":" reacted your following post.",
+//setting
+    "lang_setting_time":"Time format:{{set}}",
+    "lang_setting_theme":"Theme:{{set}}",
+    "lang_setting_nsfw":"NSFW:{{set}}",
+    "lang_setting_cw":"CW:{{set}}",
+    "lang_setting_cwtext":"Default CW text:{{set}}",
+    "lang_setting_cws":"Always CW on:{{set}}",
+    "lang_setting_rp":"Reply counter:{{set}}",
+    "lang_setting_vis":"Default visibility:{{set}}",
+    "lang_setting_popup":"Popup notification:{{set}}",
+    "lang_setting_off":"Off",
+    "lang_setting_s":"s",
+    "lang_setting_box":"Default toot box action:{{set}}",
+    "lang_setting_gif":"GIF:{{set}}",
+    "lang_setting_selt":"Auto fold:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_autocw":"Auto CW:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_width":"Minimam width:{{set}}",
+    "lang_setting_fixwidth":"TweetDeck fixed width:{{set}}px",
+    "lang_setting_img":"After posting an image:{{set}}",
+    "lang_setting_font":"Fonts:{{set}}",
+    "lang_setting_default":"default font",
+    "lang_setting_size":"Font size:{{set}}px",
+    "lang_setting_imgheight":"Image height:{{set}}px",
+    "lang_setting_ticker":"#InstanceTicker:{{set}}px",
+    "lang_setting_animation":"Animation: {{set}}",
+    "lang_setting_tag":"Tag TL:{{set}}",
+    "lang_setting_boxConfirm":"Post box:{{set}}",
+    "lang_setting_ul":"Native locale:{{set}}",
+    "lang_setting_notf":"Native notification:{{set}}",
+    "lang_setting_quote":"Quote format:{{set}}",
+    "lang_setting_via":"Via:{{set}}",
+    "lang_setting_mov":"Action buttons hiding:{{set}}",
+    "lang_setting_setasread":"Notification markers:{{set}}",
+    "lang_setting_main":"Default account:{{set}}",
+    "lang_setting_sec":"Secondary toot button:{{set}}",
+    "lang_setting_ksref":"Keyboard shortcuts are refreshed.",
+    "lang_setting_nomuting":"No client is muted.",
+    "lang_setting_notftest":" Notification test ",
+    "lang_setting_notftestprof":"Your icon is shown.",
+    "lang_setting_exportwarn":"Only important data will be exported. You must keep this data secure.",
+    "lang_setting_importwarn":"All data will be deleted.",
+}

app/js/lang/lang.ja.js

@@ -0,0 +1,241 @@
+    //commonError
+var lang={
+    "language":"ja",
+    "lang_toot":"トゥート",
+    "lang_there":"あり",
+    "lang_nothing":"なし",
+    "lang_yesno":"はい",
+    "lang_no":"いいえ",
+    "lang_progress":"処理中",
+    "lang_edit":"編集",
+    "lang_del":"削除",
+    "lang_add":"追加",
+    "lang_fatalerroroccured":"エラーが発生しました。しばらく待ってから再起動してください。",
+    "lang_speech":"Google 日本語",
+//language.html
+    "lang_lang":"言語",
+    "lang_langlocale":"日本語",
+    "lang_back":"戻る",
+    "lang_set":"設定",
+    "lang_langadd":"<a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>から翻訳に参加できます。英語の校正(緊急)や他言語に翻訳していただける方を募集しております。",
+//common/version.js
+    "lang_version_usever":"お使いのバージョン{{ver}}は最新です。",
+    "lang_version_skipver":"アップデートはスキップされました。",
+    "lang_version_platform":"このソフトウェアはMicrosoft Storeからダウンロードされましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
+    "lang_version_platform_linux":"このソフトウェアはSnapcraft(snapd)からインストールしましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
+//login
+//login/login.js
+    "lang_login_noauth":"認証せずに見る",
+//login/manager.js
+    "lang_manager_info":"インスタンス情報",
+    "lang_manager_refresh":"情報更新",
+    "lang_manager_delete":"削除",
+    "lang_manager_color":"アカウントカラーを選択",
+    "lang_manager_confirm":"を削除します。",
+    "lang_manager_mainAcct":"メインアカウントを設定しました。",
+    "lang_manager_def":"既定",
+    "lang_manager_none":"なし",
+    "lang_manager_godev":"MisskeyのDevセンターに移動します。同時に開かれるドキュメントを参考にログインしてください。",
+//post/bb-md.js
+    "lang_bbmd_misskey":"TheDeskにおけるMisskeyでは、@を返信として扱いますが、全ての@は消去され別パラメータに入力されます。また、「未収載」を「ホーム」として扱います。",
+//post/emoji.js
+    "lang_emoji_get":"絵文字リストを取得",
+    "lang_emoji_custom":"カスタム絵文字",
+    "lang_defaultemojis_text":"{{cat}}の絵文字",
+//post/img.js
+    "lang_postimg_previewdis":"プレビューできません。",
+    "lang_postimg_aftupload":"アップロード後はアカウントを切り替えられません。",
+//post/post.js
+    "lang_post_tagTL":"デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。",
+    "lang_post_tagVis":"公開範囲が「公開」以外だと、タグTLに表示されません。(一部インスタンスを除く)",
+    "lang_post_cwtitle":"長文投稿の警告",
+    "lang_post_cwtxt":"指定文字数、行数を超えるトゥートを行おうとしています。\n自動CWのタイトル:",
+    "lang_post_btn1":"キャンセル(投稿しない)",
+    "lang_post_btn2":"自動でCWを付ける",
+    "lang_post_btn3":"そのまま投稿",
+//post/status.js
+    "lang_status_favWarn":"お気に入り登録しました。インスタンスが違うときは時間がかかる場合があります。",
+    "lang_status_btWarn":"ブーストしました。インスタンスが違うときは時間がかかる場合があります。",
+    "lang_status_follow":"フォロー",
+    "lang_status_unfollow":"フォロー解除",
+    "lang_status_block":"ブロック",
+    "lang_status_unblock":"ブロック解除",
+    "lang_status_mute":"ミュート",
+    "lang_status_unmute":"ミュート解除",
+    "lang_status_redraft":"削除して再編集しますか？そのトゥートの全てのデータがリセットされます。この機能はベータ版です。画像は~v2.4.1で破棄されます。",
+    "lang_status_emphas":"を強調します。リロードしてください。",
+    "lang_status_unemphas":"を強調解除します。リロードしてください。",
+    "lang_status_unendorse":"紹介解除",
+    "lang_status_endorse":"プロフで紹介する",
+//post/suggest.js
+    "lang_suggest_nodata":"サジェストのために絵文字リストを取得してください。",
+//post/use-txtbox.js
+    "lang_usetxtbox_reply":"返信モードです。クリアするときはCtrl+Shift+Cを押してください。",
+//tl/card.js
+    "lang_cards_check":"チェック",
+    "lang_cards_pip":"ながら観モード",
+//tl/details.js
+    "lang_details_nodata":"データなし",
+    "lang_details_filtered":"フィルターされました。",
+    "lang_details_embed":"埋め込みHTMLがコピーされました。",
+    "lang_details_url":"トゥートURLがコピーされました。",
+    "lang_details_txt":"トゥート本文がコピーされました。",
+//tl/filter.js
+    "lang_filter_nodata":"フィルターはありません",
+    "lang_filter_errordegree":"適応範囲を最低一つ以上チェックしてください。",
+//tl/list.js
+    "lang_list_nodata":"リストはありません",
+    "lang_list_show":"表示",
+    "lang_list_users":"ユーザー一覧",
+    "lang_list_nouser":"ユーザーはいません",
+    "lang_list_add":"リストに追加",
+    "lang_list_remove":"リストから削除",
+//tl/notification.js
+    "lang_notf_new":"件の新しい通知",
+//tl/speech.js
+    "lang_speech_refresh":"音声読み上げ設定を更新しました。",
+//tl/src.js
+    "lang_src_ts":"時系列",
+    "lang_src_people":"人がトゥート",
+//tl/tag.js
+    "lang_tags_always":"常に",
+    "lang_tags_realtime":"実況",
+    "lang_tags_tagunpin":"{{tag}}をよく使うタグから削除",
+    "lang_tags_unrealtime":"実況解除",
+    "lang_tags_tagwarn":"{{tag}}がない場合自動で補完されます。",
+//tl/tl.js
+    "lang_tl_media":"メディア",
+    "lang_tl_reconnect":"Streamingに再接続しました",
+//ui/layout.js
+    "lang_layout_gotop":"一番上へ。アイコンが赤のときはストリーミングに接続できていません。F5等で再読込をお試し下さい。",
+    "lang_layout_thisacct":"このアカウントの{{notf}}",
+    "lang_layout_delthis":"このカラムを削除",
+    "lang_layout_setthis":"このカラムの設定",
+    "lang_layout_mediafil":"メディアフィルター",
+    "lang_layout_linkana":"リンク解析",
+    "lang_layout_linkanades":"リンクの解析を切り替え",
+    "lang_layout_tts":"読み上げ",
+    "lang_layout_reconnect":"ストリーミング再接続",
+    "lang_layout_headercolor":"TLヘッダーカラー",
+    "lang_layout_nodata":"[ここにトゥートはありません。]<br>F5/⌘+Rで再読込できます。",
+    "lang_layout_dm":"ダイレクトメッセージ",
+    "lang_layout_webviewmode":"WebView優先",
+    "lang_excluded":"除外する通知",
+    "lang_layout_excludingbt":"BT表示(OFF/BT除外/BTのみ)",
+//ui/sort.js
+    "lang_sort_gothis":"このカラムへ",
+    "lang_sort_remthis":"このカラムを削除",
+//ui/spotify.js
+    "lang_spotify_img":"アルバムアートワークを添付します。",
+    "lang_spotify_imgno":"アルバムアートワークを添付しません。",
+    "lang_spotify_acct":"アカウント連携をしてください。",
+    "lang_spotify_np":"NowPlaying文書を更新しました。",
+    "lang_setting_npprovide":"NowPlayingのソースを{{set}}に設定しました。",
+//userdata/his-data.js
+    "lang_hisdata_frcreq":"Mastodon 2.4.3~が必要です",
+    "lang_hisdata_frcwarn":"非フォローだけど絡みがある時に表示されます。",
+    "lang_hisdata_taketime":"30秒から数分かかります",
+    "lang_hisdata_notonmisskey":"このシステムはMisskeyにはありません。",
+//userdata/showOnTL.js
+    "lang_showontl_movetxt":"このアカウントは移行しています",
+    "lang_showontl_movebtn":"移行先を見る",
+    "lang_showontl_botacct":"botアカウント",
+    "lang_showontl_followed":"フォローされています",
+    "lang_showontl_notf":"通知",
+    "lang_showontl_domain":"ドメイン",
+    "lang_showontl_listwarn":"リストに追加するためにはフォローが必要です。",
+//parse
+   "lang_parse_mentioned":"が返信しました",
+    "lang_parse_faved":"がお気に入り登録しました",
+    "lang_parse_bted":"がブーストしました",
+    "lang_parse_btedsimple":"がブースト",
+    "lang_parse_notftime":"通知された時間",
+    "lang_parse_cwshow":"見る",
+    "lang_parse_fulltext":"以下全文",
+    "lang_parse_autofold":"自動折り畳み",
+    "lang_parse_more":"続き...",
+    "lang_parse_url":"URL解析",
+    "lang_parse_tagTL":"{{tag}}のタイムライン",
+    "lang_parse_tagtoot":"{{tag}}でトゥート",
+    "lang_parse_tagpin":"{{tag}}をよく使うタグへ",
+    "lang_parse_public":"公開",
+    "lang_parse_unlisted":"未収載",
+    "lang_parse_private":"非公開",
+    "lang_parse_direct":"ダイレクト",
+    "lang_parse_clickcopy":"クリックして本文をコピー",
+    "lang_parse_clickcopyurl":"クリックしてトゥートURLをコピー",
+    "lang_parse_trans":"このトゥートを日本語に翻訳",
+    "lang_parse_replyto":"このトゥートに返信",
+    "lang_parse_bt":"このトゥートをブースト",
+    "lang_parse_fav":"このトゥートをお気に入り登録",
+    "lang_parse_quote":"このトゥートを引用",
+    "lang_parse_del":"このトゥートを削除",
+    "lang_parse_pin":"このトゥートをピン留め",
+    "lang_parse_det":"詳細(メインアカウント経由)",
+    "lang_parse_redraft":"このトゥートを削除して再編集",
+    "lang_parse_followed":"フォローされました。",
+    "lang_parse_clientop":"クライアント処理",
+    "lang_parse_clienttxt":"に対する処理を選択してください。",
+    "lang_parse_clientno":"何もしない",
+    "lang_parse_clientemp":"強調表示/解除",
+    "lang_parse_clientmute":"ミュート",
+    "lang_parse_mute":"ミュートします。設定から解除できます。",
+    "lang_parse_voted":"投票済みです",
+    "lang_parse_vote":"投票",
+    "lang_parse_unvoted":"結果だけ見る",
+    "lang_parse_endedvote":"終了済み",
+    //misskey
+    "lang_misskeyparse_renote":"再投稿",
+    "lang_misskeyparse_renoteqt":"引用",
+    "lang_misskeyparse_reaction":"リアクション",
+    "lang_misskeyparse_tagnostr":"タグTLはストリーミング非対応です。",
+    "lang_misskeyparse_listnostr":"リストTLはストリーミング非対応です。",
+    "lang_misskeyparse_home":"ホーム",
+    "lang_misskeyparse_followers":"フォロワー",
+    "lang_misskeyparse_specified":"ユーザー指定",
+    "lang_misskeyparse_qt":"MisskeyのRenote(引用モード)中:Ctrl+Shift+Cでクリア",
+    "lang_misskeyparse_renoted":"がRepost",
+    "lang_misskeyparse_quoted":"が引用",
+    "lang_misskeyparse_reacted":"がリアクション",
+//setting
+    "lang_setting_time":"時間設定を{{set}}に設定しました。",
+    "lang_setting_theme":"テーマ設定を{{set}}に設定しました。",
+    "lang_setting_nsfw":"画像表示設定を{{set}}に設定しました。",
+    "lang_setting_cw":"テキスト表示設定を{{set}}に設定しました。",
+    "lang_setting_cwtext":"デフォルトの警告文を「{{set}}」に設定しました。",
+    "lang_setting_cws":"標準でCW:{{set}}",
+    "lang_setting_rp":"リプライ数表示:{{set}}",
+    "lang_setting_vis":"デフォルトの公開設定を{{set}}に設定しました。",
+    "lang_setting_popup":"ポップアップお知らせを{{set}}に設定しました。",
+    "lang_setting_off":"オフ",
+    "lang_setting_s":"秒",
+    "lang_setting_box":"デフォルトでのボックスの挙動を{{set}}に設定しました。",
+    "lang_setting_gif":"アイコンアニメーション再生を{{set}}に設定しました。",
+    "lang_setting_selt":"{{set1}}行以上または{{set2}}文字以上でテキストを隠します。",
+    "lang_setting_autocw":"{{set1}}行以上または{{set2}}文字以上で警告を表示します。",
+    "lang_setting_width":"横幅最低を{{set}}pxに設定しました。",
+    "lang_setting_fixwidth":"TweetDeckの横幅を{{set}}pxに設定しました。",
+    "lang_setting_img":"画像投稿後の設定を「{{set}}」に設定しました。",
+    "lang_setting_font":"フォントを{{set}}に設定しました。",
+    "lang_setting_default":"デフォルト",
+    "lang_setting_size":"フォントサイズを{{set}}pxに設定しました。",
+    "lang_setting_imgheight":"画像高さを{{set}}pxに設定しました。",
+    "lang_setting_ticker":"#InstanceTicker使用を{{set}}に設定しました。",
+    "lang_setting_animation":"アニメーションを{{set}}に設定しました。",
+    "lang_setting_tag":"タグの取得範囲を「{{set}}」に設定しました。",
+    "lang_setting_boxConfirm":"投稿ボックスを{{set}}",
+    "lang_setting_ul":"独自ロケール設定を{{set}}に設定しました。",
+    "lang_setting_notf":"ネイティブ通知を{{set}}に設定しました。",
+    "lang_setting_quote":"引用形式を{{set}}に設定しました。",
+    "lang_setting_via":"via表示を{{set}}に設定しました。",
+    "lang_setting_mov":"アクションボタン非表示を{{set}}に設定しました。",
+    "lang_setting_setasread":"通知カラム存在時新着非表示を{{set}}に設定しました。",
+    "lang_setting_main":"起動時・投稿時のアカウントを{{set}}に設定しました。",
+    "lang_setting_sec":"セカンダリートゥートボタン:{{set}}",
+    "lang_setting_ksref":"キーボードショートカットが更新されました。",
+    "lang_setting_nomuting":"ミュートしているクライアントはありません。",
+    "lang_setting_notftest":"通知テスト",
+    "lang_setting_notftestprof":"アイコンはあなたのアカウントのものです。",
+    "lang_setting_exportwarn":"重要なデータのみエクスポートされます。エクスポートされたデータは外部に公開しないでください。全ての認証データが含まれています。",
+    "lang_setting_importwarn":"全てのデータがリセットされます。"
+}

app/js/lang/lang.js

@@ -1,454 +0,0 @@
-//commonError
-var lang_toot={
-    "ja":"トゥート",
-    "en":"Toot"
-}
-var lang_there={
-    "ja":"あり",
-    "en":"Yes"
-}
-var lang_nothing={
-    "ja":"なし",
-    "en":"None"
-}
-var lang_yesno={
-    "ja":"はい",
-    "en":"Yes"
-}
-var lang_no={
-    "ja":"いいえ",
-    "en":"No"
-}
-var lang_progress={
-    "ja":"処理中",
-    "en":"Wait..."
-}
-var lang_edit={
-    "ja":"編集",
-    "en":"Edit"
-}
-var lang_del={
-    "ja":"削除",
-    "en":"Delete"
-}
-var lang_add={
-    "ja":"追加",
-    "en":"Add"
-}
-var lang_fatalerroroccured={
-    "ja":"エラーが発生しました。しばらく待ってから再起動してください。",
-    "en":"Some errors are occured, please restart TheDesk."
-}
-var lang_speech={
-    "ja":"Google 日本語",
-    "en":"Google US English"
-}
-//language.html
-var lang_lang={
-    "ja":"言語",
-    "en":"Language"
-}
-var lang_langlocale={
-    "ja":"日本語",
-    "en":"English"
-}
-var lang_back={
-    "ja":"戻る",
-    "en":"Back"
-}
-var lang_set={
-    "ja":"設定",
-    "en":"Set"
-}
-var lang_langadd={
-    "ja":"<a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>から翻訳に参加できます。英語の校正(緊急)や他言語に翻訳していただける方を募集しております。",
-    "en":"Translate TheDesk to other languages or proofread TheDesk on <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk needs your help."
-}
-//common/version.js
-var lang_version_usever={
-    "ja":"お使いのバージョン{{ver}}は最新です。",
-    "en":"No update is found({{ver}})"
-}
-var lang_version_skipver={
-    "ja":"アップデートはスキップされました。",
-    "en":"Update was ignored."
-}
-//login
-//login/login.js
-var lang_login_noauth={
-    "ja":"認証せずに見る",
-    "en":"Show TL of unlogined accounts"
-}
-//login/manager.js
-var lang_manager_info={
-    "ja":"インスタンス情報",
-    "en":"About this instance"
-}
-var lang_manager_refresh={
-    "ja":"情報更新",
-    "en":"Refresh"
-}
-var lang_manager_delete={
-    "ja":"削除",
-    "en":"Logout"
-}
-var lang_manager_color={
-    "ja":"アカウントカラーを選択",
-    "en":"Account Color"
-}
-var lang_manager_confirm={
-    "ja":"を削除します。",
-    "en":"is about to logout. Continue?"
-}
-var lang_manager_mainAcct={
-    "ja":"メインアカウントを設定しました。",
-    "en":"Done:choose main account"
-}
-var lang_manager_def={
-    "ja":"既定",
-    "en":"Default"
-}
-var lang_manager_none={
-    "ja":"なし",
-    "en":"None"
-}
-var lang_manager_godev={
-    "ja":"MisskeyのDevセンターに移動します。同時に開かれるドキュメントを参考にログインしてください。",
-    "en":"Open DevCenter of Misskey. We show also an official documents to refer."
-}
-//post/bb-md.js
-var lang_bbmd_misskey={
-    "ja":"TheDeskにおけるMisskeyでは、@を返信として扱いますが、全ての@は消去され別パラメータに入力されます。また、「未収載」を「ホーム」として扱います。",
-    "en":"TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey."
-}
-//post/emoji.js
-var lang_emoji_get={
-    "ja":"絵文字リストを取得",
-    "en":"Get emojis"
-}
-var lang_emoji_custom={
-    "ja":"カスタム絵文字",
-    "en":"Custom emojis"
-}
-//post/img.js
-var lang_postimg_previewdis={
-    "ja":"プレビューできません。",
-    "en":"cannot preview"
-}
-var lang_postimg_aftupload={
-    "ja":"アップロード後はアカウントを切り替えられません。",
-    "en":"You cannot change accounts after uploading."
-}
-//post/post.js
-var lang_post_tagTL={
-    "ja":"デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。",
-    "en":"This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?"
-}
-var lang_post_cwtitle={
-    "ja":"長文投稿の警告",
-    "en":"Auto CW Alert"
-}
-var lang_post_cwtxt={
-    "ja":"指定文字数、行数を超えるトゥートを行おうとしています。\n自動CWのタイトル:",
-    "en":"You are about to post longer toot than you set.\nWarning text:"
-}
-var lang_post_btn1={
-    "ja":"キャンセル(投稿しない)",
-    "en":"Cancel (will not post)"
-}
-var lang_post_btn2={
-    "ja":"自動でCWを付ける",
-    "en":"Make text hidden automatically"
-}
-var lang_post_btn3={
-    "ja":"そのまま投稿",
-    "en":"Continue to post"
-}
-//post/status.js
-var lang_status_favWarn={
-    "ja":"お気に入り登録しました。インスタンスが違うときは時間がかかる場合があります。",
-    "en":"It will take a miunte to favourite a remote toot."
-}
-var lang_status_btWarn={
-    "ja":"ブーストしました。インスタンスが違うときは時間がかかる場合があります。",
-    "en":"It will take a miunte to boost a remote toot."
-}
-var lang_status_follow={
-    "ja":"フォロー",
-    "en":"Follow" 
-}
-var lang_status_unfollow={
-    "ja":"フォロー解除",
-    "en":"Unfollow" 
-}
-var lang_status_block={
-    "ja":"ブロック",
-    "en":"Block" 
-}
-var lang_status_unblock={
-    "ja":"ブロック解除",
-    "en":"Unblock" 
-}
-var lang_status_mute={
-    "ja":"ミュート",
-    "en":"Mute" 
-}
-var lang_status_unmute={
-    "ja":"ミュート解除",
-    "en":"Unmute" 
-}
-var lang_status_redraft={
-    "ja":"削除して再編集しますか？そのトゥートの全てのデータがリセットされます。この機能はベータ版です。画像は~v2.4.1で破棄されます。",
-    "en":"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."
-}
-var lang_status_emphas={
-    "ja":"を強調します。リロードしてください。",
-    "en":"'s toots are emphasized. Please reload after this action." 
-}
-var lang_status_unemphas={
-    "ja":"を強調解除します。リロードしてください。",
-    "en":"'s toots are not emphasized. Please reload after this action." 
-}
-var lang_status_unendorse={
-    "ja":"紹介解除",
-    "en":"Not feature on profile" 
-}
-var lang_status_endorse={
-    "ja":"プロフで紹介する",
-    "en":"Feature on profile" 
-}
-//post/suggest.js
-var lang_suggest_nodata={
-    "ja":"サジェストのために絵文字リストを取得してください。",
-    "en":"Please get emojis list in order to show suggestion." 
-}
-//post/use-txtbox.js
-var lang_usetxtbox_reply={
-    "ja":"返信モードです。クリアするときはCtrl+Shift+Cを押してください。",
-    "en":"Reply Mode. Ctrl+Shift+C to clear."
-}
-//tl/card.js
-var lang_cards_check={
-    "ja":"チェック",
-    "en":" check" 
-}
-var lang_cards_pip={
-    "ja":"ながら観モード",
-    "en":"PiP mode" 
-}
-//tl/details.js
-var lang_details_nodata={
-    "ja":"データなし",
-    "en":"No data" 
-}
-var lang_details_filtered={
-    "ja":"フィルターされました。",
-    "en":"Filtered toot" 
-}
-var lang_details_embed={
-    "ja":"埋め込みHTMLがコピーされました。",
-    "en":"Embed HTML is cliped." 
-}
-var lang_details_url={
-    "ja":"トゥートURLがコピーされました。",
-    "en":"URL of this toot is cliped." 
-}
-var lang_details_txt={
-    "ja":"トゥート本文がコピーされました。",
-    "en":"Content of this toot is cliped." 
-}
-//tl/filter.js
-var lang_filter_nodata={
-    "ja":"フィルターはありません",
-    "en":"No data" 
-}
-var lang_filter_errordegree={
-    "ja":"適応範囲を最低一つ以上チェックしてください。",
-    "en":"Please check a context" 
-}
-//tl/list.js
-var lang_list_nodata={
-    "ja":"リストはありません",
-    "en":"No data" 
-}
-var lang_list_show={
-    "ja":"表示",
-    "en":"Show" 
-}
-var lang_list_users={
-    "ja":"ユーザー一覧",
-    "en":"Users list" 
-}
-var lang_list_nouser={
-    "ja":"ユーザーはいません",
-    "en":"No users in this list." 
-}
-var lang_list_add={
-    "ja":"リストに追加",
-    "en":"Add to the list" 
-}
-var lang_list_remove={
-    "ja":"リストから削除",
-    "en":"Remove from the list" 
-}
-//tl/notification.js
-var lang_notf_new={
-    "ja":"件の新しい通知",
-    "en":" new notifications" 
-}
-//tl/speech.js
-var lang_speech_refresh={
-    "ja":"音声読み上げ設定を更新しました。",
-    "en":"Save valie about TTS config" 
-}
-//tl/src.js
-var lang_src_ts={
-    "ja":"時系列",
-    "en":"chronological order" 
-}
-var lang_src_people={
-    "ja":"人がトゥート",
-    "en":" people toot" 
-}
-//tl/tag.js
-var lang_tags_always={
-    "ja":"常に",
-    "en":"Always toots with " 
-}
-var lang_tags_realtime={
-    "ja":"実況",
-    "en":"Tag-stream toot" 
-}
-var lang_tags_tagunpin={
-    "ja":"{{tag}}をよく使うタグから削除",
-    "en":"Unpin {{tag}}"
-}
-var lang_tags_tagwarn={
-    "ja":"次に{{tag}}なしでトゥートするまで全てのトゥートに{{tag}}が付与されます。",
-    "en":"When you toot without {{tag}}, tag-streaming mode will be off."
-}
-//tl/tl.js
-var lang_tl_media={
-    "ja":"メディア",
-    "en":"Media"
-}
-var lang_tl_reconnect={
-    "ja":"Streamingに再接続しました",
-    "en":"Reconnect to streaming API"
-}
-//ui/layout.js
-var lang_layout_gotop={
-    "ja":"一番上へ。アイコンが赤のときはストリーミングに接続できていません。F5等で再読込をお試し下さい。",
-    "en":"Go top of this column. When icon is red, this column cannot connect straming API. Please reload."
-}
-var lang_layout_thisacct={
-    "ja":"このアカウントの{{notf}}",
-    "en":"{{notf}} of this account"
-}
-var lang_layout_delthis={
-    "ja":"このカラムを削除",
-    "en":"Remove this column"
-}
-var lang_layout_setthis={
-    "ja":"このカラムの設定",
-    "en":"Preferences of this column"
-}
-var lang_layout_mediafil={
-    "ja":"メディアフィルター",
-    "en":"Media filtering"
-}
-var lang_layout_linkana={
-    "ja":"リンク解析",
-    "en":"Auto Link Analyzer"
-}
-var lang_layout_linkanades={
-    "ja":"リンクの解析を切り替え(OFFで制限を回避出来る場合があります)",
-    "en":"Auto link analyzer(You may got limitation of API)"
-}
-var lang_layout_tts={
-    "ja":"読み上げ",
-    "en":"Text to speech "
-}
-var lang_layout_reconnect={
-    "ja":"ストリーミング再接続",
-    "en":"Reconnect to streaming API"
-}
-var lang_layout_headercolor={
-    "ja":"TLヘッダーカラー",
-    "en":"Header color of this column"
-}
-var lang_layout_nodata={
-    "ja":"[ここにトゥートはありません。]<br>F5/⌘+Rで再読込できます。",
-    "en":"[No data]<br>F5/⌘+R to reload"
-}
-var lang_layout_dm={
-    "ja":"ダイレクトメッセージ",
-    "en":"Direct Message"
-}
-var lang_layout_webviewmode={
-    "ja":"WebView優先",
-    "en":"Prefer WebView"
-}
-//ui/spotify.js
-var lang_spotify_img={
-    "ja":"アルバムアートワークを添付します。",
-    "en":"Attach an album artwork"
-}
-var lang_spotify_imgno={
-    "ja":"アルバムアートワークを添付しません。",
-    "en":"Not ttach an album artwork"
-}
-var lang_spotify_acct={
-    "ja":"アカウント連携をしてください。",
-    "en":"Connect TheDesk to Spotify"
-}
-var lang_spotify_np={
-    "ja":"NowPlaying文書を更新しました。",
-    "en":"Done:templete of NowPlaying"
-}
-//userdata/his-data.js
-var lang_hisdata_frcreq={
-    "ja":"Mastodon 2.4.3~が必要です",
-    "en":"Required Mastodon 2.4.3 and above"
-}
-var lang_hisdata_frcwarn={
-    "ja":"非フォローだけど絡みがある時に表示されます。",
-    "en":"Unfollow accounts will be shown."
-}
-var lang_hisdata_taketime={
-    "ja":"30秒から数分かかります",
-    "en":"It will take 30s ~ several minutes"
-}
-var lang_hisdata_notonmisskey={
-    "ja":"このシステムはMisskeyにはありません。",
-    "en":"Misskey is unable to request."
-}
-//userdata/showOnTL.js
-var lang_showontl_movetxt={
-    "ja":"このアカウントは移行しています",
-    "en":"This account was moved"
-}
-var lang_showontl_movebtn={
-    "ja":"移行先を見る",
-    "en":"Continue on the new account"
-}
-var lang_showontl_botacct={
-    "ja":"botアカウント",
-    "en":"[bot]"
-}
-var lang_showontl_followed={
-    "ja":"フォローされています",
-    "en":"Following you"
-}
-var lang_showontl_notf={
-    "ja":"通知",
-    "en":"Notification "
-}
-var lang_showontl_domain={
-    "ja":"ドメイン",
-    "en":"Domain "
-}
-var lang_showontl_listwarn={
-    "ja":"リストに追加するためにはフォローが必要です。",
-    "en":"Follow to add this user to lists."
-}

app/js/lang/lang.ps.js

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

app/js/lang/parse.lang.js

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

app/js/lang/setting.lang.js

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

app/js/login/login.js

@@ -5,15 +5,16 @@
 localStorage.removeItem("kirishima")
 localStorage.removeItem("imas")
 localStorage.removeItem("image");
+localStorage.removeItem("stable")
 localStorage.setItem("mode_misskey.xyz","misskey")
 function ck() {
 	var main = localStorage.getItem("main");
 	if(!main){
 		localStorage.setItem("main",0)
 	}
-	var domain = localStorage.getItem("domain_0");
+	var domainz = localStorage.getItem("domain_0");
 	var at = localStorage.getItem("acct_0_at");
-	var oldat = localStorage.getItem(domain + "_at");
+	var oldat = localStorage.getItem(domainz + "_at");
 	if(oldat){
 		console.log("Move to New Account Management System")
 		var multi = localStorage.getItem("multi");
@@ -40,15 +41,28 @@ function ck() {
 		}else{	
 		}
 	}
-	
+	var multi = localStorage.getItem("multi");
-	if (at) {
+	if (!multi) {
+		var obj = [];
+		var json = JSON.stringify(obj);
+		localStorage.setItem("multi", json);
+	} else {
+		var obj = JSON.parse(multi);
+	}
+	Object.keys(obj).forEach(function(key) {
+		var acct=obj[key];
+		if(acct.domain){
+			refresh(key,true)
+		}
+	});
+	console.log(obj);
+	if (obj[0].domain) {
 		$("#tl").show();
-		
+		ticker();
-		parseColumn();
 		multiSelector();
 	} else {
 		$("#tl").show();
-		multiSelector();
+		$("#post-box").hide();
 	}
 }
 ck();
@@ -64,7 +78,7 @@ function login(url) {
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		scopes: 'read write follow',
 		client_name: "TheDesk(PC)",
@@ -72,7 +86,7 @@ function login(url) {
 		website: "https://thedesk.top"
 	}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			var auth = "https://" + url + "/oauth/authorize?client_id=" + json[
@@ -83,9 +97,7 @@ function login(url) {
 		localStorage.setItem("client_secret", json["client_secret"]);
 		$("#auth").show();
 		$("#masara").hide();
-		const {
+		const { shell } = require('electron');
-  			shell
-  		} = require('electron');
 
 		  shell.openExternal(auth);
 		  
@@ -173,7 +185,7 @@ function getdata() {
 		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang_fatalerroroccured[lang]+"Error:" + json.error,
+			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
 				5000);
 			return;
 		}
@@ -223,14 +235,14 @@ function getdataAdv(domain, at) {
 		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang_fatalerroroccured[lang]+"Error:" + json.error,
+			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
 				5000);
 			return;
 		}
 		var avatar=json["avatar"];
 		//missingがmissingなやつ
 		if(avatar=="/avatars/original/missing.png"){
-			avatar="./img/missing.svg";
+			avatar="../../img/missing.svg";
 		}
 		if(json["source"]["privacy"]){
 			var priv=json["source"]["privacy"];
@@ -261,7 +273,7 @@ function getdataAdv(domain, at) {
 	});
 }
 //ユーザーデータ更新
-function refresh(target) {
+function refresh(target,loadskip) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
 	if(obj[target].mode=="misskey"){
@@ -285,7 +297,7 @@ function refresh(target) {
 		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang_fatalerroroccured[lang]+"Error:" + json.error,
+			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
 				5000);
 			return;
 		}
@@ -313,8 +325,9 @@ function refresh(target) {
 		obj[target] = ref;
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
-
+		if(!loadskip){
-		load();
+			load();
+		}
 	});
 }
 //MarkdownやBBCodeの対応、文字数制限をチェック
@@ -330,7 +343,7 @@ function ckdb(acct_id) {
 	localStorage.removeItem("post_" + acct_id);
 	localStorage.removeItem("fav_" + acct_id);
 	localStorage.removeItem("bt_" + acct_id);
-	localStorage.removeItem("follow_" + acct_id);
+	localStorage.removeItem("followlocale_" + acct_id);
 	if(domain=="kirishima.cloud"){
 		localStorage.setItem("kirishima", "true");
 		$("#ranking-btn").show();
@@ -388,7 +401,7 @@ function ckdb(acct_id) {
 				localStorage.setItem("bt_" + acct_id, json[domain + "_bt"]);
 			}
 			if(json[domain + "_follow"]){
-				localStorage.setItem("follow_" + acct_id, json[domain + "_follow"]);
+				localStorage.setItem("followlocale_" + acct_id, json[domain + "_follow"]);
 			}
 	}
 	if(localStorage.getItem("mode_" + domain)!="misskey"){
@@ -444,14 +457,15 @@ function multiSelector() {
 	var sel;
 	if(obj.length<1){
 		$("#src-acct-sel").html('<option value="tootsearch">Tootsearch</option>');
-		$("#add-acct-sel").html('<option value="noauth">'+lang_login_noauth[lang]+'</option>');
+		$("#add-acct-sel").html('<option value="noauth">'+lang.lang_login_noauth+'</option>');
 	}else{
 	Object.keys(obj).forEach(function(key) {
 		var acct = obj[key];
 		var list = key * 1 + 1;
 		if (key == last) {
 			sel = "selected";
-			var domain = localStorage.getItem("domain_" + key);
+			var domain = acct.domain;
+			localStorage.setItem("domain_" + key, domain);
 			if(idata[domain+"_letters"]){
 				$("#textarea").attr("data-length", idata[domain+"_letters"])
 			}else{
@@ -465,13 +479,20 @@ function multiSelector() {
 			if(idata[domain+"_glitch"]){
 				$("#local-button").removeClass("hide")
 			}
-			var profimg=localStorage.getItem("prof_"+key);
+			var profimg = acct.prof;
+			localStorage.setItem("prof_" + key, profimg);
 			console.log(profimg);
 			if(!profimg){
-				profimg="./img/missing.svg";
+				profimg="../../img/missing.svg";
 			}
 			$("#acct-sel-prof").attr("src",profimg);
-			$("#toot-post-btn").text(lang_toot[lang]+"("+domain+")");
+			console.log(domain);
+			if(domain){
+				var cc="("+domain+")";
+			}else{
+				var cc="";
+			}
+			$("#toot-post-btn").text(lang.lang_toot+cc);
 			if(acct.background && acct.background!="def" && acct.text && acct.text!="def"){
 				$("#toot-post-btn").removeClass("indigo");
 				$("#toot-post-btn").css("background-color","#"+acct.background);
@@ -498,9 +519,10 @@ function multiSelector() {
 		
 	});
 		$("#src-acct-sel").append('<option value="tootsearch">Tootsearch</option>');
-		$("#add-acct-sel").append('<option value="noauth">'+lang_login_noauth[lang]+'</option><option value="webview">Twitter</option>');
+		$("#add-acct-sel").append('<option value="noauth">'+lang.lang_login_noauth+'</option><option value="webview">Twitter</option>');
 	}
 	$('select').material_select('update');
+	parseColumn();
 }
 
 //バージョンエンコ
@@ -512,3 +534,24 @@ function enc(ver){
     var ver = ver.replace( /\]/g , "" );
     return ver;
 }
+//インスタンスティッカー
+function ticker() {
+	var start = "https://toot.app/toot/";
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json'
+		},
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		console.error(error);
+	}).then(function(json) {
+		if (json.error) {
+			return;
+		}
+		if(json){
+			localStorage.setItem("ticker", JSON.stringify(json));
+		}
+	});
+}

app/js/login/manager.js

@@ -43,11 +43,11 @@ function load() {
 			name + '</span>' + escapeHTML(acct.user) + '@' + acct.domain +
 			'</div><div class="card-action"><a class="waves-effect disTar pointer white-text" onclick="data(\'' +
 			acct.domain +
-			'\')"><i class="material-icons">info</i>'+lang_manager_info[lang]+'</a><a class="waves-effect disTar pointer  white-text" onclick="refresh(' +
+			'\')"><i class="material-icons">info</i>'+lang.lang_manager_info+'</a><a class="waves-effect disTar pointer  white-text" onclick="refresh(' +
 			key +
-			')"><i class="material-icons">refresh</i>'+lang_manager_refresh[lang]+'</a><a class="waves-effect disTar pointer red-text" onclick="multiDel(' +
+			')"><i class="material-icons">refresh</i>'+lang.lang_manager_refresh+'</a><a class="waves-effect disTar pointer red-text" onclick="multiDel(' +
 			key +
-			')"><i class="material-icons">delete</i>'+lang_manager_delete[lang]+'</a><br>'+lang_manager_color[lang]+'<div id="colorsel_'+key+'" class="colorsel"></div></div></div>';
+			')"><i class="material-icons">delete</i>'+lang.lang_manager_delete+'</a><br>'+lang.lang_manager_color+'<div id="colorsel_'+key+'" class="colorsel"></div></div></div>';
 		$("#acct-list").append(templete);
 	colorpicker(key)
 	});
@@ -60,8 +60,8 @@ function load() {
 	var electron = require("electron");
           var remote=electron.remote;
           var platform=remote.process.platform;
-	    if(platform=="win32"){
+	    if(localStorage.getItem("winstore")!="localinstall"){
-
+			$("#linux").prop("checked", false);
         }else{
 			$("#linux").prop("checked", true);
 		}
@@ -82,7 +82,7 @@ function data(domain) {
 	$("#ins-user").text("Loading...");
 	$("#ins-ver").text("Loading...");
 	$("#ins-name").text("Loading...");
-	$("#ins-prof").attr('src', "./img/loading.svg");
+	$("#ins-prof").attr('src', "../../img/loading.svg");
 	var start = "https://instances.social/api/1.0/instances/show?name=" + domain;
 	fetch(start, {
 		method: 'GET',
@@ -141,7 +141,7 @@ function multiDel(target) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
 	//削除確認ダイアログ
-	if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] +lang_manager_confirm[lang])) {
+	if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] +lang.lang_manager_confirm)) {
 		Object.keys(obj).forEach(function(key) {
 			var nk=key-1;
 			//公開範囲(差分のみ)
@@ -175,6 +175,7 @@ function multiDel(target) {
 		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
+		load();
 		//カラムデータコンフリクト
 		var col = localStorage.getItem("column");
 		var oldcols = JSON.parse(col);
@@ -199,13 +200,13 @@ function multiDel(target) {
 		});
 		var json = JSON.stringify(newcols);
 		localStorage.setItem("column", json);
-		load();
+		
 	}
 }
 function multiDel2(target) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
-	if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] +lang_manager_confirm[lang])) {
+	if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] +lang.lang_manager_confirm)) {
 		obj.splice(target, 1);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
@@ -285,7 +286,7 @@ function login(url) {
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		scopes: 'read write follow',
 		client_name: "TheDesk(PC)",
@@ -293,7 +294,7 @@ function login(url) {
 		website: "https://thedesk.top"
 	}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			localStorage.setItem("msky","false");
@@ -325,42 +326,41 @@ function misskeyLogin(url) {
 	if(!url){
 		var url=$("#misskey-url").val();
 	}
-	var multi = localStorage.getItem("multi");
+	var start = "https://"+url+"/api/app/create";
-	var obj = JSON.parse(multi);
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.responseType = "json";
+	localStorage.setItem("msky","true");
+	httpreq.send(JSON.stringify({
+			name: "TheDesk(PC)",
+			description: "Mastodon client for PC",
+			permission: ["read","write","follow"]
+	}));
+    httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response;
+			console.log(json);
+			misskeyAuth(url, json.secret)
+		}
+	}
+	
+
+}
+function misskeyAuth(url, mkc){
 	var start = "https://"+url+"/api/auth/session/generate";
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
-	localStorage.setItem("msky","true");
-	if(url=="misskey.xyz" && misskeytoken){
-		var mkc=misskeytoken;
-	}else{
-		var mkc=$("#misskey-key").val();
-		localStorage.setItem("mkc",mkc)
-		if(!mkc){
-			$("#misskeylogin").show();
-			$("#misskey-url").val(url);
-			if(confirm(lang_manager_godev[lang])){
-				const {
-					shell
-				} = require('electron');
-				console.log("https://"+url+"/dev")
-				shell.openExternal("https://"+url+"/dev");
-				shell.openExternal("https://thedesk.top/how-to-login-misskey.html");
-			}
 
-			return false;
+	localStorage.setItem("mkc",mkc)
-		}else{
+	localStorage.setItem("msky","true");
-			$("#misskeylogin").hide();
-			$("#misskey-url").val("");
-		}
-	}
 	httpreq.send(JSON.stringify({
 		appSecret: mkc
 	}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			const {
@@ -373,11 +373,8 @@ function misskeyLogin(url) {
 			$("#misskey").prop("checked", false);
 			localStorage.setItem("domain_tmp",url);
 			shell.openExternal(json.url);
-			var electron = require("electron");
 		}
 	}
-	
-
 }
 
 //テキストボックスにURL入れた
@@ -405,13 +402,13 @@ function code(code) {
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({
 			token:code,
 			appSecret:localStorage.getItem("mkc")
 		}));
     	httpreq.onreadystatechange = function() {
-			if (httpreq.readyState == 4) {
+			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
 				var i = sha256(json.accessToken + localStorage.getItem("mkc"));
 				console.log(json);
@@ -452,7 +449,7 @@ function code(code) {
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({
 			grant_type: "authorization_code",
 			redirect_uri: "https://thedesk.top/hello.html",
@@ -461,7 +458,7 @@ function code(code) {
 			code: code
 		}));
 		httpreq.onreadystatechange = function() {
-			if (httpreq.readyState == 4) {
+			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
 				console.log(json);
 				if (json["access_token"]) {
@@ -492,14 +489,14 @@ function getdata(domain, at) {
 		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang_fatalerroroccured[lang]+"Error:" + json.error,
+			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
 				5000);
 			return;
 		}
 		var avatar=json["avatar"];
 		//missingがmissingなやつ
 		if(avatar=="/avatars/original/missing.png"){
-			avatar="./img/missing.svg";
+			avatar="../../img/missing.svg";
 		}
 		if(json["source"]){
 			var priv=json["source"]["privacy"];
@@ -557,7 +554,7 @@ function refresh(target) {
 		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang_fatalerroroccured[lang]+"Error:" + json.error,
+			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
 				5000);
 			return;
 		}
@@ -593,13 +590,13 @@ function misskeyRefresh(obj,target,url){
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({
 			username:obj[target].user,
 			i:localStorage.getItem("at")
 		}));
     	httpreq.onreadystatechange = function() {
-			if (httpreq.readyState == 4) {
+			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
 				console.log(json);
 				return;
@@ -646,19 +643,19 @@ function multisel() {
 	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_login_noauth[lang]+'</option>');
+		$("#add-acct-sel").html('<option value="noauth">'+lang.lang_login_noauth+'</option>');
 	}else{
 	Object.keys(obj).forEach(function(key) {
 		var acct = obj[key];
 		var list = key * 1 + 1;
 		if (key == last) {
 			sel = "selected";
-			mainb='('+lang_manager_def[lang]+')'
+			mainb='('+lang.lang_manager_def+')'
 			var domain = localStorage.getItem("domain_" + key);
 			var profimg=localStorage.getItem("prof_"+key);
 			var domain=localStorage.getItem("domain_"+key);
 			if(!profimg){
-				profimg="./img/missing.svg";
+				profimg="../../img/missing.svg";
 			}
 		} else {
 			sel = "";
@@ -676,11 +673,11 @@ function multisel() {
 function mainacct(){
 	var acct_id = $("#main-acct-sel").val();
 	localStorage.setItem("main", acct_id);
-	Materialize.toast(lang_manager_mainAcct[lang], 3000);
+	Materialize.toast(lang.lang_manager_mainAcct, 3000);
 }
 function colorpicker(key){
 	temp=
-		'<div onclick="coloradd('+key+',\'def\',\'def\')" class="pointer exc">'+lang_manager_none[lang]+'</div>'+
+		'<div onclick="coloradd('+key+',\'def\',\'def\')" class="pointer exc">'+lang.lang_manager_none+'</div>'+
 		'<div onclick="coloradd('+key+',\'f44336\',\'white\')" class="red white-text pointer"></div>'+
 		'<div onclick="coloradd('+key+',\'e91e63\',\'white\')" class="pink white-text pointer"></div>'+
 		'<div onclick="coloradd('+key+',\'9c27b0\',\'white\')" class="purple white-text pointer"></div>'+

app/js/platform/end.js

@@ -58,9 +58,7 @@
 		//hrefがhttp/httpsならブラウザで
 		if(urls){
 		if (urls[0]) {
-			const {
+			const {shell} = require('electron');
-				shell
-			} = require('electron');
 			if(~url.indexOf("thedeks.top")){
 				//alert("If you recieve this alert, let the developer(Cutls@kirishima.cloud) know it with a screenshot.");
 				url="https://thedesk.top";
@@ -81,8 +79,7 @@
   //よく使うライブラリ
   /*マルチバイト用切り出し*/
   $.isSurrogatePear = function(upper, lower) {
-  	return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <=
+  	return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <= 0xDFFF;
-  		0xDFFF;
   };
   $.mb_strlen = function(str) {
   	var ret = 0;
@@ -113,28 +110,7 @@
   	}
   	return ret;
   };
-  $.strip_tags = function(str, allowed) {
+
-	if(!str){
-		return "";
-	}
-  	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
-  		.join('');
-  	var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
-  		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
-  	return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
-  		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
-  	});
-  };
-  function escapeHTML(str) {
-	  if(!str){
-		  return "";
-	  }
-	return str.replace(/&/g, '&amp;')
-			  .replace(/</g, '&lt;')
-			  .replace(/>/g, '&gt;')
-			  .replace(/"/g, '&quot;')
-			  .replace(/'/g, '&#039;');
-  }
   //コピー
   function execCopy(string){
 	var temp = $("#copy");
@@ -157,7 +133,7 @@ function progshow(e) {
 	  if(percent<1){
 		 $("#imgup").text(Math.floor(percent*100)+"%");
 	  }else{
-		$("#imgup").text(lang_progress[lang]);
+		$("#imgup").text(lang.lang_progress);
 	  }
 	}
   }
@@ -193,4 +169,12 @@ function opendev(){
 		keyCode: '2'
 	  });
 	  */
-}
+}
+
+var webview = document.getElementById('webview');
+const {
+	shell
+} = require('electron');
+webview.addEventListener('new-window', function(e) {
+    shell.openExternal(e.url);
+});

app/js/platform/first.js

@@ -1,3 +1,160 @@
 //jQuery読む
 window.jQuery = window.$ = require('../../js/common/jquery.js');
-var Hammer = require('../../js/common/hammer.min.js');
+var Hammer = require('../../js/common/hammer.min.js');
+$.strip_tags = function(str, allowed) {
+	if(!str){
+		return "";
+	}
+  	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
+  		.join('');
+  	var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
+  		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
+  	return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
+  		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
+  	});
+  };
+  function escapeHTML(str) {
+	  if(!str){
+		  return "";
+	  }
+	return str.replace(/&/g, '&amp;')
+			  .replace(/</g, '&lt;')
+			  .replace(/>/g, '&gt;')
+			  .replace(/"/g, '&quot;')
+			  .replace(/'/g, '&#039;');
+  }
+  //PHPのnl2brと同様
+function nl2br(str) {
+	if(!str){
+		return "";
+	}
+    str = str.replace(/\r\n/g, "<br />");
+	str = str.replace(/(\n|\r)/g, "<br />");
+    return str;
+}
+function formattime(date){
+	var str=date.getFullYear()+"-";
+	if(date.getMonth()+1<10){
+		str=str+"0"+(date.getMonth()+1)+"-";
+	}else{
+		str=str+(date.getMonth()+1)+"-";
+	}
+	if(date.getDate()<10){
+		str=str+"0"+date.getDate()
+	}else{
+		str=str+date.getDate()
+	}
+	str=str+"T";
+	if(date.getHours()<10){
+		str=str+"0"+date.getHours()+":"
+	}else{
+		str=str+date.getHours()+":"
+	}
+	if(date.getMinutes()<10){
+		str=str+"0"+date.getMinutes()
+	}else{
+		str=str+date.getMinutes()
+	}
+	return str;
+}
+function formattimeutc(date){
+	var str=date.getUTCFullYear()+"-";
+	if(date.getUTCMonth()+1<10){
+		str=str+"0"+(date.getUTCMonth()+1)+"-";
+	}else{
+		str=str+(date.getUTCMonth()+1)+"-";
+	}
+	if(date.getUTCDate()<10){
+		str=str+"0"+date.getUTCDate()
+	}else{
+		str=str+date.getUTCDate()
+	}
+	str=str+"T";
+	if(date.getUTCHours()<10){
+		str=str+"0"+date.getUTCHours()+":"
+	}else{
+		str=str+date.getUTCHours()+":"
+	}
+	if(date.getUTCMinutes()<10){
+		str=str+"0"+date.getUTCMinutes()
+	}else{
+		str=str+date.getUTCMinutes()
+	}
+	return str;
+}
+var electron = require("electron");
+var ipc = electron.ipcRenderer;
+ipc.send('custom-css-request', "");
+ipc.on('custom-css-response', function (event, arg) {
+	if(arg==""){ return false; }
+	var styleNode = document.createElement("style");
+	styleNode.setAttribute("type","text/css")
+
+	var content = document.createTextNode(arg)
+	styleNode.append(content)
+	document.getElementsByTagName("head")[0].append(styleNode)
+})
+ipc.on('theme-css-response', function (event, arg) {
+	if(arg==""){ return false; }
+	var styleNode = document.createElement("style");
+	styleNode.setAttribute("type","text/css")
+
+	var content = document.createTextNode(arg)
+	styleNode.append(content)
+	document.getElementsByTagName("head")[0].append(styleNode)
+})
+function makeCID(){
+	return randomStr(8)+"-"+randomStr(4)+"-"+randomStr(4)+"-"+randomStr(4)+"-"+randomStr(12);
+}
+function randomStr(l){
+	// 生成する文字列に含める文字セット
+	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
+	var cl = c.length;
+	var r = "";
+	for(var i=0; i<l; i++){
+    	r += c[Math.floor(Math.random()*cl)];
+	}
+	return r;
+}
+function rgbToHex(color)
+{
+  // HEXに変換したものを代入する変数
+  var hex = '';
+  
+  // 第1引数がHEXのとき変換処理は必要ないのでそのままreturn
+  // IE8の場合はjQueryのcss()関数でHEXを返すので除外
+  if (color.match(/^#[a-f\d]{3}$|^#[a-f\d]{6}$/i))
+  {
+    return color;
+  }
+  
+  // 正規表現
+  var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/);
+  
+  // 正規表現でマッチしたとき
+  if (regex)
+  {
+    var rgb =
+    [
+      // RGBからHEXへ変換
+      parseInt(regex[1]).toString(16),
+      parseInt(regex[2]).toString(16),
+      parseInt(regex[3]).toString(16)
+    ];
+    
+    for (var i = 0; i < rgb.length; ++i)
+    {
+      // rgb(1,1,1)のようなときHEXに変換すると1桁になる
+      // 1桁のときは前に0を足す
+      if (rgb[i].length == 1)
+      {
+        rgb[i] = '0' + rgb[i];
+      }
+      hex += rgb[i];
+    }
+    
+    return hex;
+  }
+  
+  console.error(color+':第1引数はRGB形式で入力');
+}

app/js/platform/nano.js

@@ -29,16 +29,10 @@ function tl(data) {
 		var templete = parse([json[0]], '', acct_id, tlid);
 		$("#timeline_nano").html(templete);
 		jQuery("time.timeago").timeago();
-		reload(type, '', acct_id, data);
 	});
-}
-
 //Streaming接続
 var websocket=[];
-function reload(type, cc, acct_id, data) {
     var tlid=0;
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_"+ acct_id + "_at");
 	if (type == "home") {
 		var start = "wss://" + domain +
 			"/api/v1/streaming/?stream=user&access_token=" + at;

app/js/platform/twitter.js

@@ -316,4 +316,4 @@ function tjDeckStart() {
 if (document.querySelector(".js-app-columns")) tjDeckStart();
 else var timer = setInterval(function () {
   document.querySelector(".js-app-columns") ? (tjDeckStart(), clearInterval(timer)) : console.log("まだロード中")
-}, 500);
+}, 500);

app/js/post/bb-md.js

@@ -4,13 +4,13 @@ function mdCheck(){
 	var acct_id = $("#post-acct-sel").val();
 	var profimg=localStorage.getItem("prof_"+acct_id);
 	if(!profimg){
-		profimg="./img/missing.svg";
+		profimg="../../img/missing.svg";
 	}
 	$("#acct-sel-prof").attr("src",profimg);
 		if(localStorage.getItem("post_" + acct_id)){
 			$("#toot-post-btn").text(localStorage.getItem("post_" + acct_id)+"("+localStorage.getItem("domain_"+acct_id)+")");
 		}else{
-			$("#toot-post-btn").text(lang_toot[lang]+"("+localStorage.getItem("domain_"+acct_id)+")");
+			$("#toot-post-btn").text(lang.lang_toot+"("+localStorage.getItem("domain_"+acct_id)+")");
 		}
 	  if(!localStorage.getItem("bb_"+acct_id) && !localStorage.getItem("md_"+acct_id)){
 		 $(".markdown").addClass("hide");
@@ -40,17 +40,17 @@ function mdCheck(){
 		$("#trendtag").html("");
 	}
 	if(localStorage.getItem("mode_" + domain)=="misskey"){
-		Materialize.toast(lang_bbmd_misskey[lang], 5000);
+		Materialize.toast(lang.lang_bbmd_misskey, 5000);
 	}
 	if(idata[domain+"_letters"]){
 		$("#textarea").attr("data-length", idata[domain+"_letters"])
 	}else{
 		$("#textarea").attr("data-length", 500)
 	}
-	if(idata[domain+"_glitch"]){
+	if(idata[domain+"_glitch"]==="true"){
 		$("#local-button").removeClass("hide");
 	}else{
-		$("#local-button").removeClass("hide");
+		$("#local-button").addClass("hide");
 	}
 	var multi = localStorage.getItem("multi");
 	if (multi) {
@@ -117,15 +117,6 @@ if(localStorage.getItem("md")=="hide"){
     }[match]
   });
 }
-//PHPのnl2brと同様
-function nl2br(str) {
-	if(!str){
-		return "";
-	}
-    str = str.replace(/\r\n/g, "<br />");
-	str = str.replace(/(\n|\r)/g, "<br />");
-    return str;
-}
 //テキストボックスで選択したやつをタグで囲む(BB版)
 function surroundHTML(tagS,tagE) {
 	var acct_id = $("#post-acct-sel").val();
@@ -299,10 +290,10 @@ function preview(){
 	for(let l = 0; l < li.length; l++) {
 		var u=li[l].match(/^1\. (.+)$/);
 		var listUl='<li>'+u[1]+'</li>';
-		if(l == 0){
+		if(l === 0){
 			listUl='<ol>'+listUl;
 		}
-		if(l==li.length-1){
+		if(l===li.length-1){
 			listUl=listUl+'</ol>';
 		}
 		var bb=bb.replace(new RegExp(li[l], ""),listUl);

app/js/post/emoji.js

@@ -11,22 +11,23 @@ function emojiToggle() {
 		selin=0;
 	}
 	localStorage.setItem("cursor", selin);
+
 	if ($("#emoji").hasClass("hide")) {
-		if($("#bottom").hasClass("reverse")){
-			$('#emoji').css("left",$('#post-box').offset().left-295+"px");
-		}else{
-			$('#emoji').css("left",$('#post-box').offset().left+295+"px");
-		}
 		$("#emoji").removeClass("hide")
+		$("#right-side").show()
+		$("#suggest").html("");
 		if (!localStorage.getItem("emoji_" + acct_id)) {
 			var html =
-				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">'+lang_emoji_get[lang]+'</button>';
+				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">'+lang.lang_emoji_get+'</button>';
 			$("#emoji-list").html(html);
 		} else {
 			emojiList('home');
 		}
 	} else {
+		$("#poll").addClass("hide")
 		$("#emoji").addClass("hide")
+		$("#suggest").html("");
+		$("#right-side").hide()
 	}
 
 
@@ -68,7 +69,7 @@ function emojiGet(parse) {
 
 //リストの描画
 function emojiList(target) {
-	$("#now-emoji").text(lang_emoji_custom[lang]);
+	$("#now-emoji").text(lang.lang_emoji_custom);
 	var acct_id = $("#post-acct-sel").val();
 	var start = localStorage.getItem("emojiseek");
 	if (target == "next") {
@@ -91,7 +92,7 @@ function emojiList(target) {
 	var page = Math.ceil(num / 126);
 	$("#emoji-sum").text(page);
 	var ct = Math.ceil(start / 126);
-	if (ct == 0) {
+	if (ct === 0) {
 		var ct = 1;
 		$("#emoji-before").addClass("disabled");
 	} else {

app/js/post/img.js

@@ -43,7 +43,7 @@ function pimg(files) {
 			var electron = require("electron");
 		  	var ipc = electron.ipcRenderer;
 			  ipc.send('bmp-image', [files[i].path,i]);
-			  todo(lang_progress[lang]);
+			  todo(lang.lang_progress);
 			  
 		}else{
 			handleFileUpload(files[i], obj,i);
@@ -106,7 +106,7 @@ function media(b64, type, no) {
 		var start = "https://" + domain + "/api/drive/files/create";
 		httpreq.open('POST', start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		if ($("#nsfw").hasClass("nsfw-avail")) {
 			var nsfw = true;
 		} else {
@@ -121,12 +121,12 @@ function media(b64, type, no) {
 		var start = "https://" + domain + "/api/v1/media";
 		httpreq.open('POST', start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
 		httpreq.send(fd);
 	}
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			var img = localStorage.getItem("img");
@@ -134,7 +134,7 @@ function media(b64, type, no) {
 				var html = '<img src="' + json[previewer] + '" style="width:50px; max-height:100px;">';
 				$('#preview').append(html);
 			} else {
-				$('#preview').append(lang_postimg_previewdis[lang]);
+				$('#preview').append(lang.lang_postimg_previewdis);
 			}
 			if (!img) {
 				var img = "no-act";
@@ -152,8 +152,8 @@ function media(b64, type, no) {
 			todc();
 			$(".toot-btn-group").prop("disabled", false);
 			$('select').material_select();
-			$("#mec").text(lang_there[lang]);
+			$("#mec").text(lang.lang_there);
-			Materialize.toast(lang_postimg_aftupload[lang], 1000);
+			Materialize.toast(lang.lang_postimg_aftupload, 1000);
 			$("#imgup").text("");
 			$("#imgsel").show();
 			localStorage.removeItem("image");

app/js/post/misskeystatus.js

@@ -1,7 +1,7 @@
 //Renpost
 function renote(id, acct_id, remote) {
 	if ($("#pub_" + id).hasClass("rted")) {
-		return
+		return false;
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -12,10 +12,10 @@ function renote(id, acct_id, remote) {
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = 'json';
+    httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({i:at,renoteId:id}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
             var json = httpreq.response;
             console.log(json);
             $("[toot-id=" + id + "]").addClass("rted");
@@ -32,7 +32,7 @@ function renoteqt(id, acct_id) {
 	$("#post-acct-sel").val(acct_id);
 	$("#post-acct-sel").prop("disabled", true);
 	$('select').material_select();
-	$("#textarea").attr("placeholder",lang_misskeyparse_qt[lang]);
+	$("#textarea").attr("placeholder",lang.lang_misskeyparse_qt);
 	$("#textarea").focus();
 }
 //Reply
@@ -44,7 +44,7 @@ function misskeyreply(id, acct_id) {
 	$("#post-acct-sel").val(acct_id);
 	$("#post-acct-sel").prop("disabled", true);
 	$('select').material_select();
-	$("#textarea").attr("placeholder",lang_misskeyparse_qt[lang]);
+	$("#textarea").attr("placeholder",lang.lang_misskeyparse_qt);
 	$("#textarea").focus();
 }
 //Reaction
@@ -58,10 +58,10 @@ function reactiontoggle(id,acct_id,tlid){
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = 'json';
+    httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({i:at,noteId:id}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
             var json = httpreq.response;
             console.log(json);
             if(json.reactionCounts){
@@ -158,10 +158,10 @@ function reaction(mode,id,acct_id,tlid){
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = 'json';
+    httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({i:at,noteId:id,reaction:mode}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
             $(".fav_"+id).toggleClass("yellow-text");
 		}
 	}
@@ -177,7 +177,7 @@ function vote(acct_id,id,to){
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-    httpreq.responseType = 'json';
+    httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({i:at,noteId:id,choice:to}));
     httpreq.onreadystatechange = function() {
 		voterefresh(acct_id,id)

app/js/post/post.js

@@ -1,4 +1,4 @@
-/*投稿系*/
+/*投稿系*/ 
 //投稿
 function sec(){
 	var mode=localStorage.getItem("sec");
@@ -11,7 +11,7 @@ function sec(){
 }
 function post(mode,postvis) {
 	if($("#toot-post-btn").prop("disabled")){
-		return
+		return false;
 	}
 	var str = $("#textarea").val();
 	var acct_id = $("#post-acct-sel").val();
@@ -20,7 +20,7 @@ function post(mode,postvis) {
 	if(domain=="theboss.tech"){
 		if(~str.indexOf("#")){
 			if(str.indexOf("#theboss_tech")=="-1"){
-				if(!confirm(lang_post_tagTL[lang])){
+				if(!confirm(lang.lang_post_tagTL)){
 					return false;
 				}
 			}
@@ -29,7 +29,7 @@ function post(mode,postvis) {
 	if(domain=="dtp-mstdn.jp"){
 		if(~str.indexOf("#")){
 			if(str.indexOf("#dtp")=="-1"){
-				if(!confirm(lang_post_tagTL[lang])){
+				if(!confirm(lang.lang_post_tagTL)){
 					return false;
 				}
 			}
@@ -45,6 +45,7 @@ function post(mode,postvis) {
 	}else{
 		var cw_ltres=localStorage.getItem("cw_letters");
 	}
+	if(domain!="kirishima.cloud"){
 	if(mode!="pass" && !$("#cw").hasClass("cw-avail") && (str.length>cw_sent || (str.split("\n").length - 1)>cw_ltres)){
 		var electron = require("electron");
 		var remote=electron.remote;
@@ -52,23 +53,24 @@ function post(mode,postvis) {
 		var plus=str.replace(/\n/g,"").slice(0,10)+"...";
 		const options = {
 			type: 'info',
-			title: lang_post_cwtitle[lang],
+			title: lang.lang_post_cwtitle,
-			message: lang_post_cwtxt[lang]+plus,
+			message: lang.lang_post_cwtxt+plus,
-			buttons: [lang_post_btn1[lang],lang_post_btn2[lang], lang_post_btn3[lang]]
+			buttons: [lang.lang_post_btn1,lang.lang_post_btn2, lang.lang_post_btn3]
-	  	}
+	  }
-	  	dialog.showMessageBox(options, function(arg) {
+	  dialog.showMessageBox(options, function(arg) {
-			if(arg==1){
+			if(arg===1){
 				$("#cw-text").show();
 				$("#cw").addClass("yellow-text");
 				$("#cw").addClass("cw-avail");
 				$("#cw-text").val(plus);
 				post("pass");
-			}else if(arg==2){
+			}else if(arg===2){
 				post("pass");
 			}
 	  	})
 		  return false;
 	}
+}
 	if(localStorage.getItem("mode_" + domain)=="misskey"){
 		misskeyPost();
 		return;
@@ -78,6 +80,9 @@ function post(mode,postvis) {
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/statuses";
 	var reply = $("#reply").val();
+	if(str.indexOf(localStorage.getItem("stable"))==-1){
+		str+" #"+localStorage.getItem("stable");
+	}
 	var toot={
 		status: str
 	}
@@ -105,6 +110,16 @@ function post(mode,postvis) {
 	}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();
 		cw();
@@ -112,19 +127,53 @@ function post(mode,postvis) {
 	} else {
 		var spo = "";
 	}
+	if ($("#sch-box").hasClass("sch-avail")) {
+		var scheduled=formattimeutc(new Date(Date.parse($("#sch-date").val())))
+		console.log(scheduled)
+		schedule();
+		toot.scheduled_at=scheduled;
+	} else {
+		var scheduled = "";
+	}
+	if ($("#poll-sel").val()=="mastodon-poll") {
+		var options=[];
+		$(".mastodon-choice").map(function() {
+			var choice=$(this).val();
+			if(choice!=""){
+				options.push(choice);
+			}
+		});
+		if($("#poll-multiple:checked").val()=="1"){
+			var mul=true;
+		}else{
+			var mul=false;
+		}
+		if($("#poll-until:checked").val()=="1"){
+			var htt=true;
+		}else{
+			var htt=false;
+		}
+		var exin=pollCalc();
+		if(!exin){
+			todc("Error: Poll expires_in param")
+		}
+		toot.poll={
+			options: options,
+			expires_in: exin,
+			multiple: mul,
+			hide_totals: htt
+		}
+	}
+	console.log(toot);
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify(toot));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
-			if(str.indexOf(localStorage.getItem("stable"))==-1){
-				localStorage.removeItem("stable")
-			}
 			var json = httpreq.response;
-			console.log(json);
 			var box = localStorage.getItem("box");
 			if (box == "yes" || !box) {
 				$("#textarea").blur();
@@ -188,10 +237,10 @@ function misskeyPost(){
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify(toot));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			if(str.indexOf(localStorage.getItem("stable"))==-1){
 				localStorage.removeItem("stable")
 			}
@@ -215,9 +264,9 @@ function misskeyPost(){
 function clear() {
 	$("#textarea").val("");
 	if(localStorage.getItem("stable")){
-		$("#textarea").val(localStorage.getItem("stable"));
+		$("#textarea").val("#"+localStorage.getItem("stable")+" ")
 	}
-	$("#textarea").attr("placeholder", lang_toot[lang]);
+	$("#textarea").attr("placeholder", lang.lang_toot);
 	$("#reply").val("");
 	$("#media").val("");
 	var cwt = localStorage.getItem("cw-text");
@@ -236,17 +285,23 @@ function clear() {
 		$("#cw").addClass("cw-avail");
 		$("#cw-text").show();
 	}
-	$("#rec").text(lang_no[lang]);
+	$("#rec").text(lang.lang_no);
-	$("#mec").text(lang_nothing[lang]);
+	$("#mec").text(lang.lang_nothing);
 	loadVis();
 	$("#nsfw").removeClass("yellow-text");
 	$("#nsfw").html("visibility_off");
 	$("#nsfw").removeClass("nsfw-avail");
-	$("#nsc").text(lang_nothing[lang]);
+	$("#nsc").text(lang.lang_nothing);
 	$("#drag").css("background-color", "#e0e0e0");
 	$("#preview").html("");
 	$(".toot-btn-group").prop("disabled", false);
 	$("#post-acct-sel").prop("disabled", false);
+	$("#days_poll").val(0);
+  $("#hours_poll").val(0);
+	$("#mins_poll").val(0);
+	$(".mastodon-choice").map(function() {
+		$(this).val("");
+	});
 	localStorage.removeItem("image");
 	if(localStorage.getItem("mainuse")=="main"){
 		$("#post-acct-sel").val(localStorage.getItem("main"));

app/js/post/secure.js

@@ -112,4 +112,18 @@ $(function() {
 		
 
 	});
-  });
+  });
+//スケジュール
+function schedule(){
+	if($("#sch-box").hasClass("sch-avail")){
+		$("#sch-box").hide();
+		$("#sch-box").removeClass("sch-avail");
+	}else{
+		var date = new Date();
+		
+		$("#sch-box").show();
+		$("#sch-date").val(formattime(date));
+		console.log(formattime(date));
+		$("#sch-box").addClass("sch-avail");
+	}
+}

app/js/post/status.js

@@ -13,10 +13,10 @@ function fav(id, acct_id, remote) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
     httpreq.onreadystatechange = function() {
-        if (httpreq.readyState == 4) {
+        if (httpreq.readyState === 4) {
             var json = httpreq.response;
             if(remote!="remote"){
 				//APIのふぁぼカウントがおかしい
@@ -43,7 +43,7 @@ function fav(id, acct_id, remote) {
 					$(".fav_" + id).addClass("yellow-text");
 				}
 				}else{
-					Materialize.toast(lang_status_favWarn[lang], 1000);
+					Materialize.toast(lang.lang_status_favWarn, 1000);
 				}
         }
 	}
@@ -63,10 +63,10 @@ function rt(id, acct_id, remote) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			if (remote != "remote") {
@@ -90,7 +90,7 @@ function rt(id, acct_id, remote) {
 					$(".rt_" + id).addClass("teal-text");
 				}
 			} else {
-				Materialize.toast(lang_status_btWarn[lang], 1000);
+				Materialize.toast(lang.lang_status_btWarn, 1000);
 			}
 		}
 	}
@@ -133,18 +133,18 @@ function follow(acct_id,remote) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify(ent));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			if ($("#his-data").hasClass("following")) {
 				$("#his-data").removeClass("following");
-				$("#his-follow-btn").text(lang_status_follow[lang]);
+				$("#his-follow-btn").text(lang.lang_status_follow);
 			} else {
 				$("#his-data").addClass("following");
-				$("#his-follow-btn").text(lang_status_unfollow[lang]);
+				$("#his-follow-btn").text(lang.lang_status_unfollow);
 			}
 		}
 	}
@@ -168,16 +168,16 @@ function block(acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			if ($("#his-data").hasClass("blocking")) {
 				$("#his-data").removeClass("blocking");
-				$("#his-block-btn").text(lang_status_block[lang]);
+				$("#his-block-btn").text(lang.lang_status_block);
 			} else {
 				$("#his-data").addClass("blocking");
-				$("#his-block-btn").text(lang_status_unblock[lang]);
+				$("#his-block-btn").text(lang.lang_status_unblock);
 			}
 		}
 	}
@@ -210,16 +210,16 @@ function mute(acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(rq);
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			if ($("#his-data").hasClass("muting")) {
 				$("#his-data").removeClass("muting");
-				$("#his-mute-btn").text(lang_status_mute[lang]);
+				$("#his-mute-btn").text(lang.lang_status_mute);
 			} else {
 				$("#his-data").addClass("muting");
-				$("#his-mute-btn").text(lang_status_unmute[lang]);
+				$("#his-mute-btn").text(lang.lang_status_unmute);
 			}
 		}
 	}
@@ -234,7 +234,7 @@ function del(id, acct_id) {
 		var httpreq = new XMLHttpRequest();
 		httpreq.open('POST', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({i:at,noteId:id}));
 	}else{
 		var start = "https://" + domain + "/api/v1/statuses/" + id;
@@ -242,17 +242,17 @@ function del(id, acct_id) {
 		httpreq.open('DELETE', start, true);
 		httpreq.setRequestHeader('Content-Type', 'application/json');
 		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send();
 	}
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 		}
 	}
 }
 //redraft
 function redraft(id, acct_id){
-	if(confirm(lang_status_redraft[lang])){
+	if(confirm(lang.lang_status_redraft)){
 		show();
 		del(id, acct_id);
 		$("#post-acct-sel").prop("disabled", true);
@@ -278,6 +278,12 @@ function redraft(id, acct_id){
 		localStorage.setItem("nohide",true);
 		show();
 		$("#textarea").val(html);
+		var cwtxt=$("[toot-id="+id+"] .cw_text").html();
+		if(cwtxt!=""){
+			cwtxt=$.strip_tags(cwtxt);
+			cw();
+			$("#cw-text").val(cwtxt);
+		}
 	}
 }
 //ピン留め
@@ -294,10 +300,10 @@ function pin(id, acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			if ($("[toot-id=" + id + "]").hasClass("pined")) {
@@ -320,10 +326,10 @@ function request(id, flag, acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			showReq();
@@ -343,10 +349,10 @@ function domainblock(add, flag, acct_id) {
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			showDom();
@@ -367,7 +373,7 @@ function empUser(){
 	if(!obj){
 		var obj=[];
 		obj.push(id);
-		Materialize.toast(id+lang_status_emphas[lang], 4000);
+		Materialize.toast(id+lang.lang_status_emphas, 4000);
 	}else{
 		var can;
 		Object.keys(obj).forEach(function(key) {
@@ -377,7 +383,7 @@ function empUser(){
 			}else{
 				can=true;
 				obj.splice(key, 1);
-				Materialize.toast(id+lang_status_unemphas[lang], 4000);
+				Materialize.toast(id+lang.lang_status_unemphas, 4000);
 			}
 		});
 	}
@@ -400,18 +406,18 @@ function pinUser(){
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			console.log(json);
 			if ($("#his-end-btn").hasClass("endorsed")) {
 				$("#his-end-btn").removeClass("endorsed")
-				$("#his-end-btn").text(lang_status_endorse[lang])
+				$("#his-end-btn").text(lang.lang_status_endorse)
 			} else {
 				$("#his-end-btn").addClass("endorsed")
-				$("#his-end-btn").text(lang_status_unendorse[lang])
+				$("#his-end-btn").text(lang.lang_status_unendorse)
 				
 			}
 		}
@@ -420,7 +426,7 @@ function pinUser(){
 //URLコピー
 function tootUriCopy(url){
 	execCopy(url);
-	Materialize.toast(lang_details_url[lang], 1500);
+	Materialize.toast(lang.lang_details_url, 1500);
 }
 
 //他のアカウントで…

app/js/post/suggest.js

@@ -13,12 +13,19 @@ input.addEventListener("focus", function() {
 	window.clearInterval(timer);
 	timer = window.setInterval(function() {
 		var new_val = input.value;
+		if(new_val==""){
+			$("#suggest").html("");
+			if($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")){
+				$("#right-side").hide()
+			}
+			return;
+		}
 		if (prev_val != new_val) {
 			var semoji = new_val.match(/:(\S{3,})/);
 			if(semoji){
 				var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
 				if(!obj){
-					var ehtml=lang_suggest_nodata[lang];
+					var ehtml=lang.lang_suggest_nodata;
 				}else{
 					var num = obj.length;
 					var ehtml="";
@@ -32,7 +39,15 @@ input.addEventListener("focus", function() {
 						}
 						}
 				}
-				
+				if(ehtml!=""){
+					$("#right-side").show()
+					$("#poll").addClass("hide")
+					$("#emoji").addClass("hide")
+				}else{
+					if($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")){
+						$("#right-side").hide()
+					}
+				}
 				$("#suggest").html(ehtml);
 			}
 			
@@ -52,7 +67,10 @@ input.addEventListener("focus", function() {
 			} else if (acct && acct[1]) {
 				var q = acct[1];
 			}else  {
-				//$("#suggest").html("");
+				$("#suggest").html("");
+				if($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")){
+					$("#right-side").hide()
+				}
 				return;
 			}
 			var domain = localStorage.getItem("domain_" + acct_id);
@@ -72,24 +90,38 @@ input.addEventListener("focus", function() {
 					todo(error);
 					console.error(error);
 				}).then(function(json) {
-					if (json.hashtags[0] && tag[1]) {
+					if (json.hashtags[0] && tag) {
+						if(tag[1]){
 						var tags = "";
 						Object.keys(json.hashtags).forEach(function(key4) {
 							var tag = json.hashtags[key4];
-							tags = tags + '<a onclick="tagInsert(\'#' + tag + '\',\'#' + q +
+							if(tag!=q){
-								'\')" class="pointer">#' + tag + '</a>  ';
+								tags = tags + '<a onclick="tagInsert(\'#' + tag + '\',\'#' + q +
+								'\')" class="pointer">#' + tag + '</a><br>';
+							}
 						});
-						$("#suggest").html("Tags:" + tags);
+						$("#right-side").show()
+						$("#suggest").html("Tags:<br>" + tags);
+						$("#poll").addClass("hide")
+						$("#emoji").addClass("hide")
+						}
 					} else if (json.accounts[0] && acct[1]) {
 						var accts = "";
 						Object.keys(json.accounts).forEach(function(key3) {
 							var acct = json.accounts[key3];
-							accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
+							if(acct.acct!=q){
-								'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a>  ';
+								accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
+								'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
+							}
 						});
-						$("#suggest").html("@:" + accts);
+						$("#right-side").show()
+						$("#suggest").html("@:<br>" + accts);
+						$("#poll").addClass("hide")
+						$("#emoji").addClass("hide")
 					} else {
-						$("#suggest").html("Not Found");
+						if($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")){
+							$("#right-side").hide()
+						}
 					}
 				});
 			}
@@ -121,6 +153,9 @@ function tagInsert(code, del) {
 	}
 	$("#textarea").val(newt);
 	$("#textarea").focus();
+	if($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")){
+		$("#right-side").hide()
+	}
 	$("#suggest").html("");
 }
 function cgNPs(q){

app/js/post/use-txtbox.js

@@ -1,19 +1,24 @@
 /*リプライ*/
-function re(id,at,acct_id,mode){
+function re(id,ats_cm,acct_id,mode){
+	clear();
+	var ats=ats_cm.split(',');
 	localStorage.setItem("nohide",true);
 	show();
 	$("#reply").val(id);
-	var te=$("#textarea").val();
+	for(var i=0;i<ats.length;i++){
-	$("#textarea").val("@"+at+" "+te);
+		var at=ats[i];
-	$("#rec").text(lang_yesno[lang]);
+		var te=$("#textarea").val();
+		$("#textarea").val("@"+at+" "+te);
+	}
+	$("#rec").text(lang.lang_yesno);
 	$("#post-acct-sel").val(acct_id);
 	$("#post-acct-sel").prop("disabled", true);
 	$('select').material_select();
-	$("#textarea").attr("placeholder",lang_usetxtbox_reply[lang]);
+	$("#textarea").attr("placeholder",lang.lang_usetxtbox_reply);
 	$("#textarea").focus();
 	var profimg=localStorage.getItem("prof_"+acct_id);
 	if(!profimg){
-		profimg="./img/missing.svg";
+		profimg="../../img/missing.svg";
 	}
 	$("#acct-sel-prof").attr("src",profimg);
 	vis(mode);
@@ -32,6 +37,9 @@ function qt(id,acct_id,at,url){
 	if(!qt){
 		var qt="simple";
 	}
+	if(qt=="nothing"){
+		return false;
+	}
 	if(qt=="simple"){
 		show();
 		$("#textarea").val("\n"+url);

app/js/tl/card.js

@@ -64,51 +64,12 @@ function additional(acct_id, tlid) {
 				}).then(function(json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang_cards_check[lang]+":<br>Title:" + json.title + "<br>" +
+							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
 							json.description + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
 					}
 				});
-			}else{
-				var start = "https://" + domain + "/api/v1/statuses/" + id + "/card";
-				fetch(start, {
-					method: 'GET',
-					headers: {
-						'content-type': 'application/json',
-						'Authorization': 'Bearer ' + at
-					},
-					//body: JSON.stringify({})
-				}).then(function(response) {
-					return response.json();
-				}).catch(function(error) {
-					todo(error);
-					console.error(error);
-				}).then(function(json) {
-					console.log(json);
-					//このリンク鳥やんけ、ってとき
-					if (json.provider_name=="Twitter"){
-						if(json.image){
-							var twiImg='<br><img src="'+json.image+'">';
-						}else{
-							var twiImg='';
-						}
-						$("[toot-id=" + id + "] .additional").html(
-							'<blockquote class="twitter-tweet"><b>'+escapeHTML(json.author_name)+'</b><br>'+escapeHTML(json.description)+twiImg+'</blockquote>');
-					}
-					if (json.title) {
-						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang_cards_check[lang]+":<br>Title:" + escapeHTML(json.title) + "<br>" +
-							escapeHTML(json.description) + "</span>");
-					}
-					if (json.html) {
-						$("[toot-id=" + id + "] .additional").html(json.html+'<i class="material-icons" onclick="pip('+id+')" title="'+lang_cards_pip[lang]+'">picture_in_picture_alt</i>');
-					}
-					if (json.title) {
-						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
-						$("[toot-id=" + id + "]").addClass("parsed");
-					}
-				});
 			}
 		
 		}else{
@@ -122,7 +83,7 @@ function additional(acct_id, tlid) {
 		var xmlHttpRequest = new XMLHttpRequest();
 	 xmlHttpRequest.onreadystatechange = function()
 	 {
-		 if( this.readyState == 4 && this.status == 200 ) {
+		 if( this.readyState === 4 && this.status === 200 ) {
 			 if( this.response){
 				 var json=this.response;
 				 var emojis=json.emojis;
@@ -188,7 +149,7 @@ function additionalIndv(tlid, acct_id, id) {
 				}).then(function(json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang_cards_check[lang]+":<br>Title:" + json.title + "<br>" +
+							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
 							json.description + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
@@ -232,11 +193,11 @@ function additionalIndv(tlid, acct_id, id) {
 					}else{
 						if (json.title) {
 							$("[toot-id=" + id + "] .additional").html(
-								"<span class=\"gray\">URL"+lang_cards_check[lang]+":<br>Title:" + escapeHTML(json.title) + "<br>" +
+								"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(json.title) + "<br>" +
 								escapeHTML(json.description) + "</span>");
 						}
 						if (json.html) {
-							$("[toot-id=" + id + "] .additional").html(json.html+'<i class="material-icons sml pointer" onclick="pip(\''+id+'\')" title="'+lang_cards_pip[lang]+'">picture_in_picture_alt</i>');
+							$("[toot-id=" + id + "] .additional").html(json.html+'<i class="material-icons sml pointer" onclick="pip(\''+id+'\')" title="'+lang.lang_cards_pip+'">picture_in_picture_alt</i>');
 		
 						}
 					}

app/js/tl/datails.js

@@ -1,6 +1,6 @@
 //トゥートの詳細
 function details(id, acct_id, tlid) {
-	$(".toot-reset").html(lang_details_nodata[lang]);
+	$(".toot-reset").html(lang.lang_details_nodata);
 	var html = $("#timeline_"+tlid+" [toot-id=" + id + "]").html();
 	$("#toot-this").html(html);
 	$('#tootmodal').modal('open');
@@ -78,10 +78,11 @@ function details(id, acct_id, tlid) {
 			$("#tootmodal").attr("data-user",scn);
 		}
 		context(id, acct_id);
+		var dom=null;
 		if(!local){
-			var dom=scn.replace(/.+@/g,'');
+			dom=scn.replace(/.+@/g,'');
 		}else{
-			var dom=domain;
+			dom=domain;
 		}
 		beforeToot(id, acct_id, dom);
 		userToot(id, acct_id, uid);
@@ -139,7 +140,7 @@ function replyTL(id, acct_id) {
 		if(localStorage.getItem("mode_" + domain)=="misskey"){
 			var templete = misskeyParse([json], '', acct_id,"","",mute);
 			$("#toot-after").prepend(templete);
-			$("#toot-after .hide").html(lang_details_filtered[lang]);
+			$("#toot-after .hide").html(lang.lang_details_filtered);
 			$("#toot-after .by_filter").css("display","block");
 			$("#toot-after .by_filter").removeClass("hide");
 			var rep="_replyIds";
@@ -149,7 +150,7 @@ function replyTL(id, acct_id) {
 		}else{
 			var templete = parse([json], '', acct_id,"","",mute);
 			$("#toot-reply").prepend(templete);
-			$("#toot-reply .hide").html(lang_details_filtered[lang]);
+			$("#toot-reply .hide").html(lang.lang_details_filtered);
 			$("#toot-reply .by_filter").css("display","block");
 			$("#toot-reply .by_filter").removeClass("hide");
 		jQuery("time.timeago").timeago();
@@ -199,7 +200,7 @@ function context(id, acct_id) {
 			console.log(json);
 			var templete = misskeyParse(json, '', acct_id,"","",[]);
 			$("#toot-reply").html(templete);
-			$("#toot-reply .hide").html(lang_details_filtered[lang]);
+			$("#toot-reply .hide").html(lang.lang_details_filtered);
 			$("#toot-reply .by_filter").css("display","block");
 			$("#toot-reply .by_filter").removeClass("hide");
 			jQuery("time.timeago").timeago();
@@ -211,7 +212,7 @@ function context(id, acct_id) {
 			}
 			var templete = parse(json.descendants, '', acct_id,"","",mute);
 			$("#toot-after").html(templete);
-			$("#toot-after .hide").html(lang_details_filtered[lang]);
+			$("#toot-after .hide").html(lang.lang_details_filtered);
 			$("#toot-after .by_filter").css("display","block");
 			$("#toot-after .by_filter").removeClass("hide");
 			jQuery("time.timeago").timeago();
@@ -368,10 +369,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_details_embed[lang], 1500);
+		Materialize.toast(lang.lang_details_embed, 1500);
 	}else{
 		if(execCopy(url)){
-			Materialize.toast(lang_details_url[lang], 1500);
+			Materialize.toast(lang.lang_details_url, 1500);
 		}
 		
 	}
@@ -387,7 +388,7 @@ function staCopy(id){
 	html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, "$1");
 	html=$.strip_tags(html);
 	if(execCopy(html)){
-		Materialize.toast(lang_details_txt[lang], 1500);
+		Materialize.toast(lang.lang_details_txt, 1500);
 	}
 	
 }
@@ -448,7 +449,7 @@ function shot(){
 	})
 }
 //翻訳
-function trans(tar){
+function trans(tar,to){
 	var html=$("#toot-this .toot").html();
 	if(html.match(/^<p>(.+)<\/p>$/)){
 		html = html.match(/^<p>(.+)<\/p>$/)[1];
@@ -457,18 +458,21 @@ function trans(tar){
 	html = html.replace(/<p>/g, "\n");
 	html = html.replace(/<\/p>/g, "\n");
 	html=$.strip_tags(html);
+	if(~tar.indexOf("zh")){
+		tar="zh";
+	}
 	$("#toot-this .additional").text("Loading...(Powered by Google Translate)");
-	var exec='https://script.google.com/macros/s/AKfycbz0ETqcUxwNlw961GjErNb7vr_X18N2s1AS5Xu5nFTbYXcdcRM/exec?text='+encodeURIComponent(html)+'&source='+tar+'&target=ja'
+	var exec='https://script.google.com/macros/s/AKfycbxhwW5tjjop9Irg-y1zr_WsXlCKEzwWG6KuoOt_vVRDfEbRv0c/exec?format=json&text='+encodeURIComponent(html)+'&source='+tar+'&target='+to
 	console.log(exec);
 	fetch(exec, {
 		method: 'GET',
 	}).then(function(response) {
-		return response.text();
+		return response.json();
 	}).catch(function(error) {
 		todo(error);
 		console.error(error);
 	}).then(function(text) {
-		$("#toot-this .additional").html('<span class="gray">'+text+'</span>');
+		$("#toot-this .additional").html('<span class="gray">'+text.text+'</span>');
 	});
 }
 //ブラウザで開く

app/js/tl/date.js

@@ -15,10 +15,11 @@ function date(str, datetype) {
 		} else {
 			var min = date.getMinutes();
 		}
+		var sec=null;
 		if (date.getSeconds() < 10) {
-			var sec = "0" + date.getSeconds();
+			sec = "0" + date.getSeconds();
 		} else {
-			var sec = date.getSeconds();
+			sec = date.getSeconds();
 		}
 		if (datetype == "full") {
 			var ret = date.getFullYear() + "/" + month + "/" + date.getDate() + "/ " +
@@ -56,14 +57,39 @@ function date(str, datetype) {
 //特殊フォーマット(インスタンス情報で利用)
 function crat(str) {
 	var date = new Date(str);
-
+	var mnt=null;
+	if(date.getMonth()<9){
+		mnt="0"+(date.getMonth()+1);
+	}else{
+		mnt=date.getMonth()+1;
+	}
+	if(date.getDate()<10){
+		var dat="0"+date.getDate();
+	}else{
+		var dat=date.getDate();
+	}
+	if(date.getHours()<10){
+		var hrs="0"+date.getHours();
+	}else{
+		var hrs=date.getHours();
+	}
+	if(date.getMinutes()<10){
+		var mns="0"+date.getMinutes();
+	}else{
+		var mns=date.getMinutes();
+	}
+	if(date.getSeconds()<10){
+		var sec="0"+date.getSeconds();
+	}else{
+		var sec=date.getSeconds();
+	}
 	format_str = 'YYYY-MM-DD hh:mm:ss';
 	format_str = format_str.replace(/YYYY/g, date.getFullYear());
-	format_str = format_str.replace(/MM/g, date.getMonth()+1);
+	format_str = format_str.replace(/MM/g, mnt);
-	format_str = format_str.replace(/DD/g, date.getDate());
+	format_str = format_str.replace(/DD/g, dat);
-	format_str = format_str.replace(/hh/g, date.getHours());
+	format_str = format_str.replace(/hh/g, hrs);
-	format_str = format_str.replace(/mm/g, date.getMinutes());
+	format_str = format_str.replace(/mm/g, mns);
-	format_str = format_str.replace(/ss/g, date.getSeconds());
+	format_str = format_str.replace(/ss/g, sec);
 
 	return format_str;
 }

app/js/tl/dm.js

@@ -0,0 +1,540 @@
+//DM(Conv) TL
+function dm(acct_id, tlid, type,delc,voice) {
+
+    var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/conversations";
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(json) {
+        var templete = dmParse(json, type, acct_id, tlid, "", mute);
+        localStorage.setItem("lastobj_"+ tlid,json[0].id)
+        $("#timeline_" + tlid).html(templete);
+	    additional(acct_id, tlid);
+	    jQuery("time.timeago").timeago();
+	    todc();
+	    //reload(type, '', acct_id, tlid, data, mute, delc,voice);
+	    $(window).scrollTop(0);
+    });
+    
+}
+//DMオブジェクトパーサー(トゥート)
+function dmParse(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'));
+	}
+	
+	var actb = localStorage.getItem("action_btns");
+	var actb='re,rt,fav,qt,del,pin,red';
+	if(actb){
+		var actb = actb.split(',');
+		var disp={};
+		for(var k=0;k<actb.length;k++){
+			if(k<4){
+				var tp="type-a";
+			}else{
+				var tp="type-b";
+			}
+			disp[actb[k]]=tp;
+		}
+	}
+	var datetype = localStorage.getItem("datetype");
+	var nsfwtype = localStorage.getItem("nsfw");
+	var sent = localStorage.getItem("sentence");
+	var ltr = localStorage.getItem("letters");
+	var gif = localStorage.getItem("gif");
+	var imh = localStorage.getItem("img-height");
+	//独自ロケール
+	var locale = localStorage.getItem("locale");
+	if(locale=="yes"){
+		var locale=false;
+	}
+	//ネイティブ通知
+	var native=localStorage.getItem("nativenotf");
+	if(!native){
+		native="yes";
+	}
+	//クライアント強調
+	var emp = localStorage.getItem("client_emp");
+	if(emp){
+		var emp = JSON.parse(emp);
+	}
+	//クライアントミュート
+	var mute = localStorage.getItem("client_mute");
+	if(mute){
+		var mute = JSON.parse(mute);
+	}
+	//ユーザー強調
+	var useremp = localStorage.getItem("user_emp");
+	if(useremp){
+		var useremp = JSON.parse(useremp);
+	}
+	//ワード強調
+	var wordemp = localStorage.getItem("word_emp");
+	if(wordemp){
+		var wordemp = JSON.parse(wordemp);
+	}
+	//ワードミュート
+	var wordmute = localStorage.getItem("word_mute");
+	if(wordmute){
+		var wordmute = JSON.parse(wordmute);
+		wordmute = wordmute.concat(mutefilter);
+	}else{
+		wordmute = mutefilter;
+	}
+	//Ticker
+	var tickerck = localStorage.getItem("ticker_ok");
+	if(tickerck){
+		var ticker=true;
+	}else{
+		var ticker=false;
+	}
+	//Cards
+	var card = localStorage.getItem("card_" + tlid);
+	
+	if (!sent) {
+		var sent = 500;
+	}
+	if (!ltr) {
+		var ltr = 500;
+	}
+	if (!nsfwtype || nsfwtype == "yes") {
+		var nsfw = "ok";
+	} else {
+		var nsfw;
+	}
+	var cwtype = localStorage.getItem("cw");
+	if (!cwtype || cwtype == "yes") {
+		var cw = "ok";
+	} else {
+		var cw;
+	}
+	if (!datetype) {
+		datetype = "absolute";
+	}
+	if (!gif) {
+		var gif = "yes";
+	}
+	if (!imh) {
+		var imh = "200";
+	}
+	if(!emp){
+		var emp=[];
+	}
+	if(!mute){
+		var mute=[];
+	}
+	if(!useremp){
+		var useremp=[];
+	}
+	if(!wordemp){
+		var wordemp=[];
+	}
+	if(!wordmute){
+		var wordmute=[];
+	}
+	//via通知
+	var viashow=localStorage.getItem("viashow");
+	if(!viashow){
+		viashow="via-hide";
+	}
+	if(viashow=="hide"){
+		viashow="via-hide";
+	}
+	//認証なしTL
+	if(mix=="noauth"){
+		var noauth="hide";
+		var antinoauth="";
+	}else{
+		var noauth="";
+		var antinoauth="hide";
+	}
+	//マウスオーバーのみ
+	var mouseover=localStorage.getItem("mouseover");
+	if(!mouseover){
+		mouseover="";
+	}else if(mouseover=="yes" || mouseover=="click"){
+		mouseover="hide";
+	}else if(mouseover=="no"){
+		mouseover="";
+	}
+	var local = [];
+	var times=[];
+	Object.keys(obj).forEach(function(key) {
+		var toot = obj[key].last_status;
+		var dis_name=escapeHTML(toot.account.display_name);
+		if(toot.account.emojis){
+			var actemojick = toot.account.emojis[0];
+		}else{
+			var actemojick=false;
+		}
+		//絵文字があれば
+		if (actemojick) {
+			Object.keys(toot.account.emojis).forEach(function(key5) {
+				var emoji = toot.account.emojis[key5];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				dis_name = dis_name.replace(regExp, emoji_url);
+				
+			});
+		}
+		var noticeavatar="";
+			var if_notf="";
+			var uniqueid=toot.id;
+			var notice = "";
+			var boostback = "";
+			//ユーザー強調
+			if(toot.account.username!=toot.account.acct){
+				var fullname=toot.account.acct;
+			}else{
+				var domain = localStorage.getItem("domain_" + acct_id);
+				var fullname=toot.account.acct+"@"+domain;
+			}
+			if(useremp){
+				Object.keys(useremp).forEach(function(key10) {
+				var user = useremp[key10];
+				if(user==fullname){
+					boostback = "emphasized";
+				}
+			});
+		}
+        var id = toot.id;
+        var home = "";
+		if (toot.account.locked) {
+			var locked = ' <i class="fa fa-lock red-text"></i>';
+		} else {
+			var locked = "";
+		}
+		if (!toot.application) {
+			var via = '';
+			viashow="hide";
+		} else {
+			var via = toot.application.name;
+			//強調チェック
+			Object.keys(emp).forEach(function(key6) {
+				var cli = emp[key6];
+				if(cli == via){
+					boostback = "emphasized";
+				}
+			});
+			//ミュートチェック
+			Object.keys(mute).forEach(function(key7) {
+				var cli = mute[key7];
+				if(cli == via){
+					boostback = "hide";
+				}
+			});
+		}
+		if(mix=="pinned"){
+			boostback = "emphasized";
+		}
+		if (toot.spoiler_text && cw) {
+			var content = toot.content;
+			var spoil = escapeHTML(toot.spoiler_text);
+			var spoiler = "cw cw_hide_" + toot.id;
+			var api_spoil = "gray";
+			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+				'\')" class="nex parsed">'+lang.lang_parse_cwshow+'</a><br>';
+		} else {
+			var ct1 = toot.content.split('</p>').length + toot.content.split('<br />').length -2;
+			var ct2 = toot.content.split('</p>').length + toot.content.split('<br>').length -2;
+			if(ct1>ct2){ var ct= ct1; }else{ var ct= ct2;  }
+			if ((sent < ct && $.mb_strlen($.strip_tags(toot.content)) > 5) || ($.strip_tags(toot.content).length > ltr && $.mb_strlen($.strip_tags(toot.content)) > 5)) {
+				var content = '<span class="gray">'+lang.lang_parse_fulltext+'</span><br>' + toot.content
+				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(
+						toot.content), 0, 100) +
+					'</span><span class="gray">'+lang.lang_parse_autofold+'</span>';
+				var spoiler = "cw cw_hide_" + toot.id;
+				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+					'\')" class="nex parsed">'+lang.lang_parse_more+'</a><br>';
+			} else {
+				var content = toot.content;
+				var spoil = escapeHTML(toot.spoiler_text);
+				var spoiler = "";
+				var spoiler_show = "";
+			}
+		}
+		var urls = $.strip_tags(content).replace(/\n/g, " ").match(
+			/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/
+		);
+		if (urls) {
+			var analyze = '<a onclick="additionalIndv(\'' + tlid + '\',' + acct_id +
+				',\'' + id + '\')" class="add-show pointer">'+lang.lang_parse_url+'</a><br>';
+		} else {
+			var analyze = '';
+		}
+		var viewer = "";
+		var hasmedia = "";
+		var youtube = "";
+		if(toot.emojis){
+			var emojick = toot.emojis[0];
+		}else{
+			var emojick=false;
+		}
+		//絵文字があれば
+		if (emojick) {
+			Object.keys(toot.emojis).forEach(function(key5) {
+				var emoji = toot.emojis[key5];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
+		}
+		//ニコフレ絵文字
+		if(toot.profile_emojis){
+			var nicoemojick = toot.profile_emojis[0];
+		}else{
+			var nicoemojick=false;
+		}
+		//絵文字があれば
+		if (nicoemojick) {
+			Object.keys(toot.profile_emojis).forEach(function(keynico) {
+				var emoji = toot.profile_emojis[keynico];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
+		}
+		//デフォ絵文字
+		content=twemoji.parse(content);
+		if(dis_name){
+			dis_name=twemoji.parse(dis_name);
+		}
+		if(spoil){
+			spoil=twemoji.parse(spoil);
+		}
+		var mediack = toot.media_attachments[0];
+		//メディアがあれば
+		var media_ids="";
+		if (mediack) {
+			hasmedia = "hasmedia";
+			var cwdt = 100 / toot.media_attachments.length;
+			Object.keys(toot.media_attachments).forEach(function(key2) {
+				var media = toot.media_attachments[key2];
+				var purl = media.preview_url;
+				media_ids=media_ids+media.id+",";
+				var url = media.url;
+				if (toot.sensitive && nsfw) {
+					var sense = "sensitive"
+				} else {
+					var sense = ""
+				}
+				viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
+					acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
+					'" data-type="' + media.type + '" class="img-parsed"><img src="' +
+					purl + '" class="' + sense +
+					' toot-img pointer" style="width:' + cwdt + '%; height:'+imh+'px;"></a></span>';
+			});
+			media_ids = media_ids.slice(0, -1) ;
+		} else {
+			viewer = "";
+			hasmedia = "nomedia";
+		}
+		var menck = toot.mentions[0];
+		var mentions = "";
+		//メンションであれば
+		if (menck) {
+			mentions = "";
+			Object.keys(toot.mentions).forEach(function(key3) {
+				var mention = toot.mentions[key3];
+				mentions = mentions + '<a onclick="udg(\'' + mention.id + '\',' +
+					acct_id + ')" class="pointer">@' + mention.acct + '</a> ';
+			});
+			mentions = '<div style="float:right">' + mentions + '</div>';
+		}
+		var tagck = toot.tags[0];
+		var tags = "";
+		//タグであれば
+		if (tagck) {
+			Object.keys(toot.tags).forEach(function(key4) {
+				var tag = toot.tags[key4];
+				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ':<a onclick="tl(\'tag\',\'' + tag.name + '\',' + acct_id +
+					',\'add\')" class="pointer" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag.name)+ '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag.name) + '">Toot</a>　'+
+					'<a onclick="tagPin(\'' + tag.name + '\')" class="pointer" title="' +lang.lang_parse_tagpin.replace("{{tag}}" ,'#'+tag.name)+ '">Pin</a></span> ';
+			});
+			tags = '<div style="float:right">' + tags + '</div>';
+		}
+		//リプ数
+		if(toot.replies_count || toot.replies_count===0){
+			var replyct=toot.replies_count;
+		}else{
+			var replyct="";
+        }
+		//公開範囲を取得
+		var vis = "";
+		var visen = toot.visibility;
+		if (visen == "public") {
+			var vis =
+				'<i class="text-darken-3 material-icons gray sml vis-data pointer" title="'+lang.lang_parse_public+'('+lang.lang_parse_clickcopy+')" data-vis="public" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">public</i>';
+			var can_rt = "";
+		} else if (visen == "unlisted") {
+			var vis =
+				'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="'+lang.lang_parse_unlisted+'('+lang.lang_parse_clickcopy+')" data-vis="unlisted" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock_open</i>';
+			var can_rt = "";
+		} else if (visen == "private") {
+			var vis =
+				'<i class="text-darken-3 material-icons orange-text vis-data pointer" title="'+lang.lang_parse_private+'('+lang.lang_parse_clickcopy+')" data-vis="private" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock</i>';
+			var can_rt = "hide";
+		} else if (visen == "direct") {
+			var vis =
+				'<i class="text-darken-3 material-icons red-text vis-data pointer" title="'+lang.lang_parse_direct+'('+lang.lang_parse_clickcopy+')" data-vis="direct" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">mail</i>';
+			var can_rt = "hide";
+		}
+		if (toot.account.acct == localStorage.getItem("user_" + acct_id)) {
+			var if_mine = "";
+			var mine_via="type-b";
+		} else {
+			var if_mine = "hide";
+			var mine_via="";
+		}
+		if (toot.favourited) {
+			var if_fav = " yellow-text";
+			var fav_app = "faved";
+		} else {
+			var if_fav = "";
+			var fav_app = "";
+		}
+		if (toot.reblogged) {
+			var if_rt = "teal-text";
+			var rt_app = "rted";
+		} else {
+			var if_rt = "";
+			var rt_app = "";
+		}
+		if (toot.pinned) {
+			var if_pin = "blue-text";
+			var pin_app = "pinned";
+		} else {
+			var if_pin = "";
+			var pin_app = "";
+		}
+		//アニメ再生
+		if (gif == "yes") {
+			var avatar = toot.account.avatar;
+		} else {
+			var avatar = toot.account.avatar_static;
+		}
+		//ワードミュート
+		if(wordmute){
+			Object.keys(wordmute).forEach(function(key8) {
+				var worde = wordmute[key8];
+				if(worde){
+					if(worde.tag){
+						var word=worde.tag;
+					}else{
+						var word=worde
+					}
+					var regExp = new RegExp( word, "g" ) ;
+					if($.strip_tags(content).match(regExp)){
+						boostback = "hide by_filter";
+					}
+				}
+			});
+		}
+		//ワード強調
+		if(wordemp){
+			Object.keys(wordemp).forEach(function(key9) {
+				var word = wordemp[key9];
+				if(word){
+					var word=word.tag;
+					var regExp = new RegExp( word, "g" ) ;
+					content=content.replace(regExp,'<span class="emp">'+word+"</span>");
+				}
+			});
+		}
+		//日本語じゃない
+		if(toot.language!="ja"){
+			var trans='<div class="action pin"><a onclick="trans(\''+toot.language+'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_trans+'"><i class="material-icons">g_translate</i></a></div>';
+		}else{
+			var trans="";
+		}
+		//Cards
+		if (!card && toot.card) {
+			var cards=toot.card;
+				if (cards.provider_name=="Twitter"){
+					if(cards.image){
+						var twiImg='<br><img src="'+cards.image+'">';
+					}else{
+						var twiImg='';
+					}
+					analyze='<blockquote class="twitter-tweet"><b>'+escapeHTML(cards.author_name)+'</b><br>'+escapeHTML(cards.description)+twiImg+'</blockquote>';
+				}
+				if (cards.title) {
+					analyze="<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(cards.title) + "<br>" +
+						escapeHTML(cards.description) + "</span>";
+				}
+				if (cards.html) {
+					analyze=cards.html+'<i class="material-icons" onclick="pip('+id+')" title="'+lang.lang_cards_pip+'">picture_in_picture_alt</i>';
+				}
+			
+		}
+		//Ticker
+		var tickerdom="";
+		if(ticker){
+			var tickerdata=localStorage.getItem("ticker")
+			if(tickerdata){
+			var tickerdata=JSON.parse(tickerdata);
+			
+			var thisdomain=toot.account.acct.split("@");
+			if(thisdomain.length>1){
+				thisdomain=thisdomain[1];
+			}
+			for( var i=0; i<tickerdata.length; i++) {
+				var value=tickerdata[i];
+				if(value.domain==thisdomain){
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					break;
+				}
+		   }
+		}
+		}
+		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
+			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
+			' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
+				key].created_at, 'unix') + '" '+if_notf+' onclick="dmStatus()">' +
+			'<div class="area-notice"><span class="gray sharesta">' + notice + home +
+			'</span></div>' +
+			'<div class="area-icon"><a onclick="udg(\'' + toot.account.id +
+			'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
+			'<img src="' + avatar +
+			'" width="40" class="prof-img" user="' + toot.account.acct +
+			'"></a>'+noticeavatar+'</div>' +
+			'<div class="area-display_name"><div class="flex-name"><span class="user">' +
+			dis_name +
+			'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' +
+			toot.account.acct + locked + '</span></div>' +
+			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
+			toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			date(toot.created_at, datetype) + '</span>' +
+			'</div></div>' +
+			'<div class="area-toot">'+tickerdom+'<span class="' +
+			api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
+			'</span><span class="toot ' + spoiler + '">' + content +
+			'</span>' +
+			'' + viewer + '' +
+			'</div>'+
+			'<div class="area-vis"></div>'+
+			'</div></div>';
+	});
+	return templete;
+}

app/js/tl/filter.js

@@ -14,6 +14,29 @@ function mediaToggle(tlid) {
         $("#timeline_"+tlid).addClass("media-filter")
 	}
 }
+//各TL上方のBT[BTOnly/BTExc/Off]
+function ebtToggle(tlid) {
+	var ebt = localStorage.getItem("ebt_" + tlid);
+	if (ebt=="true") {
+		localStorage.setItem("ebt_" + tlid, "but");
+		$("#sta-bt-" + tlid).text("BT Only");
+        $("#sta-bt-" + tlid).css("color",'#ff9800');
+		$("#timeline_"+tlid).addClass("except-bt-filter")
+		$("#timeline_"+tlid).removeClass("bt-filter")
+	}else if (ebt=="but") {
+        localStorage.removeItem("ebt_" + tlid);
+		$("#sta-bt-" + tlid).text("Off");
+        $("#sta-bt-" + tlid).css("color",'red');
+		$("#timeline_"+tlid).removeClass("bt-filter")
+		$("#timeline_"+tlid).removeClass("except-bt-filter")
+	} else {
+		localStorage.setItem("ebt_" + tlid, "true");
+		$("#sta-bt-" + tlid).text("BT Ex");
+        $("#sta-bt-" + tlid).css("color",'#009688');
+		$("#timeline_"+tlid).addClass("bt-filter")
+		$("#timeline_"+tlid).removeClass("except-bt-filter")
+	}
+}
 //各TL上方のMedia[On/Off]をチェック
 function mediaCheck(tlid) {
 	var media = localStorage.getItem("media_" + tlid);
@@ -27,6 +50,26 @@ function mediaCheck(tlid) {
         $("#timeline_"+tlid).removeClass("media-filter")
 	}
 }
+//各TL上方のBT[On/Off]をチェック
+function ebtCheck(tlid) {
+	var ebt = localStorage.getItem("ebt_" + tlid);
+	if (ebt=="true") {
+		$("#sta-bt-" + tlid).text("BT Ex");
+        $("#sta-bt-" + tlid).css("color",'#009688');
+		$("#timeline_"+tlid).addClass("bt-filter")
+		$("#timeline_"+tlid).removeClass("except-bt-filter")
+	} else if (ebt=="but") {
+		$("#sta-bt-" + tlid).text("BT Only");
+        $("#sta-bt-" + tlid).css("color",'#ff9800');
+		$("#timeline_"+tlid).addClass("except-bt-filter")
+		$("#timeline_"+tlid).removeClass("bt-filter")
+	} else{
+		$("#sta-bt-" + tlid).text("Off");
+        $("#sta-bt-" + tlid).css("color",'red');
+		$("#timeline_"+tlid).removeClass("bt-filter")
+		$("#timeline_"+tlid).removeClass("except-bt-filter")
+	}
+}
 /* 削除追跡*/
 function catchToggle(tlid) {
 	var catchck = localStorage.getItem("catch_" + tlid);
@@ -58,17 +101,11 @@ function delreset(tlid){
 
 }
 /*ワードフィルター機能*/
-function filterToggle(){
+function filterMenu(){
-    if ($("#filter-box").hasClass("hide")) {
+    $("#left-menu div").removeClass("active");
-        $("#filter-box").removeClass("hide");
+	$("#filterMenu").addClass("active");
-        $("#filter-box").addClass("show");
+	$(".menu-content").addClass("hide");
-		$("#filter-box").css("bottom","40px");
+    $("#filter-box").removeClass("hide");
-		$("#filter-box").css("left",$('#filter-tgl').offset().left-$('#filter-box').width()/2+"px");
-		//フィルターロード
-	} else {
-        $("#filter-box").removeClass("show");
-		$("#filter-box").addClass("hide")
-	}
 }
 function filter(){
 	$("#filtered-words").html("");
@@ -97,15 +134,15 @@ function filter(){
 				var filterword = json[key];
 				var context = filterword.context.join(',');
 				filters = filters + escapeHTML(filterword.phrase)+'<span class="sml">(for '+context+')</span>:<a onclick="filterEdit(\'' + filterword.id + '\',\'' + acct_id +
-					'\')" class="pointer">'+lang_edit[lang]+'</a>/<a onclick="filterDel(' + filterword.id + ',' + acct_id +
+					'\')" class="pointer">'+lang.lang_edit+'</a>/<a onclick="filterDel(' + filterword.id + ',' + acct_id +
-					')" class="pointer">'+lang_del[lang]+'</a><br> ';
+					')" class="pointer">'+lang.lang_del+'</a><br> ';
 			});
 			if(filters==""){
-				filters=lang_filter_nodata[lang]+"<br>";
+				filters=lang.lang_filter_nodata+"<br>";
 			}
 			$("#filtered-words").html(filters);
 		}else{
-            $("#filtered-words").html(lang_filter_nodata[lang]);
+            $("#filtered-words").html(lang_filter_nodata);
         }
 	});
 }
@@ -127,7 +164,7 @@ function makeNewFilter(){
 	}
 	console.log(cont);
 	if(!cont.length){
-		$("#filtered-words").html('Error:'+lang_filter_errordegree[lang]);
+		$("#filtered-words").html('Error:'+lang.lang_filter_errordegree);
 	}
 	var exc=$("#except_filter:checked").val();
 	var who=$("#wholeword_filter:checked").val();
@@ -149,7 +186,7 @@ function makeNewFilter(){
 	httpreq.open(method, start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		phrase: phr,
 		context: cont,
@@ -158,7 +195,7 @@ function makeNewFilter(){
 		expires_in:time
 	}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			filter();
 			filterUpdate(acct_id)
@@ -172,7 +209,7 @@ function makeNewFilter(){
 			$("#days_filter").val("0");
 			$("#hours_filter").val("0");
 			$("#mins_filter").val("0");
-			$("#add-filter-btn").text(lang_add[lang]);
+			$("#add-filter-btn").text(lang.lang_add);
 			$("#filter-edit-id").val("")
 		}
 	}
@@ -188,7 +225,7 @@ function filterEdit(id,acct_id){
 		$("#days_filter").val("0");
 		$("#hours_filter").val("0");
 		$("#mins_filter").val("0");
-	$("#add-filter-btn").text(lang_edit[lang]);
+	$("#add-filter-btn").text(lang.lang_edit);
 	$("#filter-edit-id").val(id);
 	var domain = localStorage.getItem("domain_" + acct_id);
     var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -240,10 +277,10 @@ function filterDel(id,acct_id){
 	httpreq.open("DELETE", start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send();
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			filter();
 			filterUpdate(acct_id)
@@ -348,4 +385,55 @@ function filterUpdateInternal(json,type){
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="削除捕捉(削除されても残ります。背景色が変化します。)">delete</i><span id="sta-del-' +
 		  key + '">On</span></a>削除捕捉<a onclick="delreset(' + key +
 		  ')" class="pointer">リセット</a><br>
-*/
+*/
+//通知フィルター
+function exclude(key){
+	var excludetxt="";
+	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){
+			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){
+			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){
+			excludetxt=excludetxt+"&exclude_types[]=follow"
+		}else{
+			excludetxt="?exclude_types[]=follow"
+		}
+	}else{
+	}
+	localStorage.setItem("exclude-"+key,excludetxt)
+	parseColumn();
+}
+function excludeCk(key,target){
+	var exc=localStorage.getItem("exclude-"+key);
+	if(!exc){
+		return "";
+	}
+	if(~exc.indexOf(target)){
+		return "checked"
+	}else{
+		return "";
+	}
+}

app/js/tl/list.js

@@ -1,14 +1,10 @@
-function listToggle(){
+function listMenu(){
-    if ($("#list-box").hasClass("hide")) {
+    $("#left-menu div").removeClass("active");
-        $("#list-box").removeClass("hide");
+	$("#listMenu").addClass("active");
-        $("#list-box").addClass("show");
+	$(".menu-content").addClass("hide");
-		$("#list-box").css("bottom","40px");
+    $("#list-box").removeClass("hide");
-		$("#list-box").css("left",$('#list-tgl').offset().left-$('#list-box').width()/2+"px");
+	$('ul.tabs').tabs('select_tab', 'src-sta');
-		//リストロード
+	$("#src-contents").html("");
-	} else {
-        $("#list-box").removeClass("show");
-		$("#list-box").addClass("hide")
-	}
 }
 
 
@@ -36,12 +32,12 @@ function list(){
 			Object.keys(json).forEach(function(key) {
                 var list = json[key];
 				lists = lists + list.title+':<a onclick="listShow(' + list.id + ',\'' + list.title + '\',\'' + acct_id +
-					'\')" class="pointer">'+lang_list_show[lang]+'</a>/<a onclick="listUser(' + list.id + ',' + acct_id +
+					'\')" class="pointer">'+lang.lang_list_show+'</a>/<a onclick="listUser(' + list.id + ',' + acct_id +
-					')" class="pointer">'+lang_list_users[lang]+'</a><br> ';
+					')" class="pointer">'+lang.lang_list_users+'</a><br> ';
 			});
 			$("#lists").html(lists);
 		}else{
-            $("#lists").html(lang_list_nodata[lang]);
+            $("#lists").html(lang.lang_list_nodata);
         }
 	});
 }
@@ -56,12 +52,12 @@ function makeNewList(){
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		title: text
 	}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			list();
 			$("#list-add").val("")
@@ -93,11 +89,11 @@ function listUser(id,acct_id){
 			var lists = "";
             var templete = userparse(json,'',acct_id);
             if(!json[0]){
-                templete=lang_list_nouser[lang];
+                templete=lang.lang_list_nouser;
             }
 			$("#lists-user").html(templete);
 		}else{
-            $("#lists-user").html(lang_list_nouser[lang]);
+            $("#lists-user").html(lang.lang_list_nouser);
         }
 	});
 }
@@ -119,7 +115,7 @@ function hisList(user,acct_id){
 		console.error(error);
 	}).then(function(json) {
 		if (json) {
-			var lists = lang_list_add[lang]+"<br>";
+			var lists = lang.lang_list_add+"<br>";
 			Object.keys(json).forEach(function(key) {
                 var list = json[key];
 				lists = lists + '<a onclick="listAdd(' + list.id + ',\'' + user + '\',\'' + acct_id +
@@ -127,7 +123,7 @@ function hisList(user,acct_id){
 			});
 			$("#his-lists-a").html(lists);
 		}else{
-            $("#his-lists-a").html(lang_list_nodata[lang]);
+            $("#his-lists-a").html(lang.lang_list_nodata);
         }
     });
     var start = "https://" + domain + "/api/v1/accounts/"+user+"/lists"
@@ -145,7 +141,7 @@ function hisList(user,acct_id){
 		console.error(error);
 	}).then(function(json) {
 		if (json) {
-			var lists = lang_list_remove[lang]+"<br>";
+			var lists = lang.lang_list_remove+"<br>";
 			Object.keys(json).forEach(function(key) {
                 var list = json[key];
 				lists = lists + '<a onclick="listRemove(' + list.id + ',\'' + user + '\',\'' + acct_id +
@@ -153,7 +149,7 @@ function hisList(user,acct_id){
 			});
 			$("#his-lists-b").html(lists);
 		}else{
-            $("#his-lists-b").html(lang_list_nodata[lang]);
+            $("#his-lists-b").html(lang.lang_list_nodata);
         }
     });
 }
@@ -166,12 +162,12 @@ function listAdd(id,user,acct_id){
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		account_ids: [user]
 	}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			hisList(user,acct_id)
 		}
@@ -186,12 +182,12 @@ function listRemove(id,user,acct_id){
 	httpreq.open('DELETE', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		account_ids: [user]
 	}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			hisList(user,acct_id)
 		}

app/js/tl/misskeyparse.js

@@ -1,3 +1,25 @@
+function escapeHTMLtemp(str) {
+	if(!str){
+		return "";
+	}
+  return str.replace(/&/g, '&')
+			.replace(/</g, '&lt;')
+			.replace(/>/g, '&gt;')
+			.replace(/"/g, '&quot;')
+			.replace(/'/g, '&#039;');
+}
+$.strip_tagstemp = function(str, allowed) {
+	if(!str){
+		return "";
+	}
+  	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
+  		.join('');
+  	var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
+  		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
+  	return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
+  		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
+  	});
+  };
 //オブジェクトパーサー(トゥート)
 function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	var templete = '';
@@ -55,6 +77,13 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	}else{
 		wordmute = mutefilter;
 	}
+	//Ticker
+	var tickerck = localStorage.getItem("ticker_ok");
+	if(tickerck){
+		var ticker=true;
+	}else{
+		var ticker=false;
+	}
 	if (!sent) {
 		var sent = 500;
 	}
@@ -127,7 +156,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		var toot = obj[key];
         var dis_name=toot.user.name;
         if(dis_name){
-            dis_name=escapeHTML(dis_name);
+            dis_name=escapeHTMLtemp(dis_name);
         }else{
 			disname="";
 		}
@@ -143,17 +172,17 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'" width="20" class="notf-icon prof-img" user="' + toot.user.username +
 			'"></a>';
 			if (toot.type == "reply") {
-				var what = lang_parse_mentioned[lang];
+				var what = lang.lang_parse_mentioned;
 				var icon = '<i class="big-text fa fa-share teal-text"></i>';
 				noticeavatar="";
 			} else if (toot.type == "renote") {
-				var what = lang_misskeyparse_renoted[lang];
+				var what = lang.lang_misskeyparse_renoted;
 				var icon = '<i class="big-text fa fa-retweet light-blue-text"></i>';
 			}  else if (toot.type == "quote") {
-				var what = lang_misskeyparse_quoted[lang];
+				var what = lang.lang_misskeyparse_quoted;
 				var icon = '<i class="big-text fa fa-quote-right orange-text"></i>';
 			} else if (toot.type == "reaction") {
-				var what = lang_misskeyparse_reaction[lang];
+				var what = lang.lang_misskeyparse_reacted;
 				var reactions={
 					"like":"👍",
 					"love":"💓",
@@ -185,7 +214,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				var icon = '<i class="big-text material-icons indigo-text" style="font-size:17px">info</i>';
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.createdAt,
-				'absolute') + '('+lang_parse_notftime[lang]+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
 				datetype) +
 			'</span>'+icon+'<a onclick="udg(\'' + toot.user.username +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
@@ -214,14 +243,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 				var domain = localStorage.getItem("domain_" + acct_id);
 				if(popup>0){
-					Materialize.toast("["+domain+"]"+escapeHTML(toot.user.name)+what, popup * 1000);
+					Materialize.toast("["+domain+"]"+escapeHTMLtemp(toot.user.name)+what, popup * 1000);
 				}
 				if(native=="yes"){
 					var electron = require("electron");
 					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),
+						body: toot.account.display_name+"(" + toot.account.acct +")"+what+"\n\n"+$.strip_tagstemp(toot.status.content),
 						icon: toot.account.avatar
 					  };
 					if(os=="darwin"){
@@ -229,7 +258,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					}else{
 						ipc.send('native-notf', [
 							'TheDesk:'+domain,
-							toot.account.display_name+"(" + toot.account.acct +")"+what+"\n\n"+$.strip_tags(toot.status.content),
+							toot.account.display_name+"(" + toot.account.acct +")"+what+"\n\n"+$.strip_tagstemp(toot.status.content),
 							toot.account.avatar,
 							"toot",
 							acct_id,
@@ -245,18 +274,18 @@ 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=escapeHTML(toot.user.name);
+			var dis_name=escapeHTMLtemp(toot.user.name);
 		}else{
 			var if_notf="";
 			if (toot.renote) {
-				var rebtxt = lang_parse_btedsimple[lang];
+				var rebtxt = lang.lang_parse_btedsimple;
 				var rticon = "fa-retweet light-blue-text";
 				var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username +
 					")<br>";
 					var boostback = "shared";
 				var uniqueid=toot.id;
 				var toot = toot.renote;
-				var dis_name=escapeHTML(toot.user.name);
+				var dis_name=escapeHTMLtemp(toot.user.name);
 			    var uniqueid=toot.id;
 				var actemojick=false
 			} else {
@@ -320,27 +349,27 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		if ((toot.cw || toot.cw=="") && cw) {
 			var content = toot.text;
-			var spoil = escapeHTML(toot.cw);
+			var spoil = escapeHTMLtemp(toot.cw);
 			var spoiler = "cw cw_hide_" + toot.id;
 			var api_spoil = "gray";
 			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
-				'\')" class="nex parsed">'+lang_parse_cwshow[lang]+'</a><br>';
+				'\')" class="nex parsed">'+lang.lang_parse_cwshow+'</a><br>';
 		} else {
 			var ct1 =  nl2br(toot.text).split('<br />').length -2;
 			var ct2 =  nl2br(toot.text).split('<br>').length -2;
 			if(ct1>ct2){ var ct= ct1; }else{ var ct= ct2;  }
-			if ((sent < ct && $.mb_strlen($.strip_tags(toot.text)) > 5) || ($.strip_tags(toot.text).length > ltr && $.mb_strlen($.strip_tags(toot.text)) > 5)) {
+			if ((sent < ct && $.mb_strlen($.strip_tagstemp(toot.text)) > 5) || ($.strip_tagstemp(toot.text).length > ltr && $.mb_strlen($.strip_tagstemp(toot.text)) > 5)) {
-				var content = '<span class="gray">'+lang_parse_fulltext[lang]+'</span><br>' + escapeHTML(toot.text)
+				var content = '<span class="gray">'+lang.lang_parse_fulltext+'</span><br>' + escapeHTMLtemp(toot.text)
-				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(
+				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tagstemp(
 						toot.text), 0, 100) +
-					'</span><span class="gray">'+lang_parse_autofold[lang]+'</span>';
+					'</span><span class="gray">'+lang.lang_parse_autofold+'</span>';
 				var spoiler = "cw cw_hide_" + toot.id;
 				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
-					'\')" class="nex parsed">'+lang_parse_more[lang]+'</a><br>';
+					'\')" class="nex parsed">'+lang.lang_parse_more+'</a><br>';
 			} else {
-                var content = escapeHTML(toot.text);
+                var content = escapeHTMLtemp(toot.text);
                 if(toot.cw){
-                    var spoil = escapeHTML(toot.cw);
+                    var spoil = escapeHTMLtemp(toot.cw);
                 }else{
                     var spoil="";
                 }
@@ -350,12 +379,12 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			}
 		}
 		var analyze = '';
-		var urls = $.strip_tags(content).replace(/\n/g, " ").match(
+		var urls = $.strip_tagstemp(content).replace(/\n/g, " ").match(
 			/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/
 		);
 		if (urls) {
 			var analyze = '<a onclick="additionalIndv(\'' + tlid + '\',' + acct_id +
-				',\'' + id + '\')" class="add-show pointer">'+lang_parse_url[lang]+'</a><br>';
+				',\'' + id + '\')" class="add-show pointer">'+lang.lang_parse_url+'</a><br>';
 		} else {
 			var analyze = '';
 		}
@@ -431,7 +460,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					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%; height:'+imh+'px;"></a></span>';
+					' toot-img pointer" style="max-width:100%;"></a></span>';
 				}else{
 					viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',' +
 					acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
@@ -460,8 +489,8 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			Object.keys(toot.tags).forEach(function(key4) {
 				var tag = toot.tags[key4];
 				var tags =  '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
-					',\'add\')" class="pointer parsed" title="' +lang_parse_tagTL[lang].replace("{{tag}}" ,'#'+tag)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang_parse_tagtoot[lang].replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
+					',\'add\')" class="pointer parsed" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
-                    '<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' +lang_parse_tagpin[lang].replace("{{tag}}" ,'#'+tag)+ '">Pin</a></span> ';
+                    '<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' +lang.lang_parse_tagpin.replace("{{tag}}" ,'#'+tag)+ '">Pin</a></span> ';
                 content=content.replace("#"+tag,tags);
 			});
 			//tags = '<div style="float:right">' + tags + '</div>';
@@ -471,23 +500,23 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		var visen = toot.visibility;
 		if (visen == "public") {
 			var vis =
-				'<i class="text-darken-3 material-icons gray sml vis-data pointer" title="'+lang_parse_public[lang]+'('+lang_parse_clickcopy[lang]+')" data-vis="public" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">public</i>';
+				'<i class="text-darken-3 material-icons gray sml vis-data pointer" title="'+lang.lang_parse_public+'('+lang.lang_parse_clickcopy+')" data-vis="public" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">public</i>';
 			var can_rt = "";
 		} else if (visen == "home") {
 			var vis =
-				'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="'+lang_misskeyparse_home[lang]+'('+lang_parse_clickcopy[lang]+')" data-vis="unlisted" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock_open</i>';
+				'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="'+lang.lang_misskeyparse_home+'('+lang.lang_parse_clickcopy+')" data-vis="unlisted" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock_open</i>';
 			var can_rt = "";
 		} else if (visen == "followers") {
 			var vis =
-				'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="'+lang_misskeyparse_followers[lang]+'('+lang_parse_clickcopy[lang]+')" data-vis="unlisted" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">people</i>';
+				'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="'+lang.lang_misskeyparse_followers+'('+lang.lang_parse_clickcopy+')" data-vis="unlisted" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">people</i>';
 			var can_rt = "";
 		} else if (visen == "private") {
 			var vis =
-				'<i class="text-darken-3 material-icons orange-text vis-data pointer" title="'+lang_parse_private[lang]+'('+lang_parse_clickcopy[lang]+')" data-vis="private" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock</i>';
+				'<i class="text-darken-3 material-icons orange-text vis-data pointer" title="'+lang.lang_parse_private+'('+lang.lang_parse_clickcopy+')" data-vis="private" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock</i>';
 			var can_rt = "";
 		} else if (visen == "specified") {
 			var vis =
-				'<i class="text-darken-3 material-icons red-text vis-data pointer" title="'+lang_misskeyparse_specified[lang]+'('+lang_parse_clickcopy[lang]+')" data-vis="direct" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">mail</i>';
+				'<i class="text-darken-3 material-icons red-text vis-data pointer" title="'+lang.lang_misskeyparse_specified+'('+lang.lang_parse_clickcopy+')" data-vis="direct" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">mail</i>';
 			var can_rt = "hide";
 		}
 		if (toot.user.username == localStorage.getItem("user_" + acct_id)) {
@@ -528,7 +557,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						var word=worde
 					}
 					var regExp = new RegExp( word, "g" ) ;
-					if($.strip_tags(content).match(regExp)){
+					if($.strip_tagstemp(content).match(regExp)){
 						boostback = "hide by_filter";
 					}
 				}
@@ -545,6 +574,23 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 			});
 		}
+		//Ticker
+		var tickerdom="";
+		if(ticker){
+			var tickerdata=JSON.parse(localStorage.getItem("ticker"));
+			
+			var thisdomain=toot.user.username.split("@");
+			if(thisdomain.length>1){
+				thisdomain=thisdomain[1];
+			}
+			for( var i=0; i<tickerdata.length; i++) {
+				var value=tickerdata[i];
+				if(value.domain==thisdomain){
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					break;
+				}
+		   }
+		}
 		//Poll
 		var poll="";
 		if(toot.poll){
@@ -657,10 +703,10 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.user.username + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'https://' +domain+"/notes/"+
 			toot.id + '\');" title="' + date(toot.createdAt, 'absolute') +
-			'('+lang_parse_clickcopyurl[lang]+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
 			date(toot.createdAt, datetype) + '</span>' +
 			'</div></div>' +
-			'<div class="area-toot"><span class="toot ' + spoiler + '">' + content +
+			'<div class="area-toot">'+tickerdom+'<span class="toot ' + spoiler + '">' + content +
 			'</span><span class="' +
 			api_spoil + ' cw_text_' + toot.id + '">' + spoil + spoiler_show +
 			'</span>' +
@@ -688,31 +734,31 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'<div class="area-vis"></div>'+
 			'<div class="area-actions '+mouseover+'">' +
 			'<div class="action">'+vis+'</div>'+
-			'<div class="action '+antinoauth+'"><a onclick="detEx(\'https://misskey.xyz/notes/'+toot.id+'\',\'main\')" class="waves-effect waves-dark details" style="padding:0">'+lang_parse_det[lang]+'</a></div>' +
+			'<div class="action '+antinoauth+'"><a onclick="detEx(\'https://misskey.xyz/notes/'+toot.id+'\',\'main\')" class="waves-effect waves-dark details" style="padding:0">'+lang.lang_parse_det+'</a></div>' +
 			'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="misskeyreply(\'' + toot.id +
 			'\',\'' + acct_id + '\',' +
 			acct_id + ',\''+visen+
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_replyto[lang]+'"><i class="fa fa-share"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i></a></div>' +
 			'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="renote(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_misskeyparse_renote[lang]+'"><i class="text-darken-3 fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fa fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id +
-			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_misskeyparse_renoteqt[lang]+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
 			'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="reactiontoggle(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_misskeyparse_reaction[lang]+'"><i class="fa text-darken-3 fa-plus' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fa text-darken-3 fa-plus' +
 			if_fav + ' fav_' + toot.id + '"></i></div>' +
 			'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_del[lang]+'"><i class="fa fa-trash-o"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></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_parse_pin[lang]+'"><i class="fa fa-map-pin pin_' + toot.id + '"></i></a></div>' 
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + '"></i></a></div>' 
 			+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_redraft[lang]+'"><i class="material-icons">redo</i></a></div>'+trans+
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
-			'<span class="cbadge viabadge waves-effect '+viashow+' '+mine_via+'" onclick="client(\''+$.strip_tags(via)+'\')" title="via ' + $.strip_tags(via) + '">via ' +
+			'<span class="cbadge viabadge waves-effect '+viashow+' '+mine_via+'" onclick="client(\''+$.strip_tagstemp(via)+'\')" title="via ' + $.strip_tagstemp(via) + '">via ' +
 			via +
 			'</span>'+
 			'</div><div class="area-side '+mouseover+'"><div class="action ' + if_mine + ' '+noauth+'"><a onclick="toggleAction(\'' + toot.id + '\',\''+tlid+'\',\''+acct_id+'\')" class="waves-effect waves-dark btn-flat" style="padding:0"><i class="text-darken-3 material-icons act-icon">expand_more</i></a></div>' +
@@ -742,10 +788,10 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		} else {
 			var auth = "";
 		}
-		var ftxt=lang_parse_followed[lang];
+		var ftxt=lang.lang_parse_followed;
 		if(popup > 0 || popup==-1){
 			var notftext='<span class="cbadge"title="' + date(toot.createdAt,
-				'absolute') + '('+lang_parse_notftime[lang]+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
 				datetype) +
 			'</span>'+ftxt+'<br>';
 			var toot = toot.user;
@@ -754,7 +800,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(escapeHTML(toot.name)+":"+ftxt, popup * 1000);
+				Materialize.toast(escapeHTMLtemp(toot.name)+":"+ftxt, popup * 1000);
 				$(".notf-icon_" + tlid).addClass("red-text");
 				localStorage.setItem("notice-mem", notftext);
 				notftext = "";
@@ -786,7 +832,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 				}
 			}
 			if(toot.name){
-				var dis_name=escapeHTML(toot.name);
+				var dis_name=escapeHTMLtemp(toot.name);
 				dis_name=twemoji.parse(dis_name);
 			}else{
 				var dis_name=toot.name;

app/js/tl/notification.js

@@ -1,6 +1,186 @@
 //通知
 //取得+Streaming接続
-function notf(acct_id, tlid, sys) {
+function notf(acct_id, tlid, sys){
+	if (sys == "direct") {
+		notfColumn(acct_id, tlid, sys)
+	} else {
+		notfCommon(acct_id, tlid, sys)
+	}
+}
+function notfColumn(acct_id, tlid, sys){
+	todo("Notifications Loading...");
+	var native=localStorage.getItem("nativenotf");
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(!native){
+		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.setRequestHeader('Content-Type', 'application/json');
+		var body=JSON.stringify({
+			i:at
+		});
+	}else{
+		var misskey=false;
+		if(localStorage.getItem("exclude-"+tlid)){
+			var exc=localStorage.getItem("exclude-"+tlid);
+		}else{
+			var exc="";
+		}
+		var start = "https://" + domain + "/api/v1/notifications"+exc;
+		httpreq.open("GET", start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		var body="";
+	}
+	
+	httpreq.responseType = "json";
+	httpreq.send(body);
+    httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response;
+			var max_id = httpreq.getResponseHeader("link").match(/[?&]{1}max_id=([0-9]+)/)[1];
+			if(json[0]){
+				var templete="";
+				var lastnotf=localStorage.getItem("lastnotf_" + acct_id);
+				localStorage.setItem("lastnotf_" + acct_id,json[0].id);
+				Object.keys(json).forEach(function(key) {
+					var obj = json[key];
+					if(lastnotf==obj.id && key>0 && native=="yes"){
+						var ct=key;
+						if(key>14){
+							ct="15+";
+						}
+						var electron = require("electron");
+						var ipc = electron.ipcRenderer;
+						var os = electron.remote.process.platform;
+							var options = {
+								body: ct+lang_notf_new[lang],
+								icon: localStorage.getItem("prof_"+acct_id)
+							  };
+							if(os=="darwin"){
+								var n = new Notification('TheDesk:'+domain, options);
+							}else{
+								ipc.send('native-notf', ['TheDesk:'+domain,ct+lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
+							}
+						
+					}
+					if(localStorage.getItem("filter_"+ acct_id)!="undefined"){
+						var mute=getFilterType(JSON.parse(localStorage.getItem("filter_"+ acct_id)),"notif");
+					}else{
+						var mute=[];
+					}
+					if(obj.type!="follow"){
+						if(misskey){
+							templete = templete+misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
+						}else{
+							templete = templete+parse([obj], 'notf', acct_id, 'notf', -1, mute);
+						}
+					}else{
+						if(misskey){
+							templete = templete+misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
+						}else{
+							templete = templete+userparse([obj.account], 'notf', acct_id, 'notf', -1);
+						}
+						
+					}
+				});
+				templete=templete+'<div class="hide notif-marker" data-maxid="'+max_id+'"></div>';
+				$("#timeline_" + tlid).html(templete);
+				$("#landing_" + tlid).hide();
+				jQuery("time.timeago").timeago();
+				}
+				$("#notf-box").addClass("fetched");
+				todc();
+		}
+	}
+	if(!misskey){
+		if(localStorage.getItem("streaming_" + acct_id)){
+			var wss=localStorage.getItem("streaming_" + acct_id)
+		}else{
+			var wss="wss://"+domain
+		}
+		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.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...");
 	var native=localStorage.getItem("nativenotf");
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -32,6 +212,7 @@ function notf(acct_id, tlid, sys) {
 		}
 	}
 	fetch(start, i).then(function(response) {
+		console.log(response.headers.get('link'));
 		return response.json();
 	}).catch(function(error) {
 		todo(error);
@@ -82,12 +263,7 @@ function notf(acct_id, tlid, sys) {
 				
 			}
 		});
-		
+		$("div[data-notf=" + acct_id +"]").html(templete);
-		if (sys == "direct") {
-			$("#timeline_" + tlid).html(templete);
-		} else {
-			$("div[data-notf=" + acct_id +"]").html(templete);
-		}
 		$("#landing_" + tlid).hide();
 		jQuery("time.timeago").timeago();
 		}
@@ -176,6 +352,8 @@ function notf(acct_id, tlid, sys) {
 }
 //一定のスクロールで発火
 function notfmore(tlid) {
+	console.log(moreloading);
+	console.log("kicked");
 	var multi = localStorage.getItem("column");
 	var obj = JSON.parse(multi);
 	var acct_id = obj[tlid].domain;
@@ -184,72 +362,79 @@ function notfmore(tlid) {
 	}else{
 		var data;
 	}
-	var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");
+	var sid = $("#timeline_" + tlid + " .notif-marker").last().attr("data-maxid");
-	console.log(sid);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
-	if (localStorage.getItem("morelock") != sid) {
+	var domain = localStorage.getItem("domain_" + acct_id);
-		localStorage.setItem("morelock", sid);
+	if (sid && !moreloading) {
-		localStorage.setItem("now", type);
+		moreloading=true;
-		todo("Notfication TL MoreLoading");
+	var httpreq = new XMLHttpRequest();
-		var domain = localStorage.getItem("domain_" + acct_id);
+	if(localStorage.getItem("mode_" + domain)=="misskey"){
-		var at = localStorage.getItem("acct_"+ acct_id + "_at");
+		var misskey=true;
-
+		var start = "https://" + domain + "/api/i/notifications";
-		if(localStorage.getItem("mode_" + domain)=="misskey"){
+		httpreq.open(POST, start, true);
-			var misskey=true;
+		httpreq.setRequestHeader('Content-Type', 'application/json');
-				var start = "https://" + domain + "/api/i/notifications";
+		var body=JSON.stringify({
-				var i={
+			i:at,
-					method: 'POST',
+			untilID:sid
-					headers: {
-						'content-type': 'application/json',
-					},
-					body:JSON.stringify({
-						i:at,
-						untilId:sid
-					})
-				}
-			}else{
-				var misskey=false;
-				var start = "https://" + domain + "/api/v1/notifications"+
-					"max_id=" + sid;
-				var i={
-					method: 'GET',
-					headers: {
-						'content-type': 'application/json',
-						'Authorization': 'Bearer ' + at
-					},
-				}
-			}
-		fetch(start, i,
-		).then(function(response) {
-			return response.json();
-		}).catch(function(error) {
-			todo(error);
-			console.error(error);
-		}).then(function(json) {
-			var templete="";
-			Object.keys(json).forEach(function(key) {
-				var obj = json[key];
-				if(obj.type!="follow"){
-					if(misskey){
-						templete = templete+misskeyParse([obj.note], '', acct_id, tlid, -1);
-					}else{
-						templete = templete+parse([obj], '', acct_id, tlid, -1);
-					}
-				}else{
-					if(misskey){
-						templete = templete+misskeyUserparse([obj], '', acct_id, tlid, -1);
-					}else{
-						templete = templete+userparse([obj.account], '', acct_id, tlid, -1);
-					}
-				}
-				
-			});
-			$("#timeline_" + tlid).append(templete);
-			additional(acct_id, tlid);
-			jQuery("time.timeago").timeago();
-			localStorage.removeItem("morelock")
-			todc();
 		});
+	}else{
+		var misskey=false;
+		if(localStorage.getItem("exclude-"+tlid)){
+			var exc=localStorage.getItem("exclude-"+tlid)+"&max_id="+sid;
+		}else{
+			var exc="?max_id="+sid;
+		}
+		var start = "https://" + domain + "/api/v1/notifications"+exc;
+		httpreq.open("GET", start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		var body="";
 	}
+	
+	httpreq.responseType = "json";
+	httpreq.send(body);
+    httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response;
+			console.log(json);
+			var max_id = httpreq.getResponseHeader("link").match(/[?&]{1}max_id=([0-9]+)/)[1];
+			if(json[0]){
+				var templete="";
+				var lastnotf=localStorage.getItem("lastnotf_" + acct_id);
+				localStorage.setItem("lastnotf_" + acct_id,json[0].id);
+				Object.keys(json).forEach(function(key) {
+					var obj = json[key];
+					if(localStorage.getItem("filter_"+ acct_id)!="undefined"){
+						var mute=getFilterType(JSON.parse(localStorage.getItem("filter_"+ acct_id)),"notif");
+					}else{
+						var mute=[];
+					}
+					if(obj.type!="follow"){
+						if(misskey){
+							templete = templete+misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
+						}else{
+							templete = templete+parse([obj], 'notf', acct_id, 'notf', -1, mute);
+						}
+					}else{
+						if(misskey){
+							templete = templete+misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
+						}else{
+							templete = templete+userparse([obj.account], 'notf', acct_id, 'notf', -1);
+						}
+						
+					}
+				});
+				moreloading=false;
+				templete=templete+'<div class="hide notif-marker" data-maxid="'+max_id+'"></div>';
+				$("#timeline_" + tlid).append(templete);
+				$("#landing_" + tlid).hide();
+				jQuery("time.timeago").timeago();
+				}
+				$("#notf-box").addClass("fetched");
+				todc();
+		}
+	}
+}
 }
 
 //通知トグルボタン

app/js/tl/parse.js

@@ -2,13 +2,12 @@
 function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	var templete = '';
 	if(obj[0]){
-		if(tlid==1){
+		if(tlid===1){
 			console.log("testalive:"+"lastunix_"+ tlid+":"+date(obj[0].created_at, 'unix'))
 		}
 		localStorage.setItem("lastunix_"+ tlid,date(obj[0].created_at, 'unix'));
 	}
 	
-	var actb = localStorage.getItem("action_btns");
 	var actb='re,rt,fav,qt,del,pin,red';
 	if(actb){
 		var actb = actb.split(',');
@@ -22,6 +21,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			disp[actb[k]]=tp;
 		}
 	}
+	var qt = localStorage.getItem("quote");
+	if(qt=="nothing" || !qt){
+		var qtClass="hide";
+	}else{
+		var qtClass="";
+	}
 	var datetype = localStorage.getItem("datetype");
 	var nsfwtype = localStorage.getItem("nsfw");
 	var sent = localStorage.getItem("sentence");
@@ -66,11 +71,25 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	}else{
 		wordmute = mutefilter;
 	}
-
+	//Ticker
-	
+	var tickerck = localStorage.getItem("ticker_ok");
+	if(tickerck){
+		var ticker=true;
+	}else{
+		var ticker=false;
+	}
+	//Animation
+	var anime = localStorage.getItem("animation");
+	if (anime=="yes" || !anime) {
+			var animecss="cvo-anime";
+	}else{
+			var animecss="";
+	}
+	//Cards
+	var card = localStorage.getItem("card_" + tlid);
 	
 	if (!sent) {
-		var sent = 500;
+		sent = 500;
 	}
 	if (!ltr) {
 		var ltr = 500;
@@ -155,7 +174,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			Object.keys(toot.account.emojis).forEach(function(key5) {
 				var emoji = toot.account.emojis[key5];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url +
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
 					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				dis_name = dis_name.replace(regExp, emoji_url);
@@ -171,28 +190,28 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			}
 			noticeavatar='<a onclick="udg(\'' + toot.account.id +
 			'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
-			'<img src="' + noticeavatar +
+			'<img draggable="false" src="' + noticeavatar +
 			'" width="20" class="notf-icon prof-img" user="' + toot.account.acct +
 			'"></a>';
 			if (toot.type == "mention") {
-				var what = lang_parse_mentioned[lang];
+				var what = lang.lang_parse_mentioned;
 				var icon = "fa-share teal-text";
 				noticeavatar="";
 			} else if (toot.type == "reblog") {
-				var what = lang_parse_bted[lang];
+				var what = lang.lang_parse_bted;
 				var icon = "fa-retweet light-blue-text";
 				if(!locale && localStorage.getItem("bt_" + acct_id)){
 					what = localStorage.getItem("bt_" + acct_id);
 				}
 			} else if (toot.type == "favourite") {
-				var what = lang_parse_faved[lang];
+				var what = lang.lang_parse_faved;
 				var icon = "fa-star  yellow-text";
 				if(!locale && localStorage.getItem("fav_" + acct_id)){
 					what = localStorage.getItem("fav_" + acct_id);
 				}
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at,
-				'absolute') + '('+lang_parse_notftime[lang]+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,
 				datetype) +
 			'</span><i class="big-text fa '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
@@ -280,10 +299,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 				noticeavatar='<a onclick="udg(\'' + toot.account.id +
 				'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
-				'<img src="' + noticeavatar +
+				'<img draggable="false" src="' + noticeavatar +
 				'" width="20" class="notf-icon prof-img" user="' + toot.account.acct +
 				'"></a>';
-				var rebtxt = lang_parse_btedsimple[lang];
+				var rebtxt = lang.lang_parse_btedsimple;
 				var rticon = "fa-retweet light-blue-text";
 				if(localStorage.getItem("domain_" + acct_id)=="imastodon.net" && !locale){
 					rebtxt = ":「わかるわ」";
@@ -307,7 +326,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				Object.keys(toot.account.emojis).forEach(function(key5) {
 					var emoji = toot.account.emojis[key5];
 					var shortcode = emoji.shortcode;
-					var emoji_url = '<img src="' + emoji.url +
+					var emoji_url = '<img draggable="false" src="' + emoji.url +
 						'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
 					var regExp = new RegExp(":" + shortcode + ":", "g");
 					dis_name = dis_name.replace(regExp, emoji_url);
@@ -316,7 +335,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			} else {
 				var uniqueid=toot.id;
 				var notice = "";
-				var boostback = "";
+				var boostback = "unshared";
 				//ユーザー強調
 				if(toot.account.username!=toot.account.acct){
 					var fullname=toot.account.acct;
@@ -348,7 +367,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var locked = "";
 		}
 		if (!toot.application) {
-			var via = '<span style="font-style: italic;">Unknown</span>';
+			var via = '';
+			viashow="hide";
 		} else {
 			var via = toot.application.name;
 			//強調チェック
@@ -366,25 +386,28 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 			});
 		}
+		if(mix=="pinned"){
+			boostback = "emphasized";
+		}
 		if (toot.spoiler_text && cw) {
 			var content = toot.content;
 			var spoil = escapeHTML(toot.spoiler_text);
 			var spoiler = "cw cw_hide_" + toot.id;
 			var api_spoil = "gray";
 			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
-				'\')" class="nex parsed">'+lang_parse_cwshow[lang]+'</a><br>';
+				'\')" class="nex parsed">'+lang.lang_parse_cwshow+'</a><br>';
 		} else {
 			var ct1 = toot.content.split('</p>').length + toot.content.split('<br />').length -2;
 			var ct2 = toot.content.split('</p>').length + toot.content.split('<br>').length -2;
 			if(ct1>ct2){ var ct= ct1; }else{ var ct= ct2;  }
 			if ((sent < ct && $.mb_strlen($.strip_tags(toot.content)) > 5) || ($.strip_tags(toot.content).length > ltr && $.mb_strlen($.strip_tags(toot.content)) > 5)) {
-				var content = '<span class="gray">'+lang_parse_fulltext[lang]+'</span><br>' + toot.content
+				var content = '<span class="gray">'+lang.lang_parse_fulltext+'</span><br>' + toot.content
 				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(
 						toot.content), 0, 100) +
-					'</span><span class="gray">'+lang_parse_autofold[lang]+'</span>';
+					'</span><span class="gray">'+lang.lang_parse_autofold+'</span>';
 				var spoiler = "cw cw_hide_" + toot.id;
 				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
-					'\')" class="nex parsed">'+lang_parse_more[lang]+'</a><br>';
+					'\')" class="nex parsed">'+lang.lang_parse_more+'</a><br>';
 			} else {
 				var content = toot.content;
 				var spoil = escapeHTML(toot.spoiler_text);
@@ -397,7 +420,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		);
 		if (urls) {
 			var analyze = '<a onclick="additionalIndv(\'' + tlid + '\',' + acct_id +
-				',\'' + id + '\')" class="add-show pointer">'+lang_parse_url[lang]+'</a><br>';
+				',\'' + id + '\')" class="add-show pointer">'+lang.lang_parse_url+'</a><br>';
 		} else {
 			var analyze = '';
 		}
@@ -414,7 +437,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			Object.keys(toot.emojis).forEach(function(key5) {
 				var emoji = toot.emojis[key5];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url +
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
 					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
@@ -432,7 +455,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			Object.keys(toot.profile_emojis).forEach(function(keynico) {
 				var emoji = toot.profile_emojis[keynico];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url +
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
 					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
@@ -471,7 +494,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 				viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
 					acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
-					'" data-type="' + media.type + '" class="img-parsed"><img src="' +
+					'" data-type="' + media.type + '" class="img-parsed"><img draggable="false" src="' +
 					purl + '" class="' + sense +
 					' toot-img pointer" style="width:' + cwdt + '%; height:'+imh+'px;"></a></span>';
 			});
@@ -485,12 +508,27 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		//メンションであれば
 		if (menck) {
 			mentions = "";
+			var to_mention=[];
 			Object.keys(toot.mentions).forEach(function(key3) {
 				var mention = toot.mentions[key3];
 				mentions = mentions + '<a onclick="udg(\'' + mention.id + '\',' +
 					acct_id + ')" class="pointer">@' + mention.acct + '</a> ';
+					//自分は除外
+					//自インスタンスかどうかを確認し、IDの一致
+				if(mention.acct==mention.username && mention.id==localStorage.getItem("user-id_" + acct_id)){
+					//自分
+				}else{
+					//そのトゥの人NG
+					if(toot.account.acct!=mention.acct){
+						to_mention.push(mention.acct);
+					}
+				}
+				
 			});
+			to_mention.push(toot.account.acct);
 			mentions = '<div style="float:right">' + mentions + '</div>';
+		}else{
+			var to_mention=[toot.account.acct];
 		}
 		var tagck = toot.tags[0];
 		var tags = "";
@@ -499,8 +537,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			Object.keys(toot.tags).forEach(function(key4) {
 				var tag = toot.tags[key4];
 				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ':<a onclick="tl(\'tag\',\'' + tag.name + '\',' + acct_id +
-					',\'add\')" class="pointer" title="' +lang_parse_tagTL[lang].replace("{{tag}}" ,'#'+tag.name)+ '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang_parse_tagtoot[lang].replace("{{tag}}" ,'#'+tag.name) + '">Toot</a>　'+
+					',\'add\')" class="pointer" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag.name)+ '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag.name) + '">Toot</a>　'+
-					'<a onclick="tagPin(\'' + tag.name + '\')" class="pointer" title="' +lang_parse_tagpin[lang].replace("{{tag}}" ,'#'+tag.name)+ '">Pin</a></span> ';
+					'<a onclick="tagPin(\'' + tag.name + '\')" class="pointer" title="' +lang.lang_parse_tagpin.replace("{{tag}}" ,'#'+tag.name)+ '">Pin</a></span> ';
 			});
 			tags = '<div style="float:right">' + tags + '</div>';
 		}
@@ -518,19 +556,19 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		var visen = toot.visibility;
 		if (visen == "public") {
 			var vis =
-				'<i class="text-darken-3 material-icons gray sml vis-data pointer" title="'+lang_parse_public[lang]+'('+lang_parse_clickcopy[lang]+')" data-vis="public" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">public</i>';
+				'<i class="text-darken-3 material-icons gray sml vis-data pointer" title="'+lang.lang_parse_public+'('+lang.lang_parse_clickcopy+')" data-vis="public" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">public</i>';
 			var can_rt = "";
 		} else if (visen == "unlisted") {
 			var vis =
-				'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="'+lang_parse_unlisted[lang]+'('+lang_parse_clickcopy[lang]+')" data-vis="unlisted" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock_open</i>';
+				'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="'+lang.lang_parse_unlisted+'('+lang.lang_parse_clickcopy+')" data-vis="unlisted" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock_open</i>';
 			var can_rt = "";
 		} else if (visen == "private") {
 			var vis =
-				'<i class="text-darken-3 material-icons orange-text vis-data pointer" title="'+lang_parse_private[lang]+'('+lang_parse_clickcopy[lang]+')" data-vis="private" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock</i>';
+				'<i class="text-darken-3 material-icons orange-text vis-data pointer" title="'+lang.lang_parse_private+'('+lang.lang_parse_clickcopy+')" data-vis="private" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock</i>';
 			var can_rt = "hide";
 		} else if (visen == "direct") {
 			var vis =
-				'<i class="text-darken-3 material-icons red-text vis-data pointer" title="'+lang_parse_direct[lang]+'('+lang_parse_clickcopy[lang]+')" data-vis="direct" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">mail</i>';
+				'<i class="text-darken-3 material-icons red-text vis-data pointer" title="'+lang.lang_parse_direct+'('+lang.lang_parse_clickcopy+')" data-vis="direct" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">mail</i>';
 			var can_rt = "hide";
 		}
 		if (toot.account.acct == localStorage.getItem("user_" + acct_id)) {
@@ -596,20 +634,94 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 		}
 		//日本語じゃない
-		if(toot.language!="ja"){
+		if(toot.language!=lang.language && toot.language){
-			var trans='<div class="action pin"><a onclick="trans(\''+toot.language+'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_trans[lang]+'"><i class="material-icons">g_translate</i></a></div>';
+			var trans='<div class="action pin"><a onclick="trans(\''+toot.language+'\',\''+lang.language+'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_trans+'"><i class="material-icons">g_translate</i></a></div>';
 		}else{
 			var trans="";
 		}
+		//Cards
+		if (!card && toot.card) {
+			var cards=toot.card;
+				if (cards.provider_name=="Twitter"){
+					if(cards.image){
+						var twiImg='<br><img draggable="false" src="'+cards.image+'">';
+					}else{
+						var twiImg='';
+					}
+					analyze='<blockquote class="twitter-tweet"><b>'+escapeHTML(cards.author_name)+'</b><br>'+escapeHTML(cards.description)+twiImg+'</blockquote>';
+				}
+				if (cards.title) {
+					analyze="<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(cards.title) + "<br>" +
+						escapeHTML(cards.description) + "</span>";
+				}
+				if (cards.html) {
+					analyze=cards.html+'<i class="material-icons" onclick="pip('+id+')" title="'+lang.lang_cards_pip+'">picture_in_picture_alt</i>';
+				}
+			
+		}
+		//Ticker
+		var tickerdom="";
+		if(ticker){
+			var tickerdata=localStorage.getItem("ticker")
+			if(tickerdata){
+			var tickerdata=JSON.parse(tickerdata);
+			
+			var thisdomain=toot.account.acct.split("@");
+			if(thisdomain.length>1){
+				thisdomain=thisdomain[1];
+			}
+			for( var i=0; i<tickerdata.length; i++) {
+				var value=tickerdata[i];
+				if(value.domain==thisdomain){
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					break;
+				}
+		   }
+		}
+		}
+		//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{
+				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+'">'+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="fa fa-calendar-times-o"></i>' +
+			 ended+ '</span></div>';
+		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
-			' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
+			' ' + hasmedia + ' '+animecss+'" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
 				key].created_at, 'unix') + '" '+if_notf+' onmouseover="mov(\'' + toot.id + '\',\''+tlid+'\',\'mv\')" onclick="mov(\'' + toot.id + '\',\''+tlid+'\',\'cl\')" onmouseout="resetmv(\'mv\')">' +
 			'<div class="area-notice"><span class="gray sharesta">' + notice + home +
 			'</span></div>' +
 			'<div class="area-icon"><a onclick="udg(\'' + toot.account.id +
 			'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
-			'<img src="' + avatar +
+			'<img draggable="false" src="' + avatar +
 			'" width="40" class="prof-img" user="' + toot.account.acct +
 			'"></a>'+noticeavatar+'</div>' +
 			'<div class="area-display_name"><div class="flex-name"><span class="user">' +
@@ -618,48 +730,48 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.account.acct + locked + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
 			toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
-			'('+lang_parse_clickcopyurl[lang]+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
 			date(toot.created_at, datetype) + '</span>' +
 			'</div></div>' +
-			'<div class="area-toot"><span class="' +
+			'<div class="area-toot">'+tickerdom+'<span class="' +
-			api_spoil + ' cw_text_' + toot.id + '">' + spoil + spoiler_show +
+			api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
 			'</span><span class="toot ' + spoiler + '">' + content +
 			'</span>' +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
 			'</span>' +
-			'' + mentions + tags + '</div>' +
+			'' +poll+ mentions + tags + '</div>' +
 			'<div class="area-vis"></div>'+
 			'<div class="area-actions '+mouseover+'">' +
 			'<div class="action">'+vis+'</div>'+
-			'<div class="action '+antinoauth+'"><a onclick="detEx(\''+toot.url+'\',\'main\')" class="waves-effect waves-dark details" style="padding:0">'+lang_parse_det[lang]+'</a></div>' +
+			'<div class="action '+antinoauth+'"><a onclick="detEx(\''+toot.url+'\',\'main\')" class="waves-effect waves-dark details" style="padding:0">'+lang.lang_parse_det+'</a></div>' +
 			'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="re(\'' + toot.id +
-			'\',\'' + toot.account.acct + '\',' +
+			'\',\'' + to_mention + '\',' +
 			acct_id + ',\''+visen+
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_replyto[lang]+'"><i class="fa fa-share"></i><span class="rep_ct">' + replyct +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i><span class="rep_ct">' + replyct +
 			'</a></span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="rt(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_bt[lang]+'"><i class="text-darken-3 fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fa fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count +
 			'</span></a></div>' +
-			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
+			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+' '+qtClass+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
 			',\'' + toot.account.acct +'\',\''+toot.url+
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_quote[lang]+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
 			'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="fav(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_fav[lang]+'"><i class="fa text-darken-3 fa-star' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fa text-darken-3 fa-star' +
 			if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count +
 			'</a></span></div>' +
 			'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_del[lang]+'"><i class="fa fa-trash-o"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></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_parse_pin[lang]+'"><i class="fa fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
 			+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang_parse_redraft[lang]+'"><i class="material-icons">redo</i></a></div>'+trans+
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
 			'<span class="cbadge viabadge waves-effect '+viashow+' '+mine_via+'" onclick="client(\''+$.strip_tags(via)+'\')" title="via ' + $.strip_tags(via) + '">via ' +
 			via +
 			'</span>'+
@@ -705,9 +817,9 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 		} else {
 			var auth = "";
 		}
-		var ftxt=lang_parse_followed[lang];
+		var ftxt=lang.lang_parse_followed;
-		if(!locale && localStorage.getItem("follow_" + acct_id)){
+		if(!locale && localStorage.getItem("followlocale_" + acct_id)){
-			ftxt = localStorage.getItem("follow_" + acct_id);
+			ftxt = localStorage.getItem("followlocale_" + acct_id);
 		}
 		if(popup > 0 || popup==-1 || notf){
 			var notftext=ftxt+'<br>';
@@ -764,7 +876,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 		Object.keys(toot.emojis).forEach(function(key5) {
 			var emoji = toot.emojis[key5];
 			var shortcode = emoji.shortcode;
-			var emoji_url = '<img src="' + emoji.url +
+			var emoji_url = '<img draggable="false" src="' + emoji.url +
 				'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
 			var regExp = new RegExp(":" + shortcode + ":", "g");
 			dis_name = dis_name.replace(regExp, emoji_url);
@@ -776,7 +888,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	if(toot.avatar){
 		var avatar=toot.avatar;
 	}else{
-		var avatar="./img/missing.svg";
+		var avatar="../../img/missing.svg";
 	}
 	
 		templete = templete +
@@ -784,7 +896,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			notftext +
 			'</div><div class="area-icon"><a onclick="udg(\'' + toot.id + '\',' +
 			acct_id + ');" user="' + toot.acct + '" class="udg">' +
-			'<img src="' + avatar + '" width="40" class="prof-img" user="' + toot
+			'<img draggable="false" src="' + avatar + '" width="40" class="prof-img" user="' + toot
 			.acct + '"></a></div>' +
 			'<div class="area-display_name"><div class="flex-name"><span class="user">' +
 			dis_name + '</span>' +
@@ -813,18 +925,18 @@ function client(name) {
 	var dialog=remote.dialog;
 	const options = {
 		type: 'info',
-		title: lang_parse_clientop[lang],
+		title: lang.lang_parse_clientop,
-		message: name+lang_parse_clienttxt[lang],
+		message: name+lang.lang_parse_clienttxt,
-		buttons: [lang_parse_clientno[lang],lang_parse_clientemp[lang], lang_parse_clientmute[lang]]
+		buttons: [lang.lang_parse_clientno,lang.lang_parse_clientemp, lang.lang_parse_clientmute]
 	  }
 	  dialog.showMessageBox(options, function(arg) {
-		if(arg==1){
+		if(arg===1){
 			var cli = localStorage.getItem("client_emp");
 			var obj = JSON.parse(cli);
 			if(!obj){
 				var obj=[];
 				obj.push(name);
-				Materialize.toast(name+lang_status_emphas[lang], 2000);
+				Materialize.toast(name+lang.lang_status_emphas, 2000);
 			}else{
 			var can;
 			Object.keys(obj).forEach(function(key) {
@@ -834,19 +946,19 @@ function client(name) {
 				}else{
 					can=true;
 					obj.splice(key, 1);
-					Materialize.toast(name+lang_status_unemphas[lang], 2000);
+					Materialize.toast(name+lang.lang_status_unemphas, 2000);
 				}
 			});
 			if(!can){
 				obj.push(name);
-				Materialize.toast(name+lang_status_emphas[lang], 2000);
+				Materialize.toast(name+lang.lang_status_emphas, 2000);
 			}else{
 				
 			}
 		}
 			var json = JSON.stringify(obj);
 			localStorage.setItem("client_emp", json);
-		}else if(arg==2){
+		}else if(arg===2){
 			var cli = localStorage.getItem("client_mute");
 			var obj = JSON.parse(cli);
 			if(!obj){
@@ -855,7 +967,7 @@ function client(name) {
 			obj.push(name);
 			var json = JSON.stringify(obj);
 			localStorage.setItem("client_mute", json);
-			Materialize.toast(name+lang_parse_mute[lang], 2000);
+			Materialize.toast(name+lang.lang_parse_mute, 2000);
 		}else{
 			return;
 		}

app/js/tl/poll.js

@@ -0,0 +1,119 @@
+//アンケートのトグル
+function pollToggle() {
+	if ($("#poll").hasClass("hide")) {
+        $("#right-side").show()
+		$("#poll").removeClass("hide")
+	} else {
+        $("#right-side").hide()
+        $("#emoji").addClass("hide")
+		$("#poll").addClass("hide")
+	}
+}
+function pollProviderCk(){
+    $(".poll-provider").addClass("hide");
+    $("#"+$("#poll-sel").val()).removeClass("hide");
+}
+/*
+function pollAddtime(num){
+    var last=$("#expires_in").val();
+    last=last*1-(num*-1);
+    $("#expires_in").val(last);
+    pollCalc();
+}
+*/
+function pollCalc(){
+    var days=$("#days_poll").val();
+    var hrs=$("#hours_poll").val();
+    var mins=$("#mins_poll").val();
+    console.log(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");
+    }else{
+        if(!mul){
+            $('.vote_'+acct_id+'_'+id+' div' ).each(function(i, elem) {
+                if(i==to){
+                    $(this).css("background-color","var(--emphasized)");
+                    $(this).addClass("sel");
+                }else{
+                    $(this).css("background-color","transparent")
+                    $(this).removeClass("sel");
+                }
+            });
+        }else{
+            $('.vote_'+acct_id+'_'+id+'_'+to).css("background-color","var(--emphasized)")
+            $('.vote_'+acct_id+'_'+id+'_'+to).addClass("sel");
+        }
+    }
+    
+}
+function voteMastodon(acct_id,id){
+    var choice=[];
+    $('.vote_'+acct_id+'_'+id+' div' ).each(function(i, elem) {
+        if($(this).hasClass("sel")){
+            choice.push(i+"");
+        }
+    });
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_"+ acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/polls/"+id+"/votes";
+    if(localStorage.getItem("mode_" + domain)=="misskey"){
+        return false;
+    }
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+    httpreq.setRequestHeader('Content-Type', 'application/json');
+    httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+    httpreq.responseType = "json";
+	httpreq.send(JSON.stringify({choices:choice}));
+    httpreq.onreadystatechange = function() {
+		voteMastodonrefresh(acct_id,id)
+	}
+}
+function showResult(acct_id,id){
+    $('.vote_'+acct_id+'_'+id+'_result').toggleClass("hide")
+}
+function voteMastodonrefresh(acct_id,id){
+    var datetype = localStorage.getItem("datetype");
+    if (!datetype) {
+		datetype = "absolute";
+	}
+    var httpreqd = new XMLHttpRequest();
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_"+ acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/polls/"+id;
+	httpreqd.open('GET', start, true);
+	httpreqd.setRequestHeader('Content-Type', 'application/json');
+    httpreqd.responseType = 'json';
+	httpreqd.send(JSON.stringify({i:at,noteId:id}));
+    httpreqd.onreadystatechange = function() {
+		if (httpreqd.readyState == 4) {
+            var json = httpreqd.response;
+            console.log(json);
+            if(!json){
+                return false;
+            }
+            var poll="";
+		    var choices=json.options;
+			var myvote=lang.lang_parse_voted;
+			var result_hide="";
+			Object.keys(choices).forEach(function(keyc) {
+				var choice = choices[keyc];
+				if(!json.voted){
+					votesel='voteSelMastodon(\''+acct_id+'\',\''+json.id+'\','+keyc+','+json.multiple+')';
+				}
+				poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+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="fa fa-calendar-times-o"></i>' +
+            date(json.expires_at, datetype) + '</span>';
+            $('.vote_'+acct_id+'_'+json.id).html(poll)
+		}
+	}
+}

app/js/tl/speech.js

@@ -1,5 +1,5 @@
 $voise        = null;
-    $voiseName    = lang_speech[lang];
+    $voiseName    = lang.lang_speech;
     $voices       = speechSynthesis.getVoices();
     $synthes      = new SpeechSynthesisUtterance();
     $voise = $.grep($voices, function(n, i){return n.name == $voiseName})[0];
@@ -91,7 +91,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_speech_refresh[lang], 3000);
+    Materialize.toast(lang.lang_speech_refresh, 3000);
 }
 function voiceSettingLoad(){
     var speed=localStorage.getItem("voice_speed");

app/js/tl/src.js

@@ -1,10 +1,10 @@
 //検索
 //検索ボックストグル
-function srcToggle() {
+function searchMenu() {
-	$("#src-box").toggleClass("hide");
+	$("#left-menu div").removeClass("active");
-	$("#src-box").toggleClass("show");
+	$("#searchMenu").addClass("active");
-	$("#src-box").css("bottom","40px");
+	$(".menu-content").addClass("hide");
-	$("#src-box").css("left",$('#src-tgl').offset().left-$('#src-box').width()/2+"px");
+    $("#src-box").removeClass("hide");
 	$('ul.tabs').tabs('select_tab', 'src-sta');
 	$("#src-contents").html("");
 }
@@ -98,9 +98,9 @@ function tootsearch(q){
 				}
 			});
 			if(!templete){
-				templete=lang_details_nodata[lang];
+				templete=lang.lang_details_nodata;
 			}
-			$("#src-contents").html("Tootsearch("+lang_src_ts[lang]+")<br>" + templete);
+			$("#src-contents").html("Tootsearch("+lang.lang_src_ts+")<br>" + templete);
 		jQuery("time.timeago").timeago();
 	});
 }
@@ -116,15 +116,15 @@ function graphDraw(tag){
 		var two=50-(his[2].uses/max*50);
 		var one=50-(his[1].uses/max*50);
 		var zero=50-(his[0].uses/max*50);
-		if(max==0){
+		if(max===0){
 			tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">'+
 	'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
-			'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang_src_people[lang];
+			'\',\'add\')" class="pointer">#' + 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 +
-				'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang_src_people[lang];
+				'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
 		}
 		
 	return tags;

app/js/tl/tag.js

@@ -54,10 +54,19 @@ function favTag(){
         var obj = JSON.parse(tagarr);
     }
     var tags="";
+    var nowPT=localStorage.getItem("stable")
     Object.keys(obj).forEach(function(key) {
         var tag = obj[key];
-        tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' +lang_parse_tagTL[lang].replace("{{tag}}" ,'#'+tag)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang_parse_tagtoot[lang].replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
+        if(nowPT!=tag){
-            '<a onclick="autoToot(\'#' + tag + ' \');brInsert(\'#' + tag + ' \')" class="pointer" title="'+lang_tags_always[lang] + lang_parse_tagtoot[lang].replace("{{tag}}" ,'#'+tag) + '">'+lang_tags_realtime[lang]+'</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' +lang_tags_tagunpin[lang].replace("{{tag}}" ,'#'+tag)+ '">'+lang_del[lang]+'</a></span> ';
+            console.log(nowPT+"/"+tag);
+            var ptt=lang.lang_tags_realtime;
+            var nowon="";
+        }else{
+            var ptt=lang.lang_tags_unrealtime;
+            var nowon="("+lang.lang_tags_realtime+")";
+        }
+        tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a>'+nowon+'<span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
+            '<a onclick="autoToot(\'' + tag + '\');" class="pointer" title="'+lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">'+ptt+'</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' +lang.lang_tags_tagunpin.replace("{{tag}}" ,'#'+tag)+ '">'+lang.lang_del+'</a></span> ';
     });
     if(obj.length>0){
         $("#taglist").append("My Tags:" + tags);
@@ -106,6 +115,14 @@ function tagTL(a,b,c,d){
     tl(a,b,acct_id,d);
 }
 function autoToot(tag){
-    localStorage.setItem("stable",tag);
+    var nowPT=localStorage.getItem("stable")
-    Materialize.toast(lang_tags_tagwarn[lang].replace("{{tag}}" ,tag).replace("{{tag}}" ,tag),3000);
+    if(nowPT==tag){
+        localStorage.removeItem("stable");
+        Materialize.toast(lang.lang_tags_unrealtime,3000);
+    }else{
+        localStorage.setItem("stable",tag);
+        Materialize.toast(lang.lang_tags_tagwarn.replace("{{tag}}" ,tag).replace("{{tag}}" ,tag),3000);
+        brInsert('#' + tag+" ")
+    }
+    favTag();
 }

app/js/tl/tl.js

@@ -1,4 +1,5 @@
 //TL取得
+moreloading=false;
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	scrollevent();
 	localStorage.removeItem("morelock");
@@ -47,12 +48,19 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		return;
 	}else if (type == "notf") {
 		//通知なら飛ばす
-		//notf(acct_id, tlid, 'direct');
+		notf(acct_id, tlid, 'direct');
 		$("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem(
 			"user_" + acct_id) + "@" + domain + ")");
 			$("#notice_icon_" + tlid).text("notifications");
 		return;
-	}
+	}/*else if (type == "dm") {
+		//DMなら飛ばす
+		dm(acct_id, tlid, "plus",delc,voice);
+		$("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem(
+			"user_" + acct_id) + "@" + domain + ")");
+			$("#notice_icon_" + tlid).text("notifications");
+		return;
+	}*/
 	localStorage.setItem("now", type);
 	todo(cap(type) + " TL Loading...");
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -80,6 +88,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 			if(type!="noauth"){
 				req.i=at;
 			}
+			
 			if(type=="local-media"||type=="pub-media"){
 				req.mediaOnly=true;
 			}
@@ -271,7 +280,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
 				}
 				
-			} else if (typeA == "update") {
+			} else if (typeA == "update" || typeA == "conversation") {
 				localStorage.removeItem("delete");
 				var obj = JSON.parse(JSON.parse(mess.data).payload);
 				console.log(obj);
@@ -280,7 +289,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 						say(obj.content)
 					}	
 					var templete = parse([obj], type, acct_id, tlid,"",mute);
-					if ($("timeline_box_"+tlid+"_box .tl-box").scrollTop() == 0) {
+					if ($("timeline_box_"+tlid+"_box .tl-box").scrollTop() === 0) {
 						$("#timeline_" + tlid).prepend(templete);
 					}else{
 						var pool = localStorage.getItem("pool_" + tlid);
@@ -359,8 +368,7 @@ function moreload(type, tlid) {
 		var data=obj[tlid].data;
 	}
 	var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
-	if (sid && localStorage.getItem("morelock") != sid) {
+	if (sid && !moreloading) {
-		localStorage.setItem("morelock", sid);
 		if (type == "mix" && localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct_id))!="misskey") {
 			mixmore(tlid,"integrated");
 			return;
@@ -371,6 +379,7 @@ function moreload(type, tlid) {
 			notfmore(tlid);
 			return;
 		}
+		moreloading=true;
 		localStorage.setItem("now", type);
 		todo(cap(type) + " TL MoreLoading");
 		if(type!="noauth"){
@@ -440,7 +449,7 @@ function moreload(type, tlid) {
 			$("#timeline_" + tlid).append(templete);
 			additional(acct_id, tlid);
 			jQuery("time.timeago").timeago();
-			localStorage.removeItem("morelock")
+			moreloading=false;
 			todc();
 		});
 	}
@@ -508,7 +517,7 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == "local-media") {
 		if(localStorage.getItem("local_" + acct_id) && !locale){
-			var response=localStorage.getItem("local_" + acct_id)+"("+lang_tl_media[lang]+")";
+			var response=localStorage.getItem("local_" + acct_id)+"("+lang.lang_tl_media +")";
 		}else{
 			var response="Local TL(Media)";
 		}
@@ -520,7 +529,7 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == "pub-media") {
 		if(localStorage.getItem("public_" + acct_id) && !locale){
-			var response=localStorage.getItem("public_" + acct_id)+"("+lang_tl_media[lang]+")";
+			var response=localStorage.getItem("public_" + acct_id)+"("+lang.lang_tl_media +")";
 		}else{
 			var response="Federated TL(Media)";
 		}
@@ -569,7 +578,7 @@ function com(type, data) {
 		return "tag/" + data + "?"
 	}else if (type == "list") {
 		return "list/" + data + "?"
-	}else if (type="dm") {
+	}else if (type=="dm") {
 		return "direct?"
 	}
 }
@@ -596,22 +605,33 @@ function misskeycom(type, data) {
 //TLのアイコン
 function icon(type) {
 	if (type == "home") {
-		return "home"
+		var response="home";
-	} else if (type == "local" || type == "noauth" || type == "local-media") {
+	} else if (type == "local") {
-		return "people_outline"
+		var response="people_outline";
-	} else if (type == "pub" || type == "pub-media") {
+	} else if (type == "local-media") {
-		return "language"
+		var response="people_outline";
+	} else if (type == "pub") {
+		var response="language";
+	} else if (type == "pub-media") {
+		var response="language";
 	} else if (type == "tag") {
-		return "search"
+		var response="search";
 	} else if (type == "list") {
-		return "view_headline"
+		var response="view_headline";
-	}else if (type == "list") {
+	} else if (type == "notf") {
-		return "subject"
+		var response="notifications";
-	}else if (type == "dm") {
+	} else if (type == "noauth") {
-		return "mail"
+		var response="people_outline";
-	}else if (type == "mix") {
+	} else if (type == "dm") {
-		return "share"
+		var response="mail_outline";
+	} else if (type == "mix") {
+		var response="merge_type";
+	} else if (type == "plus") {
+		var response="merge_type";
+	}else if (type == "webview") {
+		var response="language";
 	}
+	return response;
 }
 function strAlive(){
     var date = new Date() ;
@@ -670,7 +690,6 @@ function reconnector(tlid,type,acct_id,data,mode){
 		}
 		reload(type, '', acct_id, tlid, data, mute, "",voice,mode);
 	}
-	Materialize.toast(lang_tl_reconnect[lang], 2000);
+	Materialize.toast(lang.lang_tl_reconnect, 2000);
 }
-
 strAliveInt()

app/js/ui/img.js

@@ -3,13 +3,14 @@
 function imgv(id, key, acct_id) {
 	$("#imgprog").text(0);
 	$('#imgmodal').hide();
-	$('#imgmodal').attr('src', './img/loading.svg');
+	$('#imgmodal').attr('src', '../../img/loading.svg');
 	var murl = $("#" + id + "-image-" + key).attr("data-url");
 	var type = $("#" + id + "-image-" + key).attr("data-type");
 	$("#imagemodal").attr("data-id",id);
 	$("#imagemodal").attr("data-acct",acct_id);
 	$(document).ready(function() {
 		if (type == "image") {
+			$('#imagemodal').modal('open');
   			xhr = new XMLHttpRequest;
 			xhr.open('GET', murl, true);
 			xhr.addEventListener('progress', function (event) {
@@ -29,7 +30,6 @@ function imgv(id, key, acct_id) {
 			xhr.send();
 			$('#imgmodal').attr('src', murl);
 			$('#imagewrap').dragScroll(); // ドラッグスクロール設定
-			$('#imagemodal').modal('open');
 			$('#imgmodal').show();
 			$('#imagemodal').attr('data-key', key);
 			$('#imagemodal').attr('data-id', id);
@@ -45,61 +45,31 @@ function imgv(id, key, acct_id) {
 			var height = element.naturalHeight;
 			var windowH = $(window).height();
 			var windowW = $(window).width();
-			//小さい画像
+			$("#imagemodal").css("bottom","0")
-			if(width<(windowW - 50) && height<(windowH-1000)){
+			$("#imagemodal img").css("width","auto")
-				$("#imgmodal").css('height',height+"px");
+			if(height<windowH){
-				$("#imgmodal").css('width',width+"px");
+				$("#imagemodal").css("height",height+60+"px")
-				$("#imagewrap").css('height',height+"px");
+				$("#imagemodal img").css("height","100%")
-				$("#imagemodal").css('height',height+100+"px");
+				if(width>windowW*0.8){
-				$("#imagewrap").css('width',width+"px");
+					$("#imagemodal").css("width","80vw")
-				$("#imagemodal").css('width',width+"px");
+					$("#imagemodal img").css("width","100%")
-				$("#imagemodal").css('margin-top',(windowH /2) - (height / 2) +"px");
+					var heightS=windowW*0.8/width*height;
-			}else{
+					$("#imagemodal").css("height",heightS+60+"px")
-				$("#imagemodal").css('margin-top',0);
-				var aspect = width/height;
-				if (aspect < 2.8 && aspect > 0.3){
-					//moderate
-					if(windowW > windowH){
-						//画面が横長(縦幅基準)
-						$("#imgmodal").css('height',windowH/1.2-70+"px");
-						var imgW = (windowH/1.2-70)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH/1.2-60+"px");
-						$("#imagemodal").css('height',windowH/1.2+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
-					}else{
-						//画面が縦長・正方形(横幅基準)
-						$("#imgmodal").css('width',windowW/1.2-30+"px");
-						var imgH = (windowW/1.2-30)/width*height;
-						$("#imgmodal").css('height',imgH+"px");
-						$("#imagewrap").css('width',windowW/1.2+"px");
-						$("#imagemodal").css('width',windowW/1.2+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
-					}
 				}else{
-					//極端な画像
+					$("#imagemodal").css("width",width+"px")
-					if(height > width){
-						//縦長
-						$("#imgmodal").css('height',windowH-60+"px");
-						var imgW = (windowH-50)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH-50+"px");
-						$("#imagemodal").css('height',windowH+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
-					}else{
-						//横長・正方形
-						$("#imgmodal").css('width',windowW-30+"px");
-						var imgH = (windowW-50)/width*height;
-						$("#imgmodal").css('height',imgH+"px");
-						$("#imagewrap").css('width',windowW+"px");
-						$("#imagemodal").css('width',windowW+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
-					}
 				}
+			}else{
+				console.log("long")
+				$("#imagemodal img").css("width","auto")
+				var widthS=windowH/height*width;
+				if(widthS<windowW){
+					$("#imagemodal").css("width",widthS+"px")
+				}else{
+					$("#imagemodal").css("width","100vw")
+				}
+				
+				$("#imagemodal").css("height","100vh")
+				$("#imagemodal img").css("height","calc(100vh - 60px)")
 			}
 			
 		}
@@ -128,12 +98,13 @@ function imgCont(type) {
 	}
 	var murl = $("#" + id + "-image-" + key).attr("data-url");
 	if(murl){
-	$('#imgmodal').attr('src', './img/loading.svg');
+	$('#imgmodal').attr('src', '../../img/loading.svg');
 	var type = $("#" + id + "-image-" + key).attr("data-type");
 	$(document).ready(function() {
 		if (type == "image") {
 			xhr = new XMLHttpRequest;
 			xhr.open('GET', murl, true);
+			xhr.responseType = "arraybuffer";
 			xhr.addEventListener('progress', function (event) {
   			if (event.lengthComputable) {
     			var total=event.total;
@@ -164,70 +135,40 @@ function imgCont(type) {
 			var height = element.naturalHeight;
 			var windowH = $(window).height();
 			var windowW = $(window).width();
-			//小さい画像
+			$("#imagemodal").css("bottom","0")
-			if(width<(windowW - 50) && height<(windowH-1000)){
+			$("#imagemodal img").css("width","auto")
-				$("#imgmodal").css('height',height+"px");
+			if(height<windowH){
-				$("#imgmodal").css('width',width+"px");
+				$("#imagemodal").css("height",height+60+"px")
-				$("#imagewrap").css('height',height+"px");
+				$("#imagemodal img").css("height","100%")
-				$("#imagemodal").css('height',height+100+"px");
+				if(width>windowW*0.8){
-				$("#imagewrap").css('width',width+"px");
+					$("#imagemodal").css("width","80vw")
-				$("#imagemodal").css('width',width+"px");
+					$("#imagemodal img").css("width","100%")
-				$("#imagemodal").css('margin-top',(windowH /2) - (height / 2) +"px");
+					var heightS=windowW*0.8/width*height;
-			}else{
+					$("#imagemodal").css("height",heightS+60+"px")
-				$("#imagemodal").css('margin-top',0);
-				var aspect = width/height;
-				if (aspect < 2.8 && aspect > 0.3){
-					//moderate
-					if(windowW > windowH){
-						//画面が横長(縦幅基準)
-						$("#imgmodal").css('height',windowH/1.2-70+"px");
-						var imgW = (windowH/1.2-70)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH/1.2-60+"px");
-						$("#imagemodal").css('height',windowH/1.2+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
-					}else{
-						//画面が縦長・正方形(横幅基準)
-						$("#imgmodal").css('width',windowW/1.2-30+"px");
-						var imgH = (windowW/1.2-30)/width*height;
-						$("#imgmodal").css('height',imgH+"px");
-						$("#imagewrap").css('width',windowW/1.2+"px");
-						$("#imagemodal").css('width',windowW/1.2+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
-					}
 				}else{
-					//極端な画像
+					$("#imagemodal").css("width",width+"px")
-					if(height > width){
-						//縦長
-						$("#imgmodal").css('height',windowH-60+"px");
-						var imgW = (windowH-50)/height*width;
-						$("#imgmodal").css('width',imgW+"px");
-						$("#imagewrap").css('height',windowH-50+"px");
-						$("#imagemodal").css('height',windowH+"px");
-						$("#imagewrap").css('width',imgW+50+"px");
-						$("#imagemodal").css('width',imgW+50+"px");
-					}else{
-						//横長・正方形
-						$("#imgmodal").css('width',windowW-30+"px");
-						var imgH = (windowW-50)/width*height;
-						$("#imgmodal").css('height',imgH+"px");
-						$("#imagewrap").css('width',windowW+"px");
-						$("#imagemodal").css('width',windowW+"px");
-						$("#imagewrap").css('height',imgH+60+"px");
-						$("#imagemodal").css('height',imgH+120+"px");
-					}
 				}
+			}else{
+				console.log("long")
+				$("#imagemodal img").css("width","auto")
+				var widthS=windowH/height*width;
+				if(widthS<windowW){
+					$("#imagemodal").css("width",widthS+"px")
+				}else{
+					$("#imagemodal").css("width","100vw")
+				}
+				
+				$("#imagemodal").css("height","100vh")
+				$("#imagemodal img").css("height","calc(100vh - 60px)")
 			}
 		}
-		if ($("#" + id + "-image-" + (key * 1 + 1)).length == 0) {
+		if ($("#" + id + "-image-" + (key * 1 + 1)).length === 0) {
 			$("#image-next").prop("disabled", true);
 		} else {
 			$("#image-next").prop("disabled", false);
 		}
 		console.log("#" + id + "-image-" + (key * 1 - 1));
-		if ($("#" + id + "-image-" + (key * 1 - 1)).length == 0) {
+		if ($("#" + id + "-image-" + (key * 1 - 1)).length === 0) {
 			$("#image-prev").prop("disabled", true);
 		} else {
 			$("#image-prev").prop("disabled", false);
@@ -288,7 +229,7 @@ function zoom(z) {
 			'cursor': 'move'
 		}); //指が触れたか検知
 		$(this).on('touchmove', function(event) {
-			if ($(target).data('down') == true) {
+			if ($(target).data('down') === true) {
 				// スクロール
 				console.log($(target).data('x'));
 				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') -

app/js/ui/layout.js

@@ -7,13 +7,18 @@ var websocketLocal = [];
 var websocketNotf = [];
 
 //カラム追加ボックストグル
-function addToggle() {
+function addColumnMenu() {
-	$("#add-box").toggleClass("hide");
+	$("#left-menu div").removeClass("active");
+	$("#addColumnMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+    $("#add-box").removeClass("hide");
 	addselCk()
-	$("#add-box").css("bottom","40px");
-	$("#add-box").css("left",$('#add-tgl').offset().left-$('#add-box').width()/2+"px");
-	$("#add-box").toggleClass("show");
 }
+$('.type').click(function() {
+	$(".type").removeClass("active");
+	$(this).addClass("active");
+	$("#type-sel").val($(this).attr("data-type"))
+})
 //最初、カラム変更時に発火
 function parseColumn() {
 	console.log("parse");
@@ -59,7 +64,6 @@ function parseColumn() {
 			domain: 0,
 			type: 'local'
 		}];
-		localStorage.setItem("card_0","true");
 		var json = JSON.stringify(obj);
 		localStorage.setItem("column", json);
 	} else {
@@ -78,14 +82,14 @@ function parseColumn() {
 			var if_notf="";
 		}
 		if(localStorage.getItem("notification_" + acct.domain)){
-			var unique_notf=lang_layout_thisacct[lang].replace("{{notf}}" ,localStorage.getItem("notification_" + acct.domain));
+			var unique_notf=lang.lang_layout_thisacct.replace("{{notf}}" ,localStorage.getItem("notification_" + acct.domain));
 		}else{
-			if(lang=="ja"){
+			if(lang.language=="ja"){
 				var notflocale="通知";
-			}else if(lang=="en"){
+			}else if(lang.language=="en"){
 				var notflocale="Notification";
 			} 
-			var unique_notf=lang_layout_thisacct[lang].replace("{{notf}}" ,notflocale);
+			var unique_notf=lang.lang_layout_thisacct.replace("{{notf}}" ,notflocale);
 		}
 		var insert="";
 		var icnsert="";
@@ -107,7 +111,7 @@ function parseColumn() {
 		console.log(acct.domain);
 		if(acctlist[acct.domain]){
 			if(acctlist[acct.domain].background!="def"){
-				insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background;
+				insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background+";";
 			}
 		}
 		if(acct.type=="notf" && localStorage.getItem("setasread")=="no"){
@@ -116,32 +120,61 @@ function parseColumn() {
 			localStorage.removeItem("hasNotfC_" + acct.domain);
 		}
 		if(acct.type=="webview"){
-			var html =webview("https://tweetdeck.twitter.com",key,insert,icnsert);
+			if(localStorage.getItem("fixwidth")){
+				var fixwidth=localStorage.getItem("fixwidth");
+				var css=" min-width:"+fixwidth+"px;"
+			}else{
+				var css="";
+			}
+			var html =webview("https://tweetdeck.twitter.com",key,insert,icnsert,css);
 			$("#timeline-container").append(html);
 		}else{
-		var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
+			var width = localStorage.getItem("width");
-			'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
+		if (width) {
-			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang_layout_gotop[lang]+'"></i></div>'+
+			var css=" min-width:"+width+"px;"
+		}
+		var anime = localStorage.getItem("animation");
+		if (anime=="yes" || !anime) {
+			var animecss="box-anime";
+		}else{
+			var animecss="";
+		}
+		if(acct.type=="notf"){
+			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fa fa-share exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fa fa-star exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fa fa-retweet exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fa fa-users exc-icons"></i></label> '+
+			'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>';
+		}else if(acct.type=="home"){
+			var exclude='<a onclick="ebtToggle(' + key +
+			')" class="setting nex"><i class="fa fa-retweet waves-effect nex" title="'+lang.lang_layout_excludingbt +'" style="font-size:24px"></i><span id="sta-bt-' +
+			key + '">Off</span></a>'+lang.lang_layout_excludingbt+'<br>';
+		}else{
+			var exclude="";
+		}
+		var html = '<div style="'+css+'" class="box '+animecss+'" id="timeline_box_' + key + '_box" tlid="' + key +
+			'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+' ">'+
+			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang.lang_layout_gotop +'"></i></div>'+
 			'<div class="area-notice_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_' +
 						  acct.domain + '">notifications</i></div><div class="area-sta"><span class="new badge teal notf-reply_'+acct.domain+' hide" data-badge-caption="Reply">0</span><span class="new badge yellow black-text notf-fav_'+acct.domain+' hide" data-badge-caption="Fav">0</span><span class="new badge blue notf-bt_'+acct.domain+' hide" data-badge-caption="BT">0</span><span class="new badge orange notf-follow_'+acct.domain+' hide" data-badge-caption="Follow">0</span></a></div>'+
 			'<div class="area-a2"><a onclick="removeColumn(' + key +
-						  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang_layout_delthis[lang]+'"'+icnsert+'>cancel</i></a></div>'+
+						  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_delthis +'"'+icnsert+'>cancel</i></a></div>'+
 		  '<div class="area-a3"><a onclick="setToggle(' + key +
-		  ')" class="setting nex" title="'+lang_layout_setthis[lang]+'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
+		  ')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
 		  '<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 		  '"><div id="notifications_' + key +
 		  '" data-notf="' + acct.domain + '" data-type="notf"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
-		  '" style="padding:5px;"><a onclick="mediaToggle(' + key +
+		  '" style="padding:5px;">'+exclude+'<a onclick="mediaToggle(' + key +
-		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang_layout_mediafil[lang]+'">perm_media</i><span id="sta-media-' +
+		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_mediafil +'">perm_media</i><span id="sta-media-' +
-		  key + '">On</span></a>'+lang_layout_mediafil[lang]+'<br><a onclick="cardToggle(' + key +
+		  key + '">On</span></a>'+lang.lang_layout_mediafil +'<br><a onclick="cardToggle(' + key +
-		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang_layout_linkanades[lang]+'">link</i><span id="sta-card-' +
+		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_linkanades +'">link</i><span id="sta-card-' +
-		  key + '">On</span></a>'+lang_layout_linkana[lang]+'<br><a onclick="voiceToggle(' + key +
+		  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_layout_tts[lang]+'">hearing</i><span id="sta-voice-' +
+		  ')" 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_layout_tts[lang]+'TL<br><a onclick="reconnector(' + key +
+		  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_layout_reconnect[lang]+'">low_priority</i></a><span class="'+if_notf+'">'+lang_layout_reconnect[lang]+'</span><br>'+lang_layout_headercolor[lang]+'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + 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 +
-			'" class="tl" tlid="' + key + '"'+notf_attr+' data-type="' + acct.type + '"><div id="landing_'+key+'" style="text-align:center">'+lang_layout_nodata[lang]+'</div></div></div></div>';
+			'" 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></div>';
 		$("#timeline-container").append(html);
 		localStorage.removeItem("pool_" + key);
 		if (acct.data) {
@@ -162,15 +195,12 @@ function parseColumn() {
 		}
 		tl(acct.type, data, acct.domain, key, delc,voice,"");
 		cardCheck(key);
+		ebtCheck(key);
 		mediaCheck(key);
 		catchCheck(key);
 		voiceCheck(key);
 		}
 	});
-	var width = localStorage.getItem("width");
-	if (width) {
-		$(".box").css("min-width", width + "px");
-	}
 	var box = localStorage.getItem("box");
 	if (box == "absolute") {
 		setTimeout(show, 1000);
@@ -239,12 +269,10 @@ function addColumn() {
 	var obj = JSON.parse(multi);
 	if(!obj){
 		var leng=0;
-		localStorage.setItem("card_" + leng,"true");
 		var json = JSON.stringify([add]);
 		localStorage.setItem("column", json);
 	}else{
 		var leng=obj.length;
-		localStorage.setItem("card_" + leng,"true");
 		obj.push(add);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("column", json);
@@ -269,11 +297,9 @@ function addselCk(){
 		$("#webview-add").addClass("hide");
 	}
 	if(domain=="knzk.me" || domain=="mstdn.y-zu.org"){
-		$("#type-sel").append('<option value="dm" data-trans="dm" id="direct-add">'+lang_layout_dm[lang]+'</option>');
+		$("#type-sel").append('<option value="dm" data-trans="dm" id="direct-add">'+lang.layout_dm +'</option>');
-		$('#type-sel').material_select('update');
 	}else{
 		$("#direct-add").remove();
-		$('#type-sel').material_select('update');
 	}
 }
 //カラム削除
@@ -288,7 +314,7 @@ function removeColumn(tlid) {
 	ipc.send('column-del', "");
 	ipc.on('column-del-reply', function (event, arg) {
 		console.log(arg);
-		if(arg==1){
+		if(arg===1){
 			localStorage.removeItem("card_" + tlid);
 			obj.splice(tlid, 1);
 			for(var i=0;i<obj.length;i++){
@@ -382,19 +408,19 @@ function coloradd(key,bg,txt){
 	}
 }
 //禁断のTwitter
-function webview(url,key,insert,icnsert){
+function webview(url,key,insert,icnsert,css){
 	var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
-			'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
+			'" style="'+css+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
 			'<div class="area-notice"><i class="fa fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
 			'<div class="area-notice_name tl-title">WebView('+url+')</div>'+
-			'<div class="area-sta"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">'+lang_layout_webviewmode[lang]+'</label></div>'+
+			'<div class="area-sta"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">'+lang.lang_layout_webviewmode +'</label></div>'+
 			'<div class="area-a2"><a onclick="removeColumn(' + key +
-						  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang_layout_delthis[lang]+'"'+icnsert+'>cancel</i></a></div>'+
+						  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_delthis +'"'+icnsert+'>cancel</i></a></div>'+
 		  '<div class="area-a3"><a onclick="setToggle(' + key +
-		  ')" class="setting nex" title="'+lang_layout_setthis[lang]+'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
+		  ')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
 		  '<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 		  '"></div><div class="column-hide notf-indv-box" id="util-box_' + key +
-		  '" style="padding:5px;">'+lang_layout_headercolor[lang]+'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:calc(100% - 110px);"><div id="timeline_' + key +
+		  '" style="padding:5px;">'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:calc(100% - 110px);"><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;

app/js/ui/menu.js

@@ -0,0 +1,51 @@
+function menu(){
+    if(!$("#menu").hasClass("appear")){
+        $("#menu").addClass("appear")
+        var left=localStorage.getItem("menu-left");
+        if(left>$('body').width()-$('#menu').width()){
+          left=$('body').width()-$('#menu').width();
+        }else if(left<0){
+            left=0;
+        }
+        var top=localStorage.getItem("menu-top");
+        if(top>$('body').height()-$('#menu').height()){
+            top=$('body').height()-$('#menu').height();
+        }else if(top<0){
+            top=0;
+        }
+        $('#menu').css("left",left+"px")
+        $('#menu').css("top",top+"px")
+        $('#menu').fadeIn();
+        $("#menu-bar").html("TheDesk "+localStorage.getItem("ver"));
+        $(".menu-content").addClass("hide");
+        $("#add-box").removeClass("hide");
+    }else{
+        $('#menu').fadeOut()
+        $("#menu").removeClass("appear")
+    }
+    
+}
+$(function() {
+    $( "#menu" ).draggable({handle: "#menu-bar",
+      stop: function() {
+      var left=$('#menu').offset().left;
+      if(left>$('body').width()-$('#menu').width()){
+        left=$('body').width()-$('#menu').width();
+      }else if(left<0){
+          left=0;
+      }
+      var top=$('#menu').offset().top;
+      if(top>$('body').height()-$('#menu').height()){
+          top=$('body').height()-$('#menu').height();
+      }else if(top<0){
+          top=0;
+      }
+        localStorage.setItem("menu-left",left);
+        localStorage.setItem("menu-top",top);
+      }
+    });
+  });
+function help(){
+    const {shell} = require('electron');
+	shell.openExternal("https://docs.thedesk.top");
+}

app/js/ui/post-box.js

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

app/js/ui/scroll.js

@@ -10,7 +10,7 @@ function scrollck() {
 	$(".tl-box").each(function(i, elem) {
 		var tlid = $(this).attr('tlid');
 		//一番上ならためていた新しいトゥートを表示
-		if ($(this).scrollTop() == 0) {
+		if ($(this).scrollTop() === 0) {
 			var pool = localStorage.getItem("pool_" + tlid);
 			if (pool) {
 				$("#timeline_" + tlid).prepend(pool);
@@ -28,6 +28,7 @@ function scrollck() {
 		var scrt = $(this).find(".tl").height() - $(window).height();
 		var scr = $(this).scrollTop();
 		if (scr > scrt) {
+			console.log("kicked");
 			moreload('', tlid);
 		}
 	});

app/js/ui/settings.js

@@ -1,420 +1,133 @@
 //設定(setting.html)で読む
+var envView = new Vue({
+	el: '#envView',
+	data: {config:envConstruction},
+	methods: {
+		complete: function (i,val) {
+			var ls=envView.config[i].storage;
+			Materialize.toast("Complete", 3000);
+			if(!val){
+				var id=envView.config[i].id;
+				var val=$("#"+id).val()
+			}
+			localStorage.setItem(ls,val)
+			if(ls=="ha"){
+				hardwareAcceleration(val)
+			}
+			return true
+		}
+	}
+});
+var tlView = new Vue({
+	el: '#tlView',
+	data: {config:tlConstruction},
+	methods: {
+		complete: function (i,val) {
+			var ls=tlView.config[i].storage;
+			if(!val){
+				var id=tlView.config[i].id;
+				var val=$("#"+id).val()
+			}
+			Materialize.toast("Complete", 3000);
+			localStorage.setItem(ls,val)
+			return true
+		}
+	}
+});
+var postView = new Vue({
+	el: '#postView',
+	data: {config:postConstruction,kirishima:localStorage.getItem('kirishima')},
+	methods: {
+		complete: function (i,val) {
+			var ls=postView.config[i].storage;
+			Materialize.toast("Complete", 3000);
+			if(!val){
+				var id=postView.config[i].id;
+				var val=$("#"+id).val()
+			}
+			localStorage.setItem(ls,val)
+			return true
+		}
+	}
+});
 //設定ボタン押した。
 function settings() {
-	var dd = $("[name=time]:checked").val();
-	var dt = $("[for="+dd+"]").text();
-		if (dd != localStorage.getItem("datetype")) {
-		Materialize.toast(lang_setting_time[lang].replace("{{set}}" ,dt), 3000);
-	}
-	localStorage.setItem("datetype", dd);
-
 	var cd = $("[name=theme]:checked").val();
 	var ct = $("[for="+cd+"]").html();
-	if (cd != localStorage.getItem("theme")) {
+	if(cd=="custom" && !$("#custom-sel-sel").val()){
-		Materialize.toast(lang_setting_theme[lang].replace("{{set}}" ,ct), 3000);
+		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);
 	}
-	//テーマはこの場で設定
-	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_setting_nsfw[lang].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_setting_cw[lang].replace("{{set}}" ,cwt), 3000);
-	}
-	localStorage.setItem("cw", cwd);
-
-	var cwtd = $("#cw-text").val();
-	if (cwtd != localStorage.getItem("cw-text")) {
-		Materialize.toast(lang_setting_cwtext[lang].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_setting_cws[lang].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_setting_rp[lang].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_setting_vis[lang].replace("{{set}}" ,vist), 3000);
-	}
-	localStorage.setItem("vis", visd);
-
-	var popd = $("#popup").val();
-	if (popd > 0 && popd != localStorage.getItem("popup")) {
-		Materialize.toast(lang_setting_popup[lang].replace("{{set}}" ,popd+lang_setting_s[lang]), 3000);
-	} else if (popd != localStorage.getItem("popup")) {
-		Materialize.toast(lang_setting_popup[lang].replace("{{set}}" ,lang_setting_off[lang]), 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_setting_gif[lang].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_setting_selt[lang].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_setting_autocw[lang].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_setting_width[lang].replace("{{set}}" ,widthd), 3000);
-	}
-	localStorage.setItem("width", widthd);
-
-	var imgd = $("[name=img]:checked").val();
-	var imgt = $("[for=i_"+imgd+"]").text();
-	if (imgd != localStorage.getItem("img")) {
-		Materialize.toast(lang_setting_img[lang].replace("{{set}}" ,imgt), 3000);
-	}
-	localStorage.setItem("img", imgd);
-
 	var fontd = $("#font").val();
 	if(fontd){
 		if (fontd != localStorage.getItem("font")) {
-			Materialize.toast(lang_setting_font[lang].replace("{{set}}" ,fontd), 3000);
+			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_setting_font[lang].replace("{{set}}" ,lang_setting_default[lang]), 3000);
+			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_setting_size[lang].replace("{{set}}" ,sized), 3000);
-	}
-	localStorage.setItem("size", sized);
-
-	var heid = $("#img-height").val();
-	if (heid != localStorage.getItem("img-height")) {
-		Materialize.toast(lang_setting_imgheight[lang].replace("{{set}}" ,heid), 3000);
-	}
-	localStorage.setItem("img-height", heid);
-
-	var boxd = $("[name=box]:checked").val();
-	var boxt = $("[for=bx_"+boxd+"]").text();
-	if (boxd != localStorage.getItem("box")) {
-		Materialize.toast(lang_setting_box[lang].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_setting_tag[lang].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_setting_ul[lang].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_setting_notf[lang].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_setting_quote[lang].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_setting_via[lang].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_setting_setasread[lang].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_setting_mov[lang].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_setting_main[lang].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_setting_sec[lang].replace("{{set}}" ,sect), 3000);
-	}
-	localStorage.setItem("sec", secd);
 }
 
 //読み込み時の設定ロード
 function load() {
+	var max=envView.config.length;
+	for(var i=0;i<max;i++){
+		var ls=envView.config[i].storage;
+		envView.config[i].setValue=localStorage.getItem(ls)
+	}
+	var max=tlView.config.length;
+	for(var i=0;i<max;i++){
+		var ls=tlView.config[i].storage;
+		tlView.config[i].setValue=localStorage.getItem(ls)
+	}
+	var max=postView.config.length;
+	for(var i=0;i<max;i++){
+		var ls=postView.config[i].storage;
+		postView.config[i].setValue=localStorage.getItem(ls)
+	}
 	if(localStorage.getItem("imas")){
 		$(".imas").removeClass("hide");
 	}
 	if(localStorage.getItem("kirishima")){
 		$(".kirishima").removeClass("hide");
 	}
-	var prof = localStorage.getItem("prof");
-	$("#my-prof").attr("src", prof);
-	var datetype = localStorage.getItem("datetype");
-	if (!datetype) {
-		var datetype = "absolute";
-	}
-	$("#" + datetype).prop("checked", true);
-
 	var theme = localStorage.getItem("theme");
 	if (!theme) {
 		var theme = "white";
 	}
 	$("#" + theme).prop("checked", true);
-
-	var nsfw = localStorage.getItem("nsfw");
-	if (!nsfw) {
-		var nsfw = "yes";
-	}
-	$("#n_" + nsfw).prop("checked", true);
-
-	var cw = localStorage.getItem("cw");
-	if (!cw) {
-		var cw = "yes";
-	}
-	$("#c_" + cw).prop("checked", true);
-
-	var cws = localStorage.getItem("always-cw");
-	if (!cws) {
-		var cws = "no";
-	}
-	$("#cws_" + cws).prop("checked", true);
-
-	var popup = localStorage.getItem("popup");
-	if (!popup) {
-		var popup = "0";
-	}
-	$("#popup").val(popup);
-
-	var box = localStorage.getItem("box");
-	if (!box) {
-		var box = "no";
-	}
-	if(box=="absolute"){
-		var box = "abs";
-	}
-	$("#bx_" + box).prop("checked", true);
-
-	var gif = localStorage.getItem("gif");
-	if (!gif) {
-		var gif = "yes";
-	}
-	$("#g_" + gif).prop("checked", true);
-
-	var sent = localStorage.getItem("sentence");
-	if (!sent) {
-		var sent = "500";
-	}
-	$("#sentence").val(sent);
-	var ltrs = localStorage.getItem("letters");
-	if (!ltrs) {
-		var ltrs = "500";
-	}
-	$("#letters").val(ltrs);
-
-	var csent = localStorage.getItem("cw_sentence");
-	if (!csent) {
-		var csent = "500";
-	}
-	$("#cw_sentence").val(csent);
-	var cltrs = localStorage.getItem("cw_letters");
-	if (!cltrs) {
-		var cltrs = "500";
-	}
-	$("#cw_letters").val(cltrs);
-
-	var width = localStorage.getItem("width");
-	if (!width) {
-		var width = "300";
-	}
-	$("#width").val(width);
-
-	var cwt = localStorage.getItem("cw-text");
-	if (!cwt) {
-		var cwt = "";
-	}
-	$("#cw-text").val(cwt);
-
-	var cws = localStorage.getItem("always-cw");
-	if (!cws) {
-		var cws = "no";
-	}
-	$("#cws_" + cws).prop("checked", true);
-
-	var rps = localStorage.getItem("replyct");
-	if (!rps) {
-		var rps = "hidden";
-	}
-	$("#rp_" + rps).prop("checked", true);
-
-	var vis = localStorage.getItem("vis");
-	if (!vis) {
-		var vis = "public";
-	}
-	$("#" + vis).prop("checked", true);
-
-	var img = localStorage.getItem("img");
-	if (!img) {
-		var img = "no-act";
-	}
-	$("#i_" + img).prop("checked", true);
-	
 	var font = localStorage.getItem("font");
 	if (!font) {
 		var font = "";
 	}
 	$("#font").val(font);
-
-	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 tag = localStorage.getItem("tag-range");
-	if (!tag) {
-		var tag = "all";
-	}
-	$("#t_" + tag).prop("checked", true);
-
-	var box = localStorage.getItem("box");
-	if (!box) {
-		var box = "yes";
-	}
-	$("#bx_" + box).prop("checked", true);
-
-	var uld = localStorage.getItem("locale");
-	if (!uld) {
-		var uld = "yes";
-	}
-	$("#ul_" + uld).prop("checked", true);
-
-	var nnd = localStorage.getItem("nativenotf");
-	if (!nnd) {
-		var nnd = "yes";
-	}
-	$("#ntf_" + nnd).prop("checked", true);
-
-	var qt = localStorage.getItem("quote");
-	if (!qt) {
-		var qt = "simple";
-	}
-	$("#q_" + qt).prop("checked", true);
-
-	var viat = localStorage.getItem("viashow");
-	if (!viat) {
-		var viat = "hide";
-	}
-	$("#via_" + viat).prop("checked", true);
-
-	var movt = localStorage.getItem("mouseover");
-	if (!movt) {
-		var movt = "no";
-	}
-	$("#mov_" + movt).prop("checked", true);
-
-	var notfmt = localStorage.getItem("setasread");
-	if (!notfmt) {
-		var notfmt = "yes";
-	}
-	$("#notfm_" + notfmt).prop("checked", true);
-
-	var maint = localStorage.getItem("mainuse");
-	if (!maint) {
-		var maint = "remain";
-	}
-	$("#mn_" + maint).prop("checked", true);
-
-	var sect = localStorage.getItem("sec");
-	if (!sect) {
-		var sect = "nothing";
-	}
-	$("#sec-" + sect).prop("checked", true);
 }
-//最初に読む
+
-load();
-climute();
-wordmute();
-wordemp();
-checkSpotify();
-voiceSettingLoad();
-oksload();
 function climute(){
 	//クライアントミュート
 	var cli = localStorage.getItem("client_mute");
 	var obj = JSON.parse(cli);
 	if(!obj){
-		$("#mute-cli").html(lang_setting_nomuting[lang]);
+		$("#mute-cli").html(lang.lang_setting_nomuting);
 	}else{
 		if(!obj[0]){
-			$("#mute-cli").html(lang_setting_nomuting[lang]);
+			$("#mute-cli").html(lang.lang_setting_nomuting);
 			return;
 		}
 	var templete;
@@ -424,7 +137,7 @@ function climute(){
 		templete = '<div class="acct" id="acct_' + key + '">' + list +
 			'.' +
 			cli + '<button class="btn waves-effect red disTar" onclick="cliMuteDel(' +
-			key + ')">'+lang_del[lang]+'</button><br></div>';
+			key + ')">'+lang.lang_del+'</button><br></div>';
 		$("#mute-cli").append(templete);
 	});
 }
@@ -468,20 +181,20 @@ function notftest(){
 		var ipc = electron.ipcRenderer;
 		var os = electron.remote.process.platform;
 		var options = {
-				body: lang_setting_notftest[lang]+'('+lang_setting_notftestprof[lang]+')',
+				body: lang.lang_setting_notftest+'('+lang.lang_setting_notftestprof+')',
 				icon: localStorage.getItem("prof_0")
 		  };
 		if(os=="darwin"){
-			var n = new Notification('TheDesk'+lang_setting_notftest[lang], options);
+			var n = new Notification('TheDesk'+lang.lang_setting_notftest, options);
 		}else{
-			ipc.send('native-notf', ['TheDesk'+lang_setting_notftest[lang],lang_setting_notftest[lang]+'('+lang_setting_notftestprof[lang]+')',localStorage.getItem('prof_0'),"",""]);
+			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_setting_ksref[lang], 3000);
+	Materialize.toast(lang.lang_setting_ksref, 3000);
 }
 function oksload(){
 	if(localStorage.getItem("oks-1")){$("#oks-1").val(localStorage.getItem("oks-1"))}
@@ -497,7 +210,7 @@ function changelang(lang){
 	});
 }
 function exportSettings(){
-	if(!confirm(lang_setting_exportwarn[lang])){
+	if(!confirm(lang.lang_setting_exportwarn)){
 		return false;
 	}
 	var electron = require("electron");
@@ -507,7 +220,7 @@ function exportSettings(){
 	dialog.showSaveDialog(null, {
 		title: 'Export',
 		properties: ['openFile', 'createDirectory'],
-		defaultPath: "export.thedeskconfig"
+		defaultPath: "export.thedeskconfigv2"
 	}, (savedFiles) => {
 		console.log(savedFiles);
 		if(!savedFiles){
@@ -523,20 +236,27 @@ function exportSettings(){
 		var column = JSON.parse(multi);
 		exp.columns=column;
 		//Themes
-		exp.theme=localStorage.getItem("theme");
+		var config={};
-		//Min width
+		config.theme=localStorage.getItem("theme");
-		exp.minwidth=localStorage.getItem("width");
+		//Other configs
+		var max=envView.config.length;
+		for(var i=0;i<max;i++){
+			var ls=envView.config[i].storage;
+			config[ls]=localStorage.getItem(ls)
+		}
+		var max=tlView.config.length;
+		for(var i=0;i<max;i++){
+			var ls=tlView.config[i].storage;
+			config[ls]=localStorage.getItem(ls)
+		}
+		var max=postView.config.length;
+		for(var i=0;i<max;i++){
+			var ls=postView.config[i].storage;
+			config[ls]=localStorage.getItem(ls)
+		}
 		//Font
-		exp.font=localStorage.getItem("font");
+		config.font=localStorage.getItem("font");
-		exp.size=localStorage.getItem("size");
+		exp.config=config;
-		//Img height
-		exp.imgheight=localStorage.getItem("img-height");
-		//Main
-		exp.mainuse=localStorage.getItem("mainuse");
-		//CW text
-		exp.cw=localStorage.getItem("cw-text");
-		//vis
-		exp.vis=localStorage.getItem("vis");
 		//keysc
 		exp.ksc=[
 			localStorage.getItem("oks-1"),
@@ -571,7 +291,7 @@ function exportSettings(){
 	});
 }
 function importSettings(){
-	if(!confirm(lang_setting_importwarn[lang])){
+	if(!confirm(lang.lang_setting_importwarn)){
 		return false;
 	}
 	var electron = require("electron");
@@ -582,7 +302,7 @@ function importSettings(){
 		title: 'Import',
 		properties: ['openFile'],
 		filters: [
-			{name: 'TheDesk Config', extensions: ['thedeskconfig']},
+			{name: 'TheDesk Config', extensions: ['thedeskconfig','thedeskconfigv2']},
 		]
 	}, (fileNames) => {
 		console.log(fileNames);
@@ -605,26 +325,53 @@ function importSettings(){
 					localStorage.setItem("acct_"+ key + "_at", acct.at);
 				}
 				localStorage.setItem("column",JSON.stringify(obj.columns));
-				localStorage.setItem("theme",obj.theme);
+				if(obj.config){
-				if(obj.width){
+					//Version 2
-					console.log(obj.width)
+					var max=envView.config.length;
-					localStorage.setItem("width",obj.width);
+					for(var i=0;i<max;i++){
+						var ls=envView.config[i].storage;
+						if(obj.config[ls]){
+							localStorage.setItem(ls,obj.config[ls])
+						}
+					}
+					var max=tlView.config.length;
+					for(var i=0;i<max;i++){
+						var ls=tlView.config[i].storage;
+						if(obj.config[ls]){
+							localStorage.setItem(ls,obj.config[ls])
+						}
+					}
+					var max=postView.config.length;
+					for(var i=0;i<max;i++){
+						var ls=postView.config[i].storage;
+						if(obj.config[ls]){
+							localStorage.setItem(ls,obj.config[ls])
+						}
+					}
+				}else{
+					//Version 1
+					localStorage.setItem("theme",obj.theme);
+					if(obj.width){
+						console.log(obj.width)
+						localStorage.setItem("width",obj.width);
+					}
+					if(obj.font){
+						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);
+					//End
 				}
-				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]);
 				}
@@ -668,4 +415,230 @@ function savefolder(){
 	}, (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(had){
+	console.log("ha");
+	ipc.send('ha', had);
+}
+
+ipc.on('theme-json-create-complete', function (event, args) {
+	$("#custom_import").val("");
+	ctLoad()
+});
+window.onload = function() {
+	//最初に読む
+load();
+climute();
+wordmute();
+wordemp();
+checkSpotify();
+voiceSettingLoad();
+oksload();
+npprovider();
+ctLoad()
+  };

app/js/ui/settings.old.js

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

app/js/ui/sort.js

@@ -32,9 +32,9 @@ function sortload(){
 				var acctdata=user+"@"+domain;
 			}
 			
-			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><a onclick="goColumn(' + key +
+			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><div class="sorticon"><i class="material-icons">'+icon(acct.type)+'</i></div><div class="sorttitle">'+cap(acct.type, acct.data,acct.domain)+'</div><div class="sortaction"><a onclick="goColumn(' + key +
-			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムへ">forward</i></a> <a onclick="removeColumn(' + key +
+			')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_sort_gothis+'">forward</i></a> <a onclick="removeColumn(' + key +
-			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a><br>'+acctdata+" "+cap(acct.type, acct.data,acct.domain)+'</li>';
+			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">'+acctdata+'</div></li>';
 			$("#sort").append(html);
 		});
 		drag();
@@ -104,18 +104,14 @@ function sort(){
 	Materialize.toast("並べ替え完了。", 3000);
 	sortload();
 	parseColumn();
-	sortToggle()
+	sortMenu()
 }
 //ソートボタントグル
-function sortToggle(){
+function sortMenu(){
+	$("#left-menu div").removeClass("active");
+	$("#sortMenu").addClass("active");
+	$(".menu-content").addClass("hide");
+    $("#sort-box").removeClass("hide");
 	$("#sort").html("");
-	if ($("#sort-box").hasClass("hide")) {
+	sortload();
-		$("#sort-box").removeClass("hide");
-		$("#sort-box").addClass("show");
-		//並べ替え
-		sortload();
-	} else {
-		$("#sort-box").addClass("hide");
-		$("#sort-box").removeClass("show");
-	}
 }

app/js/ui/spotify.js

@@ -57,10 +57,10 @@ function spotifyFlagSave(){
     var awk = $("[name=awk]:checked").val();
     if(awk=="yes"){
         localStorage.setItem("artwork","yes");
-        Materialize.toast(lang_spotify_img[lang], 3000);
+        Materialize.toast(lang.lang_spotify_img, 3000);
     }else{
         localStorage.removeItem("artwork");
-        Materialize.toast(lang_spotify_imgno[lang], 3000);
+        Materialize.toast(lang.lang_spotify_imgno, 3000);
     }
 }
 function nowplaying(mode){
@@ -118,7 +118,7 @@ function nowplaying(mode){
             $("#textarea").val(content);
         });
         }else{
-            alert(lang_spotify_acct[lang]);
+            alert(lang.lang_spotify_acct);
         }
     }else if(mode=="itunes"){
         var electron = require("electron");
@@ -130,6 +130,10 @@ function nowplaying(mode){
             if(!content || content=="" || content=="null"){
                 var content="#NowPlaying {song} / {album} / {artist}\n{url}";
             }
+            var flag=localStorage.getItem("artwork");
+            if(flag && arg.path){
+                media(arg.path,"image/png","new");
+            }
             var regExp = new RegExp("{song}", "g");
             content = content.replace(regExp, arg.name);
             var regExp = new RegExp("{album}", "g");
@@ -158,7 +162,26 @@ function nowplaying(mode){
 function spotifySave(){
     var temp=$("#np-temp").val();
     localStorage.setItem("np-temp", temp);
-    Materialize.toast(lang_spotify_np[lang], 3000);
+    Materialize.toast(lang.lang_spotify_np, 3000);
+}
+function npprovider(){
+    var provd = $("[name=npp]:checked").val();
+    if(!provd){
+        if (localStorage.getItem("np_provider")) {
+            $("[value="+localStorage.getItem("np_provider")+"]").prop("checked", true);
+        }else{
+            $("[value=AIMP]").prop("checked", true);
+            localStorage.setItem("np_provider", "AIMP");
+        }
+    }else{
+        if (provd != localStorage.getItem("np_provider")) {
+            Materialize.toast(lang.lang_setting_npprovide.replace("{{set}}" ,provd), 3000);
+        }
+        localStorage.setItem("np_provider", provd);
+        var electron = require("electron");
+        var ipc = electron.ipcRenderer;
+        ipc.send('itunes', ["set",provd]);
+    }
 }
 if(location.search){
     var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);

app/js/ui/theme.js

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

app/js/ui/tips.js

@@ -142,7 +142,7 @@ function spotifytips(){
 			spotint=setInterval(spotStart, 1000);
         });
         }else{
-            alert(lang_spotify_acct[lang]);
+            alert(lang.lang_spotify_acct);
         }
 }
 function spotStart(){

app/js/userdata/his-data.js

@@ -53,7 +53,7 @@ function utl(user, more, acct_id) {
 			var templete = parse(json, '', acct_id, 'user');
 		}
 		if(!json[0]){
-			templete=lang_details_nodata[lang]+"<br>";
+			templete=lang.lang_details_nodata+"<br>";
 		}
 		if (more) {
 			$("#his-tl-contents").append(templete);
@@ -92,7 +92,7 @@ function pinutl(before,user, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-		var templete = parse(json, '', acct_id,'user');
+		var templete = parse(json, 'pinned', acct_id,'user');
 		if(!json[0]){
 			templete="";
 		}
@@ -155,7 +155,7 @@ function flw(user, more, acct_id) {
 			var templete = userparse(json,'',acct_id);
 		}
 		if(templete==""){
-			templete=lang_details_nodata[lang]+"<br>";
+			templete=lang.lang_details_nodata+"<br>";
 		}
 		if (more) {
 			$("#his-follow-list-contents").append(templete);
@@ -221,7 +221,7 @@ function fer(user, more, acct_id) {
 			var templete = userparse(json,'',acct_id);
 		}
 		if(templete==""){
-			templete=lang_details_nodata[lang]+"<br>";
+			templete=lang.lang_details_nodata+"<br>";
 		}
 		if (more) {
 			$("#his-follower-list-contents").append(templete);
@@ -283,7 +283,7 @@ function showFav(more, acct_id) {
 			var templete = misskeyParse(json, '', acct_id,'user');
 		}
 		if(!json[0]){
-			templete=lang_details_nodata[lang]+"<br>";
+			templete=lang.lang_details_nodata+"<br>";
 		}
 		if (more) {
 			$("#his-fav-list-contents").append(templete);
@@ -339,7 +339,7 @@ function showMut(more, acct_id) {
 		console.error(error);
 	}).then(function(json) {
 		if(!json[0]){
-			templete=lang_details_nodata[lang]+"<br>";
+			templete=lang.lang_details_nodata+"<br>";
 		}
 		var templete = userparse(json,'',acct_id);
 		if (more) {
@@ -358,7 +358,7 @@ function showBlo(more, acct_id) {
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if(localStorage.getItem("mode_" + domain)=="misskey"){
-		$("#his-blocking-list-contents").html(lang_hisdata_notonmisskey[lang]+"<br>");
+		$("#his-blocking-list-contents").html(lang.lang_hisdata_notonmisskey+"<br>");
 		return false;
 	}
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -382,7 +382,7 @@ function showBlo(more, acct_id) {
 		console.error(error);
 	}).then(function(json) {
 		if(!json[0]){
-			templete=lang_details_nodata[lang]+"<br>";
+			templete=lang.lang_details_nodata+"<br>";
 		}
 		var templete = userparse(json,'',acct_id);
 		if (more) {
@@ -445,7 +445,7 @@ function showReq(more, acct_id) {
 		}
 		
 		if(!json[0]){
-			templete=lang_details_nodata[lang]+"<br>";
+			templete=lang.lang_details_nodata+"<br>";
 		}
 		if (more) {
 			$("#his-request-list-contents").append(templete);
@@ -463,7 +463,7 @@ function showDom(more, acct_id) {
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if(localStorage.getItem("mode_" + domain)=="misskey"){
-		$("#his-domain-list-contents").html(lang_hisdata_notonmisskey[lang]+"<br>");
+		$("#his-domain-list-contents").html(lang.lang_hisdata_notonmisskey+"<br>");
 		return false;
 	}
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -489,7 +489,7 @@ function showDom(more, acct_id) {
 	}).then(function(json) {
 		var templete = "";
 		if(!json[0]){
-			templete=lang_details_nodata[lang]+"<br>";
+			templete=lang.lang_details_nodata+"<br>";
 		}
 		Object.keys(json).forEach(function(key) {
 			var domain = json[key];
@@ -514,7 +514,7 @@ function showFrl(more, acct_id) {
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if(localStorage.getItem("mode_" + domain)=="misskey"){
-		$("#his-follow-recom-contents").html(lang_hisdata_notonmisskey[lang]+"<br>");
+		$("#his-follow-recom-contents").html(lang.lang_hisdata_notonmisskey+"<br>");
 		return false;
 	}
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -534,13 +534,13 @@ function showFrl(more, acct_id) {
 	}).then(function(response) {
 		return response.json();
 	}).catch(function(error) {
-		$("#his-follow-recom-contents").html(lang_details_nodata[lang]+"("+lang_hisdata_frcreq[lang]+")<br>");
+		$("#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");
-			templete=lang_details_nodata[lang]+"("+lang_hisdata_frcwarn[lang]+")<br>";
+			templete=lang.lang_details_nodata+"("+lang.lang_hisdata_frcwarn+")<br>";
 		}else{
 			var templete = userparse(json,'',acct_id);
 		}
@@ -557,7 +557,7 @@ function showFrl(more, acct_id) {
 //ユーザーマッチングリスト
 function showMat() {
 	
-	$("#his-matching-list-contents").html(lang_hisdata_taketime[lang]);
+	$("#his-matching-list-contents").html(lang.lang_hisdata_taketime);
 	var full=$("#his-acct").attr("fullname");
 	var acct_id=$("#his-data").attr("use-acct");
 	full=full.split("@");

app/js/userdata/prof-edit.js

@@ -12,13 +12,13 @@ function profedit() {
 	httpreq.open('PATCH', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-	httpreq.responseType = 'json';
+	httpreq.responseType = "json";
 	httpreq.send(JSON.stringify({
 		display_name: name,
 		note: des,
 	}));
     httpreq.onreadystatechange = function() {
-		if (httpreq.readyState == 4) {
+		if (httpreq.readyState === 4) {
 			$('#his-data').modal('close');
 			todc();
 		}
@@ -47,10 +47,10 @@ function imgChange(imgfile, target) {
 		httpreq.open('PATCH', start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
 		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-		httpreq.responseType = 'json';
+		httpreq.responseType = "json";
 		httpreq.send(fd);
    		httpreq.onreadystatechange = function() {
-			if (httpreq.readyState == 4) {
+			if (httpreq.readyState === 4) {
 				var json = httpreq.response;
 				console.log(json);
 				$('#his-data').modal('close');

app/js/userdata/showOnTL.js

@@ -46,7 +46,7 @@ function udgEx(user,acct_id){
 			shell.openExternal(url);
 		}
 	});
-	return;
+	return true;
 }
 function udg(user, acct_id) {
 	reset();
@@ -86,8 +86,8 @@ function udg(user, acct_id) {
 		//moved設定時
 		if (json.moved) {
 			Materialize.toast(
-				lang_showontl_movetxt[lang]+'<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_showontl_movebtn[lang]+'</button>', 4000)
+				json.moved.id + '\',\''+acct_id+'\')">'+lang.lang_showontl_movebtn+'</button>', 4000)
 		}
 			$('#his-data').modal('open');
 			$('#his-data').attr("user-id", user);
@@ -130,7 +130,11 @@ function udg(user, acct_id) {
 			$('#his-data').css('background-image', 'url(' + json.header + ')');
 			$("#his-sta").text(json.statuses_count);
 			$("#his-follow").text(json.following_count);
-			$("#his-follower").text(json.followers_count);
+			var flerc=json.followers_count;
+			if(flerc<0){
+				flerc="-";
+			}
+			$("#his-follower").text(flerc);
 			$("#his-since").text(crat(json.created_at));
 			$("#his-openin").attr("data-href", json.url);
 			if(json.fields){
@@ -151,7 +155,7 @@ function udg(user, acct_id) {
 				$("#his-des").html(twemoji.parse(note));
 			}
 			if(json.bot){
-				$("#his-bot").html(lang_showontl_botacct[lang]);
+				$("#his-bot").html(lang.lang_showontl_botacct);
 			}
 			$('#his-data').css('background-size', 'cover');
 			$("#his-data .tab-content").css("height",$("#his-float-timeline").height()-70+"px")
@@ -288,21 +292,21 @@ function misskeyUdg(user, acct_id) {
 				if (json.isFollowing) {
 					//自分がフォローしている
 					$("#his-data").addClass("following");
-					$("#his-follow-btn").text(lang_status_unfollow[lang]);
+					$("#his-follow-btn").text(lang.lang_status_unfollow);
 					hisList(user,acct_id);
 				}else{
-					$("#his-follow-btn").text(lang_status_follow[lang]);
+					$("#his-follow-btn").text(lang.lang_status_follow);
 				}
 				if (json.isFollowed) {
 					//フォローされてる
-					$("#his-relation").text(lang_showontl_followed[lang]);
+					$("#his-relation").text(lang.lang_showontl_followed);
 				}
 				$("#his-block-btn").hide();
 				if (json.isMuted) {
 					$("#his-data").addClass("muting");
-					$("#his-mute-btn").text(lang_status_unmute[lang]);
+					$("#his-mute-btn").text(lang.lang_status_unmute);
 				}else{
-					$("#his-mute-btn").text(lang_status_mute[lang]);
+					$("#his-mute-btn").text(lang.lang_status_mute);
 				}
 				$(".only-my-data").hide();
 				$(".only-his-data").show();
@@ -347,46 +351,46 @@ function relations(user, acct_id) {
 		if (json.following) {
 			//自分がフォローしている
 			$("#his-data").addClass("following");
-			$("#his-follow-btn").text(lang_status_unfollow[lang]);
+			$("#his-follow-btn").text(lang.lang_status_unfollow);
 			hisList(user,acct_id);
 		}else{
-			$("#his-follow-btn").text(lang_status_follow[lang]);
+			$("#his-follow-btn").text(lang.lang_status_follow);
 		}
 		if (json.followed_by) {
 			//フォローされてる
-			$("#his-relation").text(lang_showontl_followed[lang]);
+			$("#his-relation").text(lang.lang_showontl_followed);
 		}
 		if (json.blocking) {
 			$("#his-data").addClass("blocking");
-			$("#his-block-btn").text(lang_status_unblock[lang]);
+			$("#his-block-btn").text(lang.lang_status_unblock);
 		}else{
-			$("#his-block-btn").text(lang_status_block[lang]);
+			$("#his-block-btn").text(lang.lang_status_block);
 		}
 		if (json.muting) {
 			$("#his-data").addClass("muting");
-			$("#his-mute-btn").text(lang_status_unmute[lang]);
+			$("#his-mute-btn").text(lang.lang_status_unmute);
 		}else{
-			$("#his-mute-btn").text(lang_status_mute[lang]);
+			$("#his-mute-btn").text(lang.lang_status_mute);
 		}
 		if (json.muting_notifications) {
 			$("#his-data").addClass("mutingNotf");
-			$("#his-notf-btn").text(lang_showontl_notf[lang]+lang_status_unmute[lang]);
+			$("#his-notf-btn").text(lang.lang_showontl_notf+lang.lang_status_unmute);
 		}else{
-			$("#his-notf-btn").text(lang_showontl_notf[lang]+lang_status_mute[lang]);
+			$("#his-notf-btn").text(lang.lang_showontl_notf+lang.lang_status_mute);
 		}
 		if (json.domain_blocking) {
 			$("#his-data").addClass("blockingDom");
-			$("#his-domain-btn").text(lang_showontl_domain[lang]+lang_status_unblock[lang]);
+			$("#his-domain-btn").text(lang.lang_showontl_domain+lang.lang_status_unblock);
 		}else{
-			$("#his-domain-btn").text(lang_showontl_domain[lang]+lang_status_block[lang]);
+			$("#his-domain-btn").text(lang.lang_showontl_domain+lang.lang_status_block);
 		}
 		//Endorsed
 		if(json.endorsed){
 			$("#his-end-btn").addClass("endorsed");
-			$("#his-end-btn").text(lang_status_unendorse[lang])
+			$("#his-end-btn").text(lang.lang_status_unendorse)
 		}else{
 			$("#his-end-btn").removeClass("endorsed");
-			$("#his-end-btn").text(lang_status_endorse[lang])
+			$("#his-end-btn").text(lang.lang_status_endorse)
 		}
 
 	});
@@ -410,8 +414,8 @@ function reset(){
 	$(".column-first").addClass("active-back");
 	$("#his-name").text("Loading");
 	$("#his-acct").text("");
-	$("#his-prof").attr("src", "./img/loading.svg");
+	$("#his-prof").attr("src", "../../img/loading.svg");
-	$('#his-data').css('background-image', 'url(./img/loading.svg)');
+	$('#his-data').css('background-image', 'url(../../img/loading.svg)');
 	$("#his-sta").text("");
 	$("#his-follow").text("");
 	$("#his-follower").text("");
@@ -431,15 +435,15 @@ function reset(){
 	$("#his-notf-btn").show();
 	$("#his-domain-btn").show();
 	$("#his-emp-btn").show();
-	$("#his-follow-btn").text(lang_status_follow[lang]);
+	$("#his-follow-btn").text(lang.lang_status_follow);
-	$("#his-mute-btn").text(lang_status_mute[lang]);
+	$("#his-mute-btn").text(lang.lang_status_mute);
-	$("#his-block-btn").text(lang_status_block[lang]);
+	$("#his-block-btn").text(lang.lang_status_block);
-	$("#his-notf-btn").text(lang_showontl_notf[lang]+lang_status_mute[lang]);
+	$("#his-notf-btn").text(lang.lang_showontl_notf+lang.lang_status_mute);
-	$("#his-domain-btn").text(lang_showontl_domain[lang]+lang_status_block[lang]);
+	$("#his-domain-btn").text(lang.lang_showontl_domain+lang.lang_status_block);
 	$("#his-relation").text("");
 	$(".cont-series").html("");
 	$("#domainblock").val("");
-	$("#his-lists-a").html(lang_showontl_listwarn[lang]);
+	$("#his-lists-a").html(lang.lang_showontl_listwarn);
 	$("#his-lists-b").html('');
 	$("#his-name-val").val("");
 	$("#his-des-val").val("");

app/language.js

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

app/main.js

@@ -8,8 +8,12 @@ var Jimp = require("jimp");
 const shell = electron.shell;
 const os = require('os')
 const path = require('path')
+const fm = require('font-manager');
+const language = require('./language.js');
 const Menu=electron.Menu
 var updatewin=null;
+const join = require('path').join;
+var JSON5 = require('json5');
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
 // ウィンドウを作成するモジュール
@@ -17,13 +21,21 @@ const BrowserWindow = electron.BrowserWindow;
 const {
 	download
 } = require('electron-dl');
-const join = require('path').join;
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow;
 var info_path = join(app.getPath("userData"), "window-size.json");
 var max_info_path = join(app.getPath("userData"), "max-window-size.json");
 var lang_path=join(app.getPath("userData"), "language");
+var customcss=join(app.getPath("userData"), "custom.css");
 var tmp_img = join(app.getPath("userData"), "tmp.png");
+var ha_path=join(app.getPath("userData"), "hardwareAcceleration");
+try{
+	fs.readFileSync(ha_path, 'utf8');
+	app.disableHardwareAcceleration()
+	console.log("disabled: HA");
+}catch{
+	console.log("enabled: HA");
+}
 var window_size;
 try {
 	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'));
@@ -42,9 +54,21 @@ try {
 		height: "string",
 		x: "string",
 		y: "string"
+
 	}; // デフォルトバリュー
 }
-
+try {
+	var lang = fs.readFileSync(lang_path, 'utf8');
+} catch (e) {
+	var lang=app.getLocale();
+	if(~lang.indexOf("ja")){
+		lang="ja";
+	}else{
+		lang="en";
+	}
+	fs.writeFileSync(lang_path,lang);
+}
+console.log("launch:"+lang);
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function() {
 	if (process.platform != 'darwin') {
@@ -58,22 +82,13 @@ 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 + '/thedesk.png'}
+		var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,icon: __dirname + '/desk.png'}
-	}else{
+	}else if(platform=="win32"){
+		var arg={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}
 	}
 	mainWindow = new BrowserWindow(arg);
-	try {
-		var lang = fs.readFileSync(lang_path, 'utf8');
-	} catch (e) {
-		var lang=app.getLocale();
-		if(~lang.indexOf("ja")){
-			lang="ja";
-		}else{
-			lang="en";
-		}
-		fs.writeFileSync(lang_path,lang);
-	}
 	electron.session.defaultSession.clearCache(() => {})
 	if(process.argv){
 		if(process.argv[1]){
@@ -118,60 +133,11 @@ function createWindow() {
 	mainWindow.on('maximize', function() {
 		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
 	});
-	  // Create the Application's main menu
+		
-	  var template = [{
-        label: "アプリケーション",
-        submenu: [
-			{ label: "TheDeskについて", click: function() { about(); } },
-            { type: "separator" },
-			{ label: "終了", accelerator: "Command+Q", click: function() { app.quit(); }}
-			
-        ]}, {
-        label: "編集",
-        submenu: [
-            { label: "元に戻す", accelerator: "CmdOrCtrl+Z", selector: "undo:" },
-            { label: "やり直し", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
-            { type: "separator" },
-            { label: "切り取り", accelerator: "CmdOrCtrl+X", selector: "cut:" },
-            { label: "コピー", accelerator: "CmdOrCtrl+C", selector: "copy:" },
-            { label: "貼り付け", accelerator: "CmdOrCtrl+V", selector: "paste:" },
-            { label: "すべて選択", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
-		]},{
-		label: "表示",
-		submenu: [
-			{
-				label: 'Toggle Developer Tools',
-				accelerator: 'Alt+Command+I',
-				click: function() { mainWindow.toggleDevTools(); }
-			  },
-          {
-            label: '再読み込み',
-            accelerator: 'CmdOrCtrl+R',
-            click: function() { mainWindow.webContents.send('reload', " "); }
-          }
-		]
-		},
-		{
-		label: 'ウィンドウ',
-		role: 'window',
-		submenu: [
-			  {
-				label: '最小化',
-				accelerator: 'CmdOrCtrl+M',
-				role: 'minimize'
-			  },
-			  {
-				label: '閉じる',
-				accelerator: 'CmdOrCtrl+W',
-				role: 'close'
-			  },
-			]
-		  }
-    ];
 	var platform=process.platform;
 	var bit=process.arch;
 	if(platform=="darwin"){
-		Menu.setApplicationMenu(Menu.buildFromTemplate(template));
+		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang,mainWindow)));
 	}
 }
 // Electronの初期化完了後に実行
@@ -179,8 +145,13 @@ app.on('ready', createWindow);
 var onError = function(err,response){
     console.error(err,response);
 };
-
 var ipc = electron.ipcMain;
+ipc.on('minimize', function(e, args) {
+	mainWindow.minimize();
+});
+ipc.on('maximize', function(e, args) {
+	mainWindow.isMaximized() ? mainWindow.unmaximize() : mainWindow.maximize();
+});
 ipc.on('native-notf', function(e, args) {
 	var platform=process.platform;
 	var bit=process.arch;
@@ -210,9 +181,108 @@ ipc.on('native-notf', function(e, args) {
 });
 //言語
 ipc.on('lang', function(e, arg) {
+	console.log("set:"+arg);
 	fs.writeFileSync(lang_path,arg);
 	mainWindow.webContents.send('langres', "");
 })
+//CSS
+ipc.on('custom-css-create', function(e, arg) {
+	fs.writeFileSync(customcss,arg);
+	mainWindow.webContents.send('custom-css-create-complete', "");
+})
+ipc.on('custom-css-request', function(e, arg) {
+	try {
+		var css = fs.readFileSync(customcss, 'utf8');
+	} catch (e) {
+		var css="";
+	}
+	mainWindow.webContents.send('custom-css-response', css);
+})
+ipc.on('theme-json-create', function(e, arg) {
+	var themecss=join(app.getPath("userData"), JSON5.parse(arg)["id"]+".thedesktheme");
+	fs.writeFileSync(themecss,JSON.stringify(JSON5.parse(arg)));
+	if(JSON5.parse(arg)["id"]){
+		mainWindow.webContents.send('theme-json-create-complete', "");
+	}else{
+		mainWindow.webContents.send('theme-json-create-complete', "error");	
+	}
+})
+ipc.on('theme-json-delete', function(e, arg) {
+	var themecss=join(app.getPath("userData"), arg+".thedesktheme");
+	console.log(themecss);
+	fs.unlink(themecss, function (err) {
+		mainWindow.webContents.send('theme-json-delete-complete', "");
+	});
+})
+ipc.on('theme-json-request', function(e, arg) {
+	var themecss=join(app.getPath("userData"), arg+".thedesktheme");
+	var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+	mainWindow.webContents.send('theme-json-response', json);
+})
+ipc.on('theme-css-request', function(e, arg) {
+	var themecss=join(app.getPath("userData"), arg+".thedesktheme");
+	try {
+		var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+		
+		var primary=json.vars.primary;
+		var secondary=json.vars.secondary;
+		var text=json.vars.text;
+		if(json.base=="light"){
+			var drag="rgba(255, 255, 255, 0.8)";
+			var beforehover="#757575";
+		}else{
+			var drag="rgba(0, 0, 0, 0.8)";
+			var beforehover="#9e9e9e";
+		}
+		if(json.props){
+			if(json.props.TheDeskAccent){
+				var emphasized=json.props.TheDeskAccent
+			}else{
+				var emphasized=secondary;
+			}
+		}else{
+			var emphasized=primary;
+		}
+		
+		var css=".customtheme {--bg:"+secondary+";--drag:"+drag+";"+
+			"--color:"+text+";--beforehover:"+beforehover+";--modal:"+secondary+";--subcolor:"+primary+";--box:"+primary+";--sidebar:"+primary+";--shared:"+emphasized+";"+
+			"--notfbox:"+secondary+";--emphasized:"+primary+";--his-data:"+secondary+
+			"--active:"+primary+";--postbox:"+primary+";--modalfooter:"+primary+";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}";
+			mainWindow.webContents.send('theme-css-response', css);
+	} catch (e) {
+		var css="";
+	}
+	
+})
+ipc.on('theme-json-list', function(e, arg) {
+	fs.readdir(app.getPath("userData"), function(err, files){
+		if (err) throw err;
+		var fileList = files.filter(function(file){
+			var tfile=join(app.getPath("userData"), file);
+			return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile); //絞り込み
+		})
+		var themes=[];
+		for(var i=0;i<fileList.length;i++){
+			var themecss=join(app.getPath("userData"), fileList[i]);
+			var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+			themes.push({
+				name:json.name,
+				id:json.id
+			})
+		}
+		mainWindow.webContents.send('theme-json-list-response', themes);
+	});
+})
+//ハードウェアアクセラレーションの無効化
+ipc.on('ha', function(e, arg) {
+	if(arg=="true"){
+		fs.writeFileSync(ha_path,arg);
+	}else{
+		fs.unlink(ha_path, function (err) {});
+	}
+	app.relaunch()
+	app.exit()
+})
 
 ipc.on('update', function(e, x, y) {
 	var platform=process.platform;
@@ -223,7 +293,8 @@ ipc.on('update', function(e, x, y) {
 		height: 400,
 		"transparent": false, // ウィンドウの背景を透過
 		"frame": false, // 枠の無いウィンドウ
-		"resizable": false
+		"resizable": false,
+		"modal":true
 	});
 	var lang = fs.readFileSync(lang_path, 'utf8');
 	updatewin.loadURL('file://' + __dirname + '/view/'+lang+'/update.html');
@@ -275,65 +346,12 @@ ipc.on('shot-img-dl', (e, args) => {
 })
 //アプデDL
 ipc.on('download-btn', (e, args) => {
+	//console.log(args[1]);
 	var platform=process.platform;
 	var bit=process.arch;
-	var versioning=args[3];
-	var portable=args[2];
-	if(platform=="win32" || platform=="linux" || platform=="darwin" ){
-		var exe=false;
-		if(platform=="win32" && bit=="x64"){
-			if(portable){
-				var zip="TheDesk.exe";
-			}else{
-				var zip="TheDesk-setup.exe";
-			}
-			exe=true;
-		}else if(platform=="win32" && bit=="ia32"){
-			if(portable){
-				var zip="TheDesk-ia32.exe";
-			}else{
-				var zip="TheDesk-setup-ia32.exe";
-			}
-			exe=true;
-		}else if(platform=="linux" && bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(platform=="linux" && bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}else if(platform=="darwin"){
-			var zip="TheDesk-darwin-x64.zip";
-		}else{
-			return;
-		}
-		if(versioning && !exe){
-			zip=zip.replace(".zip","."+args[1]+".zip");
-		}else if(versioning){
-			zip=zip.replace(".exe","."+args[1]+".exe");
-		}
-	}else{
-		const options = {
-			type: 'info',
-			title: 'Other OS Supporting System',
-			message: "thedesk.topをブラウザで開きます。",
-			buttons: ['OK']
-		  }
-		  dialog.showMessageBox(options, function(index) {
-			shell.openExternal("https://thedesk.top");
-		  })
-		  return;
-		if(bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}
-	}
-	var ver=args[1];
-	
-	console.log(zip);
-	if(args[0]=="true"){
 		dialog.showSaveDialog(null, {
-            title: '保存',
+      title: 'Save',
-			properties: ['openFile', 'createDirectory'],
+			defaultPath: app.getPath('home')+"/"+args[1]
-			defaultPath: zip
         }, (savedFiles) => {
 			console.log(savedFiles);
 			if(!savedFiles){
@@ -344,18 +362,12 @@ ipc.on('download-btn', (e, args) => {
 			}else{
 				var m = savedFiles.match(/(.+)\/(.+)$/);
 			}
-			
+			//console.log(m);
 			  if(isExistFile(savedFiles)){
-				fs.statSync(savedFiles);
+					fs.unlinkSync(savedFiles);
-				fs.unlink(savedFiles);
 			  }
-			  console.log(m[1]+":"+savedFiles)
+              dl(args[0],args[1],m[1]);
-              dl(portable,ver,m[1],savedFiles);
         });
-	}else{
-		dl(portable,ver);
-	}
-	
 });
 function isExistFile(file) {
 	try {
@@ -365,48 +377,10 @@ function isExistFile(file) {
 	  if(err.code === 'ENOENT') return false
 	}
   }
-function dl(portable,ver,files,fullname){
+function dl(url,file,dir){
-	console.log(files);
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform=="win32"){
-		if(bit=="x64"){
-			if(portable){
-				var zip="TheDesk.exe";
-			}else{
-				var zip="TheDesk-setup.exe";
-			}
-		}else if(bit=="ia32"){
-			if(portable){
-				var zip="TheDesk-ia32.exe";
-			}else{
-				var zip="TheDesk-setup-ia32.exe";
-			}
-		}
-	}else if(platform=="linux"){
-		if(bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}
-	}else if(platform=="darwin"){
-			var zip="TheDesk-darwin-x64.zip";
-	}
-	//zip=zip+"?"+ver;
-	var l = 8;
-
-	// 生成する文字列に含める文字セット
-	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
-
-	var cl = c.length;
-	var r = "";
-	for(var i=0; i<l; i++){
-	  r += c[Math.floor(Math.random()*cl)];
-	}
-
 	updatewin.webContents.send('mess', "ダウンロードを開始します。");
 	const opts = {
-		directory:fullname,
+		directory:dir,
 		openFolderWhenDone: true,
 		onProgress: function(e) {
 			updatewin.webContents.send('prog', e);
@@ -414,7 +388,7 @@ function dl(portable,ver,files,fullname){
 		saveAs: false
 	};
 	download(BrowserWindow.getFocusedWindow(),
-			'https://dl.thedesk.top/'+zip, opts)
+			url, opts)
 		.then(dl => {
 			updatewin.webContents.send('mess', "ダウンロードが完了しました。");
 			app.quit();
@@ -463,23 +437,69 @@ function about(){
 	var window = new BrowserWindow({width: 300, height: 460,
 			"transparent": false,    // ウィンドウの背景を透過
 			"frame": false,     // 枠の無いウィンドウ
-			 "resizable": false });
+			"resizable": false });
 	   window.loadURL('file://' + __dirname + '/about.html?ver='+ver);
 	   return "true"
 }
-ipc.on('itunes', (e, args) => {
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform=="darwin"){
-	const nowplaying = require("itunes-nowplaying-mac")
 
-nowplaying.getRawData().then(function (value) {
+ipc.on('itunes', (e, args) => {
-    mainWindow.webContents.send('itunes-np', value);
+	console.log("Access");
-}).catch(function (error) {
+	if(args[0]=="set"){
-    // 非同期処理失敗。呼ばれない
+		var {NowPlaying,PlayerName} = require("nowplaying-node");
-    console.log(error);
+		var nppath=join(app.getPath("userData"), "nowplaying");
-});
+		var npProvider;
-}
+		try {
+			npProvider = args[1];
+		} catch (e) {
+			npProvider="AIMP";
+		}
+		var myAIMP = new NowPlaying({
+			fetchCover: true,
+			player: PlayerName[npProvider],
+		});
+		fs.writeFileSync(nppath, npProvider);
+	}else{
+		var platform=process.platform;
+		var bit=process.arch;
+		if(platform=="darwin"){
+		const nowplaying = require("itunes-nowplaying-mac")
+		nowplaying.getRawData().then(function (value) {
+		mainWindow.webContents.send('itunes-np', value);
+		}).catch(function (error) {
+			// 非同期処理失敗。呼ばれない
+			console.log(error);
+		});
+		}else{
+			var {NowPlaying,PlayerName} = require("nowplaying-node");
+			var nppath=join(app.getPath("userData"), "nowplaying");
+			var npProvider;
+			try {
+				npProvider = fs.readFileSync(nppath, 'utf8');
+			} catch (e) {
+				npProvider="AIMP";
+			}
+			var myAIMP = new NowPlaying({
+				fetchCover: true,
+				player: PlayerName[npProvider],
+			});
+			myAIMP.update();
+			var path=myAIMP.getCoverPath();
+			if(path){
+				var bin = fs.readFileSync(path, 'base64');
+			}else{
+				var bin=false;
+			}
+			
+			var value={
+				name:myAIMP.getTitle(),
+				artist:myAIMP.getArtist(),
+				album:myAIMP.getAlbum(),
+				path:bin
+			}
+			mainWindow.webContents.send('itunes-np', value);
+		}
+		}
+	
 });
 ipc.on('file-select', (e, args) => {
 	dialog.showOpenDialog(null, {
@@ -505,12 +525,8 @@ ipc.on('file-select', (e, args) => {
 });
 
 ipc.on('column-del', (e, args) => {
-const options = {
+	console.log(lang);
-    type: 'info',
+	var options=language.delsel(lang)
-    title: 'カラム削除',
-    message: "カラムを削除しますか？(すべてのカラムのリンク解析がOFFになります。)",
-    buttons: ['いいえ', 'はい']
-  }
   dialog.showMessageBox(options, function(index) {
     mainWindow.webContents.send('column-del-reply', index);
   })
@@ -533,8 +549,8 @@ ipc.on('nano', function (e, x, y) {
 	} catch (e) {
 	window_pos = [0,0]; // デフォルトバリュー
 	}
-	var nanowindow = new BrowserWindow({width: 300, height: 200,
+	var nanowindow = new BrowserWindow({width: 350, height: 200,
-	"transparent": false,    // ウィンドウの背景を透過
+		"transparent": false,    // ウィンドウの背景を透過
 		 "frame": false,     // 枠の無いウィンドウ
 		 "resizable": false });
 	nanowindow.loadURL('file://' + __dirname + '/nano.html');
@@ -555,7 +571,7 @@ ipc.on('nano', function (e, x, y) {
 			buttons: ['拒否', '許可','永続的に許可']
 		  }
 		  dialog.showMessageBox(options, function(index) {
-			if(index==2){
+			if(index===2){
 				mainWindow.webContents.send('adobeagree', "true");
 			}
 			if(index>0){
@@ -604,5 +620,45 @@ ipc.on('export', (e, args) => {
 ipc.on('import', (e, arg) => {
 	mainWindow.webContents.send('config', fs.readFileSync(arg, 'utf8'));
 });
+//フォント
+function object_array_sort(data,key,order,fn){
+	//デフォは降順(DESC)
+	var num_a = -1;
+	var num_b = 1;
+   
+	if(order === 'asc'){//指定があれば昇順(ASC)
+	  num_a = 1;
+	  num_b = -1;
+	}
+   
+	data = data.sort(function(a, b){
+	  var x = a[key];
+	  var y = b[key];
+	  if (x > y) return num_a;
+	  if (x < y) return num_b;
+	  return 0;
+	});
+   
+	//重複排除
+	var arrObj = {};
+	for (var i = 0; i < data.length; i++) {
+	  arrObj[data[i]['family']] = data[i];
+	}
+   
+	data = [];
+	for (var key in arrObj) {
+	  data.push(arrObj[key]);
+	}
+   
+	fn(data); // ソート後の配列を返す
+  }
+ipc.on('fonts', (e, arg) => {
+	var fonts = fm.getAvailableFontsSync();
+object_array_sort(fonts, 'family', 'asc', function(fonts_sorted){
+	mainWindow.webContents.send('font-list', fonts_sorted);
+});
+});
 
-app.setAsDefaultProtocolClient('thedesk')
+
+
+app.setAsDefaultProtocolClient('thedesk')

app/nano.html

@@ -13,6 +13,7 @@ html{
 	 width:100vw;
 	 height:100vh;
 	 overflow:hidden;
+	 font-family:sans-serif;
 }
 body {
 	background-color: rgba(0, 0, 0, 0.1);
@@ -45,6 +46,7 @@ textarea {
 }
  .area-actions{display:none !important;}
  .area-date_via{display:none !important;}
+ .area-side{display:none !important;}
 /* Handle */
 ::-webkit-scrollbar-thumb {
     -webkit-border-radius: 5px;
@@ -69,7 +71,33 @@ textarea {
 </style>
 </head>
 <body>
-        <script type="text/javascript" src="./js/common/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 "";
+	}
+  	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
+  		.join('');
+  	var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
+  		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
+  	return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
+  		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
+  	});
+  };
+  function escapeHTML(str) {
+	  if(!str){
+		  return "";
+	  }
+	return str.replace(/&/g, '&amp;')
+			  .replace(/</g, '&lt;')
+			  .replace(/>/g, '&gt;')
+			  .replace(/"/g, '&quot;')
+			  .replace(/'/g, '&#039;');
+  }
+		</script>
         <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
 <select id="post-acct-sel" style="max-width:150px">
 </select>
@@ -82,8 +110,6 @@ textarea {
 </div>
 <br>
 <textarea id="textarea" style="width:80%; background-color:transparent"></textarea>
-<input type="hidden" id="reply">
-<input type="hidden" id="media">
 	<button class="btn" onclick="post()">Post</button>
 	<script>
 	if(localStorage.getItem("lang")){
@@ -92,8 +118,6 @@ textarea {
 		var lang="ja";
 	}
 	</script>
-	<script type="text/javascript" src="./js/lang/lang.js"></script>
-	<script type="text/javascript" src="./js/lang/parse.lang.js"></script>
 <script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
 <script type="text/javascript" src="./js/post/post.js"></script>
 <script type="text/javascript" src="./js/post/use-txtbox.js"></script>
@@ -139,4 +163,52 @@ function mov(){
 function resetmv(){
 	return false;
 }
+function post(){
+	var acct_id=$("#post-acct-sel").val();
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/statuses";
+	var str=$("#textarea").val();
+	var toot={
+		status: str
+	}
+	var vis = loadVis(acct_id)
+	toot.visibility=vis;
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify(toot));
+    httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			$("#textarea").val("");
+		}
+	}
+}
+function loadVis(acct_id){
+		var vist = localStorage.getItem("vis");
+		console.log(vist);
+		if (!vist) {
+			return "public";
+		} else {
+			if (vist == "memory") {
+				var memory = localStorage.getItem("vis-memory-"+acct_id);
+				if (!memory) {
+					memory = "public";
+				}
+				return memory;
+			} else if(vist == "server") {
+				var multi = localStorage.getItem("multi");
+				var obj = JSON.parse(multi);
+				var memory = obj[acct_id]["vis"];
+				if (!memory) {
+					memory = "public";
+				}
+				return memory;
+			} else {
+				return vist;
+			}
+	}
+}
 </script>

app/package.json

@@ -1,10 +1,13 @@
 {
   "name": "thedesk",
-  "version": "16.1.5",
+  "version": "18.0.2",
   "description": "TheDesk is a Mastodon client for PC.",
   "main": "main.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "dist": "build --linux snap",
+    "build:all": "electron-builder --win --linux",
+    "build:win": "electron-builder --win"
   },
   "keywords": [],
   "bugs": {
@@ -13,7 +16,7 @@
   },
   "homepage": "https://thedesk.top",
   "author": {
-    "name": "Cutls P",
+    "name": "Cutls",
     "url": "https://kirishima.clooud/@Cutls",
     "email": "web-pro@cutls.com"
   },
@@ -22,42 +25,65 @@
       "name": "とねぢ",
       "url": "https://minohdon.jp/@toneji",
       "email": "solfa.tono@gmail.com"
+    },
+    {
+      "name": "ぽぷんじゃ",
+      "url": "https://popon.pptdn.jp/@popn_ja",
+      "email": "popn.ja@gmail.com"
     }
   ],
-  "license": "GPL-3.0-or-later",
+  "license": "GPL-3.0",
   "dependencies": {
     "electron-dl": "^1.11.0",
+    "font-manager": "^0.3.0",
     "jimp": "^0.2.28",
+    "json5": "^2.1.0",
     "node-notifier": "^5.2.1",
-    "sumchecker": "^2.0.2"
+    "sumchecker": "^2.0.2",
+    "vue": "^2.6.9"
   },
   "optionalDependencies": {
-    "itunes-nowplaying-mac": "^0.2.3"
+    "itunes-nowplaying-mac": "^0.2.3",
+    "nowplaying-node": "^0.1.3"
   },
   "build": {
     "productName": "TheDesk",
     "appId": "top.thedesk",
     "directories": {
-      "output": "build"
+      "output": "../build"
     },
     "win": {
       "icon": "thedesk.ico",
       "target": [
         "nsis",
-        "portable"
+        "portable",
+        "appx"
       ]
     },
+    "nsis": {
+      "oneClick": false,
+      "allowToChangeInstallationDirectory": true,
+      "artifactName": "TheDesk-setup.${ext}"
+    },
     "linux": {
       "icon": "build/icons",
       "target": [
-        "deb",
+        "snap"
-        "rpm"
       ],
       "category": "Network"
     },
-    "electronDownload": {
+    "mac": {
-      "version": "2.0.7"
+      "target": "dmg"
     },
-    "electronVersion": "2.0.7"
+    "electronDownload": {
+      "version": "4.0.5"
+    },
+    "electronVersion": "4.0.5"
+  },
+  "devDependencies": {
+    "electron": "^4.0.5",
+    "electron-packager": "^13.0.1",
+    "electron-prebuilt": "^1.4.13",
+    "electron-rebuild": "^1.8.4"
   }
 }

app/view/en/acct.html

@@ -20,14 +20,20 @@ body,html{overflow-y: scroll;}
 .card .colorsel div.exc{width:40px;height:20px;}
 </style>
 <meta charset="utf-8">
+<!--
+<script type="text/javascript">
+	var _jipt = [];
+	_jipt.push(['project', 'thedesk']);
+</script>
+<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+-->
 </head>
 <body id="mainView">
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
 <script>
-      var lang="en"; 
       var misskeytoken=false;
 </script>
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
@@ -43,7 +49,7 @@ body,html{overflow-y: scroll;}
       <div class="col s6">
             <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
             <div id="ins-suggest"></div>
-            Check if TheDesk is not working on Windows, you want to login Pleroma instance.<br>
+            Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.<br>
             <input type="checkbox" class="filled-in" id="linux" />
                   <label for="linux">Code setup</label><br>
             <input type="checkbox" class="filled-in" id="misskey" />
@@ -77,10 +83,10 @@ Some instance data by <a href="https://instances.social" target="_blank">instanc
 <h5 id="ins-title"></h5>
 Administered by:<a id="ins-admin"></a><br>
 <span id="ins-desc"></span><br>
-<img src="./img/loading.svg" id="ins-prof" width="200"><br>
+<img src="../../img/loading.svg" id="ins-prof" width="200"><br>
 <br>
 Domain:<span id="ins-name"></span><br>
-Federated instances:<span id="ins-connect"></span><br>
+Federated servers:<span id="ins-connect"></span><br>
 Toots:<span id="ins-toot"></span><br>
 Users:<span id="ins-user"></span>Users<br>
 Connection:<span id="ins-per"></span>%<br>

app/view/en/index.html

@@ -13,28 +13,32 @@
 	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
+	<!--
+	<script type="text/javascript">
+		var _jipt = [];
+		_jipt.push(['project', 'thedesk']);
+	</script>
+	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+	-->
 </head>
 <body>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
-<script type="text/javascript" src="../../js/lang/parse.lang.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/version.js"></script>
 <script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Akane (16.1.5)";
+var ver="Usamin (18.0.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
-var winstore=false;
 var acct_id=0;
 var tlid=0;
-var lang="en";
   verck(ver);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
@@ -48,8 +52,10 @@ var lang="en";
 </div>
 </div>
 </div>
-<div id="post-box" class="z-depth-3">
+<div id="post-box" class="z-depth-5">
+<div id="post-bar" class="drag-bar">Post new</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@@ -118,16 +124,14 @@ var lang="en";
 <span class="sml gray pointer anti-markdown mize">
 <a onclick="mdToggle()">Markdownエディタを表示</a>
 </span>
-<span id="suggest"></span>
 </div>
 <div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 		<i class="waves-effect gray material-icons" id="nsfw" title="Mark media as sensitive" onclick="nsfw()">visibility_off</i>
 		<i class="waves-effect gray material-icons purple-text dropdown-button" data-activates='dropdown1' id="vis-icon">public</i>
 		<a class="waves-effect gray" id="cw" onclick="cw()" title="Hide text behind warning">CW</a>
 		<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray" onclick="fileselect()" title="Attach..">photo_library</i></span></span>
-		<i class="waves-effect gray material-icons" onclick="adobe()" title="Adobe Photo Editor">format_shapes</i>
 		<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn" title="Emojis">tag_faces</i>
-		<a class="pointer waves-effect gray" id="npbtn" title="NowPlaying[Click to insert info of Spotify(account link is required.)/control+click to insert that of iTunes(macOS)]"><i class="material-icons" style="font-size:24px;">music_note</i></a>
+		<i class="waves-effect gray material-icons dropdown-button" data-activates='dropdown2'>more_vert</i>
 		<i class="material-icons nex gray waves-effect" title="Clear toot box(Ctrl+Shit+C)" data-trans-title="post_box_clear" id="clear">clear</i>
 </div>
 <div class="col s12 mize" style="margin-bottom:5px; padding:0;">
@@ -140,6 +144,9 @@ var lang="en";
 </span>
 <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">
+</div>
 </div>
 </div>
 <!-- 公開範囲 Dropdown Structure -->
@@ -164,6 +171,24 @@ var lang="en";
 	<a onclick="vis('direct')" class="disabled direct">(Direct)</a>
 </li>
 </ul>
+<!-- その他 Dropdown Structure -->
+<ul id='dropdown2' class='dropdown-content'>
+	<li>
+		<a onclick="adobe()">Adobe Photo Editor</a>
+	</li>
+	<li>
+		<a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a>
+	</li>
+	<li>
+		<a onclick="nowplaying('itunes');">NowPlaying</a>
+	</li>
+	<li>
+		<a onclick="schedule();">Scheduled toot</a>
+	</li>
+	<li>
+		<a onclick="pollToggle();">Poll</a>
+	</li>
+	</ul>
 <!--hidden area-->
 <input type="hidden" id="reply">
 <input type="hidden" id="media">
@@ -174,59 +199,87 @@ var lang="en";
 	<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="Secondary Toot">lock_open</i></button>
 </div>
 </div>
+<div id="right-side">
+<div id="suggest"></div>
 <!--絵文字ピッカー-->
-<div id="emoji" class="hide shared z-depth-4">
+<div id="emoji" class="hide">
-	<span class="gray sml">
+		<span class="gray sml">
-		<a onclick="emojiGet('true')" class="pointer">Refresh emojis list</a>
+			<a onclick="emojiGet('true')" class="pointer">Refresh emojis list</a>
-		<i class="material-icons waves-effect" onclick="emoji()" title="Close this box" data-trans-title="post_box_close">cancel</i>
+			<i class="material-icons waves-effect" onclick="emojiToggle()" title="Close this box" data-trans-title="post_box_close">cancel</i>
-	<br>
-	</span>
-	<div id="emoji-list" class="" style="">
-	</div>
-	<div class="emoji-control center">
-		<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
-		<i class="material-icons">navigate_before</i>
-		</button>
-		<span id="emoji-count"></span>/
-		<span id="emoji-sum"></span>
-		<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')" id="emoji-next">
-		<i class="material-icons">navigate_next</i>
-		</button>
-		</div>
-		<div id="default-emoji">
-		<span id="now-emoji"></span> are shown.<br><span class="gray sml">Some emojis are not able to be inserted.</span>
 		<br>
-		<a onclick="customEmoji()" class="pointer waves-effect" title="Custom emojis">
+		</span>
-		<i class="material-icons">add</i>
+		<div id="emoji-list" class="" style="">
-		</a>
+		</div>
-		<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="Emojis of people">
+		<div class="emoji-control center">
-		<i class="material-icons">people</i>
+			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
-		</a>
+			<i class="material-icons">navigate_before</i>
-		<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="Emojis of nature">
+			</button>
-		<i class="material-icons">local_florist</i>
+			<span id="emoji-count"></span>/
-		</a>
+			<span id="emoji-sum"></span>
-		<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="Emojis of foods">
+			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')" id="emoji-next">
-		<i class="material-icons">restaurant</i>
+			<i class="material-icons">navigate_next</i>
-		</a>
+			</button>
-		<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="Emojis of activities">
+			</div>
-		<i class="material-icons">directions_run</i>
+			<div id="default-emoji">
-		</a>
+			<span id="now-emoji"></span> are shown.<br><span class="gray sml">Some emojis are not able to be inserted.</span>
-		<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="Emojis of places">
+			<br>
-		<i class="material-icons">directions_car</i>
+			<a onclick="customEmoji()" class="pointer waves-effect" title="Custom emojis">
-		</a>
+			<i class="material-icons">add</i>
-		<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="Emojis of tools">
+			</a>
-		<i class="material-icons">attach_file</i>
+			<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="Emojis of people">
-		</a>
+			<i class="material-icons">people</i>
-		<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="Emojis of symbols">
+			</a>
-		<i class="material-icons">gesture</i>
+			<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="Emojis of nature">
-		</a>
+			<i class="material-icons">local_florist</i>
-		<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="Emojis of flags">
+			</a>
-		<i class="material-icons">flag</i>
+			<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="Emojis of foods">
-		</a>
+			<i class="material-icons">restaurant</i>
-		<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+			</a>
-		<i class="fa fa-fort-awesome"></i>
+			<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="Emojis of activities">
-		</a>
+			<i class="material-icons">directions_run</i>
+			</a>
+			<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="Emojis of places">
+			<i class="material-icons">directions_car</i>
+			</a>
+			<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="Emojis of tools">
+			<i class="material-icons">attach_file</i>
+			</a>
+			<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="Emojis of symbols">
+			<i class="material-icons">gesture</i>
+			</a>
+			<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="Emojis of flags">
+			<i class="material-icons">flag</i>
+			</a>
+			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+			<i class="fa fa-fort-awesome"></i>
+			</a>
+		</div>
 	</div>
+	<!--Poll UI-->
+	<div id="poll" class="hide">
+		<select id="poll-sel"  onchange="pollProviderCk()">
+			<option value="nothing">Polls: Disabled</option>
+			<option value="votedon">votedon.</option>
+			<option value="mastodon-poll">Mastodon(2.8~)</option>
+		</select>
+		<div id="votedon" class="poll-provider hide">
+	WIP
+		</div>
+		<div id="mastodon-poll" class="poll-provider hide">
+			<input type="text" class="mastodon-choice" placeholder="Choice1">
+			<input type="text" class="mastodon-choice" placeholder="Choice2">
+			<input type="text" class="mastodon-choice" placeholder="Choice3">
+			<input type="text" class="mastodon-choice" placeholder="Choice4">
+			<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+			<label for="poll-multiple">Multiple select</label><br>
+			<input type="checkbox" class="filled-in" id="poll-until" value="1" />
+			<label for="poll-until">Hide 'votes' count until people vote it.</label><br>
+			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">days
+			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hours
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">minutes
+		</div>
+	</div>
+</div>
 </div>
 <!-- Modal Structure Tootdata-->
 <div id="tootmodal" class="modal modal-fixed-footer">
@@ -285,17 +338,17 @@ var lang="en";
 	</ul>
 	Use other account(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>:unfav and unBT are disabled.)<br>
 	<div class="row">
-		<div class="col s4">
+		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share left"></i>Reply</button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet left"></i>Boost</button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
 		</div>
-		<div class="col s3">
+		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>Favourite</button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -317,7 +370,7 @@ var lang="en";
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="./img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -528,28 +581,30 @@ var lang="en";
 		<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-Akane_16-1-5" style="display:none">
+			<div id="release-Usamin_18-0-2" 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>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Akane (16.1.5)</h5>
+					<h5>Release Note Usamin (18.0.2)</h5>
-					16.1.5<br>
+・設定の値が保存できなくなるバグ<br>
-					<ul>
+・画像送りしたときに進化したメディアビューが適用されない問題<br>
-						<li>バグ,脆弱性修正</li>
+・設定の表記がおかしい問題<br>
-					</ul>
+--以下18.0.0--<br>
-					16.1.4<br>
+・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
-					<ul>
+・Alt+Enterでセカンダリートゥートボタン<br>
-						<li>全てバグ修正(5件ほど)</li>
+・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
-					</ul>
+・実況機能をまともに書き直した。<br>
-					ご迷惑をおかけしたことをお詫び申し上げます。
+・サジェストをトゥートボックスの右に<br>
-					16.1.3<br>
+・ハードウェアアクセラレーションを無効化するオプション。(設定の表示などが乱れるときに設定)<br>
-					<ul>
+・返信時に「@」が複数含まれない仕様を訂正<br>
-						<li>セカンダリートゥートボタン</li>
+・一部のデフォルト値を修正。<br>
-						<li>読み上げや絵文字に関するバグの修正</li>
+・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
-						<li>公式ヘルプサイト:<a href="https://docs.thedesk.top">TheDesk Docs</a></li>
+・イメージビューワーの修正<br>
-					</ul>
+			</div>
-					いつの間にかリアルタイムユーザー数が100を超えていました。皆様のご愛顧に感謝申し上げます。<br>
+			<div id="release-en">
+				<h5>Let's make it native!</h5>
+				<a href="https://translate.thedesk.top">Crowdin translation project</a>
 			</div>
 			<br><br>
 			<h3>Support TheDesk!</h3>
@@ -579,130 +634,154 @@ var lang="en";
 		<i class="material-icons pointer" onclick="endPip()">close</i>
 		<div id="pip-content">
 		</div>
-    </div>
+		</div>
-<!--カラム追加-->
+<!--menu-->
-<div id="add-box" class="hide z-depth-4 notf-box">
+<div id="menu" class="z-depth-5" style="display:none">
-<div class="input-field"><span data-trans="your_acct">Select an account</span>
+		<div id="menu-bar" class="drag-bar"></div>
-<br>
+		<span class="cancel">
-<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
+				<i class="material-icons waves-effect" onclick="menu()" title="Close this box(X)">cancel</i>
-<label></label>
+			</span>
-</div>
+		<div id="menu-wrapper">
-<div class="input-field">
+		<div id="left-menu">
-<div id="auth">
+			<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"><i class="material-icons">add</i><span>Add a column</span></div>
-<select id="type-sel" style="color:black">
+			<div class="waves-effect" onclick="sortMenu()" id="sortMenu"><i class="material-icons">sort</i><span>Sort</span></div>
-	<option value="local" data-trans="local">Local</option>
+			<div class="waves-effect" onclick="searchMenu()" id="searchMenu"><i class="material-icons">search</i><span>Search</span></div>
-	<option value="local-media" data-trans="local-media">Local(Media)</option>
+			<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>List</span></div>
-	<option value="home" data-trans="home">Home</option>
+			<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>Filter</span></div>
-	<option value="pub" data-trans="public">Federated</option>
+			<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>Help</span></div>
-	<option value="pub-media" data-trans="public-media">Federated(Media)</option>
+			<div class="waves-effect" onclick="location.href='index.html'"><i class="material-icons">refresh</i><span>Reload TL</span></div>
-	<option value="dm" data-trans="dm">Direct Message</option>
+		</div>
-	<option value="mix" data-trans="integrated">Integrated(Local and Home)</option>
+		<div id="right-menu">
-	<option value="plus" data-trans="plus">Integrated(Local and replies and BT on Home)</option>
+				<!--カラム追加-->
-	<option value="notf" data-trans="notification">Notifications</option>
+<div id="add-box" class="hide menu-content">
-</select>
+	<div class="input-field"><span data-trans="your_acct">Account(Scroll to show all)</span>
-<label data-trans="show_tl">Show this TL:</label>
+	<br>
-</div>
+	<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
-<div id="noauth" class="hide">Show this TL:
+	<label></label>
-	<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">
-	<i class="material-icons left">add</i>Add
-</button>
-<br>
-<br>
-</div>
-<!--検索-->
-<div id="src-box" class="hide notf-box z-depth-4" style="width:500px">
-		<div class="input-field">
-		<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
-</div><div class="input-field">
-<i class="material-icons prefix">search</i>
-<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
-<label for="src" data-trans="src">Search</label>
-<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
-	<i class="material-icons left">search</i>Search
-</button>
-<br>
-<br>
-</div>
-<div id="search">
-<div id="src-contents">
-</div>
-</div>
-</div>
-<!--並べ替え-->
-<div id="sort-box" class="hide">
-<ul id="sort"></ul>
-<div>
-<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
-	<i class="material-icons left">sort</i>Sort
-</button>
-<button onclick="sortToggle()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="close">
-		<i class="material-icons left">close</i>Close
-</button>
-</div>
-</div>
-<!--リスト-->
-<div id="list-box" class="hide notf-box z-depth-4">
-	<div class="input-field" style="width:calc( 100% - 100px);float:left">
-		<select id="list-acct-sel" class="acct-sel"></select>
-		<label>Select an account</label>
 	</div>
-	<div style="float:left; padding-top:8px; padding-bottom:28px;">
+	<div class="input-field">
-		<button class="btn waves-effect indigo" style="width:80px;" onclick="list()" data-trans-i="lists">
+	<div id="auth">
-			List
+	<input type="hidden" value="local" id="type-sel">
-		</button>
+	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" 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 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">
+	</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">
+		<i class="material-icons left">add</i>Add
+	</button>
+	<br>
+	<br>
+	</div>
+	<!--検索-->
+	<div id="src-box" class="hide menu-content">
+			<div class="input-field">
+			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
+	</div><div class="input-field">
+	<i class="material-icons prefix">search</i>
+	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
+	<label for="src" data-trans="src">Search</label>
+	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
+		<i class="material-icons left">search</i>Search
+	</button>
+	<br>
+	<br>
+	</div>
+	<div id="search">
+	<div id="src-contents">
+	</div>
+	</div>
+	</div>
+	<!--並べ替え-->
+	<div id="sort-box" class="hide menu-content">
+	<ul id="sort"></ul>
+	<div>
+	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+		<i class="material-icons left">sort</i>Sort
+	</button>
+	</div>
+	</div>
+	<!--リスト-->
+	<div id="list-box" class="hide menu-content">
+		<div class="input-field" style="width:calc( 100% - 100px);float:left">
+			<select id="list-acct-sel" class="acct-sel"></select>
+			<label>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">
+				List
+			</button>
+		</div>
+		<br><br>
+		<div id="lists"></div>
+		<div id="lists-user"></div>
+		<input type="text" style="width:150px" id="list-add" placeholder="Display name">
+			<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">Save</button>
+	</div>
+	<!--フィルター-->
+	<div id="filter-box" class="hide menu-content">
+		<div class="input-field" style="width:calc( 100% - 100px);float:left">
+			<select id="filter-acct-sel" class="acct-sel"></select>
+			<label>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">
+				List
+			</button>
+		</div>
+		<div id="filtered-words"></div>
+		<input type="hidden" id="filter-edit-id">
+		<input type="text" style="width:150px" id="filter-add-word" placeholder="Filtering words"><br>
+		Filter contexts<br>
+		<input type="checkbox" class="filled-in" id="home_filter" value="home" />
+			<label for="home_filter">Home</label>
+		<input type="checkbox" class="filled-in" id="local_filter" value="public" />
+			<label for="local_filter">Local</label>
+		<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
+			<label for="notf_filter">Notifications</label>
+		<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
+			<label for="conv_filter">Conversations</label><br>
+			Options<br>
+		<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
+			<label for="wholeword_filter">Whole word</label><br>
+		<span class="sml">Nice for Latin language</span><br>
+		<input type="checkbox" class="filled-in" id="except_filter" value="1" />
+			<label for="except_filter">Drop instead of hide</label><br>
+		<span class="sml">Filtered toots will disappear irreversibly, even if filter is later removed</span><br>
+		Expire after<span class="sml">Unset or "0" means "Never"<b>This value may contain some error</b></span><br><br>
+		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">days
+		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">hours
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">minutes
+		<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>
-	<br><br>
-	<div id="lists"></div>
-	<div id="lists-user"></div>
-	<input type="text" style="width:150px" id="list-add" placeholder="Display name">
-		<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">Save</button>
 </div>
-<!--フィルター-->
+		</div>
-<div id="filter-box" class="hide notf-box z-depth-4">
+		<a onclick="about()" class="nex waves-effect">
-	<div class="input-field" style="width:calc( 100% - 100px);float:left">
+				<i class="material-icons" style="font-size: 1rem;">info</i>About TheDesk
-		<select id="filter-acct-sel" class="acct-sel"></select>
+		</a>&nbsp;|&nbsp;
-		<label>Select an account</label>
+		<a onclick="bottomReverse()" class="nex waves-effect">
-	</div>
+				<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>Toot button layout reverse
-	<div style="float:left; padding-top:8px; padding-bottom:28px;">
+		</a>
-		<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()" data-trans-i="filters">
-			List
-		</button>
-	</div>
-	<div id="filtered-words"></div>
-	<input type="hidden" id="filter-edit-id">
-	<input type="text" style="width:150px" id="filter-add-word" placeholder="Filtering words"><br>
-	Filter contexts<br>
-	<input type="checkbox" class="filled-in" id="home_filter" value="home" />
-	  <label for="home_filter">Home</label>
-	<input type="checkbox" class="filled-in" id="local_filter" value="public" />
-	  <label for="local_filter">Local</label>
-	<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
-	  <label for="notf_filter">Notifications</label>
-	<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
-	  <label for="conv_filter">Conversations</label><br>
-	  Options<br>
-	<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
-	  <label for="wholeword_filter">Whole word</label><br>
-	<span class="sml">Nice for Latin language</span><br>
-	<input type="checkbox" class="filled-in" id="except_filter" value="1" />
-	  <label for="except_filter">Drop instead of hide</label><br>
-	<span class="sml">Filtered toots will disappear irreversibly, even if filter is later removed</span><br>
-	Expire after<span class="sml">Unset or "0" means "Never"<b>This value may contain some error</b></span><br><br>
-	<input type="text" style="width:50px" id="days_filter" placeholder="d" value="0">days
-	<input type="text" style="width:50px" id="hours_filter" placeholder="h" value="0">hours
-	<input type="text" style="width:50px" id="mins_filter" placeholder="m" value="0">minutes
-	<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 id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	<h3>Welcome to TheDesk</h3><br><a href="acct.html">Add an account</a> or click <i class="material-icons">add</i> to add a column.
+	<h3>Welcome to TheDesk</h3><br><a href="acct.html">Add an account</a> or click <i class="material-icons">apps</i> to add a column.
 </div>
 </div>
 </div>
@@ -710,53 +789,26 @@ var lang="en";
 <div id="bottom" class="reverse">
     <div class="leftside reverse">
         <div id="dambox">
-                <input type="text" id="posttgl" placeholder="Toot" style="height:2rem">
+								<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
-        </div>
+									<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>Toot
+								</button>
+				</div>
         <div class="leftside reverse" id="group">
-            <div class="btnsgroup"><span class="grouptitle">Columns:</span>
+						<div class="btnsgroup">
-                <a onclick="addToggle()" class="nex waves-effect" data-trans-i="add" id="add-tgl">
+							<a href="acct.html" class="nex waves-effect">
-                    <i class="material-icons nex" title="Add a column" data-trans-title="column_add">add</i>
+                    <i class="material-icons nex big-icon" title="Account Manager(Ctrl+Shift+M)">account_circle</i>
-                </a>
+              </a>
-                <a onclick="sortToggle()" class="nex waves-effect">
+							<a href="setting.html" class="nex waves-effect">
-                    <i class="material-icons nex big-icon" title="Sort" data-trans-title="sort">sort</i>
+									<i class="material-icons nex" title="Preferences(Ctrl+Shift+S)">settings</i>
-                </a>
+							</a>
-            </div>
+							<a onclick="nano()" class="nex waves-effect">
-            <div class="btnsgroup"><span class="grouptitle">Accounts:</span>
+									<i class="material-icons" title="The smallest Mastodon,TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
-                <a href="acct.html" class="nex waves-effect">
+							</a>
-                    <i class="material-icons nex big-icon" title="Account Manager(Ctrl+Shift+M)" data-trans-title="manager">account_circle</i>
+							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
-                </a>
+									<i class="material-icons" title="List">apps</i>
-                <a onclick="srcToggle()" class="nex waves-effect" id="src-tgl">
+							</a>
-                    <i class="material-icons" title="Search" data-trans-title="src">search</i>
+						</div>
-                </a>
+    </div></div>
-                <a onclick="listToggle()" class="nex waves-effect" id="list-tgl">
-                    <i class="material-icons" title="List" data-trans-title="list">view_headline</i>
-                </a>
-                <a onclick="filterToggle()" class="nex waves-effect" id="filter-tgl">
-                    <i class="material-icons" title="Filter" data-trans-title="filter">filter_list</i>
-                </a>
-            </div>
-			<div class="btnsgroup"><span class="grouptitle">Preferences:</span>
-				<a onclick="bottomReverse()" class="nex waves-effect">
-                    <i class="material-icons nex" title="Toot box reverse" data-trans-title="reverse">swap_horiz</i>
-                </a>
-                <a href="setting.html" class="nex waves-effect">
-                    <i class="material-icons nex" title="Preferences(Ctrl+Shift+S)" data-trans-title="setting">settings</i>
-                </a>
-                <a href="index.html" class="nex mize waves-effect">
-                    <i class="material-icons nex" title="Super Reload(F5/⌘+R)" data-trans-title="reload">refresh</i>
-                </a>
-                <a onclick="nano()" class="nex waves-effect">
-                    <i class="material-icons" title="The smallest Mastodon,TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
-                </a>
-                <a onclick="window.open('https://astarte.thedesk.top');" class="setting nex waves-effect" target="_blank" id="ranking-btn" style="display:none;">
-                    <i class="material-icons nex" title="アスタルテランキング">timeline</i>
-				</a>
-				<a href="https://docs.thedesk.top" class="setting nex waves-effect" target="_blank">
-                    <i class="material-icons nex" title="Help">help_outline</i>
-				</a>
-            </div>
-        </div>
-    </div>
     <div>
 		<div id="tips-menu">
 			<div class="btnsgroup" style="height:34px"><span class="grouptitle">Tips:</span>
@@ -796,9 +848,11 @@ var lang="en";
 <script type="text/javascript" src="../../js/common/about.js"></script>
 <script type="text/javascript" src="../../js/tl/parse.js"></script>
 <script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
+<script type="text/javascript" src="../../js/tl/dm.js"></script>
 <script type="text/javascript" src="../../js/ui/scroll.js"></script>
 <script type="text/javascript" src="../../js/tl/tl.js"></script>
 <script type="text/javascript" src="../../js/tl/card.js"></script>
+<script type="text/javascript" src="../../js/tl/poll.js"></script>
 <script type="text/javascript" src="../../js/tl/date.js"></script>
 <script type="text/javascript" src="../../js/tl/notification.js"></script>
 <script type="text/javascript" src="../../js/tl/datails.js"></script>
@@ -831,4 +885,5 @@ var lang="en";
 <script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
 <script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
 <script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/ui/menu.js"></script>

app/view/en/oss.html

@@ -877,7 +877,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.<br>
-
+<h5>#InstanceTicker</h5>
+The MIT License (MIT)<br>
+<br>
+ORIGINAL CSS © 小田急don <a href="https://odakyu.app/@ars42525">https://odakyu.app/@ars42525</a><br>
+#InstanceTicker © weep.me <a href="https://weep.me/@weep">https://weep.me/@weep</a><br>
+<br>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:<br>
+<br>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.<br>
+<br>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.<br>
 </article>
 <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>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>

app/view/en/setting.html

@@ -2,20 +2,32 @@
 <html lang="en">
 <head>
 	<title>Settings - TheDesk</title>
+	<!--
+	<script type="text/javascript">
+		var _jipt = [];
+		_jipt.push(['project', 'thedesk']);
+	</script>
+	<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="../../css/themes.css" type="text/css" rel="stylesheet">
+	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
+	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
 </head>
 <body id="mainView" style="overflow-y:scroll">
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/setting.lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
-<script>var lang="en";</script>
+<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+<script src="../../node_modules/vue/dist/vue.min.js"></script>
+<script type="text/javascript" src="setting.vue.js"></script>
+
 <h4>Preferences</h4>
 <ul class="collapsible" data-collapsible="accordion">
 	<li>
@@ -24,11 +36,55 @@
 	</div>
 	<div class="collapsible-body">
 		<h5>Languages</h5>
-		<a onclick="changelang('ja')" class="pointer">日本語</a>/<a onclick="changelang('en')" class="pointer">English</a>
+		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>/
 		<h5>Import and export of preferences</h5>
 		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">Export</button>
 		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">Import</button>
-		<h5>Themes</h5>
+		<div id="envView">
+            <template v-for="(item, i) in config">
+				<h5>{{item.text.head}}</h5>
+				<templete v-html=item.text.desc></templete><br>
+				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">Notification test</a><br></template>
+                <template v-if="item.checkbox">
+                        <template v-for="(check, j) in item.text.checkbox">
+                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
+                        </template>
+				</template>
+				<template v-else>
+					<template v-if="item.doubleText">
+						<template v-for="(textbox, j) in item.data">
+                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+                        </template>
+					</template>
+					<template v-else>
+							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+					</template>
+					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">Change</button> 
+				</template>
+			</template>
+        </div>
+        <h5>Font</h5>
+		Select your favorite font to 'Select'<br>
+		<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
+		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
+		<br>
+		<input type="text" style="width:150px" id="font">
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+		<br>
+        <h5>Folder to save</h5>
+		TheDesk uses this value when it try to save pictures or take screenshots.<br>
+		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">Change</button>
+		<br>
+	</div>
+	</li>
+	<li>
+	<div class="collapsible-header">
+			<i class="material-icons">color_lens</i>Themes
+	</div>
+	<div class="collapsible-body">
+		<h4>Select theme</h4>
 		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
 		<label for="black">Black</label>
 		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
@@ -39,130 +95,84 @@
 		<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
 		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
 		<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
-		<br>
+		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
-		<h5>Popup notification(on window)</h5>Hide to set "0"
+		<label for="custom">Custom</label>
-		<br>
+		<div style="width:300px" id="sel-selector">
-		<input type="text" style="width:50px" id="popup">sec
+			<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+		</div>
-		<br>
+		<h4>Edit and add custom themes</h4>
-		<h5>Native notification</h5>
+		<div style="width:300px" id="edit-selector" data-add="Add new">
-		This does not work on Windows Portable ver.<br><a onclick="notftest()" class="pointer">Notification test</a>
+			<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
-		<br>
+				<option value="add_new">Add new</option>
-		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_yes" value="yes" />
+			</select>
-		<label for="ntf_yes">Yes</label>
+		</div>
-		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_no" value="no" />
+		<h5>Name</h5>
-		<label for="ntf_no">No</label>
+		<input type="text" style="width:300px" id="custom_name" placeholder="Name...">
-		<br>
+		<h5>About this theme</h5>
-		<h5>Minimam width of columns</h5>Scroll bar will be shown when your window size is more than ammounts of columns.
+		<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea" placeholder="About this theme..."></textarea></div>
-		<br>
+		<h5>Color scheme</h5>
-		<input type="text" style="width:50px" id="width">pxabove
+		<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+		<label for="dark">Dark</label>
-		<br>
+		<input class="with-gap" name="derection" type="radio" id="light" value="light" />
-		<h5>Font</h5>
+		<label for="light">Light</label>
-		Set local font<br>
+		<div id="pickers">
-		<input type="text" style="width:150px" id="font">
+		<div>
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+			<h5>Primary</h5>Background of components
-		<br>
+			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
-		<h5>Font size</h5>
+			<input type="hidden" id="color-picker0_value">
-		<span style="font-size:15px">15px(absolute value)</span>
+		</div>
-		<br>
+		<div>
-		<input type="text" style="width:50px" id="size">px 
+			<h5>Secondary</h5>Background color
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button><br>
+			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
-		<h5>Folder to save</h5>
+			<input type="hidden" id="color-picker1_value">
-		TheDesk uses this value when it try to save pictures or take screenshots.<br>
+		</div>
-		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">Change</button>
+		<div>
-		<br>
+			<h5>Texts</h5>Text color
-	</div>
+			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
+			<input type="hidden" id="color-picker2_value">
+		</div>
+		<div>
+			<h5>Accent</h5>Background of boosts
+			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
+			<input type="hidden" id="color-picker3_value">
+		</div>
+		</div>
+		<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">Delete</button><br><br>
+		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
+		Share this code with other TheDesk. Do not share this code with MiAS.
+		<h4>Import of custom themes</h4>
+		Get more themes on <a href="https://assets.msky.cafe/" target="_blank">MiAS</a><br>
+		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
+		<button class="btn waves-effect" onclick="customImp()">Import</button><br>
 	</li>
 	<li>
 	<div class="collapsible-header">
 			<i class="material-icons">reorder</i>Timeline Preferences
 	</div>
 	<div class="collapsible-body">
-		<h5>Time format</h5>Relative format:"1 minutes ago","3 days ago"
+		<div id="tlView">
-		<br>Absolute format:"23:25:21","2017/12/30 23:59:00"
+            <template v-for="(item, i) in config">
-		<br>Mixed format:toots posted today are relative-format, others are absolute-format.
+				<h5>{{item.text.head}}</h5>
-		<br>
+				{{item.text.desc}}<br>
-		<input class="with-gap" onchange="settings()" onchange="settings()" name="time" type="radio" id="relative" value="relative" />
+                <template v-if="item.checkbox">
-		<label for="relative">Relative</label>
+                        <template v-for="(check, j) in item.text.checkbox">
-		<input class="with-gap" onchange="settings()" name="time" type="radio" id="absolute" value="absolute" />
+                            <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 for="absolute">Absoltue</label>
+                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-		<input class="with-gap" onchange="settings()" name="time" type="radio" id="double" value="double" />
+                        </template>
-		<label for="double">Both relative and absolute</label>
+				</template>
-		<input class="with-gap" onchange="settings()" name="time" type="radio" id="medium" value="medium" />
+				<template v-else>
-		<label for="medium">Mixed</label>
+					<template v-if="item.doubleText">
-		<h5>Instance unique locale</h5>This value is available on some Japanese instances
+						<template v-for="(textbox, j) in item.data">
-		<br>
+                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_yes" value="yes" />
+                        </template>
-		<label for="ul_yes">Yes</label>
+					</template>
-		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_no" value="no" />
+					<template v-else>
-		<label for="ul_no">No</label>
+							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-		<br>
+					</template>
-		<h5>Hide NSFW pictures</h5>Strong blur effect
+					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">Change</button> 
-		<br>
+				</template>
-		<input class="with-gap" onchange="settings()" name="nsfw" type="radio" id="n_yes" value="yes" />
+			</template>
-		<label for="n_yes">Yes</label>
+        </div>
-		<input class="with-gap" onchange="settings()" name="nsfw" type="radio" id="n_no" value="no" />
-		<label for="n_no">No</label>
-		<br>
-		<h5>Hide CW contents</h5>
-		<input class="with-gap" onchange="settings()" name="cw" type="radio" id="c_yes" value="yes" />
-		<label for="c_yes">Yes</label>
-		<input class="with-gap" onchange="settings()" name="cw" type="radio" id="c_no" value="no" />
-		<label for="c_no">No</label>
-		<br>
-		<h5>Reply counter style</h5>
-		<input class="with-gap" onchange="settings()" name="rp" type="radio" id="rp_hidden" value="hidden" />
-		<label for="rp_hidden">Show 1+ if the replies are more than 1.</label>
-		<input class="with-gap" onchange="settings()" name="rp" type="radio" id="rp_all" value="all" />
-		<label for="rp_all">Show full count(1,2...)</label>
-		<br>
-		<h5>Animated GIF images animation</h5>
-		<input class="with-gap" onchange="settings()" name="gif" type="radio" id="g_yes" value="yes" />
-		<label for="g_yes">Yes</label>
-		<input class="with-gap" onchange="settings()" name="gif" type="radio" id="g_no" value="no" />
-		<label for="g_no">No</label>
-		<br>
-		<h5>Tag TL Search</h5>
-		<input class="with-gap" onchange="settings()" name="tag" type="radio" id="t_all" value="all" />
-		<label for="t_all">Use federated network</label>
-		<input class="with-gap" onchange="settings()" name="tag" type="radio" id="t_local" value="local" />
-		<label for="t_local">Use local network</label>
-		<br>
-		<h5>Show via</h5>
-		<input class="with-gap" onchange="settings()" name="via" type="radio" id="via_yes" value="yes" />
-		<label for="via_yes">Yes</label>
-		<input class="with-gap" onchange="settings()" name="via" type="radio" id="via_hide" value="hide" />
-		<label for="via_hide">No</label>
-		<br>
-		<h5>Hide action buttons without mouseover</h5>
-		You may feel 'mouseover' is unconfortable:(<br>
-		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_yes" value="yes" />
-		<label for="mov_yes">Mouseover to show</label>
-		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_click" value="click" />
-		<label for="mov_click">Click to show</label>
-		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_no" value="no" />
-		<label for="mov_no">No</label>
-		<br>
-		<h5>Show Notification marker, red colored bell and counter(if you show a notification column.)</h5>
-		<input class="with-gap" onchange="settings()" name="notfm" type="radio" id="notfm_yes" value="yes" />
-		<label for="notfm_yes">Yes</label>
-		<input class="with-gap" onchange="settings()" name="notfm" type="radio" id="notfm_no" value="no" />
-		<label for="notfm_no">No</label>
-		<br>
-		<h5>Auto folding</h5>
-		TheDesk does not collapse totes of 5 characters or less. Also, when collapsing, newlines are not shown. TheDesk count only newlines as the number of lines.
-		<br>
-		<input type="text" style="width:50px" id="sentence">linesaboveor
-		<input type="text" style="width:50px" id="letters">lettersabove
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
-		<br>
-		<h5>Height of images
-        </h5>
-		<input type="text" style="width:50px" id="img-height">px
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
-		<br>
-		<br>
 	</div>
 	</li>
 	<li>
@@ -170,89 +180,32 @@
 			<i class="material-icons">send</i>Posting Preferences
 	</div>
 	<div class="collapsible-body">
-		<h5>Default warining text</h5>
+		<div id="postView">
-		<input type="text" style="width:150px" id="cw-text">
+            <template v-for="(item, i) in config">
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+				<h5>{{item.text.head}}</h5>
-		<br>
+				{{item.text.desc}}<br>
-		<h5>Alert before posting a long toot.</h5>
+                <template v-if="item.checkbox">
-		Show dialog whether you make too-long text hidden.
+                        <template v-for="(check, j) in item.text.checkbox">
-		<br>
+							<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-		<input type="text" style="width:50px" id="cw_sentence">linesaboveor
+                            	<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" />
-		<input type="text" style="width:50px" id="cw_letters">lettersabove
+								<label v-bind:for="item.id+check.value">{{check.text}}</label>
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+								<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
-		<br>
+							</template>
-		<h5>Always CW set</h5>
+                        </template>
-		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_yes" value="yes" />
+				</template>
-		<label for="cws_yes">Yes</label>
+				<template v-else>
-		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_no" value="no" />
+					<template v-if="item.doubleText">
-		<label for="cws_no">No
+						<template v-for="(textbox, j) in item.data">
-		</label>
+                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-		<br>
+                        </template>
-		<h5>Default visibility</h5>
+					</template>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="public" value="public" />
+					<template v-else>
-		<label for="public">Public</label>
+							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="unlisted" value="unlisted" />
+					</template>
-		<label for="unlisted">Unlisted</label>
+					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">Change</button> 
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="private" value="private" />
+				</template>
-		<label for="private">Private</label>
+			</template>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="direct" value="direct" />
+        </div>
-		<label for="direct">Direct</label>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="memory" value="memory" />
-		<label for="memory">Memory(memorized as each instance)</label>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="server" value="server" />
-		<label for="server">Default of your visibility(Set on preferences of Mastodon instance)</label>
-		<br>
-		<h5>Posting images preferences</h5>
-		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_url" value="url" />
-		<label for="i_url">Insert media URL</label>
-		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_no-act" value="no-act" />
-		<label for="i_no-act">Insert nothig</label>
-		<br>
-		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_inline" value="inline" disabled />
-		<label for="i_inline">Disabled 
-			<!--画像を投稿し、インラインで表示(Markdownに対応したインスタンスのみ。マルチアカウント環境では非推奨。)-->
-		</label>
-		<br>
-		<h5>Action of posting-box</h5>
-		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_yes" value="yes" />
-		<label for="bx_yes">Folding</label>
-		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_no" value="no" />
-		<label for="bx_no">Open after posting
-		</label>
-		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_abs" value="absolute" />
-		<label for="bx_abs">Absolutely open</label>
-		<br>
-		<h5>Quote format</h5>
-		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_simple" value="simple" />
-		<label for="q_simple">Only URL</label>
-		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_mention" value="mention" />
-		<label for="q_mention">URL and acct(mention to the user)</label>
-		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_full" value="full" />
-		<label for="q_full">URL, text and acct(mention to the user)
-		</label>
-		<br>
-		<h5>Default accounts of actions</h5>
-		Main account can be set on Account Manager.<br>
-		<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_remain" value="remain" />
-		<label for="mn_remain">Account you used recently</label>
-		<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_main" value="main" />
-		<label for="mn_main">Main account</label>
-		</label>
-		<h5>Secondary Toot Button</h5>
-		Toot with other visibility setting<br>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-nothing" value="nothing" />
-		<label for="sec-nothing">Hidden</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-public" value="public" />
-		<label for="sec-public">Public</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-unlisted" value="unlisted" />
-		<label for="sec-unlisted">Unlisted</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-private" value="private" />
-		<label for="sec-private">Private</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-direct" value="direct" />
-		<label for="sec-direct">Direct</label>
-		<input class="with-gap hide kirishima" onchange="settings()" name="sec" type="radio" id="sec-local" value="local" />
-		<label for="sec-local">Local Only</label><span class="hide kirishima">非対応インスタンスでは「未収載」になります。</span>
-		<br>
 	</div>
 	</li>
 	<li>
@@ -298,6 +251,22 @@
 			<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
 		</div>
 		<div class="collapsible-body">
+			<h5>NowPlaying Provider(Windows)</h5>
+			macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
+			<label for="aimp">AIMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+			<label for="itunes">iTunes</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+			<label for="npmm">MediaMonkey</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+			<label for="winamp">Winamp</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
+			<label for="wmp">WMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
+			<label for="wlm">WLM</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
+			<label for="cad">CAD</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>
@@ -308,8 +277,9 @@
 			<br>
 			<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
 {url}</textarea><br>
-				Refer:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify<br>
+				Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify<br>
-				iTunes NowPlaying:{url} is disabled, but composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre} are available.<br>
+				macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}<br>
+				Windows:{song}:Song name/{album}:Album name/{artist}:Artist name<br>
 				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
                     CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
@@ -353,6 +323,7 @@
 <li>X:Toggle toot box</li>
 <li>Ctrl+Enter:Post</li>
 <li>Ctrl+Enter+Shift:Post(secondary toot)</li>
+<li>Alt+Enter:Secondary Toot Button</li>
 <li>Ctrl+E:Make all notifications read</li>
 <li>Esc:Hide toot box</li>
 <li>F5:Super Reload</li>
@@ -389,7 +360,7 @@ Kyash<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. 
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://github.com/cutls/TheDesk/blob/master/TOS.md">Terms of Use</a>
+	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
 	<br>Developer: Cutls P( 
 	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 	<br>
@@ -399,9 +370,9 @@ TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のため
 <script type="text/javascript" src="../../js/common/about.js"></script>
 <script type="text/javascript" src="../../js/platform/end.js"></script>
 <script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.js"></script>
 <script type="text/javascript" src="../../js/ui/spotify.js"></script>
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
+<script type="text/javascript" src="../../js/platform/pickr.js"></script>
 <script type="text/javascript" src="../../js/ui/settings.js"></script>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>
 <script type="text/javascript" src="../../js/tl/date.js"></script>

app/view/en/setting.vue.js

@@ -0,0 +1,480 @@
+var yesno=[
+    {
+        text:"Yes",
+        value:"yes"
+    },{
+        text:"No",
+        value:"no"
+    }
+];
+var envConstruction=[
+    {
+        id:"popup",
+        storage:"popup",
+        checkbox:false,
+        doubleText:false,
+        setValue:0,
+        width:50,
+        text:{
+            head:"Popup notification(on Windows)",
+            desc:"Hide to set "0"",
+            after:"sec"
+        }
+    },{
+        id:"notf",
+        storage:"nativenotf",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"Native notification",
+            desc:"This does not work on Windows Portable ver.",
+            checkbox:yesno
+        }
+    },{
+        id:"width",
+        storage:"width",
+        checkbox:false,
+        doubleText:false,
+        width:50,
+        setValue:300,
+        text:{
+            head:"Minimum width of columns",
+            desc:"Scroll bar will be shown when your window size is more than ammounts of columns.",
+            after:"px above"
+        }
+    },{
+        id:"fixwidth",
+        storage:"fixwidth",
+        checkbox:false,
+        doubleText:false,
+        setValue:300,
+        width:50,
+        text:{
+            head:"Minimum width of TweetDeck browser",
+            desc:"",
+            after:"px above"
+        }
+    },{
+        id:"size",
+        storage:"size",
+        checkbox:false,
+        doubleText:false,
+        width:50,
+        setValue:13,
+        text:{
+            head:"Font size",
+            desc:'<span style="font-size:13px">13px(absolute value)</span>',
+            after:"px"
+        }
+    },{
+        id:"ha",
+        storage:"ha",
+        checkbox:true,
+        setValue:false,
+        text:{
+            head:"Disable hardware acceleration",
+            desc:"Auto restarted",
+            checkbox:[
+                {
+                    text:"Yes",
+                    value:"true"
+                },{
+                    text:"No",
+                    value:"false"
+                }
+            ]
+        }
+    }
+];
+var tlConstruction=[
+    {
+        id:"time",
+        storage:"datetype",
+        checkbox:true,
+        setValue:"absolute",
+        text:{
+            head:"Time format",
+            desc:'Relative format:"1 minutes ago","3 days ago"<br>Absolute format:"23:25:21","2017/12/30 23:59:00"<br>Mixed format:toots posted today are relative-format, others are absolute-format.',
+            checkbox:[
+                {
+                    text:"Relative",
+                    value:"relative"
+                },{
+                    text:"Absolute",
+                    value:"absolute"
+                },{
+                    text:"Both relative and absolute",
+                    value:"double"
+                },{
+                    text:"Mixed",
+                    value:"medium"
+                }
+
+            ]
+        }
+    },{
+        id:"ul",
+        storage:"locale",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"Server's unique locale",
+            desc:"This value is available on some Japanese servers",
+            checkbox:yesno
+        }
+    },{
+        id:"nsfw",
+        storage:"nsfw",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"Hide NSFW pictures",
+            desc:"Strong blur effect",
+            checkbox:yesno
+        }
+    },{
+        id:"cw",
+        storage:"cw",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"Hide CW contents",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        id:"rp",
+        storage:"replyct",
+        checkbox:true,
+        setValue:"hidden",
+        text:{
+            head:"Reply counter style",
+            desc:"",
+            checkbox:[
+                {
+                    text:"Show 1+ if the replies are more than 1.",
+                    value:"hidden"
+                },{
+                    text:"Show 1+ if the replies are more than 1.",
+                    value:"all"
+                }
+
+            ]
+        }
+    },{
+        id:"gif",
+        storage:"gif",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"Animated GIF images animation",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        id:"tag",
+        storage:"tag-range",
+        checkbox:true,
+        setValue:"local",
+        text:{
+            head:"Tag TL Search",
+            desc:"",
+            checkbox:[
+                {
+                    text:"Use federated network",
+                    value:"all"
+                },{
+                    text:"Use local network",
+                    value:"local"
+                }
+
+            ]
+        }
+    },{
+        id:"via",
+        storage:"viashow",
+        checkbox:true,
+        setValue:"no",
+        text:{
+            head:"Show via",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        id:"mov",
+        storage:"mouseover",
+        checkbox:true,
+        setValue:"no",
+        text:{
+            head:"Hide action buttons without mouseover",
+            desc:"You may feel 'mouseover' is unconfortable:(",
+            checkbox:[
+                {
+                    text:"Mouseover to show",
+                    value:"yes"
+                },{
+                    text:"Click to show",
+                    value:"click"
+                },{
+                    text:"No",
+                    value:"no"
+                }
+
+            ]
+        }
+    },{
+        id:"notfm",
+        storage:"setasread",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"Show Notification marker, red colored bell and counter(if you show a notification column.)",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        checkbox:false,
+        doubleText:true,
+        data:[
+            {
+                id:"sentence",
+                storage:"sentence",
+                width:50,
+                setValue:500,
+                text:{after:"lines above or"}
+            },{
+                id:"letters",
+                storage:"letters",
+                width:50,
+                setValue:7000,
+                text:{after:"letters above"}
+            }
+        ],
+        text:{
+            head:"Auto folding",
+            desc:"TheDesk does not collapse totes of 5 characters or less. Also, when collapsing, newlines are not shown. TheDesk count only newlines as the number of lines.",
+        }
+    },{
+        id:"img-height",
+        storage:"img-height",
+        checkbox:false,
+        doubleText:false,
+        width:80,
+        setValue:200,
+        text:{
+            head:"Height of images",
+            desc:"",
+            after:"px"
+        }
+    },{
+        id:"ticker",
+        storage:"ticker_ok",
+        checkbox:true,
+        setValue:"no",
+        text:{
+            head:"Enable #InstanceTicker",
+            desc:'Show colorful stickers about tooters' server. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.',
+            checkbox:yesno
+        }
+    },{
+        id:"anime",
+        storage:"animation",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"Animation of timelines",
+            desc:"",
+            checkbox:yesno
+        }
+    }
+];
+var postConstruction=[
+    {
+        id:"cw-text",
+        storage:"cw-text",
+        checkbox:false,
+        doubleText:false,
+        width:150,
+        setValue:"",
+        text:{
+            head:"Default warining text",
+            desc:"",
+            after:""
+        }
+    },{
+        checkbox:false,
+        doubleText:true,
+        data:[
+            {
+                id:"cw_sentence",
+                storage:"cw_sentence",
+                width:50,
+                setValue:500,
+                text:{after:"lines above or"}
+            },{
+                id:"cw_letters",
+                storage:"cw_letters",
+                width:50,
+                setValue:7000,
+                text:{after:"letters above"}
+            }
+        ],
+        text:{
+            head:"Alert before posting a long toot.",
+            desc:"Show dialog whether you make too-long text hidden.",
+        }
+    },{
+        id:"cws",
+        storage:"always-cw",
+        checkbox:true,
+        setValue:"no",
+        text:{
+            head:"Always CW set",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        id:"vis",
+        storage:"vis",
+        checkbox:true,
+        setValue:"public",
+        text:{
+            head:"Default visibility",
+            desc:"",
+            checkbox:[
+                {
+                    text:"Public",
+                    value:"public"
+                },{
+                    text:"Unlisted",
+                    value:"unlisted"
+                },{
+                    text:"Private",
+                    value:"private"
+                },{
+                    text:"Direct",
+                    value:"direct"
+                },{
+                    text:"Memory(memorized as each server)",
+                    value:"memory"
+                },{
+                    text:"Default of your visibility(Set on preferences of Mastodon server)",
+                    value:"useapi"
+                }
+            ]
+        }
+    },{
+        id:"img",
+        storage:"img",
+        checkbox:true,
+        setValue:"no-act",
+        text:{
+            head:"Posting images preferences",
+            desc:"",
+            checkbox:[
+                {
+                    text:"Insert media URL",
+                    value:"url"
+                },{
+                    text:"Insert nothig",
+                    value:"no-act"
+                }
+            ]
+        }
+    },{
+        id:"box",
+        storage:"box",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"Action of posting-box",
+            desc:"",
+            checkbox:[
+                {
+                    text:"Folding",
+                    value:"yes"
+                },{
+                    text:"Open after posting",
+                    value:"no"
+                },{
+                    text:"Absolutely open",
+                    value:"absolute"
+                }
+            ]
+        }
+    },{
+        id:"quote",
+        storage:"quote",
+        checkbox:true,
+        setValue:"nothing",
+        text:{
+            head:"Quote format",
+            desc:"",
+            checkbox:[
+                {
+                    text:"Only URL",
+                    value:"simple"
+                },{
+                    text:"URL and acct(mention to the user)",
+                    value:"mention"
+                },{
+                    text:"URL, text and acct(mention to the user)",
+                    value:"full"
+                },{
+                    text:"Disabled(Hide buttons on TLs)",
+                    value:"nothing"
+                }
+            ]
+        }
+    },{
+        id:"main",
+        storage:"mainuse",
+        checkbox:true,
+        setValue:"remain",
+        text:{
+            head:"Default accounts of actions",
+            desc:"Main account can be set on Account Manager.",
+            checkbox:[
+                {
+                    text:"Account you used recently",
+                    value:"remain"
+                },{
+                    text:"Main account",
+                    value:"main"
+                }
+            ]
+        }
+    },{
+        id:"sec",
+        storage:"sec",
+        checkbox:true,
+        setValue:"public",
+        text:{
+            head:"Secondary Toot Button",
+            desc:"",
+            checkbox:[
+                {
+                    text:"Hidden",
+                    value:"nothing"
+                },{
+                    text:"Public",
+                    value:"public"
+                },{
+                    text:"Unlisted",
+                    value:"unlisted"
+                },{
+                    text:"Private",
+                    value:"private"
+                },{
+                    text:"Direct",
+                    value:"direct"
+                },{
+                    text:"Local Only",
+                    value:"local",
+                    kirishima:true,
+                    kirishimaText:"非対応インスタンスでは「未収載」になります。"
+                }
+            ]
+        }
+    }
+]

app/view/en/update.html

@@ -6,6 +6,13 @@
 <link href="../../css/master.css" type="text/css" rel="stylesheet">
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 <meta charset="utf-8">
+<!--
+<script type="text/javascript">
+	var _jipt = [];
+	_jipt.push(['project', 'thedesk']);
+</script>
+<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+-->
 </head>
 <body>
 <style>
@@ -55,6 +62,9 @@ a,button,input,label,i{
 #prog{
     font-size:200%;
 }
+.linux, .mac{
+    display:none;
+}
 </style>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -68,14 +78,12 @@ a,button,input,label,i{
         <p>Get latest TheDesk</p>
         <span id="now"></span>→<b id="ver"></b><br>
         <span id="det"></span><br>
-        <button id="update" class="waves-effect btn" onclick="update('true')" style="margin-left:15px;">Start</button>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">Installer ver.</button>
-        <div id="checkbox">
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">Portable ver.</button>
-            Options:<br>
+        <span class="linux">Snap ver may be on Snapcraft<br></span>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">Start</button>
-            <label for="portable">Poetable ver.</label><br>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">Start</button>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
+        <br>
-            <label for="rewrite">Not rewrite</label><br>
-        </div>
         Some problems?<br>Please download on <a href="https://thedesk.top">Oficial HP</a>.
     </div>
     <div id="skipper" class="hide">
@@ -116,17 +124,49 @@ function update(sel){
     $("#dlnow").toggleClass("hide");
     $("#dlnow").toggleClass("show");
     $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
+    var remote=electron.remote;
-        var versioning=true;
+    var bit=process.arch;
-	}else{
+    var start="https://thedesk.top/ver.json";
-        var versioning=false;
+	fetch(start, {
-    }
+		method: 'GET',
-    if($('#portable:checked').val()=="true"){
+		headers: {'content-type': 'application/json'},
-		var zip=true;
+    }).then(function(response) {
-	}else{
+       return response.json();
-        var zip=false;
+    }).catch(function(error) {
-    }
+        todo(error);
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="install"){
+            if(bit=="x64"){
+                var url=json["winx64"];
+                var file="TheDesk-setup.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32"];
+                var file="TheDesk-setup-ia32.exe";
+            }
+        }else if(sel=="portable"){
+            if(bit=="x64"){
+                var url=json["winx64p"];
+                var file="TheDesk.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32p"];
+                var file="TheDesk-ia32.exe";
+            }
+        }else if(sel=="linux"){
+            if(bit=="x64"){
+                var url=json["linuxx64"];
+                var file="TheDesk-linux-x64.zip";
+            }else if(bit=="ia32"){
+                var url=json["linuxia64"];
+                var file="TheDesk-linux-ia32.zip";
+            }
+        }else if(sel=="mac"){
+            var url=json["mac"];
+            var file="TheDesk-darwin-x64.zip";
+        }
+        ipc.send('download-btn', [url,file]);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -142,9 +182,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
     var remote=electron.remote;
-	var platform=remote.process.platform;
+    var platform=remote.process.platform;
-	if(platform!="win32"){
+    var bit=process.arch;
-		$('#portable').prop("disabled",true)
+	if(platform=="linux"){
+        $('.windows').hide()
+        $('.linux').show()
+	}else if(platform=="mac"){
+        $('.windows').hide()
+        $('.mac').show()
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
@@ -160,7 +205,8 @@ function verck(){
              $("#ver").text(json.desk);
              localStorage.setItem("next-ver",json.desk);
 			 $("#det").html(json.detail);
-			 $("#now").text(localStorage.getItem("ver"));
+             $("#now").text(localStorage.getItem("ver"));
+             
     });
 }
 function nextv(){

app/view/ja/acct.html

@@ -20,14 +20,20 @@ body,html{overflow-y: scroll;}
 .card .colorsel div.exc{width:40px;height:20px;}
 </style>
 <meta charset="utf-8">
+<!--
+<script type="text/javascript">
+	var _jipt = [];
+	_jipt.push(['project', 'thedesk']);
+</script>
+<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+-->
 </head>
 <body id="mainView">
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.ja.js"></script>
 <script>
-      var lang="ja"; 
       var misskeytoken=false;
 </script>
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
@@ -43,7 +49,7 @@ body,html{overflow-y: scroll;}
       <div class="col s6">
             <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
             <div id="ins-suggest"></div>
-            Windows以外でご使用の方やPleromaにログインされる方はチェックを入れて下さい。<br>
+            Windows以外でご使用の方やPleromaにログインされる方はチェックを入れて下さい。ログインできない場合、チェックを外してください。<br>
             <input type="checkbox" class="filled-in" id="linux" />
                   <label for="linux">コードセットアップ</label><br>
             <input type="checkbox" class="filled-in" id="misskey" />
@@ -77,10 +83,10 @@ Some instance data by <a href="https://instances.social" target="_blank">instanc
 <h5 id="ins-title"></h5>
 Administered by:<a id="ins-admin"></a><br>
 <span id="ins-desc"></span><br>
-<img src="./img/loading.svg" id="ins-prof" width="200"><br>
+<img src="../../img/loading.svg" id="ins-prof" width="200"><br>
 <br>
 ドメイン名:<span id="ins-name"></span><br>
-接続インスタンス数:<span id="ins-connect"></span>個<br>
+接続サーバー数:<span id="ins-connect"></span>個<br>
 トゥート数:<span id="ins-toot"></span>個<br>
 ユーザー数:<span id="ins-user"></span>ユーザー数<br>
 コネクション:<span id="ins-per"></span>%<br>

app/view/ja/beta.html

@@ -0,0 +1,109 @@
+<!doctype html>
+<!--Vue.jsでなんかTLづくりやってみようみたいなやつ。そっ閉じ推奨。-->
+<html lang="ja">
+<head>
+	<title>Beta - TheDesk</title>
+	<meta content="width=device-width,initial-scale=1.0" name="viewport">
+	<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+	<meta charset="utf-8">
+</head>
+<a href="index.html">Back</a>
+<div id="tl">
+    <div :id="pub_id" class="cvo" :class="boostback" v-bind:class="{ 'faved': fav_app, 'rted': rt_app, 'pinned':pin_app,'hasmedia':hasmedia}" 
+        :toot-id="id" :unique-id="uniqueid" :data-medias="media_ids" :unixtime="unixtime" :data-notfIndv="if_notf" 
+        @mouseover="mov('mv')" @click="mov('cl')" @mouseout="resetmv('mv')"> 
+        <div class="area-notice"><span class="gray sharesta"><span v-if="notice"><i class="big-text fa" :class="rticon"></i>{{dis_name}}(@{{acct}})<br></span></span></div>
+        <div class="area-icon">
+            <a @click="udg" :user="acct" class="udg"><img :src="avatar" width="40" class="prof-img" :user="acct"></a>
+            <a @click="udg" :user="acct" class="udg" v-if="notice"><img :src="avatar" width="40" class="notf-icon prof-img" :user="acct"></a>
+        </div>
+
+        Yeah
+    </div>
+</div>
+<script>
+var app = new Vue({
+el: '#tl',
+data: {
+    tlid:0,
+    pub_id:"pub_123",
+    id: 123,
+    uniqueid:1234,
+    boostback:'a',
+    fav_app:true,
+    rt_app:true,
+    pin_app:false,
+    hasmedia:false,
+    media_ids:'',
+    unixtime:'1238954',
+    if_notf:''
+},
+methods: {
+    mov: function (c) {
+      mov(this.id,this.tlid,c)
+    },
+    resetmv: function (c) {
+      resetmv(c)
+    }
+  }
+})
+
+</script>
+<script>
+function mov(a,b,c){
+    console.log(a+":"+b+":"+c);
+}
+function resetmv(a){
+    console.log(a);
+}
+</script>
+<!--@mouseover="mov({{id}},{{tlid}},'mv')" @click="mov({{id}},{{tlid}},'cl')" @mouseout="resetmv('mv')"-->
+<!--
+    <div id="pub_toot.id" class="cvo boostback fav_app rt_app pin_app hasmedia" toot-id="id" unique-id="uniqueid" data-medias="media_ids " unixtime="date(obj[key].created_at, unix)" if_notf onmouseover="mov(toot.id,tlid,mv)" onclick="mov(toot.id,tlid,cl)" onmouseout="resetmv(mv)"> 
+			<div class="area-notice"><span class="gray sharesta">noticehome</span></div> 
+			<div class="area-icon">
+                <a onclick="udg(toot.account.id,acct_id);" user="toot.account.acct" class="udg"><img src="avatar" width="40" class="prof-img" user="toot.account.acct"></a>noticeavatar
+            </div> 
+			<div class="area-display_name">
+                <div class="flex-name"><span class="user">dis_name</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;">@toot.account.acctlocked</span></div> 
+			<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(toot.url);" title="date(toot.created_at, absolute)(lang_parse_clickcopyurl[lang])"><i class="fa fa-clock-o"></i> 
+			date(toot.created_at, datetype)</span> 
+			</div></div> 
+			<div class="area-toot"><span class="api_spoil cw_text_toot.id">spoilspoiler_show</span><span class="toot spoiler">content</span> 
+			viewer 
+			</div><div class="area-additional"><span class="additional">analyze</span>mentionstags</div> 
+			<div class="area-vis"></div>
+			<div class="area-actions mouseover"> 
+			<div class="action">vis</div>
+			<div class="action antinoauth"><a onclick="detEx(toot.url,main)" class="waves-effect waves-dark details" style="padding:0">lang_parse_det[lang]</a></div> 
+            <div class="action disp["re"] noauth"><a onclick="re(toot.id,toot.account.acct,acct_id,visen)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_replyto[lang]">
+                <i class="fa fa-share"></i><span class="rep_ct">replyct</a></span></a></div> 
+			<div class="action can_rt disp["rt"] noauth"><a onclick="rt(toot.id,acct_id,tlid)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_bt[lang]"><i class="text-darken-3 fa fa-retweet
+			if_rt rt_toot.id"></i><span class="rt_ct">toot.reblogs_count 
+			</span></a></div> 
+			<div class="action can_rt disp["qt"] noauth"><a onclick="qt(toot.id,acct_id 
+			,toot.account.acct ,toot.url
+			)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_quote[lang]"><i class="text-darken-3 fa fa-quote-right"></i></a></div> 
+			<div class="action disp["fav"] noauth"><a onclick="fav(toot.id,acct_id 
+			,tlid 
+			)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_fav[lang]"><i class="fa text-darken-3 fa-star 
+			if_fav fav_toot.id"></i><span class="fav_ct">toot.favourites_count 
+			</a></span></div> 
+			<div class="if_mine action disp["del"] noauth"><a onclick="del(toot.id, 
+			acct_id 
+			)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_del[lang]"><i class="fa fa-trash-o"></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_parse_pin[lang]"><i class="fa fa-map-pin pin_toot.id if_pin"></i></a></div> 
+			<div class="if_mine action disp["red"] noauth"><a onclick="redraft(toot.id, 
+			acct_id 
+			)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_redraft[lang]"><i class="material-icons">redo</i></a></div>trans
+			<span class="cbadge viabadge waves-effect viashow mine_via" onclick="client($.strip_tags(via))" title="via $.strip_tags(via)">via
+			via 
+			</span>
+			</div><div class="area-side mouseover"><div class="action if_mine noauth"><a onclick="toggleAction(toot.id,tlid,acct_id)" class="waves-effect waves-dark btn-flat" style="padding:0"><i class="text-darken-3 material-icons act-icon">expand_more</i></a></div> 
+			<div class="action noauth"><a onclick="details(toot.id,acct_id 
+			,tlid)" class="waves-effect waves-dark btn-flat details" style="padding:0"><i class="text-darken-3 material-icons">more_vert</i></a></div> 
+			</div></div> 
+			</div></div>
+-->

app/view/ja/index.html

@@ -13,28 +13,32 @@
 	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
+	<!--
+	<script type="text/javascript">
+		var _jipt = [];
+		_jipt.push(['project', 'thedesk']);
+	</script>
+	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+	-->
 </head>
 <body>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.ja.js"></script>
-<script type="text/javascript" src="../../js/lang/parse.lang.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/version.js"></script>
 <script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Akane (16.1.5)";
+var ver="Usamin (18.0.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
-var winstore=false;
 var acct_id=0;
 var tlid=0;
-var lang="ja";
   verck(ver);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
@@ -48,8 +52,10 @@ var lang="ja";
 </div>
 </div>
 </div>
-<div id="post-box" class="z-depth-3">
+<div id="post-box" class="z-depth-5">
+<div id="post-bar" class="drag-bar">投稿</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@@ -118,16 +124,14 @@ var lang="ja";
 <span class="sml gray pointer anti-markdown mize">
 <a onclick="mdToggle()">Markdownエディタを表示</a>
 </span>
-<span id="suggest"></span>
 </div>
 <div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 		<i class="waves-effect gray material-icons" id="nsfw" title="画像に制限を付与" onclick="nsfw()">visibility_off</i>
 		<i class="waves-effect gray material-icons purple-text dropdown-button" data-activates='dropdown1' id="vis-icon">public</i>
 		<a class="waves-effect gray" id="cw" onclick="cw()" title="コンテンツワーニング(トゥートを表示する前にメッセージで隠す)">CW</a>
 		<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray" onclick="fileselect()" title="ファイルを選択">photo_library</i></span></span>
-		<i class="waves-effect gray material-icons" onclick="adobe()" title="Adobeフォトエディタ">format_shapes</i>
 		<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn" title="絵文字を挿入">tag_faces</i>
-		<a class="pointer waves-effect gray" id="npbtn" title="NowPlaying[クリックでSpotify(アカウント連携が必要です)/control+クリックでiTunes(macOSが必要です)]"><i class="material-icons" style="font-size:24px;">music_note</i></a>
+		<i class="waves-effect gray material-icons dropdown-button" data-activates='dropdown2'>more_vert</i>
 		<i class="material-icons nex gray waves-effect" title="トゥートボックスのクリア(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;">
@@ -140,6 +144,9 @@ var lang="ja";
 </span>
 <br>
 <input type="text" id="cw-text" placeholder="警告文" class="mize" style="margin:0">
+<div id="sch-box">時間指定投稿<br><span class="sml">2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。</span><br>
+	<input type="datetime-local" id="sch-date" placeholder="時間指定投稿" class="datepicker" style="margin:0">
+</div>
 </div>
 </div>
 <!-- 公開範囲 Dropdown Structure -->
@@ -164,6 +171,24 @@ var lang="ja";
 	<a onclick="vis('direct')" class="disabled direct">ダイレクト(Direct)</a>
 </li>
 </ul>
+<!-- その他 Dropdown Structure -->
+<ul id='dropdown2' class='dropdown-content'>
+	<li>
+		<a onclick="adobe()">Adobeフォトエディタ</a>
+	</li>
+	<li>
+		<a onclick="nowplaying('spotify');">NowPlaying(Spotify)</a>
+	</li>
+	<li>
+		<a onclick="nowplaying('itunes');">NowPlaying</a>
+	</li>
+	<li>
+		<a onclick="schedule();">時間指定投稿</a>
+	</li>
+	<li>
+		<a onclick="pollToggle();">アンケート</a>
+	</li>
+	</ul>
 <!--hidden area-->
 <input type="hidden" id="reply">
 <input type="hidden" id="media">
@@ -174,59 +199,87 @@ var lang="ja";
 	<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="セカンダリートゥート">lock_open</i></button>
 </div>
 </div>
+<div id="right-side">
+<div id="suggest"></div>
 <!--絵文字ピッカー-->
-<div id="emoji" class="hide shared z-depth-4">
+<div id="emoji" class="hide">
-	<span class="gray sml">インスタンスによって実装が異なります。
+		<span class="gray sml">サーバーによって実装が異なります。
-		<a onclick="emojiGet('true')" class="pointer">絵文字更新</a>
+			<a onclick="emojiGet('true')" class="pointer">絵文字更新</a>
-		<i class="material-icons waves-effect" onclick="emoji()" title="このボックスを閉じる" data-trans-title="post_box_close">cancel</i>
+			<i class="material-icons waves-effect" onclick="emojiToggle()" title="このボックスを閉じる" data-trans-title="post_box_close">cancel</i>
-	<br>
-	</span>
-	<div id="emoji-list" class="" style="">
-	</div>
-	<div class="emoji-control center">
-		<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
-		<i class="material-icons">navigate_before</i>
-		</button>
-		<span id="emoji-count"></span>/
-		<span id="emoji-sum"></span>
-		<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')" id="emoji-next">
-		<i class="material-icons">navigate_next</i>
-		</button>
-		</div>
-		<div id="default-emoji">
-		<span id="now-emoji"></span>一覧を表示中<br><span class="gray sml">一部絵文字は入力できません。</span>
 		<br>
-		<a onclick="customEmoji()" class="pointer waves-effect" title="カスタム絵文字">
+		</span>
-		<i class="material-icons">add</i>
+		<div id="emoji-list" class="" style="">
-		</a>
+		</div>
-		<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="ひと">
+		<div class="emoji-control center">
-		<i class="material-icons">people</i>
+			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
-		</a>
+			<i class="material-icons">navigate_before</i>
-		<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="自然">
+			</button>
-		<i class="material-icons">local_florist</i>
+			<span id="emoji-count"></span>/
-		</a>
+			<span id="emoji-sum"></span>
-		<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="食べ物">
+			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')" id="emoji-next">
-		<i class="material-icons">restaurant</i>
+			<i class="material-icons">navigate_next</i>
-		</a>
+			</button>
-		<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="活動">
+			</div>
-		<i class="material-icons">directions_run</i>
+			<div id="default-emoji">
-		</a>
+			<span id="now-emoji"></span>一覧を表示中<br><span class="gray sml">一部絵文字は入力できません。</span>
-		<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="場所">
+			<br>
-		<i class="material-icons">directions_car</i>
+			<a onclick="customEmoji()" class="pointer waves-effect" title="カスタム絵文字">
-		</a>
+			<i class="material-icons">add</i>
-		<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="もの">
+			</a>
-		<i class="material-icons">attach_file</i>
+			<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="ひと">
-		</a>
+			<i class="material-icons">people</i>
-		<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="記号">
+			</a>
-		<i class="material-icons">gesture</i>
+			<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="自然">
-		</a>
+			<i class="material-icons">local_florist</i>
-		<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="国旗">
+			</a>
-		<i class="material-icons">flag</i>
+			<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="食べ物">
-		</a>
+			<i class="material-icons">restaurant</i>
-		<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+			</a>
-		<i class="fa fa-fort-awesome"></i>
+			<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="活動">
-		</a>
+			<i class="material-icons">directions_run</i>
+			</a>
+			<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="場所">
+			<i class="material-icons">directions_car</i>
+			</a>
+			<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="もの">
+			<i class="material-icons">attach_file</i>
+			</a>
+			<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="記号">
+			<i class="material-icons">gesture</i>
+			</a>
+			<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="国旗">
+			<i class="material-icons">flag</i>
+			</a>
+			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+			<i class="fa fa-fort-awesome"></i>
+			</a>
+		</div>
 	</div>
+	<!--Poll UI-->
+	<div id="poll" class="hide">
+		<select id="poll-sel"  onchange="pollProviderCk()">
+			<option value="nothing">アンケートを使用しない</option>
+			<option value="votedon">votedon.</option>
+			<option value="mastodon-poll">Mastodon(2.8~)</option>
+		</select>
+		<div id="votedon" class="poll-provider hide">
+	WIP
+		</div>
+		<div id="mastodon-poll" class="poll-provider hide">
+			<input type="text" class="mastodon-choice" placeholder="選択肢1">
+			<input type="text" class="mastodon-choice" placeholder="選択肢2">
+			<input type="text" class="mastodon-choice" placeholder="選択肢3">
+			<input type="text" class="mastodon-choice" placeholder="選択肢4">
+			<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+			<label for="poll-multiple">複数選択を許可</label><br>
+			<input type="checkbox" class="filled-in" id="poll-until" value="1" />
+			<label for="poll-until">投票するまで票数を隠す</label><br>
+			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">日
+			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">時間
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">分
+		</div>
+	</div>
+</div>
 </div>
 <!-- Modal Structure Tootdata-->
 <div id="tootmodal" class="modal modal-fixed-footer">
@@ -285,17 +338,17 @@ var lang="ja";
 	</ul>
 	他のアカウントを使用(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>の解除はできません)<br>
 	<div class="row">
-		<div class="col s4">
+		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share left"></i>返信</button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet left"></i>ブースト</button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
 		</div>
-		<div class="col s3">
+		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>お気に入り登録</button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -317,7 +370,7 @@ var lang="ja";
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="./img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -528,28 +581,30 @@ var lang="ja";
 		<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-Akane_16-1-5" style="display:none">
+			<div id="release-Usamin_18-0-2" 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>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Akane (16.1.5)</h5>
+					<h5>Release Note Usamin (18.0.2)</h5>
-					16.1.5<br>
+・設定の値が保存できなくなるバグ<br>
-					<ul>
+・画像送りしたときに進化したメディアビューが適用されない問題<br>
-						<li>バグ,脆弱性修正</li>
+・設定の表記がおかしい問題<br>
-					</ul>
+--以下18.0.0--<br>
-					16.1.4<br>
+・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
-					<ul>
+・Alt+Enterでセカンダリートゥートボタン<br>
-						<li>全てバグ修正(5件ほど)</li>
+・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
-					</ul>
+・実況機能をまともに書き直した。<br>
-					ご迷惑をおかけしたことをお詫び申し上げます。
+・サジェストをトゥートボックスの右に<br>
-					16.1.3<br>
+・ハードウェアアクセラレーションを無効化するオプション。(設定の表示などが乱れるときに設定)<br>
-					<ul>
+・返信時に「@」が複数含まれない仕様を訂正<br>
-						<li>セカンダリートゥートボタン</li>
+・一部のデフォルト値を修正。<br>
-						<li>読み上げや絵文字に関するバグの修正</li>
+・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
-						<li>公式ヘルプサイト:<a href="https://docs.thedesk.top">TheDesk Docs</a></li>
+・イメージビューワーの修正<br>
-					</ul>
+			</div>
-					いつの間にかリアルタイムユーザー数が100を超えていました。皆様のご愛顧に感謝申し上げます。<br>
+			<div id="release-en">
+				<h5>Let's make it native!</h5>
+				<a href="https://translate.thedesk.top">Crowdin translation project</a>
 			</div>
 			<br><br>
 			<h3>ご支援ください。</h3>
@@ -579,130 +634,154 @@ var lang="ja";
 		<i class="material-icons pointer" onclick="endPip()">close</i>
 		<div id="pip-content">
 		</div>
-    </div>
+		</div>
-<!--カラム追加-->
+<!--menu-->
-<div id="add-box" class="hide z-depth-4 notf-box">
+<div id="menu" class="z-depth-5" style="display:none">
-<div class="input-field"><span data-trans="your_acct">アカウントを選択</span>
+		<div id="menu-bar" class="drag-bar"></div>
-<br>
+		<span class="cancel">
-<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
+				<i class="material-icons waves-effect" onclick="menu()" title="このボックスを閉じる(X)">cancel</i>
-<label></label>
+			</span>
-</div>
+		<div id="menu-wrapper">
-<div class="input-field">
+		<div id="left-menu">
-<div id="auth">
+			<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"><i class="material-icons">add</i><span>カラム追加</span></div>
-<select id="type-sel" style="color:black">
+			<div class="waves-effect" onclick="sortMenu()" id="sortMenu"><i class="material-icons">sort</i><span>カラム一覧/並べ替え</span></div>
-	<option value="local" data-trans="local">ローカル</option>
+			<div class="waves-effect" onclick="searchMenu()" id="searchMenu"><i class="material-icons">search</i><span>検索</span></div>
-	<option value="local-media" data-trans="local-media">ローカル(メディア)</option>
+			<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>リスト</span></div>
-	<option value="home" data-trans="home">ホーム</option>
+			<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>フィルター</span></div>
-	<option value="pub" data-trans="public">連合</option>
+			<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>ヘルプ</span></div>
-	<option value="pub-media" data-trans="public-media">連合(メディア)</option>
+			<div class="waves-effect" onclick="location.href='index.html'"><i class="material-icons">refresh</i><span>TL再読込</span></div>
-	<option value="dm" data-trans="dm">ダイレクトメッセージ</option>
+		</div>
-	<option value="mix" data-trans="integrated">統合(ローカルとホーム)</option>
+		<div id="right-menu">
-	<option value="plus" data-trans="plus">統合(ローカルとブースト・リプライ)</option>
+				<!--カラム追加-->
-	<option value="notf" data-trans="notification">通知</option>
+<div id="add-box" class="hide menu-content">
-</select>
+	<div class="input-field"><span data-trans="your_acct">選択(スクロールで全選択肢表示)</span>
-<label data-trans="show_tl">表示するタイムライン</label>
+	<br>
-</div>
+	<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
-<div id="noauth" class="hide">表示するタイムライン
+	<label></label>
-	<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を表示します。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>)。キーボードショートカットが邪魔をするので、文字入力時はカラムの「WebView優先」にチェックを入れてください。
-</div>
-</div>
-<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()" data-trans-i="add">
-	<i class="material-icons left">add</i>追加
-</button>
-<br>
-<br>
-</div>
-<!--検索-->
-<div id="src-box" class="hide notf-box z-depth-4" style="width:500px">
-		<div class="input-field">
-		<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
-</div><div class="input-field">
-<i class="material-icons prefix">search</i>
-<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
-<label for="src" data-trans="src">検索</label>
-<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
-	<i class="material-icons left">search</i>検索
-</button>
-<br>
-<br>
-</div>
-<div id="search">
-<div id="src-contents">
-</div>
-</div>
-</div>
-<!--並べ替え-->
-<div id="sort-box" class="hide">
-<ul id="sort"></ul>
-<div>
-<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
-	<i class="material-icons left">sort</i>並べ替え設定
-</button>
-<button onclick="sortToggle()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="close">
-		<i class="material-icons left">close</i>Close
-</button>
-</div>
-</div>
-<!--リスト-->
-<div id="list-box" class="hide notf-box z-depth-4">
-	<div class="input-field" style="width:calc( 100% - 100px);float:left">
-		<select id="list-acct-sel" class="acct-sel"></select>
-		<label>アカウントを選択</label>
 	</div>
-	<div style="float:left; padding-top:8px; padding-bottom:28px;">
+	<div class="input-field">
-		<button class="btn waves-effect indigo" style="width:80px;" onclick="list()" data-trans-i="lists">
+	<div id="auth">
-			一覧
+	<input type="hidden" value="local" id="type-sel">
-		</button>
+	表示するタイムライン
+	<div id="tltype">
+		<div class="type waves-effect active" data-type="local"><div><i class="material-icons">people_outline</i></div><span>ローカル</span></div>
+		<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>ローカル(メディア)</span></div>
+		<div class="type waves-effect" data-type="home"><div><i class="material-icons">home</i></div><span>ホーム</span></div>
+		<div class="type waves-effect" data-type="pub"><div><i class="material-icons">language</i></div><span>連合</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>連合(メディア)</span></div>
+		<div class="type waves-effect" data-type="dm"><div><i class="material-icons">mail_outline</i></div><span>ダイレクトメッセージ</span></div>
+		<div class="type waves-effect" data-type="mix"><div><i class="material-icons">merge_type</i></div><span>統合(ローカルとホーム)</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+BT+返信)</span></div>
+		<div class="type waves-effect" data-type="notf"><div><i class="material-icons">notifications</i></div><span>通知</span></div>
+	</div>
+	</div>
+	<div id="noauth" class="hide">表示するタイムライン
+		<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を表示します。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>)。キーボードショートカットが邪魔をするので、文字入力時はカラムの「WebView優先」にチェックを入れてください。
+	</div>
+	</div>
+	<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()" data-trans-i="add">
+		<i class="material-icons left">add</i>追加
+	</button>
+	<br>
+	<br>
+	</div>
+	<!--検索-->
+	<div id="src-box" class="hide menu-content">
+			<div class="input-field">
+			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
+	</div><div class="input-field">
+	<i class="material-icons prefix">search</i>
+	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
+	<label for="src" data-trans="src">検索</label>
+	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
+		<i class="material-icons left">search</i>検索
+	</button>
+	<br>
+	<br>
+	</div>
+	<div id="search">
+	<div id="src-contents">
+	</div>
+	</div>
+	</div>
+	<!--並べ替え-->
+	<div id="sort-box" class="hide menu-content">
+	<ul id="sort"></ul>
+	<div>
+	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+		<i class="material-icons left">sort</i>並べ替え設定
+	</button>
+	</div>
+	</div>
+	<!--リスト-->
+	<div id="list-box" class="hide menu-content">
+		<div class="input-field" style="width:calc( 100% - 100px);float:left">
+			<select id="list-acct-sel" class="acct-sel"></select>
+			<label>選択(スクロールで全選択肢表示)</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>
+		</div>
+		<br><br>
+		<div id="lists"></div>
+		<div id="lists-user"></div>
+		<input type="text" style="width:150px" id="list-add" placeholder="名前">
+			<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">新規作成</button>
+	</div>
+	<!--フィルター-->
+	<div id="filter-box" class="hide menu-content">
+		<div class="input-field" style="width:calc( 100% - 100px);float:left">
+			<select id="filter-acct-sel" class="acct-sel"></select>
+			<label>選択(スクロールで全選択肢表示)</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>
+		</div>
+		<div id="filtered-words"></div>
+		<input type="hidden" id="filter-edit-id">
+		<input type="text" style="width:150px" id="filter-add-word" placeholder="フィルターワード"><br>
+		適応範囲<br>
+		<input type="checkbox" class="filled-in" id="home_filter" value="home" />
+			<label for="home_filter">ホーム</label>
+		<input type="checkbox" class="filled-in" id="local_filter" value="public" />
+			<label for="local_filter">ローカル</label>
+		<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
+			<label for="notf_filter">通知</label>
+		<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
+			<label for="conv_filter">会話</label><br>
+			オプション<br>
+		<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
+			<label for="wholeword_filter">単語マッチ</label><br>
+		<span class="sml">非ラテン系の文字列では「単語マッチ」は推奨されません。</span><br>
+		<input type="checkbox" class="filled-in" id="except_filter" value="1" />
+			<label for="except_filter">除外</label><br>
+		<span class="sml">「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。</span><br>
+		有効期限(あと)<span class="sml">未指定(または0分)で「無制限」になります。<b>仕様上数値の正確性を保証できません。</b></span><br><br>
+		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">日
+		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">時間
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">分
+		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">追加</button><br>
+		<span class="sml">Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。</span>
 	</div>
-	<br><br>
-	<div id="lists"></div>
-	<div id="lists-user"></div>
-	<input type="text" style="width:150px" id="list-add" placeholder="名前">
-		<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">新規作成</button>
 </div>
-<!--フィルター-->
+		</div>
-<div id="filter-box" class="hide notf-box z-depth-4">
+		<a onclick="about()" class="nex waves-effect">
-	<div class="input-field" style="width:calc( 100% - 100px);float:left">
+				<i class="material-icons" style="font-size: 1rem;">info</i>このソフトについて
-		<select id="filter-acct-sel" class="acct-sel"></select>
+		</a>&nbsp;|&nbsp;
-		<label>アカウントを選択</label>
+		<a onclick="bottomReverse()" class="nex waves-effect">
-	</div>
+				<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>トゥートボタンの左右入れ替え
-	<div style="float:left; padding-top:8px; padding-bottom:28px;">
+		</a>
-		<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()" data-trans-i="filters">
-			一覧
-		</button>
-	</div>
-	<div id="filtered-words"></div>
-	<input type="hidden" id="filter-edit-id">
-	<input type="text" style="width:150px" id="filter-add-word" placeholder="フィルターワード"><br>
-	適応範囲<br>
-	<input type="checkbox" class="filled-in" id="home_filter" value="home" />
-	  <label for="home_filter">ホーム</label>
-	<input type="checkbox" class="filled-in" id="local_filter" value="public" />
-	  <label for="local_filter">ローカル</label>
-	<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
-	  <label for="notf_filter">通知</label>
-	<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
-	  <label for="conv_filter">会話</label><br>
-	  オプション<br>
-	<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
-	  <label for="wholeword_filter">単語マッチ</label><br>
-	<span class="sml">非ラテン系の文字列では「単語マッチ」は推奨されません。</span><br>
-	<input type="checkbox" class="filled-in" id="except_filter" value="1" />
-	  <label for="except_filter">除外</label><br>
-	<span class="sml">「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。</span><br>
-	有効期限(あと)<span class="sml">未指定(または0分)で「無制限」になります。<b>仕様上数値の正確性を保証できません。</b></span><br><br>
-	<input type="text" style="width:50px" id="days_filter" placeholder="d" value="0">日
-	<input type="text" style="width:50px" id="hours_filter" placeholder="h" value="0">時間
-	<input type="text" style="width:50px" id="mins_filter" placeholder="m" value="0">分
-	<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">追加</button><br>
-	<span class="sml">Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。</span>
 </div>
 <div id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	<h3>Welcome to TheDesk</h3><br><a href="acct.html">アカウントを追加</a>するか下の<i class="material-icons">add</i>ボタンよりカラムを追加してください。
+	<h3>Welcome to TheDesk</h3><br><a href="acct.html">アカウントを追加</a>するか下の<i class="material-icons">apps</i>ボタンよりカラムを追加してください。
 </div>
 </div>
 </div>
@@ -710,53 +789,26 @@ var lang="ja";
 <div id="bottom" class="reverse">
     <div class="leftside reverse">
         <div id="dambox">
-                <input type="text" id="posttgl" placeholder="トゥート" style="height:2rem">
+								<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
-        </div>
+									<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>トゥート
+								</button>
+				</div>
         <div class="leftside reverse" id="group">
-            <div class="btnsgroup"><span class="grouptitle">Columns:</span>
+						<div class="btnsgroup">
-                <a onclick="addToggle()" class="nex waves-effect" data-trans-i="add" id="add-tgl">
+							<a href="acct.html" class="nex waves-effect">
-                    <i class="material-icons nex" title="カラム追加" data-trans-title="column_add">add</i>
+                    <i class="material-icons nex big-icon" title="アカウントマネージャー(Ctrl+Shift+M)">account_circle</i>
-                </a>
+              </a>
-                <a onclick="sortToggle()" class="nex waves-effect">
+							<a href="setting.html" class="nex waves-effect">
-                    <i class="material-icons nex big-icon" title="カラム一覧/並べ替え" data-trans-title="sort">sort</i>
+									<i class="material-icons nex" title="設定(Ctrl+Shift+S)">settings</i>
-                </a>
+							</a>
-            </div>
+							<a onclick="nano()" class="nex waves-effect">
-            <div class="btnsgroup"><span class="grouptitle">Accounts:</span>
+									<i class="material-icons" title="最小のマストドン。TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
-                <a href="acct.html" class="nex waves-effect">
+							</a>
-                    <i class="material-icons nex big-icon" title="アカウントマネージャー(Ctrl+Shift+M)" data-trans-title="manager">account_circle</i>
+							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
-                </a>
+									<i class="material-icons" title="リスト">apps</i>
-                <a onclick="srcToggle()" class="nex waves-effect" id="src-tgl">
+							</a>
-                    <i class="material-icons" title="検索" data-trans-title="src">search</i>
+						</div>
-                </a>
+    </div></div>
-                <a onclick="listToggle()" class="nex waves-effect" id="list-tgl">
-                    <i class="material-icons" title="リスト" data-trans-title="list">view_headline</i>
-                </a>
-                <a onclick="filterToggle()" class="nex waves-effect" id="filter-tgl">
-                    <i class="material-icons" title="フィルター" data-trans-title="filter">filter_list</i>
-                </a>
-            </div>
-			<div class="btnsgroup"><span class="grouptitle">Preferences:</span>
-				<a onclick="bottomReverse()" class="nex waves-effect">
-                    <i class="material-icons nex" title="トゥートバーの左右入れ替え" data-trans-title="reverse">swap_horiz</i>
-                </a>
-                <a href="setting.html" class="nex waves-effect">
-                    <i class="material-icons nex" title="設定(Ctrl+Shift+S)" data-trans-title="setting">settings</i>
-                </a>
-                <a href="index.html" class="nex mize waves-effect">
-                    <i class="material-icons nex" title="スーパーリロード(F5/⌘+R)" data-trans-title="reload">refresh</i>
-                </a>
-                <a onclick="nano()" class="nex waves-effect">
-                    <i class="material-icons" title="最小のマストドン。TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
-                </a>
-                <a onclick="window.open('https://astarte.thedesk.top');" class="setting nex waves-effect" target="_blank" id="ranking-btn" style="display:none;">
-                    <i class="material-icons nex" title="アスタルテランキング">timeline</i>
-				</a>
-				<a href="https://docs.thedesk.top" class="setting nex waves-effect" target="_blank">
-                    <i class="material-icons nex" title="ヘルプ">help_outline</i>
-				</a>
-            </div>
-        </div>
-    </div>
     <div>
 		<div id="tips-menu">
 			<div class="btnsgroup" style="height:34px"><span class="grouptitle">Tips:</span>
@@ -796,9 +848,11 @@ var lang="ja";
 <script type="text/javascript" src="../../js/common/about.js"></script>
 <script type="text/javascript" src="../../js/tl/parse.js"></script>
 <script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
+<script type="text/javascript" src="../../js/tl/dm.js"></script>
 <script type="text/javascript" src="../../js/ui/scroll.js"></script>
 <script type="text/javascript" src="../../js/tl/tl.js"></script>
 <script type="text/javascript" src="../../js/tl/card.js"></script>
+<script type="text/javascript" src="../../js/tl/poll.js"></script>
 <script type="text/javascript" src="../../js/tl/date.js"></script>
 <script type="text/javascript" src="../../js/tl/notification.js"></script>
 <script type="text/javascript" src="../../js/tl/datails.js"></script>
@@ -831,4 +885,5 @@ var lang="ja";
 <script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
 <script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
 <script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/ui/menu.js"></script>

app/view/ja/oss.html

@@ -876,6 +876,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.<br>
+<h5>#InstanceTicker</h5>
+The MIT License (MIT)<br>
+<br>
+ORIGINAL CSS © 小田急don <a href="https://odakyu.app/@ars42525">https://odakyu.app/@ars42525</a><br>
+#InstanceTicker © weep.me <a href="https://weep.me/@weep">https://weep.me/@weep</a><br>
+<br>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:<br>
+<br>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.<br>
+<br>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.<br>
 </article>
 <a href="setting.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>戻る</a>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>

app/view/ja/setting.html

@@ -2,20 +2,32 @@
 <html lang="ja">
 <head>
 	<title>Settings - TheDesk</title>
+	<!--
+	<script type="text/javascript">
+		var _jipt = [];
+		_jipt.push(['project', 'thedesk']);
+	</script>
+	<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="../../css/themes.css" type="text/css" rel="stylesheet">
+	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
+	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
 </head>
 <body id="mainView" style="overflow-y:scroll">
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/setting.lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.ja.js"></script>
-<script>var lang="ja";</script>
+<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+<script src="../../node_modules/vue/dist/vue.min.js"></script>
+<script type="text/javascript" src="setting.vue.js"></script>
+
 <h4>設定</h4>
 <ul class="collapsible" data-collapsible="accordion">
 	<li>
@@ -24,11 +36,55 @@
 	</div>
 	<div class="collapsible-body">
 		<h5>言語</h5>
-		<a onclick="changelang('ja')" class="pointer">日本語</a>/<a onclick="changelang('en')" class="pointer">English</a>
+		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>/
 		<h5>設定のインポートとエクスポート</h5>
 		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">エクスポート</button>
 		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">インポート</button>
-		<h5>テーマの設定</h5>
+		<div id="envView">
+            <template v-for="(item, i) in config">
+				<h5>{{item.text.head}}</h5>
+				<templete v-html=item.text.desc></templete><br>
+				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">通知テスト</a><br></template>
+                <template v-if="item.checkbox">
+                        <template v-for="(check, j) in item.text.checkbox">
+                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
+                        </template>
+				</template>
+				<template v-else>
+					<template v-if="item.doubleText">
+						<template v-for="(textbox, j) in item.data">
+                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+                        </template>
+					</template>
+					<template v-else>
+							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+					</template>
+					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">変更</button> 
+				</template>
+			</template>
+        </div>
+        <h5>フォント</h5>
+		「選択」を押してフォントを選んでください。<br>
+		<button class="btn waves-effect" style="width:100px;" onclick="font()">選択</button><br>
+		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
+		<br>
+		<input type="text" style="width:150px" id="font">
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
+		<br>
+        <h5>デフォルトの保存先</h5>
+		画像ダウンロードやスクリーンショットに影響します。<br>
+		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">変更</button>
+		<br>
+	</div>
+	</li>
+	<li>
+	<div class="collapsible-header">
+			<i class="material-icons">color_lens</i>テーマの設定
+	</div>
+	<div class="collapsible-body">
+		<h4>テーマの選択</h4>
 		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
 		<label for="black">Black</label>
 		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
@@ -39,130 +95,84 @@
 		<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
 		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
 		<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
-		<br>
+		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
-		<h5>新規通知のポップアップお知らせの表示秒数</h5>0に設定すると表示されません
+		<label for="custom">Custom</label>
-		<br>
+		<div style="width:300px" id="sel-selector">
-		<input type="text" style="width:50px" id="popup">秒
+			<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
+		</div>
-		<br>
+		<h4>カスタムテーマの作成・編集</h4>
-		<h5>ネイティブ通知設定</h5>
+		<div style="width:300px" id="edit-selector" data-add="新規作成">
-		Portableバージョンでは表示できません。<br><a onclick="notftest()" class="pointer">通知テスト</a>
+			<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
-		<br>
+				<option value="add_new">新規作成</option>
-		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_yes" value="yes" />
+			</select>
-		<label for="ntf_yes">はい</label>
+		</div>
-		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_no" value="no" />
+		<h5>名前</h5>
-		<label for="ntf_no">いいえ</label>
+		<input type="text" style="width:300px" id="custom_name" placeholder="名前...">
-		<br>
+		<h5>説明</h5>
-		<h5>マルチカラムの最低横幅</h5>画面全体の横幅÷コラム数がこの値を超えた時、横スクロールとなります。
+		<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea" placeholder="説明..."></textarea></div>
-		<br>
+		<h5>色の系統</h5>
-		<input type="text" style="width:50px" id="width">px以上
+		<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
+		<label for="dark">Dark</label>
-		<br>
+		<input class="with-gap" name="derection" type="radio" id="light" value="light" />
-		<h5>フォント</h5>
+		<label for="light">Light</label>
-		ローカルフォントを指定します。<br>
+		<div id="pickers">
-		<input type="text" style="width:150px" id="font">
+		<div>
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
+			<h5>Primary</h5>補助要素に使われる背景色
-		<br>
+			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
-		<h5>フォントサイズ</h5>
+			<input type="hidden" id="color-picker0_value">
-		<span style="font-size:15px">15px(絶対指定)</span>
+		</div>
-		<br>
+		<div>
-		<input type="text" style="width:50px" id="size">px 
+			<h5>Secondary</h5>全体の背景色など
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button><br>
+			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
-		<h5>デフォルトの保存先</h5>
+			<input type="hidden" id="color-picker1_value">
-		画像ダウンロードやスクリーンショットに影響します。<br>
+		</div>
-		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">変更</button>
+		<div>
-		<br>
+			<h5>Texts</h5>テキストの色
-	</div>
+			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
+			<input type="hidden" id="color-picker2_value">
+		</div>
+		<div>
+			<h5>Accent</h5>ブーストの背景色など
+			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
+			<input type="hidden" id="color-picker3_value">
+		</div>
+		</div>
+		<button class="btn-large waves-effect" onclick="customComp()">変更</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">削除</button><br><br>
+		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
+		このコードは他のTheDeskなどとシェアできます。このコードをMiASに貼ることはご遠慮ください。詳細:<a href="https://thedesk.top/mias.html" target="_blank">テーマ互換性</a>
+		<h4>カスタムテーマのインポート</h4>
+		<a href="https://assets.msky.cafe/" target="_blank">MiAS</a>上の80を超えるテーマを張り付けることもできます。<br>
+		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
+		<button class="btn waves-effect" onclick="customImp()">インポート</button><br>
 	</li>
 	<li>
 	<div class="collapsible-header">
 			<i class="material-icons">reorder</i>タイムラインの設定
 	</div>
 	<div class="collapsible-body">
-		<h5>時間表記設定</h5>相対時間の例:"1分前","3日前"
+		<div id="tlView">
-		<br>絶対時間の例"23:25:21","2017年12月30日 23:59:00"
+            <template v-for="(item, i) in config">
-		<br>混合表示は、当日のトゥートのみ相対、それ以外は絶対で表示 
+				<h5>{{item.text.head}}</h5>
-		<br>
+				{{item.text.desc}}<br>
-		<input class="with-gap" onchange="settings()" onchange="settings()" name="time" type="radio" id="relative" value="relative" />
+                <template v-if="item.checkbox">
-		<label for="relative">相対時間</label>
+                        <template v-for="(check, j) in item.text.checkbox">
-		<input class="with-gap" onchange="settings()" name="time" type="radio" id="absolute" value="absolute" />
+                            <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 for="absolute">絶対時間</label>
+                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-		<input class="with-gap" onchange="settings()" name="time" type="radio" id="double" value="double" />
+                        </template>
-		<label for="double">両方表示</label>
+				</template>
-		<input class="with-gap" onchange="settings()" name="time" type="radio" id="medium" value="medium" />
+				<template v-else>
-		<label for="medium">混合表示</label>
+					<template v-if="item.doubleText">
-		<h5>独自ロケールを使用</h5>対応インスタンスではそのインスタンスにあわせた言語表示ができます。
+						<template v-for="(textbox, j) in item.data">
-		<br>
+                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_yes" value="yes" />
+                        </template>
-		<label for="ul_yes">はい</label>
+					</template>
-		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_no" value="no" />
+					<template v-else>
-		<label for="ul_no">いいえ</label>
+							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-		<br>
+					</template>
-		<h5>非表示設定の画像(NSFW)を隠す</h5>きつめのぼかしがかかります。
+					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">変更</button> 
-		<br>
+				</template>
-		<input class="with-gap" onchange="settings()" name="nsfw" type="radio" id="n_yes" value="yes" />
+			</template>
-		<label for="n_yes">はい</label>
+        </div>
-		<input class="with-gap" onchange="settings()" name="nsfw" type="radio" id="n_no" value="no" />
-		<label for="n_no">いいえ</label>
-		<br>
-		<h5>非表示設定のテキスト(CW)を隠す</h5>
-		<input class="with-gap" onchange="settings()" name="cw" type="radio" id="c_yes" value="yes" />
-		<label for="c_yes">はい</label>
-		<input class="with-gap" onchange="settings()" name="cw" type="radio" id="c_no" value="no" />
-		<label for="c_no">いいえ</label>
-		<br>
-		<h5>リプライ数表示</h5>
-		<input class="with-gap" onchange="settings()" name="rp" type="radio" id="rp_hidden" value="hidden" />
-		<label for="rp_hidden">2以上のとき1+と表示</label>
-		<input class="with-gap" onchange="settings()" name="rp" type="radio" id="rp_all" value="all" />
-		<label for="rp_all">完全に表示</label>
-		<br>
-		<h5>アイコンのアニメーションを再生する</h5>
-		<input class="with-gap" onchange="settings()" name="gif" type="radio" id="g_yes" value="yes" />
-		<label for="g_yes">はい</label>
-		<input class="with-gap" onchange="settings()" name="gif" type="radio" id="g_no" value="no" />
-		<label for="g_no">いいえ</label>
-		<br>
-		<h5>タグタイムラインの表示範囲</h5>
-		<input class="with-gap" onchange="settings()" name="tag" type="radio" id="t_all" value="all" />
-		<label for="t_all">接続しているインスタンス</label>
-		<input class="with-gap" onchange="settings()" name="tag" type="radio" id="t_local" value="local" />
-		<label for="t_local">検索対象のインスタンスのみ</label>
-		<br>
-		<h5>viaを表示する</h5>
-		<input class="with-gap" onchange="settings()" name="via" type="radio" id="via_yes" value="yes" />
-		<label for="via_yes">はい</label>
-		<input class="with-gap" onchange="settings()" name="via" type="radio" id="via_hide" value="hide" />
-		<label for="via_hide">いいえ</label>
-		<br>
-		<h5>アクションメニューを非表示</h5>
-		「マウスオーバー」はすこし鬱陶しいと思うかもしれません。<br>
-		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_yes" value="yes" />
-		<label for="mov_yes">マウスオーバーで表示</label>
-		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_click" value="click" />
-		<label for="mov_click">クリックで表示</label>
-		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_no" value="no" />
-		<label for="mov_no">いいえ</label>
-		<br>
-		<h5>通知を開いているとき、通知新着お知らせを表示する</h5>
-		<input class="with-gap" onchange="settings()" name="notfm" type="radio" id="notfm_yes" value="yes" />
-		<label for="notfm_yes">はい</label>
-		<input class="with-gap" onchange="settings()" name="notfm" type="radio" id="notfm_no" value="no" />
-		<label for="notfm_no">いいえ</label>
-		<br>
-		<h5>指定行数以上を折りたたむ</h5>
-		5文字以下のトゥートは折りたたみません。また、折りたたみ時は改行が描画されません。改行のみを行数とカウントします。
-		<br>
-		<input type="text" style="width:50px" id="sentence">行以上または
-		<input type="text" style="width:50px" id="letters">文字以上
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
-		<br>
-		<h5>画像の高さ
-        </h5>
-		<input type="text" style="width:50px" id="img-height">px
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
-		<br>
-		<br>
 	</div>
 	</li>
 	<li>
@@ -170,89 +180,32 @@
 			<i class="material-icons">send</i>投稿設定
 	</div>
 	<div class="collapsible-body">
-		<h5>デフォルトの警告文</h5>
+		<div id="postView">
-		<input type="text" style="width:150px" id="cw-text">
+            <template v-for="(item, i) in config">
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
+				<h5>{{item.text.head}}</h5>
-		<br>
+				{{item.text.desc}}<br>
-		<h5>長文投稿時に警告</h5>
+                <template v-if="item.checkbox">
-		下で指定した以上のトゥートを投稿するときにCWするかのダイアログを表示します。
+                        <template v-for="(check, j) in item.text.checkbox">
-		<br>
+							<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-		<input type="text" style="width:50px" id="cw_sentence">行以上または
+                            	<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" />
-		<input type="text" style="width:50px" id="cw_letters">文字以上
+								<label v-bind:for="item.id+check.value">{{check.text}}</label>
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
+								<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
-		<br>
+							</template>
-		<h5>標準でCWを設定</h5>
+                        </template>
-		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_yes" value="yes" />
+				</template>
-		<label for="cws_yes">はい</label>
+				<template v-else>
-		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_no" value="no" />
+					<template v-if="item.doubleText">
-		<label for="cws_no">いいえ
+						<template v-for="(textbox, j) in item.data">
-		</label>
+                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-		<br>
+                        </template>
-		<h5>デフォルトの公開設定</h5>
+					</template>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="public" value="public" />
+					<template v-else>
-		<label for="public">公開(Public)</label>
+							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="unlisted" value="unlisted" />
+					</template>
-		<label for="unlisted">未収載(Unlisted)</label>
+					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">変更</button> 
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="private" value="private" />
+				</template>
-		<label for="private">非公開(Private)</label>
+			</template>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="direct" value="direct" />
+        </div>
-		<label for="direct">ダイレクト(Direct)</label>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="memory" value="memory" />
-		<label for="memory">前回の投稿設定を記憶する(インスタンスごとに記憶されます)</label>
-		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="server" value="server" />
-		<label for="server">マストドンアカウント設定の既定値</label>
-		<br>
-		<h5>画像投稿設定</h5>
-		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_url" value="url" />
-		<label for="i_url">画像を投稿し、画像のURLを最後に表示</label>
-		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_no-act" value="no-act" />
-		<label for="i_no-act">画像を投稿するがURLは表示しない</label>
-		<br>
-		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_inline" value="inline" disabled />
-		<label for="i_inline">現在利用できません。 
-			<!--画像を投稿し、インラインで表示(Markdownに対応したインスタンスのみ。マルチアカウント環境では非推奨。)-->
-		</label>
-		<br>
-		<h5>投稿ボックスの挙動</h5>
-		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_yes" value="yes" />
-		<label for="bx_yes">たたむ</label>
-		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_no" value="no" />
-		<label for="bx_no">投稿後も隠さない
-		</label>
-		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_abs" value="absolute" />
-		<label for="bx_abs">枠外クリックで閉じない(起動時に展開)</label>
-		<br>
-		<h5>引用形式</h5>
-		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_simple" value="simple" />
-		<label for="q_simple">URLのみ</label>
-		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_mention" value="mention" />
-		<label for="q_mention">URLとアカウント名(相手に通知)</label>
-		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_full" value="full" />
-		<label for="q_full">本文・URL・アカウント名
-		</label>
-		<br>
-		<h5>投稿後や起動時のアカウント</h5>
-		メインアカウントはアカウント設定で指定できます。投稿以外のアカウント選択にも影響します。<br>
-		<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_remain" value="remain" />
-		<label for="mn_remain">最後に使用したアカウント</label>
-		<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_main" value="main" />
-		<label for="mn_main">メインアカウント</label>
-		</label>
-		<h5>セカンダリートゥートボタン</h5>
-		公開範囲の変更とトゥートを一発でできます。<br>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-nothing" value="nothing" />
-		<label for="sec-nothing">表示しない</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-public" value="public" />
-		<label for="sec-public">公開(Public)</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-unlisted" value="unlisted" />
-		<label for="sec-unlisted">未収載(Unlisted)</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-private" value="private" />
-		<label for="sec-private">非公開(Private)</label>
-		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-direct" value="direct" />
-		<label for="sec-direct">ダイレクト(Direct)</label>
-		<input class="with-gap hide kirishima" onchange="settings()" name="sec" type="radio" id="sec-local" value="local" />
-		<label for="sec-local">ローカル限定</label><span class="hide kirishima">非対応インスタンスでは「未収載」になります。</span>
-		<br>
 	</div>
 	</li>
 	<li>
@@ -298,6 +251,22 @@
 			<i class="fa fa-spotify"></i>SpotifyとNowPlayingの設定
 		</div>
 		<div class="collapsible-body">
+			<h5>NowPlayingのソース(Windows)</h5>
+			macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。<br>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
+			<label for="aimp">AIMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+			<label for="itunes">iTunes</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+			<label for="npmm">MediaMonkey</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+			<label for="winamp">Winamp</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
+			<label for="wmp">WMP</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
+			<label for="wlm">WLM</label>
+			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
+			<label for="cad">CAD</label><br><br>
 			<i class="material-icons" style="font-size:24px;">music_note</i>ボタンから簡単にNowPlayingができます。<br>
 			<h5>アカウントの連携</h5>
 			APIの性質上，thedesk.topへアクセスします。<br>
@@ -308,12 +277,13 @@
 			以下を編集してテンプレートを変更できます。<br>
 			<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
 {url}</textarea><br>
-				テンプレート:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br>
+				Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br>
-				iTunes NowPlayingでも{url}以外のテンプレートに従ってトゥートされます。また、作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}が有効です。<br>
+				macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}<br>
+				Windows:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名<br>
 				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
                     CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
-			<h5>Spotifyでアルバムアートワークを添付する</h5>
+			<h5>アルバムアートワークを添付する(Spotify/Windows)</h5>
 			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
 			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
 			<label for="awk_yes">はい</label>
@@ -337,7 +307,7 @@
 			0-100まで、デフォルトは100。<br>
 			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
 			<h5>テスト</h5>
-			<input type="text" style="width:350px" id="voicetxt" value="これはテスト音声です。TheDeskはオープンソースのPC向けマストドンクライアントです。マルチインスタンスやマルチカラムに対応しています。">
+			<input type="text" style="width:350px" id="voicetxt" value="これはテスト音声です。TheDeskはオープンソースのPC向けマストドンクライアントです。マルチサーバーやマルチカラムに対応しています。">
 			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">再生/停止</button><br>
 			<br>
 			<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">設定</button>
@@ -353,6 +323,7 @@
 <li>X:投稿パネルを開閉</li>
 <li>Ctrl+Enter:投稿</li>
 <li>Ctrl+Enter+Shift:投稿(セカンダリートゥート)</li>
+<li>Alt+Enter:セカンダリートゥートボタン</li>
 <li>Ctrl+E:全ての通知を既読にする</li>
 <li>Esc:投稿パネルを消す</li>
 <li>F5:スーパーリロード</li>
@@ -389,7 +360,7 @@ Kyash<br>
 <a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">アップデートを確認</a><br>
 <a href="oss.html">OSS License(オープンソースライセンス)</a><br>
 <span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://github.com/cutls/TheDesk/blob/master/TOS.md">Terms of Use</a>
+	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
 	<br>Developer: Cutls P( 
 	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 	<br>
@@ -399,9 +370,9 @@ TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のため
 <script type="text/javascript" src="../../js/common/about.js"></script>
 <script type="text/javascript" src="../../js/platform/end.js"></script>
 <script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.js"></script>
 <script type="text/javascript" src="../../js/ui/spotify.js"></script>
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
+<script type="text/javascript" src="../../js/platform/pickr.js"></script>
 <script type="text/javascript" src="../../js/ui/settings.js"></script>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>
 <script type="text/javascript" src="../../js/tl/date.js"></script>

app/view/ja/setting.vue.js

@@ -0,0 +1,480 @@
+var yesno=[
+    {
+        text:"はい",
+        value:"yes"
+    },{
+        text:"いいえ",
+        value:"no"
+    }
+];
+var envConstruction=[
+    {
+        id:"popup",
+        storage:"popup",
+        checkbox:false,
+        doubleText:false,
+        setValue:0,
+        width:50,
+        text:{
+            head:"新規通知のポップアップお知らせの表示秒数",
+            desc:"0に設定すると表示されません",
+            after:"秒"
+        }
+    },{
+        id:"notf",
+        storage:"nativenotf",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"ネイティブ通知設定",
+            desc:"Portableバージョンでは表示できません。",
+            checkbox:yesno
+        }
+    },{
+        id:"width",
+        storage:"width",
+        checkbox:false,
+        doubleText:false,
+        width:50,
+        setValue:300,
+        text:{
+            head:"マルチカラムの最低横幅",
+            desc:"画面全体の横幅÷コラム数がこの値を超えた時、横スクロールとなります。",
+            after:"px 以上"
+        }
+    },{
+        id:"fixwidth",
+        storage:"fixwidth",
+        checkbox:false,
+        doubleText:false,
+        setValue:300,
+        width:50,
+        text:{
+            head:"TweetDeckの限定の最低横幅",
+            desc:"",
+            after:"px 以上"
+        }
+    },{
+        id:"size",
+        storage:"size",
+        checkbox:false,
+        doubleText:false,
+        width:50,
+        setValue:13,
+        text:{
+            head:"フォントサイズ",
+            desc:'<span style="font-size:13px">13px(絶対指定)</span>',
+            after:"px"
+        }
+    },{
+        id:"ha",
+        storage:"ha",
+        checkbox:true,
+        setValue:false,
+        text:{
+            head:"ハードウェアアクセラレーションの無効化",
+            desc:"表示(特に設定画面)が乱れる場合に「はい」を選択してください。自動で再起動します。",
+            checkbox:[
+                {
+                    text:"はい",
+                    value:"true"
+                },{
+                    text:"いいえ",
+                    value:"false"
+                }
+            ]
+        }
+    }
+];
+var tlConstruction=[
+    {
+        id:"time",
+        storage:"datetype",
+        checkbox:true,
+        setValue:"absolute",
+        text:{
+            head:"時間表記設定",
+            desc:'相対時間の例:"1分前","3日前"<br>絶対時間の例"23:25:21","2017年12月30日 23:59:00"<br>混合表示は、当日のトゥートのみ相対、それ以外は絶対で表示 ',
+            checkbox:[
+                {
+                    text:"相対時間",
+                    value:"relative"
+                },{
+                    text:"絶対時間",
+                    value:"absolute"
+                },{
+                    text:"両方表示",
+                    value:"double"
+                },{
+                    text:"混合表示",
+                    value:"medium"
+                }
+
+            ]
+        }
+    },{
+        id:"ul",
+        storage:"locale",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"独自ロケールを使用",
+            desc:"対応サーバーではそのサーバーにあわせた言語表示ができます。",
+            checkbox:yesno
+        }
+    },{
+        id:"nsfw",
+        storage:"nsfw",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"非表示設定の画像(NSFW)を隠す",
+            desc:"きつめのぼかしがかかります。",
+            checkbox:yesno
+        }
+    },{
+        id:"cw",
+        storage:"cw",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"非表示設定のテキスト(CW)を隠す",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        id:"rp",
+        storage:"replyct",
+        checkbox:true,
+        setValue:"hidden",
+        text:{
+            head:"リプライ数表示",
+            desc:"",
+            checkbox:[
+                {
+                    text:"2以上のとき1+と表示",
+                    value:"hidden"
+                },{
+                    text:"2以上のとき1+と表示",
+                    value:"all"
+                }
+
+            ]
+        }
+    },{
+        id:"gif",
+        storage:"gif",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"アイコンのアニメーションを再生する",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        id:"tag",
+        storage:"tag-range",
+        checkbox:true,
+        setValue:"local",
+        text:{
+            head:"タグタイムラインの表示範囲",
+            desc:"",
+            checkbox:[
+                {
+                    text:"接続しているサーバー",
+                    value:"all"
+                },{
+                    text:"検索対象のサーバーのみ",
+                    value:"local"
+                }
+
+            ]
+        }
+    },{
+        id:"via",
+        storage:"viashow",
+        checkbox:true,
+        setValue:"no",
+        text:{
+            head:"viaを表示する",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        id:"mov",
+        storage:"mouseover",
+        checkbox:true,
+        setValue:"no",
+        text:{
+            head:"アクションメニューを非表示",
+            desc:"「マウスオーバー」はすこし鬱陶しいと思うかもしれません。",
+            checkbox:[
+                {
+                    text:"マウスオーバーで表示",
+                    value:"yes"
+                },{
+                    text:"クリックで表示",
+                    value:"click"
+                },{
+                    text:"いいえ",
+                    value:"no"
+                }
+
+            ]
+        }
+    },{
+        id:"notfm",
+        storage:"setasread",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"通知を開いているとき、通知新着お知らせを表示する",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        checkbox:false,
+        doubleText:true,
+        data:[
+            {
+                id:"sentence",
+                storage:"sentence",
+                width:50,
+                setValue:500,
+                text:{after:"行 以上 または"}
+            },{
+                id:"letters",
+                storage:"letters",
+                width:50,
+                setValue:7000,
+                text:{after:"文字 以上"}
+            }
+        ],
+        text:{
+            head:"指定行数以上を折りたたむ",
+            desc:"5文字以下のトゥートは折りたたみません。また、折りたたみ時は改行が描画されません。改行のみを行数とカウントします。",
+        }
+    },{
+        id:"img-height",
+        storage:"img-height",
+        checkbox:false,
+        doubleText:false,
+        width:80,
+        setValue:200,
+        text:{
+            head:"画像の高さ",
+            desc:"",
+            after:"px"
+        }
+    },{
+        id:"ticker",
+        storage:"ticker_ok",
+        checkbox:true,
+        setValue:"no",
+        text:{
+            head:"#InstanceTickerを使う",
+            desc:'トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href="https://cdn.weep.me/mastodon/">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.',
+            checkbox:yesno
+        }
+    },{
+        id:"anime",
+        storage:"animation",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"タイムラインのアニメーション",
+            desc:"",
+            checkbox:yesno
+        }
+    }
+];
+var postConstruction=[
+    {
+        id:"cw-text",
+        storage:"cw-text",
+        checkbox:false,
+        doubleText:false,
+        width:150,
+        setValue:"",
+        text:{
+            head:"デフォルトの警告文",
+            desc:"",
+            after:""
+        }
+    },{
+        checkbox:false,
+        doubleText:true,
+        data:[
+            {
+                id:"cw_sentence",
+                storage:"cw_sentence",
+                width:50,
+                setValue:500,
+                text:{after:"行 以上 または"}
+            },{
+                id:"cw_letters",
+                storage:"cw_letters",
+                width:50,
+                setValue:7000,
+                text:{after:"文字 以上"}
+            }
+        ],
+        text:{
+            head:"長文投稿時に警告",
+            desc:"下で指定した以上のトゥートを投稿するときにCWするかのダイアログを表示します。",
+        }
+    },{
+        id:"cws",
+        storage:"always-cw",
+        checkbox:true,
+        setValue:"no",
+        text:{
+            head:"標準でCWを設定",
+            desc:"",
+            checkbox:yesno
+        }
+    },{
+        id:"vis",
+        storage:"vis",
+        checkbox:true,
+        setValue:"public",
+        text:{
+            head:"デフォルトの公開設定",
+            desc:"",
+            checkbox:[
+                {
+                    text:"公開(Public)",
+                    value:"public"
+                },{
+                    text:"未収載(Unlisted)",
+                    value:"unlisted"
+                },{
+                    text:"非公開(Private)",
+                    value:"private"
+                },{
+                    text:"ダイレクト(Direct)",
+                    value:"direct"
+                },{
+                    text:"前回の投稿設定を記憶する(サーバーごとに記憶されます)",
+                    value:"memory"
+                },{
+                    text:"マストドンアカウント設定の既定値",
+                    value:"useapi"
+                }
+            ]
+        }
+    },{
+        id:"img",
+        storage:"img",
+        checkbox:true,
+        setValue:"no-act",
+        text:{
+            head:"画像投稿設定",
+            desc:"",
+            checkbox:[
+                {
+                    text:"画像を投稿し、画像のURLを最後に表示",
+                    value:"url"
+                },{
+                    text:"画像を投稿するがURLは表示しない",
+                    value:"no-act"
+                }
+            ]
+        }
+    },{
+        id:"box",
+        storage:"box",
+        checkbox:true,
+        setValue:"yes",
+        text:{
+            head:"投稿ボックスの挙動",
+            desc:"",
+            checkbox:[
+                {
+                    text:"たたむ",
+                    value:"yes"
+                },{
+                    text:"投稿後も隠さない",
+                    value:"no"
+                },{
+                    text:"枠外クリックで閉じない(起動時に展開)",
+                    value:"absolute"
+                }
+            ]
+        }
+    },{
+        id:"quote",
+        storage:"quote",
+        checkbox:true,
+        setValue:"nothing",
+        text:{
+            head:"引用形式",
+            desc:"",
+            checkbox:[
+                {
+                    text:"URLのみ",
+                    value:"simple"
+                },{
+                    text:"URLとアカウント名(相手に通知)",
+                    value:"mention"
+                },{
+                    text:"本文・URL・アカウント名",
+                    value:"full"
+                },{
+                    text:"使わない(TL上にボタンも表示されません)",
+                    value:"nothing"
+                }
+            ]
+        }
+    },{
+        id:"main",
+        storage:"mainuse",
+        checkbox:true,
+        setValue:"remain",
+        text:{
+            head:"投稿後や起動時のアカウント",
+            desc:"メインアカウントはアカウント設定で指定できます。投稿以外のアカウント選択にも影響します。",
+            checkbox:[
+                {
+                    text:"最後に使用したアカウント",
+                    value:"remain"
+                },{
+                    text:"メインアカウント",
+                    value:"main"
+                }
+            ]
+        }
+    },{
+        id:"sec",
+        storage:"sec",
+        checkbox:true,
+        setValue:"public",
+        text:{
+            head:"セカンダリートゥートボタン",
+            desc:"",
+            checkbox:[
+                {
+                    text:"表示しない",
+                    value:"nothing"
+                },{
+                    text:"公開(Public)",
+                    value:"public"
+                },{
+                    text:"未収載(Unlisted)",
+                    value:"unlisted"
+                },{
+                    text:"非公開(Private)",
+                    value:"private"
+                },{
+                    text:"ダイレクト(Direct)",
+                    value:"direct"
+                },{
+                    text:"ローカル限定",
+                    value:"local",
+                    kirishima:true,
+                    kirishimaText:"非対応インスタンスでは「未収載」になります。"
+                }
+            ]
+        }
+    }
+]

app/view/ja/update.html

@@ -6,6 +6,13 @@
 <link href="../../css/master.css" type="text/css" rel="stylesheet">
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 <meta charset="utf-8">
+<!--
+<script type="text/javascript">
+	var _jipt = [];
+	_jipt.push(['project', 'thedesk']);
+</script>
+<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+-->
 </head>
 <body>
 <style>
@@ -55,6 +62,9 @@ a,button,input,label,i{
 #prog{
     font-size:200%;
 }
+.linux, .mac{
+    display:none;
+}
 </style>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -68,14 +78,12 @@ a,button,input,label,i{
         <p>アップデートがあります</p>
         <span id="now"></span>→<b id="ver"></b><br>
         <span id="det"></span><br>
-        <button id="update" class="waves-effect btn" onclick="update('true')" style="margin-left:15px;">開始</button>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">インストーラー版(推奨)</button>
-        <div id="checkbox">
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">ポータブル版</button>
-            Options:<br>
+        <span class="linux">snap版はSnapcraft等よりDLしてください。<br></span>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">開始</button>
-            <label for="portable">ポータブル版</label><br>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">開始</button>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
+        <br>
-            <label for="rewrite">上書きしない</label><br>
-        </div>
         問題が発生しますか？<br><a href="https://thedesk.top">公式HP</a>からダウンロードをお試しください。
     </div>
     <div id="skipper" class="hide">
@@ -116,17 +124,49 @@ function update(sel){
     $("#dlnow").toggleClass("hide");
     $("#dlnow").toggleClass("show");
     $("#prog").text("");
-    if($('#rewrite:checked').val()=="true"){
+    var remote=electron.remote;
-        var versioning=true;
+    var bit=process.arch;
-	}else{
+    var start="https://thedesk.top/ver.json";
-        var versioning=false;
+	fetch(start, {
-    }
+		method: 'GET',
-    if($('#portable:checked').val()=="true"){
+		headers: {'content-type': 'application/json'},
-		var zip=true;
+    }).then(function(response) {
-	}else{
+       return response.json();
-        var zip=false;
+    }).catch(function(error) {
-    }
+        todo(error);
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+		console.error(error);
+    }).then(function(json) {
+        if(sel=="install"){
+            if(bit=="x64"){
+                var url=json["winx64"];
+                var file="TheDesk-setup.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32"];
+                var file="TheDesk-setup-ia32.exe";
+            }
+        }else if(sel=="portable"){
+            if(bit=="x64"){
+                var url=json["winx64p"];
+                var file="TheDesk.exe";
+            }else if(bit=="ia32"){
+                var url=json["winia32p"];
+                var file="TheDesk-ia32.exe";
+            }
+        }else if(sel=="linux"){
+            if(bit=="x64"){
+                var url=json["linuxx64"];
+                var file="TheDesk-linux-x64.zip";
+            }else if(bit=="ia32"){
+                var url=json["linuxia64"];
+                var file="TheDesk-linux-ia32.zip";
+            }
+        }else if(sel=="mac"){
+            var url=json["mac"];
+            var file="TheDesk-darwin-x64.zip";
+        }
+        ipc.send('download-btn', [url,file]);
+    });
+	
 }
 	function quit(){
 				ipc.send('quit', 'go');
@@ -142,9 +182,14 @@ ipc.on('mess', function (event, arg) {
 })
 function verck(){
     var remote=electron.remote;
-	var platform=remote.process.platform;
+    var platform=remote.process.platform;
-	if(platform!="win32"){
+    var bit=process.arch;
-		$('#portable').prop("disabled",true)
+	if(platform=="linux"){
+        $('.windows').hide()
+        $('.linux').show()
+	}else if(platform=="mac"){
+        $('.windows').hide()
+        $('.mac').show()
 	}
 	var start="https://thedesk.top/ver.json";
 	fetch(start, {
@@ -160,7 +205,8 @@ function verck(){
              $("#ver").text(json.desk);
              localStorage.setItem("next-ver",json.desk);
 			 $("#det").html(json.detail);
-			 $("#now").text(localStorage.getItem("ver"));
+             $("#now").text(localStorage.getItem("ver"));
+             
     });
 }
 function nextv(){

app/view/make/acct.sample.html

@@ -20,14 +20,20 @@ body,html{overflow-y: scroll;}
 .card .colorsel div.exc{width:40px;height:20px;}
 </style>
 <meta charset="utf-8">
+{{comment-start}}
+<script type="text/javascript">
+	var _jipt = [];
+	_jipt.push(['project', 'thedesk']);
+</script>
+<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+{{comment-end}}
 </head>
 <body id="mainView">
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.{{lang}}.js"></script>
 <script>
-      var lang="{{lang}}"; 
       var misskeytoken=false;
 </script>
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
@@ -77,7 +83,7 @@ Some instance data by <a href="https://instances.social" target="_blank">instanc
 <h5 id="ins-title"></h5>
 Administered by:<a id="ins-admin"></a><br>
 <span id="ins-desc"></span><br>
-<img src="./img/loading.svg" id="ins-prof" width="200"><br>
+<img src="../../img/loading.svg" id="ins-prof" width="200"><br>
 <br>
 {{domain}}:<span id="ins-name"></span><br>
 {{connect}}:<span id="ins-connect"></span>{{ko}}<br>

app/view/make/index.sample.html

@@ -13,28 +13,32 @@
 	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
+	{{comment-start}}
+	<script type="text/javascript">
+		var _jipt = [];
+		_jipt.push(['project', 'thedesk']);
+	</script>
+	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+	{{comment-end}}
 </head>
 <body>
 <script type="text/javascript" src="../../js/common/jquery.js"></script>
 <script type="text/javascript" src="../../js/platform/first.js"></script>
 <script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.{{lang}}.js"></script>
-<script type="text/javascript" src="../../js/lang/parse.lang.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/version.js"></script>
 <script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Akane (16.1.5)";
+var ver="{{versionLetter}}";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
-var winstore=false;
 var acct_id=0;
 var tlid=0;
-var lang="{{lang}}";
   verck(ver);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
@@ -48,8 +52,10 @@ var lang="{{lang}}";
 </div>
 </div>
 </div>
-<div id="post-box" class="z-depth-3">
+<div id="post-box" class="z-depth-5">
+<div id="post-bar" class="drag-bar">{{post-new}}</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@@ -118,16 +124,14 @@ var lang="{{lang}}";
 <span class="sml gray pointer anti-markdown mize">
 <a onclick="mdToggle()">Markdownエディタを表示</a>
 </span>
-<span id="suggest"></span>
 </div>
 <div class="col s12 mize" style="margin-top: 0; display:flex; justify-content: space-between">
 		<i class="waves-effect gray material-icons" id="nsfw" title="{{nsfwDes}}" onclick="nsfw()">visibility_off</i>
 		<i class="waves-effect gray material-icons purple-text dropdown-button" data-activates='dropdown1' id="vis-icon">public</i>
 		<a class="waves-effect gray" id="cw" onclick="cw()" title="{{cwDes}}">CW</a>
 		<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray" onclick="fileselect()" title="{{selfile}}">photo_library</i></span></span>
-		<i class="waves-effect gray material-icons" onclick="adobe()" title="{{adobephoto}}">format_shapes</i>
 		<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn" title="{{insertEmoji}}">tag_faces</i>
-		<a class="pointer waves-effect gray" id="npbtn" title="{{NowPlayingDes}}"><i class="material-icons" style="font-size:24px;">music_note</i></a>
+		<i class="waves-effect gray material-icons dropdown-button" data-activates='dropdown2'>more_vert</i>
 		<i class="material-icons nex gray waves-effect" title="{{clearToot}}(Ctrl+Shit+C)" data-trans-title="post_box_clear" id="clear">clear</i>
 </div>
 <div class="col s12 mize" style="margin-bottom:5px; padding:0;">
@@ -140,6 +144,9 @@ var lang="{{lang}}";
 </span>
 <br>
 <input type="text" id="cw-text" placeholder="{{cwtext}}" class="mize" style="margin:0">
+<div id="sch-box">{{postat}}<br><span class="sml">{{scheduleWarn}}</span><br>
+	<input type="datetime-local" id="sch-date" placeholder="{{schedule}}" class="datepicker" style="margin:0">
+</div>
 </div>
 </div>
 <!-- 公開範囲 Dropdown Structure -->
@@ -164,6 +171,24 @@ var lang="{{lang}}";
 	<a onclick="vis('direct')" class="disabled direct">{{directJP}}(Direct)</a>
 </li>
 </ul>
+<!-- その他 Dropdown Structure -->
+<ul id='dropdown2' class='dropdown-content'>
+	<li>
+		<a onclick="adobe()">{{adobephoto}}</a>
+	</li>
+	<li>
+		<a onclick="nowplaying('spotify');">{{NPSpotify}}</a>
+	</li>
+	<li>
+		<a onclick="nowplaying('itunes');">{{NPiTunes}}</a>
+	</li>
+	<li>
+		<a onclick="schedule();">{{schedule}}</a>
+	</li>
+	<li>
+		<a onclick="pollToggle();">{{poll}}</a>
+	</li>
+	</ul>
 <!--hidden area-->
 <input type="hidden" id="reply">
 <input type="hidden" id="media">
@@ -174,59 +199,87 @@ var lang="{{lang}}";
 	<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="{{sectoot}}">lock_open</i></button>
 </div>
 </div>
+<div id="right-side">
+<div id="suggest"></div>
 <!--絵文字ピッカー-->
-<div id="emoji" class="hide shared z-depth-4">
+<div id="emoji" class="hide">
-	<span class="gray sml">{{emojiWarn}}
+		<span class="gray sml">{{emojiWarn}}
-		<a onclick="emojiGet('true')" class="pointer">{{refreshEmoji}}</a>
+			<a onclick="emojiGet('true')" class="pointer">{{refreshEmoji}}</a>
-		<i class="material-icons waves-effect" onclick="emoji()" title="{{closeThisBox}}" data-trans-title="post_box_close">cancel</i>
+			<i class="material-icons waves-effect" onclick="emojiToggle()" title="{{closeThisBox}}" data-trans-title="post_box_close">cancel</i>
-	<br>
-	</span>
-	<div id="emoji-list" class="" style="">
-	</div>
-	<div class="emoji-control center">
-		<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
-		<i class="material-icons">navigate_before</i>
-		</button>
-		<span id="emoji-count"></span>/
-		<span id="emoji-sum"></span>
-		<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')" id="emoji-next">
-		<i class="material-icons">navigate_next</i>
-		</button>
-		</div>
-		<div id="default-emoji">
-		<span id="now-emoji"></span>{{showThisEmoji}}<br><span class="gray sml">{{emojiInsertWarn}}</span>
 		<br>
-		<a onclick="customEmoji()" class="pointer waves-effect" title="{{customEmoji}}">
+		</span>
-		<i class="material-icons">add</i>
+		<div id="emoji-list" class="" style="">
-		</a>
+		</div>
-		<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="{{peopleEmoji}}">
+		<div class="emoji-control center">
-		<i class="material-icons">people</i>
+			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
-		</a>
+			<i class="material-icons">navigate_before</i>
-		<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="{{natureEmoji}}">
+			</button>
-		<i class="material-icons">local_florist</i>
+			<span id="emoji-count"></span>/
-		</a>
+			<span id="emoji-sum"></span>
-		<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="{{foodEmoji}}">
+			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')" id="emoji-next">
-		<i class="material-icons">restaurant</i>
+			<i class="material-icons">navigate_next</i>
-		</a>
+			</button>
-		<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="{{activityEmoji}}">
+			</div>
-		<i class="material-icons">directions_run</i>
+			<div id="default-emoji">
-		</a>
+			<span id="now-emoji"></span>{{showThisEmoji}}<br><span class="gray sml">{{emojiInsertWarn}}</span>
-		<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="{{placeEmoji}}">
+			<br>
-		<i class="material-icons">directions_car</i>
+			<a onclick="customEmoji()" class="pointer waves-effect" title="{{customEmoji}}">
-		</a>
+			<i class="material-icons">add</i>
-		<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="{{thingsEmoji}}">
+			</a>
-		<i class="material-icons">attach_file</i>
+			<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="{{peopleEmoji}}">
-		</a>
+			<i class="material-icons">people</i>
-		<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="{{symbolEmoji}}">
+			</a>
-		<i class="material-icons">gesture</i>
+			<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="{{natureEmoji}}">
-		</a>
+			<i class="material-icons">local_florist</i>
-		<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="{{flagsEmoji}}">
+			</a>
-		<i class="material-icons">flag</i>
+			<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="{{foodEmoji}}">
-		</a>
+			<i class="material-icons">restaurant</i>
-		<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+			</a>
-		<i class="fa fa-fort-awesome"></i>
+			<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="{{activityEmoji}}">
-		</a>
+			<i class="material-icons">directions_run</i>
+			</a>
+			<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="{{placeEmoji}}">
+			<i class="material-icons">directions_car</i>
+			</a>
+			<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="{{thingsEmoji}}">
+			<i class="material-icons">attach_file</i>
+			</a>
+			<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="{{symbolEmoji}}">
+			<i class="material-icons">gesture</i>
+			</a>
+			<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="{{flagsEmoji}}">
+			<i class="material-icons">flag</i>
+			</a>
+			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+			<i class="fa fa-fort-awesome"></i>
+			</a>
+		</div>
 	</div>
+	<!--Poll UI-->
+	<div id="poll" class="hide">
+		<select id="poll-sel"  onchange="pollProviderCk()">
+			<option value="nothing">{{pollDdisabled}}</option>
+			<option value="votedon">votedon.</option>
+			<option value="mastodon-poll">Mastodon(2.8~)</option>
+		</select>
+		<div id="votedon" class="poll-provider hide">
+	WIP
+		</div>
+		<div id="mastodon-poll" class="poll-provider hide">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}1">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}2">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}3">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}4">
+			<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+			<label for="poll-multiple">{{pollmulti}}</label><br>
+			<input type="checkbox" class="filled-in" id="poll-until" value="1" />
+			<label for="poll-until">{{polluntil}}</label><br>
+			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">{{days}}
+			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">{{hours}}
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">{{mins}}
+		</div>
+	</div>
+</div>
 </div>
 <!-- Modal Structure Tootdata-->
 <div id="tootmodal" class="modal modal-fixed-footer">
@@ -285,17 +338,17 @@ var lang="{{lang}}";
 	</ul>
 	{{useOtherAcct1}}(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>{{useOtherAcct2}})<br>
 	<div class="row">
-		<div class="col s4">
+		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share left"></i>{{reply}}</button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet left"></i>{{bt}}</button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
 		</div>
-		<div class="col s3">
+		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>{{favRegist}}</button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -317,7 +370,7 @@ var lang="{{lang}}";
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="./img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -528,28 +581,30 @@ var lang="{{lang}}";
 		<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-Akane_16-1-5" style="display:none">
+			<div id="release-Usamin_18-0-2" 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>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Akane (16.1.5)</h5>
+					<h5>Release Note Usamin (18.0.2)</h5>
-					16.1.5<br>
+・設定の値が保存できなくなるバグ<br>
-					<ul>
+・画像送りしたときに進化したメディアビューが適用されない問題<br>
-						<li>バグ,脆弱性修正</li>
+・設定の表記がおかしい問題<br>
-					</ul>
+--以下18.0.0--<br>
-					16.1.4<br>
+・多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
-					<ul>
+・Alt+Enterでセカンダリートゥートボタン<br>
-						<li>全てバグ修正(5件ほど)</li>
+・引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
-					</ul>
+・実況機能をまともに書き直した。<br>
-					ご迷惑をおかけしたことをお詫び申し上げます。
+・サジェストをトゥートボックスの右に<br>
-					16.1.3<br>
+・ハードウェアアクセラレーションを無効化するオプション。(設定の表示などが乱れるときに設定)<br>
-					<ul>
+・返信時に「@」が複数含まれない仕様を訂正<br>
-						<li>セカンダリートゥートボタン</li>
+・一部のデフォルト値を修正。<br>
-						<li>読み上げや絵文字に関するバグの修正</li>
+・設定のエクスポート(バックアップ)がバージョン2に。ほとんどの設定をエクスポートします。<br>
-						<li>公式ヘルプサイト:<a href="https://docs.thedesk.top">TheDesk Docs</a></li>
+・イメージビューワーの修正<br>
-					</ul>
+			</div>
-					いつの間にかリアルタイムユーザー数が100を超えていました。皆様のご愛顧に感謝申し上げます。<br>
+			<div id="release-en">
+				<h5>Let's make it native!</h5>
+				<a href="https://translate.thedesk.top">Crowdin translation project</a>
 			</div>
 			<br><br>
 			<h3>{{supportme}}</h3>
@@ -579,125 +634,149 @@ var lang="{{lang}}";
 		<i class="material-icons pointer" onclick="endPip()">close</i>
 		<div id="pip-content">
 		</div>
-    </div>
+		</div>
-<!--カラム追加-->
+<!--menu-->
-<div id="add-box" class="hide z-depth-4 notf-box">
+<div id="menu" class="z-depth-5" style="display:none">
-<div class="input-field"><span data-trans="your_acct">{{selectAcct}}</span>
+		<div id="menu-bar" class="drag-bar"></div>
-<br>
+		<span class="cancel">
-<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
+				<i class="material-icons waves-effect" onclick="menu()" title="{{closeThisBox}}(X)">cancel</i>
-<label></label>
+			</span>
-</div>
+		<div id="menu-wrapper">
-<div class="input-field">
+		<div id="left-menu">
-<div id="auth">
+			<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"><i class="material-icons">add</i><span>{{addColumn}}</span></div>
-<select id="type-sel" style="color:black">
+			<div class="waves-effect" onclick="sortMenu()" id="sortMenu"><i class="material-icons">sort</i><span>{{sortColumns}}</span></div>
-	<option value="local" data-trans="local">{{local}}</option>
+			<div class="waves-effect" onclick="searchMenu()" id="searchMenu"><i class="material-icons">search</i><span>{{search}}</span></div>
-	<option value="local-media" data-trans="local-media">{{localMedia}}</option>
+			<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>{{list}}</span></div>
-	<option value="home" data-trans="home">{{home}}</option>
+			<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>{{filter}}</span></div>
-	<option value="pub" data-trans="public">{{fed}}</option>
+			<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>{{help}}</span></div>
-	<option value="pub-media" data-trans="public-media">{{fedMedia}}</option>
+			<div class="waves-effect" onclick="location.href='index.html'"><i class="material-icons">refresh</i><span>{{f5}}</span></div>
-	<option value="dm" data-trans="dm">{{dm}}</option>
+		</div>
-	<option value="mix" data-trans="integrated">{{integratedTLDes}}</option>
+		<div id="right-menu">
-	<option value="plus" data-trans="plus">{{localPlusDes}}</option>
+				<!--カラム追加-->
-	<option value="notf" data-trans="notification">{{notf}}</option>
+<div id="add-box" class="hide menu-content">
-</select>
+	<div class="input-field"><span data-trans="your_acct">{{selectAcct}}</span>
-<label data-trans="show_tl">{{showThisTL}}</label>
+	<br>
-</div>
+	<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
-<div id="noauth" class="hide">{{showThisTL}}
+	<label></label>
-	<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">{{webviewWarn}}
-</div>
-</div>
-<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()" data-trans-i="add">
-	<i class="material-icons left">add</i>{{add}}
-</button>
-<br>
-<br>
-</div>
-<!--検索-->
-<div id="src-box" class="hide notf-box z-depth-4" style="width:500px">
-		<div class="input-field">
-		<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
-</div><div class="input-field">
-<i class="material-icons prefix">search</i>
-<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
-<label for="src" data-trans="src">{{search}}</label>
-<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
-	<i class="material-icons left">search</i>{{search}}
-</button>
-<br>
-<br>
-</div>
-<div id="search">
-<div id="src-contents">
-</div>
-</div>
-</div>
-<!--並べ替え-->
-<div id="sort-box" class="hide">
-<ul id="sort"></ul>
-<div>
-<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
-	<i class="material-icons left">sort</i>{{sortSet}}
-</button>
-<button onclick="sortToggle()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="close">
-		<i class="material-icons left">close</i>{{close}}
-</button>
-</div>
-</div>
-<!--リスト-->
-<div id="list-box" class="hide notf-box z-depth-4">
-	<div class="input-field" style="width:calc( 100% - 100px);float:left">
-		<select id="list-acct-sel" class="acct-sel"></select>
-		<label>{{selectAcct}}</label>
 	</div>
-	<div style="float:left; padding-top:8px; padding-bottom:28px;">
+	<div class="input-field">
-		<button class="btn waves-effect indigo" style="width:80px;" onclick="list()" data-trans-i="lists">
+	<div id="auth">
-			{{listLocale}}
+	<input type="hidden" value="local" id="type-sel">
-		</button>
+	{{showThisTL}}
+	<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" data-type="local-media"><div><i class="material-icons">people_outline</i><i class="material-icons sub-icon">perm_media</i></div><span>{{localMedia}}</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>{{fed}}</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>{{fedMedia}}</span></div>
+		<div class="type waves-effect" data-type="dm"><div><i class="material-icons">mail_outline</i></div><span>{{dm}}</span></div>
+		<div class="type waves-effect" data-type="mix"><div><i class="material-icons">merge_type</i></div><span>{{integratedTLDes}}</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>{{localPlusDes}}</span></div>
+		<div class="type waves-effect" data-type="notf"><div><i class="material-icons">notifications</i></div><span>{{notf}}</span></div>
+	</div>
+	</div>
+	<div id="noauth" class="hide">{{showThisTL}}
+		<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">{{webviewWarn}}
+	</div>
+	</div>
+	<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()" data-trans-i="add">
+		<i class="material-icons left">add</i>{{add}}
+	</button>
+	<br>
+	<br>
+	</div>
+	<!--検索-->
+	<div id="src-box" class="hide menu-content">
+			<div class="input-field">
+			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
+	</div><div class="input-field">
+	<i class="material-icons prefix">search</i>
+	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
+	<label for="src" data-trans="src">{{search}}</label>
+	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
+		<i class="material-icons left">search</i>{{search}}
+	</button>
+	<br>
+	<br>
+	</div>
+	<div id="search">
+	<div id="src-contents">
+	</div>
+	</div>
+	</div>
+	<!--並べ替え-->
+	<div id="sort-box" class="hide menu-content">
+	<ul id="sort"></ul>
+	<div>
+	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+		<i class="material-icons left">sort</i>{{sortSet}}
+	</button>
+	</div>
+	</div>
+	<!--リスト-->
+	<div id="list-box" class="hide menu-content">
+		<div class="input-field" style="width:calc( 100% - 100px);float:left">
+			<select id="list-acct-sel" class="acct-sel"></select>
+			<label>{{selectAcct}}</label>
+		</div>
+		<div style="float:left; padding-top:8px; padding-bottom:28px;">
+			<button class="btn waves-effect indigo" style="width:80px;" onclick="list()" data-trans-i="lists">
+				{{listLocale}}
+			</button>
+		</div>
+		<br><br>
+		<div id="lists"></div>
+		<div id="lists-user"></div>
+		<input type="text" style="width:150px" id="list-add" placeholder="{{name}}">
+			<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">{{makeNew}}</button>
+	</div>
+	<!--フィルター-->
+	<div id="filter-box" class="hide menu-content">
+		<div class="input-field" style="width:calc( 100% - 100px);float:left">
+			<select id="filter-acct-sel" class="acct-sel"></select>
+			<label>{{selectAcct}}</label>
+		</div>
+		<div style="float:left; padding-top:8px; padding-bottom:28px;">
+			<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()" data-trans-i="filters">
+				{{listLocale}}
+			</button>
+		</div>
+		<div id="filtered-words"></div>
+		<input type="hidden" id="filter-edit-id">
+		<input type="text" style="width:150px" id="filter-add-word" placeholder="{{filterWord}}"><br>
+		{{degree}}<br>
+		<input type="checkbox" class="filled-in" id="home_filter" value="home" />
+			<label for="home_filter">{{home}}</label>
+		<input type="checkbox" class="filled-in" id="local_filter" value="public" />
+			<label for="local_filter">{{local}}</label>
+		<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
+			<label for="notf_filter">{{notf}}</label>
+		<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
+			<label for="conv_filter">{{conver}}</label><br>
+			{{option}}<br>
+		<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
+			<label for="wholeword_filter">{{matchWord}}</label><br>
+		<span class="sml">{{warnMatchWord}}</span><br>
+		<input type="checkbox" class="filled-in" id="except_filter" value="1" />
+			<label for="except_filter">{{except}}</label><br>
+		<span class="sml">{{exceptWorn}}</span><br>
+		{{avalableBefore}}<span class="sml">{{warnAvBefore}}<b>{{warnAvBefore2}}</b></span><br><br>
+		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">{{days}}
+		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">{{hours}}
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}
+		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">{{add}}</button><br>
+		<span class="sml">{{warnOnIntegratedTL}}</span>
 	</div>
-	<br><br>
-	<div id="lists"></div>
-	<div id="lists-user"></div>
-	<input type="text" style="width:150px" id="list-add" placeholder="{{name}}">
-		<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">{{makeNew}}</button>
 </div>
-<!--フィルター-->
+		</div>
-<div id="filter-box" class="hide notf-box z-depth-4">
+		<a onclick="about()" class="nex waves-effect">
-	<div class="input-field" style="width:calc( 100% - 100px);float:left">
+				<i class="material-icons" style="font-size: 1rem;">info</i>{{about}}
-		<select id="filter-acct-sel" class="acct-sel"></select>
+		</a>&nbsp;|&nbsp;
-		<label>{{selectAcct}}</label>
+		<a onclick="bottomReverse()" class="nex waves-effect">
-	</div>
+				<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>{{reverse}}
-	<div style="float:left; padding-top:8px; padding-bottom:28px;">
+		</a>
-		<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()" data-trans-i="filters">
-			{{listLocale}}
-		</button>
-	</div>
-	<div id="filtered-words"></div>
-	<input type="hidden" id="filter-edit-id">
-	<input type="text" style="width:150px" id="filter-add-word" placeholder="{{filterWord}}"><br>
-	{{degree}}<br>
-	<input type="checkbox" class="filled-in" id="home_filter" value="home" />
-	  <label for="home_filter">{{home}}</label>
-	<input type="checkbox" class="filled-in" id="local_filter" value="public" />
-	  <label for="local_filter">{{local}}</label>
-	<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
-	  <label for="notf_filter">{{notf}}</label>
-	<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
-	  <label for="conv_filter">{{conver}}</label><br>
-	  {{option}}<br>
-	<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
-	  <label for="wholeword_filter">{{matchWord}}</label><br>
-	<span class="sml">{{warnMatchWord}}</span><br>
-	<input type="checkbox" class="filled-in" id="except_filter" value="1" />
-	  <label for="except_filter">{{except}}</label><br>
-	<span class="sml">{{exceptWorn}}</span><br>
-	{{avalableBefore}}<span class="sml">{{warnAvBefore}}<b>{{warnAvBefore2}}</b></span><br><br>
-	<input type="text" style="width:50px" id="days_filter" placeholder="d" value="0">{{days}}
-	<input type="text" style="width:50px" id="hours_filter" placeholder="h" value="0">{{hours}}
-	<input type="text" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}
-	<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">{{add}}</button><br>
-	<span class="sml">{{warnOnIntegratedTL}}</span>
 </div>
 <div id="main">
 <!--TLのTL-->
@@ -710,53 +789,26 @@ var lang="{{lang}}";
 <div id="bottom" class="reverse">
     <div class="leftside reverse">
         <div id="dambox">
-                <input type="text" id="posttgl" placeholder="{{toot}}" style="height:2rem">
+								<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
-        </div>
+									<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>{{toot}}
+								</button>
+				</div>
         <div class="leftside reverse" id="group">
-            <div class="btnsgroup"><span class="grouptitle">Columns:</span>
+						<div class="btnsgroup">
-                <a onclick="addToggle()" class="nex waves-effect" data-trans-i="add" id="add-tgl">
+							<a href="acct.html" class="nex waves-effect">
-                    <i class="material-icons nex" title="{{addColumn}}" data-trans-title="column_add">add</i>
+                    <i class="material-icons nex big-icon" title="{{acctMan}}(Ctrl+Shift+M)">account_circle</i>
-                </a>
+              </a>
-                <a onclick="sortToggle()" class="nex waves-effect">
+							<a href="setting.html" class="nex waves-effect">
-                    <i class="material-icons nex big-icon" title="{{sortColumns}}" data-trans-title="sort">sort</i>
+									<i class="material-icons nex" title="{{setting}}(Ctrl+Shift+S)">settings</i>
-                </a>
+							</a>
-            </div>
+							<a onclick="nano()" class="nex waves-effect">
-            <div class="btnsgroup"><span class="grouptitle">Accounts:</span>
+									<i class="material-icons" title="{{nanoDes}}TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
-                <a href="acct.html" class="nex waves-effect">
+							</a>
-                    <i class="material-icons nex big-icon" title="{{acctMan}}(Ctrl+Shift+M)" data-trans-title="manager">account_circle</i>
+							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
-                </a>
+									<i class="material-icons" title="{{list}}">apps</i>
-                <a onclick="srcToggle()" class="nex waves-effect" id="src-tgl">
+							</a>
-                    <i class="material-icons" title="{{search}}" data-trans-title="src">search</i>
+						</div>
-                </a>
+    </div></div>
-                <a onclick="listToggle()" class="nex waves-effect" id="list-tgl">
-                    <i class="material-icons" title="{{list}}" data-trans-title="list">view_headline</i>
-                </a>
-                <a onclick="filterToggle()" class="nex waves-effect" id="filter-tgl">
-                    <i class="material-icons" title="{{filter}}" data-trans-title="filter">filter_list</i>
-                </a>
-            </div>
-			<div class="btnsgroup"><span class="grouptitle">Preferences:</span>
-				<a onclick="bottomReverse()" class="nex waves-effect">
-                    <i class="material-icons nex" title="{{reverse}}" data-trans-title="reverse">swap_horiz</i>
-                </a>
-                <a href="setting.html" class="nex waves-effect">
-                    <i class="material-icons nex" title="{{setting}}(Ctrl+Shift+S)" data-trans-title="setting">settings</i>
-                </a>
-                <a href="index.html" class="nex mize waves-effect">
-                    <i class="material-icons nex" title="{{f5}}(F5/⌘+R)" data-trans-title="reload">refresh</i>
-                </a>
-                <a onclick="nano()" class="nex waves-effect">
-                    <i class="material-icons" title="{{nanoDes}}TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
-                </a>
-                <a onclick="window.open('https://astarte.thedesk.top');" class="setting nex waves-effect" target="_blank" id="ranking-btn" style="display:none;">
-                    <i class="material-icons nex" title="アスタルテランキング">timeline</i>
-				</a>
-				<a href="https://docs.thedesk.top" class="setting nex waves-effect" target="_blank">
-                    <i class="material-icons nex" title="{{help}}">help_outline</i>
-				</a>
-            </div>
-        </div>
-    </div>
     <div>
 		<div id="tips-menu">
 			<div class="btnsgroup" style="height:34px"><span class="grouptitle">Tips:</span>
@@ -796,9 +848,11 @@ var lang="{{lang}}";
 <script type="text/javascript" src="../../js/common/about.js"></script>
 <script type="text/javascript" src="../../js/tl/parse.js"></script>
 <script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
+<script type="text/javascript" src="../../js/tl/dm.js"></script>
 <script type="text/javascript" src="../../js/ui/scroll.js"></script>
 <script type="text/javascript" src="../../js/tl/tl.js"></script>
 <script type="text/javascript" src="../../js/tl/card.js"></script>
+<script type="text/javascript" src="../../js/tl/poll.js"></script>
 <script type="text/javascript" src="../../js/tl/date.js"></script>
 <script type="text/javascript" src="../../js/tl/notification.js"></script>
 <script type="text/javascript" src="../../js/tl/datails.js"></script>
@@ -831,4 +885,5 @@ var lang="{{lang}}";
 <script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
 <script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
 <script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/ui/menu.js"></script>

app/view/make/language/acct.en.json

@@ -2,14 +2,14 @@
     "list":"List of accounts",
     "back":"Back",
     "add":"Add an account",
-    "codesetupwarn":"Check if TheDesk is not working on Windows, you want to login Pleroma instance.",
+    "codesetupwarn":"Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.",
     "codesetup":"Code setup",
     "mainacct":"Main an account",
     "selacct":"Select an account",
     "codepastewarn":"Paste the code and close browser.",
     "codepaste":"Code",
     "domain":"Domain",
-    "connect":"Federated instances",
+    "connect":"Federated servers",
     "toots":"Toots",
     "users":"Users",
     "users2":"users",

app/view/make/language/acct.ja.json

@@ -2,14 +2,14 @@
     "list":"アカウント一覧",
     "back":"戻る",
     "add":"アカウントを追加",
-    "codesetupwarn":"Windows以外でご使用の方やPleromaにログインされる方はチェックを入れて下さい。",
+    "codesetupwarn":"Windows以外でご使用の方やPleromaにログインされる方はチェックを入れて下さい。ログインできない場合、チェックを外してください。",
     "codesetup":"コードセットアップ",
     "mainacct":"メインアカウント",
     "selacct":"アカウントを選択",
     "codepastewarn":"指定されたコードを貼り付けてください。ログインウィンドウは閉じていただいて構いません。",
     "codepaste":"コードを入力",
     "domain":"ドメイン名",
-    "connect":"接続インスタンス数",
+    "connect":"接続サーバー数",
     "toots":"トゥート数",
     "users":"ユーザー数",
     "users2":"人",

app/view/make/language/acct.ps.json

@@ -0,0 +1,21 @@
+{
+    "list": "crwdns365:0crwdne365:0",
+    "back": "crwdns366:0crwdne366:0",
+    "add": "crwdns367:0crwdne367:0",
+    "codesetupwarn": "crwdns368:0crwdne368:0",
+    "codesetup": "crwdns369:0crwdne369:0",
+    "mainacct": "crwdns370:0crwdne370:0",
+    "selacct": "crwdns371:0crwdne371:0",
+    "codepastewarn": "crwdns372:0crwdne372:0",
+    "codepaste": "crwdns373:0crwdne373:0",
+    "domain": "crwdns374:0crwdne374:0",
+    "connect": "crwdns375:0crwdne375:0",
+    "toots": "crwdns376:0crwdne376:0",
+    "users": "crwdns377:0crwdne377:0",
+    "users2": "crwdns378:0crwdne378:0",
+    "safety": "crwdns379:0crwdne379:0",
+    "ver": "crwdns380:0crwdne380:0",
+    "ko": "crwdns381:0crwdne381:0",
+    "thisismisskey": "crwdns382:0crwdne382:0",
+    "misskeylogin": "crwdns383:0crwdne383:0"
+}

app/view/make/language/index.en.json

@@ -4,12 +4,17 @@
     "showSelectProf":"Show profile of the selecting account",
     "closethisbox":"Close this box",
     "toot":"Toot",
+    "post-new":"Post new",
     "nsfwDes":"Mark media as sensitive",
     "cwDes":"Hide text behind warning",
     "selfile":"Attach..",
     "adobephoto":"Adobe Photo Editor",
     "insertEmoji":"Emojis",
-    "NowPlayingDes":"NowPlaying[Click to insert info of Spotify(account link is required.)/control+click to insert that of iTunes(macOS)]",
+    "NPSpotify":"NowPlaying(Spotify)",
+    "NPiTunes":"NowPlaying",
+    "schedule":"Scheduled toot",
+    "postat":"Post at",
+    "scheduleWarn":"2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
     "clearToot":"Clear toot box",
     "replyMode":"Reply",
     "no":"No",
@@ -39,6 +44,13 @@
     "thingsEmoji":"Emojis of tools",
     "symbolEmoji":"Emojis of symbols",
     "flagsEmoji":"Emojis of flags",
+    "poll":"Poll",
+    "pollDdisabled":"Polls: Disabled",
+    "pollProvider":"Provider of Poll",
+    "polluntil":"Hide 'votes' count until people vote it.",
+    "choice":"Choice",
+    "pollmulti":"Multiple select",
+    "expires_in":"Expires in...(sec)",
     "contextBefore":"Context before this toot",
     "thisToot":"This toot",
     "contextAfter":"Context after this toot",
@@ -103,15 +115,15 @@
     "fed":"Federated",
     "fedMedia":"Federated(Media)",
     "dm":"Direct Message",
-    "integratedTLDes":"Integrated(Local and Home)",
+    "integratedTLDes":"Integrated(Local/Home)",
-    "localPlusDes":"Integrated(Local and replies and BT on Home)",
+    "localPlusDes":"LTL+Reply+BT",
     "notf":"Notifications",
     "showThisTL":"Show this TL:",
     "webviewWarn":"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.",
     "add":"Add",
     "search":"Search",
     "sortSet":"Sort",
-    "selectAcct":"Select an account",
+    "selectAcct":"Account(Scroll to show all)",
     "listLocale":"List",
     "filterWord":"Filtering words",
     "degree":"Filter contexts",
@@ -127,19 +139,21 @@
     "days":"days",
     "hours":"hours",
     "mins":"minutes",
+    "secs":"seconds",
     "warnOnIntegratedTL":"Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
-    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">Add an account</a> or click <i class=\"material-icons\">add</i> to add a column.",
+    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">Add an account</a> or click <i class=\"material-icons\">apps</i> to add a column.",
     "addColumn":"Add a column",
     "sortColumns":"Sort",
     "acctMan":"Account Manager",
     "filter":"Filter",
     "setting":"Preferences",
-    "reverse":"Toot box reverse",
+    "reverse":"Toot button layout reverse",
-    "f5":"Super Reload",
+    "f5":"Reload TL",
     "nanoDes":"The smallest Mastodon,",
     "verTips":"Version",
     "clockTips":"Clock",
     "ramTips":"RAM status",
     "changeTips":"Change Tips",
-    "help":"Help"
+    "help":"Help",
+    "about":"About TheDesk"
 }

app/view/make/language/index.ja.json

@@ -3,13 +3,18 @@
     "close":"Close",
     "showSelectProf":"選択したアカウントのプロフィールを表示",
     "closethisbox":"このボックスを閉じる",
+    "post-new":"投稿",
     "toot":"トゥート",
     "nsfwDes":"画像に制限を付与",
     "cwDes":"コンテンツワーニング(トゥートを表示する前にメッセージで隠す)",
     "selfile":"ファイルを選択",
     "adobephoto":"Adobeフォトエディタ",
     "insertEmoji":"絵文字を挿入",
-    "NowPlayingDes":"NowPlaying[クリックでSpotify(アカウント連携が必要です)/control+クリックでiTunes(macOSが必要です)]",
+    "NPSpotify":"NowPlaying(Spotify)",
+    "NPiTunes":"NowPlaying",
+    "schedule":"時間指定投稿",
+    "postat":"時間指定投稿",
+    "scheduleWarn":"2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。",
     "clearToot":"トゥートボックスのクリア",
     "replyMode":"返信モード",
     "no":"いいえ",
@@ -25,7 +30,7 @@
     "localJP":"ローカル限定",
     "directJP":"ダイレクト",
     "sectoot":"セカンダリートゥート",
-    "emojiWarn":"インスタンスによって実装が異なります。",
+    "emojiWarn":"サーバーによって実装が異なります。",
     "emojiInsertWarn":"一部絵文字は入力できません。",
     "refreshEmoji":"絵文字更新",
     "closeThisBox":"このボックスを閉じる",
@@ -39,6 +44,13 @@
     "thingsEmoji":"もの",
     "symbolEmoji":"記号",
     "flagsEmoji":"国旗",
+    "poll":"アンケート",
+    "pollDdisabled":"アンケートを使用しない",
+    "pollProvider":"アンケートのプロバイダ",
+    "choice":"選択肢",
+    "polluntil":"投票するまで票数を隠す",
+    "pollmulti":"複数選択を許可",
+    "expires_in":"有効期限(秒)",
     "contextBefore":"これより前の会話",
     "thisToot":"対象のトゥート",
     "contextAfter":"これより後の会話",
@@ -104,14 +116,14 @@
     "fedMedia":"連合(メディア)",
     "dm":"ダイレクトメッセージ",
     "integratedTLDes":"統合(ローカルとホーム)",
-    "localPlusDes":"統合(ローカルとブースト・リプライ)",
+    "localPlusDes":"統合(LTL+BT+返信)",
     "notf":"通知",
     "showThisTL":"表示するタイムライン",
     "webviewWarn":"TweetDeckを表示します。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>)。キーボードショートカットが邪魔をするので、文字入力時はカラムの「WebView優先」にチェックを入れてください。",
     "add":"追加",
     "search":"検索",
     "sortSet":"並べ替え設定",
-    "selectAcct":"アカウントを選択",
+    "selectAcct":"選択(スクロールで全選択肢表示)",
     "filterWord":"フィルターワード",
     "listLocale":"一覧",
     "degree":"適応範囲",
@@ -127,19 +139,21 @@
     "days":"日",
     "hours":"時間",
     "mins":"分",
+    "secs":"秒",
     "warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。",
-    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">アカウントを追加</a>するか下の<i class=\"material-icons\">add</i>ボタンよりカラムを追加してください。",
+    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">アカウントを追加</a>するか下の<i class=\"material-icons\">apps</i>ボタンよりカラムを追加してください。",
     "addColumn":"カラム追加",
     "sortColumns":"カラム一覧/並べ替え",
     "acctMan":"アカウントマネージャー",
     "filter":"フィルター",
     "setting":"設定",
-    "reverse":"トゥートバーの左右入れ替え",
+    "reverse":"トゥートボタンの左右入れ替え",
-    "f5":"スーパーリロード",
+    "f5":"TL再読込",
     "nanoDes":"最小のマストドン。",
     "verTips":"バージョン",
     "clockTips":"時計",
     "ramTips":"システムメモリ容量",
     "changeTips":"Tips変更",
-    "help":"ヘルプ"
+    "help":"ヘルプ",
+    "about":"このソフトについて"
 }

app/view/make/language/index.ps.json

@@ -0,0 +1,158 @@
+{
+    "draghere": "crwdns384:0crwdne384:0",
+    "close": "crwdns385:0crwdne385:0",
+    "showSelectProf": "crwdns386:0crwdne386:0",
+    "closethisbox": "crwdns387:0crwdne387:0",
+    "toot": "crwdns388:0crwdne388:0",
+    "post-new": "crwdns2402:0crwdne2402:0",
+    "nsfwDes": "crwdns389:0crwdne389:0",
+    "cwDes": "crwdns390:0crwdne390:0",
+    "selfile": "crwdns391:0crwdne391:0",
+    "adobephoto": "crwdns392:0crwdne392:0",
+    "insertEmoji": "crwdns393:0crwdne393:0",
+    "NPSpotify": "crwdns1880:0crwdne1880:0",
+    "NPiTunes": "crwdns2404:0crwdne2404:0",
+    "schedule": "crwdns1884:0crwdne1884:0",
+    "postat": "crwdns1886:0crwdne1886:0",
+    "scheduleWarn": "crwdns1888:0crwdne1888:0",
+    "clearToot": "crwdns395:0crwdne395:0",
+    "replyMode": "crwdns396:0crwdne396:0",
+    "no": "crwdns397:0crwdne397:0",
+    "yes": "crwdns398:0crwdne398:0",
+    "temp": "crwdns399:0crwdne399:0",
+    "nothing": "crwdns400:0crwdne400:0",
+    "vis": "crwdns401:0crwdne401:0",
+    "cwtext": "crwdns402:0crwdne402:0",
+    "selectVis": "crwdns403:0crwdne403:0",
+    "publicJP": "crwdns404:0crwdne404:0",
+    "unlistedJP": "crwdns405:0crwdne405:0",
+    "privateJP": "crwdns406:0crwdne406:0",
+    "localJP": "crwdns407:0crwdne407:0",
+    "sectoot": "crwdns1890:0crwdne1890:0",
+    "directJP": "crwdns408:0crwdne408:0",
+    "emojiWarn": "crwdns409:0crwdne409:0",
+    "emojiInsertWarn": "crwdns410:0crwdne410:0",
+    "refreshEmoji": "crwdns411:0crwdne411:0",
+    "closeThisBox": "crwdns412:0crwdne412:0",
+    "showThisEmoji": "crwdns413:0crwdne413:0",
+    "customEmoji": "crwdns414:0crwdne414:0",
+    "peopleEmoji": "crwdns415:0crwdne415:0",
+    "natureEmoji": "crwdns416:0crwdne416:0",
+    "foodEmoji": "crwdns417:0crwdne417:0",
+    "activityEmoji": "crwdns418:0crwdne418:0",
+    "placeEmoji": "crwdns419:0crwdne419:0",
+    "thingsEmoji": "crwdns420:0crwdne420:0",
+    "symbolEmoji": "crwdns421:0crwdne421:0",
+    "flagsEmoji": "crwdns422:0crwdne422:0",
+    "poll": "crwdns2406:0crwdne2406:0",
+    "pollDdisabled": "crwdns2408:0crwdne2408:0",
+    "pollProvider": "crwdns2410:0crwdne2410:0",
+    "polluntil": "crwdns2412:0crwdne2412:0",
+    "choice": "crwdns2414:0crwdne2414:0",
+    "pollmulti": "crwdns2416:0crwdne2416:0",
+    "expires_in": "crwdns2418:0crwdne2418:0",
+    "contextBefore": "crwdns423:0crwdne423:0",
+    "thisToot": "crwdns424:0crwdne424:0",
+    "contextAfter": "crwdns425:0crwdne425:0",
+    "beforeLTL": "crwdns426:0crwdne426:0",
+    "beforeUTL": "crwdns427:0crwdne427:0",
+    "favedPeople": "crwdns428:0crwdne428:0",
+    "btedPeople": "crwdns429:0crwdne429:0",
+    "useOtherAcct1": "crwdns430:0crwdne430:0",
+    "useOtherAcct2": "crwdns431:0crwdne431:0",
+    "reply": "crwdns432:0crwdne432:0",
+    "bt": "crwdns433:0crwdne433:0",
+    "favRegist": "crwdns434:0crwdne434:0",
+    "openBrowser": "crwdns435:0crwdne435:0",
+    "screenshot": "crwdns436:0crwdne436:0",
+    "copyURL": "crwdns437:0crwdne437:0",
+    "embed": "crwdns438:0crwdne438:0",
+    "toots": "crwdns439:0crwdne439:0",
+    "follow": "crwdns440:0crwdne440:0",
+    "follower": "crwdns441:0crwdne441:0",
+    "timeline": "crwdns442:0crwdne442:0",
+    "operateOtherAcct": "crwdns443:0crwdne443:0",
+    "list": "crwdns444:0crwdne444:0",
+    "makeNew": "crwdns445:0crwdne445:0",
+    "blocks": "crwdns446:0crwdne446:0",
+    "mutes": "crwdns447:0crwdne447:0",
+    "block": "crwdns448:0crwdne448:0",
+    "mute": "crwdns449:0crwdne449:0",
+    "domainBlock": "crwdns450:0crwdne450:0",
+    "editProf": "crwdns451:0crwdne451:0",
+    "change": "crwdns1892:0crwdne1892:0",
+    "followReq": "crwdns452:0crwdne452:0",
+    "likeHimOrHer": "crwdns453:0crwdne453:0",
+    "endorse": "crwdns454:0crwdne454:0",
+    "openinbrowser": "crwdns455:0crwdne455:0",
+    "frc": "crwdns456:0crwdne456:0",
+    "more": "crwdns457:0crwdne457:0",
+    "revoverJP": "crwdns458:0crwdne458:0",
+    "warnUseOtherAcct": "crwdns459:0crwdne459:0",
+    "revoverJPde": "crwdns460:0crwdne460:0",
+    "or": "crwdns461:0crwdne461:0",
+    "openProf": "crwdns462:0crwdne462:0",
+    "warnListRegist": "crwdns463:0crwdne463:0",
+    "blockDomain": "crwdns464:0crwdne464:0",
+    "name": "crwdns465:0crwdne465:0",
+    "note": "crwdns466:0crwdne466:0",
+    "editProfImg": "crwdns467:0crwdne467:0",
+    "editHeader": "crwdns468:0crwdne468:0",
+    "likeUserDes": "crwdns469:0crwdne469:0",
+    "get": "crwdns470:0crwdne470:0",
+    "historyBack": "crwdns471:0crwdne471:0",
+    "empUser": "crwdns472:0crwdne472:0",
+    "supportme": "crwdns473:0crwdne473:0",
+    "TheDeskDes": "crwdns474:0crwdne474:0",
+    "EntySupport": "crwdns475:0crwdne475:0",
+    "AWLSupport": "crwdns476:0crwdne476:0",
+    "SendAmazonGift1": "crwdns477:0crwdne477:0",
+    "SendAmazonGift2": "crwdns478:0crwdne478:0",
+    "sendSushi": "crwdns479:0crwdne479:0",
+    "local": "crwdns480:0crwdne480:0",
+    "localMedia": "crwdns481:0crwdne481:0",
+    "home": "crwdns482:0crwdne482:0",
+    "fed": "crwdns483:0crwdne483:0",
+    "fedMedia": "crwdns484:0crwdne484:0",
+    "dm": "crwdns485:0crwdne485:0",
+    "integratedTLDes": "crwdns486:0crwdne486:0",
+    "localPlusDes": "crwdns487:0crwdne487:0",
+    "notf": "crwdns488:0crwdne488:0",
+    "showThisTL": "crwdns489:0crwdne489:0",
+    "webviewWarn": "crwdns490:0crwdne490:0",
+    "add": "crwdns491:0crwdne491:0",
+    "search": "crwdns492:0crwdne492:0",
+    "sortSet": "crwdns493:0crwdne493:0",
+    "selectAcct": "crwdns494:0crwdne494:0",
+    "listLocale": "crwdns495:0crwdne495:0",
+    "filterWord": "crwdns496:0crwdne496:0",
+    "degree": "crwdns497:0crwdne497:0",
+    "conver": "crwdns498:0crwdne498:0",
+    "option": "crwdns499:0crwdne499:0",
+    "matchWord": "crwdns500:0crwdne500:0",
+    "warnMatchWord": "crwdns501:0crwdne501:0",
+    "except": "crwdns502:0crwdne502:0",
+    "exceptWorn": "crwdns503:0crwdne503:0",
+    "avalableBefore": "crwdns504:0crwdne504:0",
+    "warnAvBefore": "crwdns505:0crwdne505:0",
+    "warnAvBefore2": "crwdns506:0crwdne506:0",
+    "days": "crwdns507:0crwdne507:0",
+    "hours": "crwdns508:0crwdne508:0",
+    "mins": "crwdns509:0crwdne509:0",
+    "secs": "crwdns2420:0crwdne2420:0",
+    "warnOnIntegratedTL": "crwdns510:0crwdne510:0",
+    "helloTheDesk": "crwdns511:0crwdne511:0",
+    "addColumn": "crwdns512:0crwdne512:0",
+    "sortColumns": "crwdns513:0crwdne513:0",
+    "acctMan": "crwdns514:0crwdne514:0",
+    "filter": "crwdns515:0crwdne515:0",
+    "setting": "crwdns516:0crwdne516:0",
+    "reverse": "crwdns517:0crwdne517:0",
+    "f5": "crwdns518:0crwdne518:0",
+    "nanoDes": "crwdns519:0crwdne519:0",
+    "verTips": "crwdns520:0crwdne520:0",
+    "clockTips": "crwdns521:0crwdne521:0",
+    "ramTips": "crwdns522:0crwdne522:0",
+    "changeTips": "crwdns523:0crwdne523:0",
+    "help": "crwdns1894:0crwdne1894:0"
+}

app/view/make/language/setting.en.json

@@ -4,38 +4,57 @@
     "yes":"Yes",
     "no":"No",
     "change":"Change",
+    "select":"Select",
     "env":"System Preferences",
     "setlang":"Languages",
     "backup":"Import and export of preferences",
     "import":"Import",
     "export":"Export",
+    "hardwareAcceleration":"Disable hardware acceleration",
+    "hardwareAccelerationWarn":"Auto restarted",
     "theme":"Themes",
-    "popup":"Popup notification(on window)",
+    "popup":"Popup notification(on Windows)",
     "popupwarn":"Hide to set \"0\"",
     "s":"sec",
     "nativenotf":"Native notification",
     "nnwarn":"This does not work on Windows Portable ver.",
     "nntest":"Notification test",
-    "minwidth":"Minimam width of columns",
+    "minwidth":"Minimum width of columns",
     "minwidthwarn":"Scroll bar will be shown when your window size is more than ammounts of columns.",
+    "fixwidth":"Minimum width of TweetDeck browser",
+    "fixwidthwarn":"",
     "above":"above",
     "font":"Font",
-    "fontwarn":"Set local font",
+    "fontwarn":"Select your favorite font to 'Select'",
     "fontsize":"Font size",
     "savefolder":"Folder to save",
     "savefolderwarn":"TheDesk uses this value when it try to save pictures or take screenshots.",
     "absolute":"absolute value",
+    "themeSel":"Select theme",
+    "customtheme":"Edit and add custom themes",
+    "customthemeDirection":"Color scheme",
+    "primary":"Background color",
+    "secondarycolor":"Background of components",
+    "text":"Text color",
+    "accent":"Background of boosts",
+    "add_new":"Add new",
+    "name":"Name",
+    "desc":"About this theme",
+    "customShare":"Share this code with other TheDesk. Do not share this code with MiAS.",
+    "customImport":"Import of custom themes",
+    "delete":"Delete",
+    "cImpWarn":"Get more themes on <a href=\"https://assets.msky.cafe/\" target=\"_blank\">MiAS</a>",
     "timeline":"Timeline Preferences",
     "timemode":"Time format",
     "relativetime":"Relative format:\"1 minutes ago\",\"3 days ago\"",
     "absolutetime":"Absolute format:\"23:25:21\",\"2017/12/30 23:59:00\"",
     "mixtime":"Mixed format:toots posted today are relative-format, others are absolute-format.",
     "relativesel":"Relative",
-    "absolutesel":"Absoltue",
+    "absolutesel":"Absolute",
     "doublesel":"Both relative and absolute",
     "mixsel":"Mixed",
-    "locale":"Instance unique locale",
+    "locale":"Server's unique locale",
-    "localewarn":"This value is available on some Japanese instances",
+    "localewarn":"This value is available on some Japanese servers",
     "nswf":"Hide NSFW pictures",
     "nsfwwarn":"Strong blur effect",
     "cw":"Hide CW contents",
@@ -62,6 +81,9 @@
     "letters":"letters",
     "or":"or",
     "imgheight":"Height of images",
+    "ticker":"Enable #InstanceTicker",
+    "tickerwarn":"Show colorful stickers about tooters' server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+    "animation":"Animation of timelines",
     "post":"Posting Preferences",
     "autocw":"Alert before posting a long toot.",
     "autocwwarn":"Show dialog whether you make too-long text hidden.",
@@ -72,8 +94,8 @@
     "unlisted":"Unlisted",
     "private":"Private",
     "direct":"Direct",
-    "memory":"Memory(memorized as each instance)",
+    "memory":"Memory(memorized as each server)",
-    "useapi":"Default of your visibility(Set on preferences of Mastodon instance)",
+    "useapi":"Default of your visibility(Set on preferences of Mastodon server)",
     "postimg":"Posting images preferences",
     "showurl":"Insert media URL",
     "nourl":"Insert nothig",
@@ -82,6 +104,7 @@
     "simple":"Only URL",
     "mention":"URL and acct(mention to the user)",
     "full":"URL, text and acct(mention to the user)",
+    "notqt":"Disabled(Hide buttons on TLs)",
     "main":"Default accounts of actions",
     "mainwarn":"Main account can be set on Account Manager.",
     "lastacct":"Account you used recently",
@@ -104,6 +127,8 @@
     "useerempwarn":"Set on users data modals.",
     "empcolorwarn":"Use this color to emphasis",
     "spotify":"Spotify and NowPlaying Preferences",
+    "npProvider":"NowPlaying Provider(Windows)",
+    "npPeoviderWarn":"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.",
     "spotifynote1":"Click ",
     "spotifynote2":"icon to NowPlaying",
     "link":"Account Connection",
@@ -112,8 +137,9 @@
     "disconnect":"Disconnect",
     "templeteedit":"Edit a template",
     "templeteeditwarn":"",
-    "templete1":"Refer:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+    "templete1":"Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-    "templete2":"iTunes NowPlaying:{url} is disabled, but composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre} are available.",
+    "templete2":"macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+    "templete3":"Windows:{song}:Song name/{album}:Album name/{artist}:Artist name",
     "postartwork":"Attach an Artwork of Spotify",
     "tts":"TTS(text to speech) Preferences",
     "speed":"Speed",
@@ -149,4 +175,4 @@
     "sushi":"Give me a sushi!",
     "checkup":"Check update",
     "ossJP":""
-}
+}

app/view/make/language/setting.ja.json

@@ -4,11 +4,14 @@
     "yes":"はい",
     "no":"いいえ",
     "change":"変更",
+    "select":"選択",
     "env":"環境設定",
     "setlang":"言語",
     "backup":"設定のインポートとエクスポート",
     "import":"インポート",
     "export":"エクスポート",
+    "hardwareAcceleration":"ハードウェアアクセラレーションの無効化",
+    "hardwareAccelerationWarn":"表示(特に設定画面)が乱れる場合に「はい」を選択してください。自動で再起動します。",
     "theme":"テーマの設定",
     "popup":"新規通知のポップアップお知らせの表示秒数",
     "popupwarn":"0に設定すると表示されません",
@@ -18,13 +21,29 @@
     "nntest":"通知テスト",
     "minwidth":"マルチカラムの最低横幅",
     "minwidthwarn":"画面全体の横幅÷コラム数がこの値を超えた時、横スクロールとなります。",
+    "fixwidth":"TweetDeckの限定の最低横幅",
+    "fixwidthwarn":"",
     "above":"以上",
     "font":"フォント",
-    "fontwarn":"ローカルフォントを指定します。",
+    "fontwarn":"「選択」を押してフォントを選んでください。",
     "fontsize":"フォントサイズ",
     "savefolder":"デフォルトの保存先",
     "savefolderwarn":"画像ダウンロードやスクリーンショットに影響します。",
     "absolute":"絶対指定",
+    "themeSel":"テーマの選択",
+    "customtheme":"カスタムテーマの作成・編集",
+    "customthemeDirection":"色の系統",
+    "primary":"全体の背景色など",
+    "secondarycolor":"補助要素に使われる背景色",
+    "text":"テキストの色",
+    "accent":"ブーストの背景色など",
+    "add_new":"新規作成",
+    "name":"名前",
+    "desc":"説明",
+    "customShare":"このコードは他のTheDeskなどとシェアできます。このコードをMiASに貼ることはご遠慮ください。詳細:<a href=\"https://thedesk.top/mias.html\" target=\"_blank\">テーマ互換性</a>",
+    "customImport":"カスタムテーマのインポート",
+    "delete":"削除",
+    "cImpWarn":"<a href=\"https://assets.msky.cafe/\" target=\"_blank\">MiAS</a>上の80を超えるテーマを張り付けることもできます。",
     "timeline":"タイムラインの設定",
     "timemode":"時間表記設定",
     "relativetime":"相対時間の例:\"1分前\",\"3日前\"",
@@ -35,7 +54,7 @@
     "doublesel":"両方表示",
     "mixsel":"混合表示",
     "locale":"独自ロケールを使用",
-    "localewarn":"対応インスタンスではそのインスタンスにあわせた言語表示ができます。",
+    "localewarn":"対応サーバーではそのサーバーにあわせた言語表示ができます。",
     "nswf":"非表示設定の画像(NSFW)を隠す",
     "nsfwwarn":"きつめのぼかしがかかります。",
     "cw":"非表示設定のテキスト(CW)を隠す",
@@ -48,8 +67,8 @@
     "boxabs":"枠外クリックで閉じない(起動時に展開)",
     "boxno":"投稿後も隠さない",
     "tag":"タグタイムラインの表示範囲",
-    "tagfed":"接続しているインスタンス",
+    "tagfed":"接続しているサーバー",
-    "taglocal":"検索対象のインスタンスのみ",
+    "taglocal":"検索対象のサーバーのみ",
     "via":"viaを表示する",
     "mouseover":"アクションメニューを非表示",
     "mouseoverwarn":"「マウスオーバー」はすこし鬱陶しいと思うかもしれません。",
@@ -62,6 +81,9 @@
     "letters":"文字",
     "or":"または",
     "imgheight":"画像の高さ",
+    "ticker":"#InstanceTickerを使う",
+    "tickerwarn":"トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://cdn.weep.me/mastodon/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
+    "animation":"タイムラインのアニメーション",
     "post":"投稿設定",
     "autocw":"長文投稿時に警告",
     "autocwwarn":"下で指定した以上のトゥートを投稿するときにCWするかのダイアログを表示します。",
@@ -72,7 +94,7 @@
     "unlisted":"未収載(Unlisted)",
     "private":"非公開(Private)",
     "direct":"ダイレクト(Direct)",
-    "memory":"前回の投稿設定を記憶する(インスタンスごとに記憶されます)",
+    "memory":"前回の投稿設定を記憶する(サーバーごとに記憶されます)",
     "useapi":"マストドンアカウント設定の既定値",
     "postimg":"画像投稿設定",
     "showurl":"画像を投稿し、画像のURLを最後に表示",
@@ -82,6 +104,7 @@
     "simple":"URLのみ",
     "mention":"URLとアカウント名(相手に通知)",
     "full":"本文・URL・アカウント名",
+    "notqt":"使わない(TL上にボタンも表示されません)",
     "main":"投稿後や起動時のアカウント",
     "mainwarn":"メインアカウントはアカウント設定で指定できます。投稿以外のアカウント選択にも影響します。",
     "lastacct":"最後に使用したアカウント",
@@ -104,6 +127,8 @@
     "useerempwarn":"各ユーザーのデータ表示画面で設定できます。",
     "empcolorwarn":"強調色(テーマによって異なります。)",
     "spotify":"SpotifyとNowPlayingの設定",
+    "npProvider":"NowPlayingのソース(Windows)",
+    "npPeoviderWarn":"macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。",
     "spotifynote1":"",
     "spotifynote2":"ボタンから簡単にNowPlayingができます。",
     "link":"アカウントの連携",
@@ -112,9 +137,10 @@
     "disconnect":"切断",
     "templeteedit":"テンプレートの編集",
     "templeteeditwarn":"以下を編集してテンプレートを変更できます。",
-    "templete1":"テンプレート:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
+    "templete1":"Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
-    "templete2":"iTunes NowPlayingでも{url}以外のテンプレートに従ってトゥートされます。また、作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}が有効です。",
+    "templete2":"macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}",
-    "postartwork":"Spotifyでアルバムアートワークを添付する",
+    "templete3":"Windows:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名",
+    "postartwork":"アルバムアートワークを添付する(Spotify/Windows)",
     "tts":"読み上げの設定",
     "speed":"読み上げの速さ",
     "speedwarn":"1-100まで、デフォルトは10。",
@@ -123,7 +149,7 @@
     "vol":"読み上げの音量",
     "volwarn":"0-100まで、デフォルトは100。",
     "test":"テスト",
-    "sample":"これはテスト音声です。TheDeskはオープンソースのPC向けマストドンクライアントです。マルチインスタンスやマルチカラムに対応しています。",
+    "sample":"これはテスト音声です。TheDeskはオープンソースのPC向けマストドンクライアントです。マルチサーバーやマルチカラムに対応しています。",
     "playstop":"再生/停止",
     "back":"戻る",
     "keyscs":"キーボードショートカット一覧",

app/view/make/language/setting.ps.json

@@ -0,0 +1,173 @@
+{
+    "setting": "crwdns524:0crwdne524:0",
+    "set": "crwdns525:0crwdne525:0",
+    "yes": "crwdns526:0crwdne526:0",
+    "no": "crwdns527:0crwdne527:0",
+    "change": "crwdns528:0crwdne528:0",
+    "select": "crwdns1896:0crwdne1896:0",
+    "env": "crwdns529:0crwdne529:0",
+    "setlang": "crwdns530:0crwdne530:0",
+    "backup": "crwdns531:0crwdne531:0",
+    "import": "crwdns532:0crwdne532:0",
+    "export": "crwdns533:0crwdne533:0",
+    "theme": "crwdns534:0crwdne534:0",
+    "popup": "crwdns1898:0crwdne1898:0",
+    "popupwarn": "crwdns536:0crwdne536:0",
+    "s": "crwdns537:0crwdne537:0",
+    "nativenotf": "crwdns538:0crwdne538:0",
+    "nnwarn": "crwdns539:0crwdne539:0",
+    "nntest": "crwdns540:0crwdne540:0",
+    "minwidth": "crwdns2376:0crwdne2376:0",
+    "minwidthwarn": "crwdns542:0crwdne542:0",
+    "fixwidth": "crwdns2378:0crwdne2378:0",
+    "fixwidthwarn": "crwdns2380:0crwdne2380:0",
+    "above": "crwdns543:0crwdne543:0",
+    "font": "crwdns544:0crwdne544:0",
+    "fontwarn": "crwdns1900:0crwdne1900:0",
+    "fontsize": "crwdns546:0crwdne546:0",
+    "savefolder": "crwdns547:0crwdne547:0",
+    "savefolderwarn": "crwdns548:0crwdne548:0",
+    "absolute": "crwdns549:0crwdne549:0",
+    "themeSel": "crwdns2422:0crwdne2422:0",
+    "customtheme": "crwdns2424:0crwdne2424:0",
+    "customthemeDirection": "crwdns2426:0crwdne2426:0",
+    "primary": "crwdns2428:0crwdne2428:0",
+    "secondarycolor": "crwdns2430:0crwdne2430:0",
+    "text": "crwdns2432:0crwdne2432:0",
+    "accent": "crwdns2434:0crwdne2434:0",
+    "add_new": "crwdns2436:0crwdne2436:0",
+    "name": "crwdns2438:0crwdne2438:0",
+    "desc": "crwdns2440:0crwdne2440:0",
+    "customShare": "crwdns2442:0crwdne2442:0",
+    "customImport": "crwdns2444:0crwdne2444:0",
+    "timeline": "crwdns550:0crwdne550:0",
+    "timemode": "crwdns551:0crwdne551:0",
+    "relativetime": "crwdns552:0crwdne552:0",
+    "absolutetime": "crwdns553:0crwdne553:0",
+    "mixtime": "crwdns554:0crwdne554:0",
+    "relativesel": "crwdns555:0crwdne555:0",
+    "absolutesel": "crwdns1902:0crwdne1902:0",
+    "doublesel": "crwdns557:0crwdne557:0",
+    "mixsel": "crwdns558:0crwdne558:0",
+    "locale": "crwdns1904:0crwdne1904:0",
+    "localewarn": "crwdns1906:0crwdne1906:0",
+    "nswf": "crwdns561:0crwdne561:0",
+    "nsfwwarn": "crwdns562:0crwdne562:0",
+    "cw": "crwdns563:0crwdne563:0",
+    "replyct": "crwdns564:0crwdne564:0",
+    "replyct_hidden": "crwdns565:0crwdne565:0",
+    "replyct_full": "crwdns566:0crwdne566:0",
+    "gif": "crwdns567:0crwdne567:0",
+    "box": "crwdns568:0crwdne568:0",
+    "boxyes": "crwdns569:0crwdne569:0",
+    "boxabs": "crwdns570:0crwdne570:0",
+    "boxno": "crwdns571:0crwdne571:0",
+    "tag": "crwdns572:0crwdne572:0",
+    "tagfed": "crwdns573:0crwdne573:0",
+    "taglocal": "crwdns574:0crwdne574:0",
+    "via": "crwdns575:0crwdne575:0",
+    "mouseover": "crwdns576:0crwdne576:0",
+    "mouseoverwarn": "crwdns577:0crwdne577:0",
+    "mv": "crwdns578:0crwdne578:0",
+    "mvclick": "crwdns579:0crwdne579:0",
+    "notfmarker": "crwdns580:0crwdne580:0",
+    "autofold": "crwdns581:0crwdne581:0",
+    "autofoldwarn": "crwdns582:0crwdne582:0",
+    "lines": "crwdns583:0crwdne583:0",
+    "letters": "crwdns584:0crwdne584:0",
+    "or": "crwdns585:0crwdne585:0",
+    "imgheight": "crwdns586:0crwdne586:0",
+    "ticker": "crwdns1908:0crwdne1908:0",
+    "tickerwarn": "crwdns1910:0crwdne1910:0",
+    "animation": "crwdns2446:0crwdne2446:0",
+    "post": "crwdns587:0crwdne587:0",
+    "autocw": "crwdns588:0crwdne588:0",
+    "autocwwarn": "crwdns589:0crwdne589:0",
+    "defaultcw": "crwdns590:0crwdne590:0",
+    "cws": "crwdns591:0crwdne591:0",
+    "defaultvis": "crwdns592:0crwdne592:0",
+    "public": "crwdns593:0crwdne593:0",
+    "unlisted": "crwdns594:0crwdne594:0",
+    "private": "crwdns595:0crwdne595:0",
+    "direct": "crwdns596:0crwdne596:0",
+    "memory": "crwdns1912:0crwdne1912:0",
+    "useapi": "crwdns1914:0crwdne1914:0",
+    "postimg": "crwdns599:0crwdne599:0",
+    "showurl": "crwdns600:0crwdne600:0",
+    "nourl": "crwdns601:0crwdne601:0",
+    "disabled": "crwdns602:0crwdne602:0",
+    "quote": "crwdns603:0crwdne603:0",
+    "simple": "crwdns604:0crwdne604:0",
+    "mention": "crwdns605:0crwdne605:0",
+    "full": "crwdns606:0crwdne606:0",
+    "main": "crwdns607:0crwdne607:0",
+    "mainwarn": "crwdns608:0crwdne608:0",
+    "lastacct": "crwdns609:0crwdne609:0",
+    "usemainacct": "crwdns610:0crwdne610:0",
+    "secondary": "crwdns1916:0crwdne1916:0",
+    "secwarn": "crwdns1918:0crwdne1918:0",
+    "nothing": "crwdns1920:0crwdne1920:0",
+    "localonly": "crwdns1922:0crwdne1922:0",
+    "keysc": "crwdns611:0crwdne611:0",
+    "iks": "crwdns612:0crwdne612:0",
+    "okswarn": "crwdns613:0crwdne613:0",
+    "muteemp": "crwdns614:0crwdne614:0",
+    "climute": "crwdns615:0crwdne615:0",
+    "cliemp": "crwdns616:0crwdne616:0",
+    "cliwarn": "crwdns617:0crwdne617:0",
+    "enter": "crwdns618:0crwdne618:0",
+    "wordmute": "crwdns619:0crwdne619:0",
+    "wordemp": "crwdns620:0crwdne620:0",
+    "useremp": "crwdns621:0crwdne621:0",
+    "useerempwarn": "crwdns622:0crwdne622:0",
+    "empcolorwarn": "crwdns623:0crwdne623:0",
+    "spotify": "crwdns624:0crwdne624:0",
+    "npProvider": "crwdns2354:0crwdne2354:0",
+    "npPeoviderWarn": "crwdns2356:0crwdne2356:0",
+    "spotifynote1": "crwdns625:0crwdne625:0",
+    "spotifynote2": "crwdns626:0crwdne626:0",
+    "link": "crwdns627:0crwdne627:0",
+    "linkwarn": "crwdns628:0crwdne628:0",
+    "connect": "crwdns629:0crwdne629:0",
+    "disconnect": "crwdns630:0crwdne630:0",
+    "templeteedit": "crwdns631:0crwdne631:0",
+    "templeteeditwarn": "crwdns632:0crwdne632:0",
+    "templete1": "crwdns2358:0{song}crwdnd2358:0{album}crwdnd2358:0{artist}crwdnd2358:0{url}crwdne2358:0",
+    "templete2": "crwdns2360:0{song}crwdnd2360:0{album}crwdnd2360:0{artist}crwdnd2360:0{composer}crwdnd2360:0{hz}crwdnd2360:0{bitRate}crwdnd2360:0{genre}crwdne2360:0",
+    "templete3": "crwdns2362:0{song}crwdnd2362:0{album}crwdnd2362:0{artist}crwdne2362:0",
+    "postartwork": "crwdns635:0crwdne635:0",
+    "tts": "crwdns636:0crwdne636:0",
+    "speed": "crwdns637:0crwdne637:0",
+    "speedwarn": "crwdns638:0crwdne638:0",
+    "pitch": "crwdns639:0crwdne639:0",
+    "pitchwarn": "crwdns640:0crwdne640:0",
+    "vol": "crwdns641:0crwdne641:0",
+    "volwarn": "crwdns642:0crwdne642:0",
+    "test": "crwdns643:0crwdne643:0",
+    "sample": "crwdns644:0crwdne644:0",
+    "playstop": "crwdns645:0crwdne645:0",
+    "back": "crwdns646:0crwdne646:0",
+    "keyscs": "crwdns647:0crwdne647:0",
+    "keyscr": "crwdns648:0crwdne648:0",
+    "keynew": "crwdns649:0crwdne649:0",
+    "keytoggle": "crwdns650:0crwdne650:0",
+    "keypost": "crwdns651:0crwdne651:0",
+    "keysecpost": "crwdns1924:0crwdne1924:0",
+    "keyunread": "crwdns652:0crwdne652:0",
+    "keyesc": "crwdns653:0crwdne653:0",
+    "keyf5": "crwdns654:0crwdne654:0",
+    "keyclear": "crwdns655:0crwdne655:0",
+    "keyacctman": "crwdns656:0crwdne656:0",
+    "keyshowprof": "crwdns657:0crwdne657:0",
+    "keyrow": "crwdns658:0crwdne658:0",
+    "keyzoom": "crwdns659:0crwdne659:0",
+    "reset": "crwdns660:0crwdne660:0",
+    "resetconfirm": "crwdns661:0crwdne661:0",
+    "about": "crwdns662:0crwdne662:0",
+    "hp": "crwdns663:0crwdne663:0",
+    "support": "crwdns664:0crwdne664:0",
+    "help": "crwdns665:0crwdne665:0",
+    "sushi": "crwdns666:0crwdne666:0",
+    "checkup": "crwdns667:0crwdne667:0",
+    "ossJP": "crwdns668:0crwdne668:0"
+}

app/view/make/language/update.en.json

@@ -1,8 +1,9 @@
 {
     "updatehere":"Get latest TheDesk",
     "download":"Start",
-    "portable":"Poetable ver.",
+    "portable":"Portable ver.",
-    "winzip":"Durling unzippng, TheDesk may freeze. It takes several seconds.",
+    "installer":"Installer ver.",
+    "snap":"Snap ver may be on Snapcraft",
     "unrewrite":"Not rewrite",
     "sureupd":"You may lose a cool experience!",
     "skipupd":"Skip this update",
@@ -12,4 +13,4 @@
     "problem2":"Please download on <a href=\"https://thedesk.top\">Oficial HP</a>.",
     "continue":"Continue updating",
     "dlnow":"Downloading..."
-}
+}

app/view/make/language/update.ja.json

@@ -2,7 +2,8 @@
     "updatehere":"アップデートがあります",
     "download":"開始",
     "portable":"ポータブル版",
-    "unrewrite":"上書きしない",
+    "installer":"インストーラー版(推奨)",
+    "snap":"snap版はSnapcraft等よりDLしてください。",
     "sureupd":"アップデートは必ず行ってください",
     "skipupd":"アップデートをスキップする",
     "nexttl":"次回TL表示時まで",