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

THeDesk Miria (17.1.0) complete

.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

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)  
@@ -14,65 +17,93 @@ Contact me(bug report...):GitHub Issues, mention to [Cutls@kirishima.cloud](http
 
 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)
-- English(英語)
+* 日本語(Japanese)
+* 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  
-
-## 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向けアイコン.セルフビルドにどうぞ.  
+Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.top  
 
 ## Requirement/環境
 
-- Electron 2.0.7
-- electron-dl
-- Jimp
-- adm-zip
-- itunes-nowplaying-mac(for macOS)
-- node-notifier
-- Ability to read unformated files!
+* Electron 3.0.10(install yourself)
+* electron-dl(in package.json)
+* Jimp(in package.json)
+* font-manager(in package.json)
+  * Python 2.x(install yourself)
+  * VisualC++(Windows)(install yourself)
+* itunes-nowplaying-mac(for macOS)(in package.json)
+* node-notifier(in package.json)
+* sumchecker(in package.json)
+* Ability to read unformated files!(install yourself)
 
 ## 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

@@ -41,12 +41,10 @@ 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 {
@@ -56,6 +54,7 @@ option {
   overflow-x:scroll;
   overflow-y:hidden;
 }
+
 #imagewrap {
   width: 100%;
   height: 100%;
@@ -269,6 +268,18 @@ 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);
 }

app/css/post.css

@@ -1,23 +1,35 @@
 /*トゥートボックス向けCSS*/
 #post-box {
+  display:none;
   position: fixed;
-  left: 78px;
-  bottom: -500px;
+  left: calc(50vw - 150px);
+  top: 50vh;
   background-color: var(--postbox);
   border: thin solid gray;
   z-index: 501;
-  width: 300px;
   min-width:300px;
   max-width:100%;
   padding: 5px;
 }
+#post-bar{
+  cursor:move;
+  text-align:center;
+  width:calc(100% + 10px);
+  background-color: var(--bg);
+  margin-left:-5px;
+  margin-right:-5px;
+  margin-top:-5px;
+  font-size:16px;
+  padding:4px;
+}
 .cancel {
   font-size: 0.5rem;
   color: gray;
   cursor: pointer;
   position: absolute;
-  width: 60px;
-  right: 0px;
+  right: 2px;
+  top:4px;
+
 }
 .more-show {
   display: none;
@@ -35,6 +47,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 +63,11 @@
   filter: blur(50px);
 }
 #emoji {
-  position: fixed;
-  bottom: 40px;
-  width: 300px;
-  height: 380px;
-  z-index: 502;
-  padding: 5px;
+  
 }
 #emoji-list {
   width: 100%;
-  height: calc(100% - 130px);
+  height: 200px;
   overflow-y: scroll;
 }
 #preview-field {
@@ -78,7 +94,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/themes.css

@@ -15,11 +15,14 @@
     --postbox:white;
     --modalfooter:#fafafa;
 }
+#imagemodal{
+    background: url("../img/pixel.white.svg");
+}
 .blacktheme {
     --bg:#212121;
     --drag:rgba(0, 0, 0, 0.8);
     --color:white;
-    --beforehover:#e0e0e0;
+    --beforehover:#9e9e9e;
     --modal:black;
     --subcolor:#212121;
     --box:#424242;
@@ -32,11 +35,14 @@
     --postbox:#424242;
     --modalfooter:#212121;
 }
+.blacktheme #imagemodal{
+    background: url("../img/pixel.svg");
+}
 .indigotheme {
     --bg:#031833;
     --drag:rgba(0, 0, 0, 0.8);
     --color:white;
-    --beforehover:#e0e0e0;
+    --beforehover:#9e9e9e;
     --modal:#0d1351;
     --subcolor:#0d1351;
     --shared:#004d40;
@@ -49,11 +55,14 @@
     --postbox:#1a237e;
     --modalfooter:#031833;
 }
+.indigotheme #imagemodal{
+    background: url("../img/pixel.svg");
+}
 .browntheme {
     --bg:#261411;
     --drag:rgba(0, 0, 0, 0.8);
     --color:white;
-    --beforehover:#e0e0e0;
+    --beforehover:#9e9e9e;
     --modal:#261411;
     --subcolor:#4e342e;
     --shared:#004d40;
@@ -66,6 +75,9 @@
     --postbox:#4e342e;
     --modalfooter:#261411;
 }
+.browntheme #imagemodal{
+    background: url("../img/pixel.svg");
+}
 .greentheme{
     --bg:#c8e6c9;
     --drag:rgba(255, 255, 255, 0.8);
@@ -82,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;
@@ -132,12 +138,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;
@@ -217,6 +229,9 @@ grid-area: toot;
   margin:2px;
   grid-area: side;
 }
+.btn-flat{
+  color:var(--color);
+}
 .area-side i{
   margin-left:10px;
 }
@@ -226,11 +241,13 @@ grid-area: toot;
 .action i{
   font-size:1.2rem;
   margin-right:2px;
+}
+.actct{
   color:var(--beforehover);
 }
-.action i:hover{
+.actct:hover{
   color:var(--color);
-  transition: 1s;
+  transition: 0.5s;
 }
 
 .gray {
@@ -414,9 +431,6 @@ p:not(:last-child){
   bottom:0px;
   right:0px;
 }
-.btn-flat{
-  color:var(--color);
-}
 .toot a span.ellipsis:after{
   content:"...";
 }
@@ -453,4 +467,55 @@ 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/version.js

@@ -45,7 +45,7 @@ function verck(ver,winstore) {
 				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ならアプデチェックしない
 			} else if (ver.indexOf("beta")!=-1 || winstore) {
 				
@@ -56,7 +56,7 @@ function verck(ver,winstore) {
 						var ipc = electron.ipcRenderer;
 						ipc.send('update', "true");
 					}else{
-						todo(lang_version_skipver[lang]);
+						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 if(lang=="en"){
+}else{
     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(){

app/js/lang/lang.en.js

@@ -0,0 +1,234 @@
+//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.",
+    //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_tagwarn":"When you toot without {{tag}}, tag-streaming mode will be off.",
+    //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/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",
+    //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,235 @@
+    //commonError
+var lang={
+    "language":"ja",
+    //commonError
+    "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":"アップデートはスキップされました。",
+//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_tagwarn":"次に{{tag}}なしでトゥートするまで全てのトゥートに{{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/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":"結果だけ見る",
+    //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/login/login.js

@@ -40,15 +40,28 @@ function ck() {
 		}else{	
 		}
 	}
-	
-	if (at) {
+	var multi = localStorage.getItem("multi");
+	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();
@@ -173,7 +186,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 +236,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 +274,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 +298,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 +326,9 @@ function refresh(target) {
 		obj[target] = ref;
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
-
-		load();
+		if(!loadskip){
+			load();
+		}
 	});
 }
 //MarkdownやBBCodeの対応、文字数制限をチェック
@@ -330,7 +344,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 +402,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 +458,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 +480,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 +520,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();
 }
 
 //バージョンエンコ

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)
 	});
@@ -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);
@@ -342,7 +343,7 @@ function misskeyLogin(url) {
 		if(!mkc){
 			$("#misskeylogin").show();
 			$("#misskey-url").val(url);
-			if(confirm(lang_manager_godev[lang])){
+			if(confirm(lang.lang_manager_godev)){
 				const {
 					shell
 				} = require('electron');
@@ -493,14 +494,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"];
@@ -558,7 +559,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;
 		}
@@ -647,19 +648,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 = "";
@@ -677,11 +678,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

@@ -136,7 +136,7 @@ function progshow(e) {
 	  if(percent<1){
 		 $("#imgup").text(Math.floor(percent*100)+"%");
 	  }else{
-		$("#imgup").text(lang_progress[lang]);
+		$("#imgup").text(lang.lang_progress);
 	  }
 	}
   }
@@ -172,4 +172,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

@@ -31,4 +31,54 @@ function nl2br(str) {
     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;
 }

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,7 +40,7 @@ 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"])

app/js/post/emoji.js

@@ -11,22 +11,21 @@ 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()
 		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")
+		$("#right-side").hide()
 	}
 
 
@@ -68,7 +67,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") {

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);
@@ -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]);
-			Materialize.toast(lang_postimg_aftupload[lang], 1000);
+			$("#mec").text(lang.lang_there);
+			Materialize.toast(lang.lang_postimg_aftupload, 1000);
 			$("#imgup").text("");
 			$("#imgsel").show();
 			localStorage.removeItem("image");

app/js/post/misskeystatus.js

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

app/js/post/post.js

@@ -1,4 +1,4 @@
-/*投稿系*/
+/*投稿系*/ 
 //投稿
 function sec(){
 	var mode=localStorage.getItem("sec");
@@ -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;
 				}
 			}
@@ -52,11 +52,11 @@ function post(mode,postvis) {
 		var plus=str.replace(/\n/g,"").slice(0,10)+"...";
 		const options = {
 			type: 'info',
-			title: lang_post_cwtitle[lang],
-			message: lang_post_cwtxt[lang]+plus,
-			buttons: [lang_post_btn1[lang],lang_post_btn2[lang], lang_post_btn3[lang]]
-	  	}
-	  	dialog.showMessageBox(options, function(arg) {
+			title: lang.lang_post_cwtitle,
+			message: lang.lang_post_cwtxt+plus,
+			buttons: [lang.lang_post_btn1,lang.lang_post_btn2, lang.lang_post_btn3]
+	  }
+	  dialog.showMessageBox(options, function(arg) {
 			if(arg==1){
 				$("#cw-text").show();
 				$("#cw").addClass("yellow-text");
@@ -105,6 +105,14 @@ function post(mode,postvis) {
 	}else if(vis=="local"){
 		toot.status=str+"👁️";
 	}
+	//ここに非公開・未収載タグについてwarn
+	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,6 +120,44 @@ 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');
@@ -217,7 +263,7 @@ function clear() {
 	if(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 +282,23 @@ function clear() {
 		$("#cw").addClass("cw-avail");
 		$("#cw-text").show();
 	}
-	$("#rec").text(lang_no[lang]);
-	$("#mec").text(lang_nothing[lang]);
+	$("#rec").text(lang.lang_no);
+	$("#mec").text(lang.lang_nothing);
 	loadVis();
 	$("#nsfw").removeClass("yellow-text");
 	$("#nsfw").html("visibility_off");
 	$("#nsfw").removeClass("nsfw-avail");
-	$("#nsc").text(lang_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

@@ -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);
 				}
         }
 	}
@@ -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);
 			}
 		}
 	}
@@ -141,10 +141,10 @@ function follow(acct_id,remote) {
 			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);
 			}
 		}
 	}
@@ -174,10 +174,10 @@ function block(acct_id) {
 		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);
 			}
 		}
 	}
@@ -216,10 +216,10 @@ function mute(acct_id) {
 		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);
 			}
 		}
 	}
@@ -252,7 +252,7 @@ function del(id, acct_id) {
 }
 //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);
+		}
 	}
 }
 //ピン留め
@@ -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);
 			}
 		});
 	}
@@ -408,10 +414,10 @@ function pinUser(){
 			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

@@ -18,7 +18,7 @@ input.addEventListener("focus", function() {
 			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="";

app/js/post/use-txtbox.js

@@ -5,15 +5,15 @@ function re(id,at,acct_id,mode){
 	$("#reply").val(id);
 	var te=$("#textarea").val();
 	$("#textarea").val("@"+at+" "+te);
-	$("#rec").text(lang_yesno[lang]);
+	$("#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);

app/js/tl/card.js

@@ -64,7 +64,7 @@ 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");
@@ -149,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");
@@ -193,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');
@@ -139,7 +139,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 +149,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 +199,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 +211,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 +368,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 +387,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);
 	}
 	
 }

app/js/tl/date.js

@@ -56,14 +56,38 @@ function date(str, datetype) {
 //特殊フォーマット(インスタンス情報で利用)
 function crat(str) {
 	var date = new Date(str);
-
+	if(date.getMonth()<9){
+		var mnt="0"+(date.getMonth()+1);
+	}else{
+		var 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(/DD/g, date.getDate());
-	format_str = format_str.replace(/hh/g, date.getHours());
-	format_str = format_str.replace(/mm/g, date.getMinutes());
-	format_str = format_str.replace(/ss/g, date.getSeconds());
+	format_str = format_str.replace(/MM/g, mnt);
+	format_str = format_str.replace(/DD/g, dat);
+	format_str = format_str.replace(/hh/g, hrs);
+	format_str = format_str.replace(/mm/g, mns);
+	format_str = format_str.replace(/ss/g, sec);
 
 	return format_str;
 }

app/js/tl/dm.js

@@ -0,0 +1,543 @@
+//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]){
+		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(',');
+		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);
@@ -348,4 +391,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

@@ -36,12 +36,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_list_users[lang]+'</a><br> ';
+					'\')" class="pointer">'+lang.lang_list_show+'</a>/<a onclick="listUser(' + list.id + ',' + acct_id +
+					')" class="pointer">'+lang.lang_list_users+'</a><br> ';
 			});
 			$("#lists").html(lists);
 		}else{
-            $("#lists").html(lang_list_nodata[lang]);
+            $("#lists").html(lang.lang_list_nodata);
         }
 	});
 }
@@ -93,11 +93,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 +119,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 +127,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 +145,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 +153,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);
         }
     });
 }

app/js/tl/misskeyparse.js

@@ -172,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":"💓",
@@ -214,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 +
@@ -278,7 +278,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}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>";
@@ -353,19 +353,19 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			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_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>' + escapeHTMLtemp(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_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 = escapeHTMLtemp(toot.text);
                 if(toot.cw){
@@ -384,7 +384,7 @@ function misskeyParse(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 = '';
 		}
@@ -489,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>　'+
-                    '<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' +lang_parse_tagpin[lang].replace("{{tag}}" ,'#'+tag)+ '">Pin</a></span> ';
+					',\'add\')" class="pointer parsed" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
+                    '<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' +lang.lang_parse_tagpin.replace("{{tag}}" ,'#'+tag)+ '">Pin</a></span> ';
                 content=content.replace("#"+tag,tags);
 			});
 			//tags = '<div style="float:right">' + tags + '</div>';
@@ -500,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)) {
@@ -703,7 +703,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.user.username + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'https://' +domain+"/notes/"+
 			toot.id + '\');" title="' + date(toot.createdAt, 'absolute') +
-			'('+lang_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">'+tickerdom+'<span class="toot ' + spoiler + '">' + content +
@@ -734,30 +734,30 @@ 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_tagstemp(via)+'\')" title="via ' + $.strip_tagstemp(via) + '">via ' +
 			via +
 			'</span>'+
@@ -788,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;

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(/\?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) {
 				
 			}
 		});
-		
-		if (sys == "direct") {
-			$("#timeline_" + tlid).html(templete);
-		} else {
-			$("div[data-notf=" + acct_id +"]").html(templete);
-		}
+		$("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");
-	console.log(sid);
-	if (localStorage.getItem("morelock") != sid) {
-		localStorage.setItem("morelock", sid);
-		localStorage.setItem("now", type);
-		todo("Notfication TL MoreLoading");
-		var domain = localStorage.getItem("domain_" + acct_id);
-		var at = localStorage.getItem("acct_"+ acct_id + "_at");
-
-		if(localStorage.getItem("mode_" + domain)=="misskey"){
-			var misskey=true;
-				var start = "https://" + domain + "/api/i/notifications";
-				var i={
-					method: 'POST',
-					headers: {
-						'content-type': 'application/json',
-					},
-					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();
+	var sid = $("#timeline_" + tlid + " .notif-marker").last().attr("data-maxid");
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var domain = localStorage.getItem("domain_" + acct_id);
+	if (sid && !moreloading) {
+		moreloading=true;
+	var httpreq = new XMLHttpRequest();
+	if(localStorage.getItem("mode_" + domain)=="misskey"){
+		var misskey=true;
+		var start = "https://" + domain + "/api/i/notifications";
+		httpreq.open(POST, start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		var body=JSON.stringify({
+			i:at,
+			untilID:sid
 		});
+	}else{
+		var misskey=false;
+		if(localStorage.getItem("exclude-"+tlid)){
+			var exc=localStorage.getItem("exclude-"+tlid)+"&max_id="+sid;
+		}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(/\?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

@@ -73,10 +73,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	}else{
 		var ticker=false;
 	}
+	//Animation
+	var anime = localStorage.getItem("animation");
+	if (anime=="yes" || !anime) {
+			var animecss="cvo-anime";
+	}else{
+			var animecss="";
+	}
 	//Cards
 	var card = localStorage.getItem("card_" + tlid);
 	
-	
 	if (!sent) {
 		var sent = 500;
 	}
@@ -163,7 +169,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			Object.keys(toot.account.emojis).forEach(function(key5) {
 				var emoji = toot.account.emojis[key5];
 				var shortcode = emoji.shortcode;
-				var emoji_url = '<img src="' + emoji.url +
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
 					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				dis_name = dis_name.replace(regExp, emoji_url);
@@ -179,28 +185,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 +
@@ -288,10 +294,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 = ":「わかるわ」";
@@ -315,7 +321,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				Object.keys(toot.account.emojis).forEach(function(key5) {
 					var emoji = toot.account.emojis[key5];
 					var shortcode = emoji.shortcode;
-					var emoji_url = '<img src="' + emoji.url +
+					var emoji_url = '<img draggable="false" src="' + emoji.url +
 						'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
 					var regExp = new RegExp(":" + shortcode + ":", "g");
 					dis_name = dis_name.replace(regExp, emoji_url);
@@ -324,7 +330,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;
@@ -356,7 +362,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;
 			//強調チェック
@@ -374,25 +381,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);
@@ -405,7 +415,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 = '';
 		}
@@ -422,7 +432,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);
@@ -440,7 +450,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);
@@ -479,7 +489,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>';
 			});
@@ -507,8 +517,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>　'+
-					'<a onclick="tagPin(\'' + tag.name + '\')" class="pointer" title="' +lang_parse_tagpin[lang].replace("{{tag}}" ,'#'+tag.name)+ '">Pin</a></span> ';
+					',\'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>';
 		}
@@ -526,19 +536,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)) {
@@ -605,33 +615,36 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		//日本語じゃない
 		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_parse_trans[lang]+'"><i class="material-icons">g_translate</i></a></div>';
+			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='';
+				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>';
 				}
-				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_cards_check[lang]+":<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_cards_pip[lang]+'">picture_in_picture_alt</i>';
-			}
+				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=JSON.parse(localStorage.getItem("ticker"));
+			var tickerdata=localStorage.getItem("ticker")
+			if(tickerdata){
+			var tickerdata=JSON.parse(tickerdata);
 			
 			var thisdomain=toot.account.acct.split("@");
 			if(thisdomain.length>1){
@@ -640,20 +653,50 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+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";
+			}
+			Object.keys(choices).forEach(function(keyc) {
+				var choice = choices[keyc];
+				if(!toot.poll.voted){
+					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>' +
+			date(toot.poll.expires_at, datetype) + '</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">' +
@@ -662,48 +705,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">'+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 + '\',' +
 			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 +
 			',\'' + 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>'+
@@ -749,9 +792,9 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 		} else {
 			var auth = "";
 		}
-		var ftxt=lang_parse_followed[lang];
-		if(!locale && localStorage.getItem("follow_" + acct_id)){
-			ftxt = localStorage.getItem("follow_" + acct_id);
+		var ftxt=lang.lang_parse_followed;
+		if(!locale && localStorage.getItem("followlocale_" + acct_id)){
+			ftxt = localStorage.getItem("followlocale_" + acct_id);
 		}
 		if(popup > 0 || popup==-1 || notf){
 			var notftext=ftxt+'<br>';
@@ -808,7 +851,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);
@@ -820,7 +863,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 +
@@ -828,7 +871,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>' +
@@ -857,9 +900,9 @@ function client(name) {
 	var dialog=remote.dialog;
 	const options = {
 		type: 'info',
-		title: lang_parse_clientop[lang],
-		message: name+lang_parse_clienttxt[lang],
-		buttons: [lang_parse_clientno[lang],lang_parse_clientemp[lang], lang_parse_clientmute[lang]]
+		title: lang.lang_parse_clientop,
+		message: name+lang.lang_parse_clienttxt,
+		buttons: [lang.lang_parse_clientno,lang.lang_parse_clientemp, lang.lang_parse_clientmute]
 	  }
 	  dialog.showMessageBox(options, function(arg) {
 		if(arg==1){
@@ -868,7 +911,7 @@ function client(name) {
 			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) {
@@ -878,12 +921,12 @@ 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{
 				
 			}
@@ -899,7 +942,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

@@ -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();
 	});
 }
@@ -119,12 +119,12 @@ function graphDraw(tag){
 		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

@@ -56,8 +56,8 @@ function favTag(){
     var tags="";
     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>　'+
-            '<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> ';
+        tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
+            '<a onclick="autoToot(\'#' + tag + ' \');brInsert(\'#' + tag + ' \')" class="pointer" title="'+lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">'+lang.lang_tags_realtime+'</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' +lang.lang_tags_tagunpin.replace("{{tag}}" ,'#'+tag)+ '">'+lang.lang_del+'</a></span> ';
     });
     if(obj.length>0){
         $("#taglist").append("My Tags:" + tags);
@@ -107,5 +107,5 @@ function tagTL(a,b,c,d){
 }
 function autoToot(tag){
     localStorage.setItem("stable",tag);
-    Materialize.toast(lang_tags_tagwarn[lang].replace("{{tag}}" ,tag).replace("{{tag}}" ,tag),3000);
+    Materialize.toast(lang.lang_tags_tagwarn +replace("{{tag}}" ,tag).replace("{{tag}}" ,tag),3000);
 }

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;
 			}
@@ -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) {
-		localStorage.setItem("morelock", sid);
+	if (sid && !moreloading) {
 		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)";
 		}
@@ -670,7 +679,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,7 +3,7 @@
 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);
@@ -128,12 +128,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;

app/js/ui/layout.js

@@ -59,7 +59,6 @@ function parseColumn() {
 			domain: 0,
 			type: 'local'
 		}];
-		localStorage.setItem("card_0","true");
 		var json = JSON.stringify(obj);
 		localStorage.setItem("column", json);
 	} else {
@@ -78,14 +77,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 +106,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 +115,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 +
-			'" 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_layout_gotop[lang]+'"></i></div>'+
+			var width = localStorage.getItem("width");
+		if (width) {
+			var css=" min-width:"+width+"px;"
+		}
+		var anime = localStorage.getItem("animation");
+		if (anime=="yes" || !anime) {
+			var animecss="box-anime";
+		}else{
+			var animecss="";
+		}
+		if(acct.type=="notf"){
+			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fa fa-share exc-icons"></i></label> '+
+			'<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 +
-		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang_layout_mediafil[lang]+'">perm_media</i><span id="sta-media-' +
-		  key + '">On</span></a>'+lang_layout_mediafil[lang]+'<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-' +
-		  key + '">On</span></a>'+lang_layout_linkana[lang]+'<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-' +
-		  key + '">On</span></a>'+lang_layout_tts[lang]+'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 +
-			'" 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>';
+		  '" style="padding:5px;">'+exclude+'<a onclick="mediaToggle(' + key +
+		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_mediafil +'">perm_media</i><span id="sta-media-' +
+		  key + '">On</span></a>'+lang.lang_layout_mediafil +'<br><a onclick="cardToggle(' + key +
+		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_linkanades +'">link</i><span id="sta-card-' +
+		  key + '">On</span></a>'+lang.lang_layout_linkana +'<br><a onclick="voiceToggle(' + key +
+		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_tts +'">hearing</i><span id="sta-voice-' +
+		  key + '">On</span></a>'+lang.lang_layout_tts +'TL<br><a onclick="reconnector(' + key +
+		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+			'" 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 +190,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);
@@ -267,7 +292,7 @@ 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();
@@ -380,19 +405,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/post-box.js

@@ -1,10 +1,8 @@
 /*ささやきボックス(Cr民並感)*/
 //✕隠す
 function hide() {
-	$('#post-box').removeClass("appear")
-	$('#post-box').animate({
-		'bottom': "-500px"
-	});
+	$('#post-box').fadeOut()
+	$("#post-box").removeClass("appear")
 	$("#emoji").addClass("hide")
 }
 //最小化
@@ -18,16 +16,23 @@ function mini() {
 }
 //最小化時に展開
 function show() {
+	$("#post-box").addClass("appear")
 	$("#textarea").focus();
-	$('#post-box').addClass("appear")
-	console.log($('#posttgl').offset());
-	$('#post-box').css("left",$('#posttgl').offset().left+"px");
-	$('#post-box').animate({
-		'bottom': 0
-	});
+	console.log("show"+localStorage.getItem("postbox-left"));
+	$('#post-box').css("left",localStorage.getItem("postbox-left")+"px")
+	$('#post-box').css("top",localStorage.getItem("postbox-top")+"px")
+	$('#post-box').fadeIn();
 }
 
-
+$(function() {
+  $( "#post-box" ).draggable({handle: "#post-bar",
+	stop: function() {
+		console.log("stopped");
+	  localStorage.setItem("postbox-left",$('#post-box').offset().left);
+	  localStorage.setItem("postbox-top",$('#post-box').offset().top);
+	}
+  });
+});
 
 //コード受信
 if(location.search){
@@ -43,9 +48,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();
 	}
 });
 

app/js/ui/scroll.js

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

@@ -4,14 +4,14 @@ 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);
+		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 != localStorage.getItem("theme")) {
-		Materialize.toast(lang_setting_theme[lang].replace("{{set}}" ,ct), 3000);
+		Materialize.toast(lang.lang_setting_theme.replace("{{set}}" ,ct), 3000);
 	}
 	//テーマはこの場で設定
 	themes(cd);
@@ -20,63 +20,63 @@ function settings() {
 	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);
+		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_setting_cw[lang].replace("{{set}}" ,cwt), 3000);
+		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_setting_cwtext[lang].replace("{{set}}" ,cwtd), 3000);
+		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_setting_cws[lang].replace("{{set}}" ,cwst), 3000);
+		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_setting_rp[lang].replace("{{set}}" ,rpt), 3000);
+		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_setting_vis[lang].replace("{{set}}" ,vist), 3000);
+		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_setting_popup[lang].replace("{{set}}" ,popd+lang_setting_s[lang]), 3000);
+		Materialize.toast(lang.lang_setting_popup.replace("{{set}}" ,popd+lang.lang_setting_s), 3000);
 	} else if (popd != localStorage.getItem("popup")) {
-		Materialize.toast(lang_setting_popup[lang].replace("{{set}}" ,lang_setting_off[lang]), 3000);
+		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_setting_gif[lang].replace("{{set}}" ,gift), 3000);
+		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_setting_selt[lang].replace("{{set1}}" ,sentd).replace("{{set2}}" ,ltrd), 3000);
+		Materialize.toast(lang.lang_setting_selt.replace("{{set1}}" ,sentd).replace("{{set2}}" ,ltrd), 3000);
 	}
 	localStorage.setItem("sentence", sentd);
 	localStorage.setItem("letters", ltrd);
@@ -84,35 +84,41 @@ function settings() {
 	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);
+		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_setting_width[lang].replace("{{set}}" ,widthd), 3000);
+		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_setting_img[lang].replace("{{set}}" ,imgt), 3000);
+		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_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();
 		}
 	}
@@ -120,90 +126,97 @@ function settings() {
 
 	var sized = $("#size").val();
 	if (sized != localStorage.getItem("size")) {
-		Materialize.toast(lang_setting_size[lang].replace("{{set}}" ,sized), 3000);
+		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_setting_imgheight[lang].replace("{{set}}" ,heid), 3000);
+		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_setting_ticker[lang].replace("{{set}}" ,tckrt), 3000);
+		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_setting_box[lang].replace("{{set}}" ,boxt), 3000);
+		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_setting_tag[lang].replace("{{set}}" ,tagt), 3000);
+		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_setting_ul[lang].replace("{{set}}" ,ult), 3000);
+		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_setting_notf[lang].replace("{{set}}" ,ntt), 3000);
+		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_setting_quote[lang].replace("{{set}}" ,qtt), 3000);
+		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_setting_via[lang].replace("{{set}}" ,viat), 3000);
+		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_setting_setasread[lang].replace("{{set}}" ,notfmt), 3000);
+		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_setting_mov[lang].replace("{{set}}" ,movt), 3000);
+		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_setting_main[lang].replace("{{set}}" ,maint), 3000);
+		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_setting_sec[lang].replace("{{set}}" ,sect), 3000);
+		Materialize.toast(lang.lang_setting_sec.replace("{{set}}" ,sect), 3000);
 	}
 	localStorage.setItem("sec", secd);
 }
@@ -297,6 +310,12 @@ function load() {
 	}
 	$("#width").val(width);
 
+	var fwidth = localStorage.getItem("fixwidth");
+	if (!fwidth) {
+		var fwidth = "0";
+	}
+	$("#fixwidth").val(fwidth);
+
 	var cwt = localStorage.getItem("cw-text");
 	if (!cwt) {
 		var cwt = "";
@@ -345,12 +364,18 @@ function load() {
 	}
 	$("#img-height").val(imh);
 
-	var ticker = localStorage.getItem("ticker-ok");
+	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";
@@ -419,15 +444,16 @@ wordemp();
 checkSpotify();
 voiceSettingLoad();
 oksload();
+npprovider();
 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;
@@ -437,7 +463,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);
 	});
 }
@@ -481,20 +507,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"))}
@@ -510,7 +536,7 @@ function changelang(lang){
 	});
 }
 function exportSettings(){
-	if(!confirm(lang_setting_exportwarn[lang])){
+	if(!confirm(lang.lang_setting_exportwarn)){
 		return false;
 	}
 	var electron = require("electron");
@@ -584,7 +610,7 @@ function exportSettings(){
 	});
 }
 function importSettings(){
-	if(!confirm(lang_setting_importwarn[lang])){
+	if(!confirm(lang.lang_setting_importwarn)){
 		return false;
 	}
 	var electron = require("electron");

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/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/showOnTL.js

@@ -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(\'' +
-				json.moved.id + '\',\''+acct_id+'\')">'+lang_showontl_movebtn[lang]+'</button>', 4000)
+				lang.lang_showontl_movetxt+'<button class="btn-flat toast-action" onclick="udg(\'' +
+				json.moved.id + '\',\''+acct_id+'\')">'+lang.lang_showontl_movebtn+'</button>', 4000)
 		}
 			$('#his-data').modal('open');
 			$('#his-data').attr("user-id", user);
@@ -151,7 +151,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 +288,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 +347,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 +410,8 @@ function reset(){
 	$(".column-first").addClass("active-back");
 	$("#his-name").text("Loading");
 	$("#his-acct").text("");
-	$("#his-prof").attr("src", "./img/loading.svg");
-	$('#his-data').css('background-image', 'url(./img/loading.svg)');
+	$("#his-prof").attr("src", "../../img/loading.svg");
+	$('#his-data').css('background-image', 'url(../../img/loading.svg)');
 	$("#his-sta").text("");
 	$("#his-follow").text("");
 	$("#his-follower").text("");
@@ -431,15 +431,15 @@ function reset(){
 	$("#his-notf-btn").show();
 	$("#his-domain-btn").show();
 	$("#his-emp-btn").show();
-	$("#his-follow-btn").text(lang_status_follow[lang]);
-	$("#his-mute-btn").text(lang_status_mute[lang]);
-	$("#his-block-btn").text(lang_status_block[lang]);
-	$("#his-notf-btn").text(lang_showontl_notf[lang]+lang_status_mute[lang]);
-	$("#his-domain-btn").text(lang_showontl_domain[lang]+lang_status_block[lang]);
+	$("#his-follow-btn").text(lang.lang_status_follow);
+	$("#his-mute-btn").text(lang.lang_status_mute);
+	$("#his-block-btn").text(lang.lang_status_block);
+	$("#his-notf-btn").text(lang.lang_showontl_notf+lang.lang_status_mute);
+	$("#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/main.js

@@ -11,6 +11,7 @@ const path = require('path')
 const fm = require('font-manager');
 const Menu=electron.Menu
 var updatewin=null;
+const join = require('path').join;
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
 // ウィンドウを作成するモジュール
@@ -18,7 +19,6 @@ 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");
@@ -59,7 +59,7 @@ 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{
 		var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,simpleFullscreen:true}
 	}
@@ -276,65 +276,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: '保存',
-			properties: ['openFile', 'createDirectory'],
-			defaultPath: zip
+      title: 'Save',
+			defaultPath: app.getPath('home')+"/"+args[1]
         }, (savedFiles) => {
 			console.log(savedFiles);
 			if(!savedFiles){
@@ -345,18 +292,12 @@ ipc.on('download-btn', (e, args) => {
 			}else{
 				var m = savedFiles.match(/(.+)\/(.+)$/);
 			}
-			
+			//console.log(m);
 			  if(isExistFile(savedFiles)){
-				fs.statSync(savedFiles);
-				fs.unlink(savedFiles);
+					fs.unlinkSync(savedFiles);
 			  }
-			  console.log(m[1]+":"+savedFiles)
-              dl(portable,ver,m[1],savedFiles);
+              dl(args[0],args[1],m[1]);
         });
-	}else{
-		dl(portable,ver);
-	}
-	
 });
 function isExistFile(file) {
 	try {
@@ -366,48 +307,10 @@ function isExistFile(file) {
 	  if(err.code === 'ENOENT') return false
 	}
   }
-function dl(portable,ver,files,fullname){
-	console.log(files);
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform=="win32"){
-		if(bit=="x64"){
-			if(portable){
-				var zip="TheDesk.exe";
-			}else{
-				var zip="TheDesk-setup.exe";
-			}
-		}else if(bit=="ia32"){
-			if(portable){
-				var zip="TheDesk-ia32.exe";
-			}else{
-				var zip="TheDesk-setup-ia32.exe";
-			}
-		}
-	}else if(platform=="linux"){
-		if(bit=="x64"){
-			var zip="TheDesk-linux-x64.zip";
-		}else if(bit=="ia32"){
-			var zip="TheDesk-linux-ia32.zip";
-		}
-	}else if(platform=="darwin"){
-			var zip="TheDesk-darwin-x64.zip";
-	}
-	//zip=zip+"?"+ver;
-	var l = 8;
-
-	// 生成する文字列に含める文字セット
-	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
-
-	var cl = c.length;
-	var r = "";
-	for(var i=0; i<l; i++){
-	  r += c[Math.floor(Math.random()*cl)];
-	}
-
+function dl(url,file,dir){
 	updatewin.webContents.send('mess', "ダウンロードを開始します。");
 	const opts = {
-		directory:fullname,
+		directory:dir,
 		openFolderWhenDone: true,
 		onProgress: function(e) {
 			updatewin.webContents.send('prog', e);
@@ -415,7 +318,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();
@@ -464,23 +367,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) {
-    mainWindow.webContents.send('itunes-np', value);
-}).catch(function (error) {
-    // 非同期処理失敗。呼ばれない
-    console.log(error);
-});
-}
+ipc.on('itunes', (e, args) => {
+	console.log("Access");
+	if(args[0]=="set"){
+		var {NowPlaying,PlayerName} = require("nowplaying-node");
+		var nppath=join(app.getPath("userData"), "nowplaying");
+		var npProvider;
+		try {
+			npProvider = args[1];
+		} catch (e) {
+			npProvider="AIMP";
+		}
+		var myAIMP = new NowPlaying({
+			fetchCover: true,
+			player: PlayerName[npProvider],
+		});
+		fs.writeFileSync(nppath, npProvider);
+	}else{
+		var platform=process.platform;
+		var bit=process.arch;
+		if(platform=="darwin"){
+		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, {
@@ -534,7 +483,7 @@ 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,    // ウィンドウの背景を透過
 		 "frame": false,     // 枠の無いウィンドウ
 		 "resizable": false });
@@ -645,4 +594,5 @@ object_array_sort(fonts, 'family', 'asc', function(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;
@@ -108,8 +110,6 @@ $.strip_tags = function(str, allowed) {
 </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")){
@@ -118,9 +118,6 @@ $.strip_tags = function(str, allowed) {
 		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>
@@ -166,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": "17.0.0",
+  "version": "17.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": {
@@ -22,14 +25,20 @@
       "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",
     "node-notifier": "^5.2.1",
+    "nowplaying-node": "^0.1.3",
     "sumchecker": "^2.0.2"
   },
   "optionalDependencies": {
@@ -45,23 +54,34 @@
       "icon": "thedesk.ico",
       "target": [
         "nsis",
-        "portable"
+        "portable",
+        "appx"
       ]
     },
+    "nsis": {
+      "oneClick": false,
+      "allowToChangeInstallationDirectory": true,
+      "artifactName": "TheDesk-setup.${ext}"
+    },
     "linux": {
       "icon": "build/icons",
       "target": [
-        "deb",
-        "rpm"
+        "snap"
       ],
       "category": "Network"
     },
-    "electronDownload": {
-      "version": "3.0.10"
+    "mac": {
+      "target": "dmg"
     },
-    "electronVersion": "3.0.10"
+    "electronDownload": {
+      "version": "4.0.5"
+    },
+    "electronVersion": "4.0.5"
   },
   "devDependencies": {
-    "electron-rebuild": "^1.8.2"
+    "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,20 +13,26 @@
 	<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/parse.lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/version.js"></script>
 <script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Miria (17.0.0)";
+var ver="Miria (17.1.0) beta1";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -34,7 +40,6 @@ var ver="Miria (17.0.0)";
 var winstore=false;
 var acct_id=0;
 var tlid=0;
-var lang="en";
   verck(ver,winstore);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
@@ -48,8 +53,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">Post new</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@@ -125,9 +132,8 @@ var lang="en";
 		<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 +146,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 +173,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 +201,86 @@ 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="emoji" class="hide shared z-depth-4">
-	<span class="gray sml">
-		<a onclick="emojiGet('true')" class="pointer">Refresh emojis list</a>
-		<i class="material-icons waves-effect" onclick="emoji()" title="Close this box" data-trans-title="post_box_close">cancel</i>
-	<br>
-	</span>
-	<div id="emoji-list" class="" style="">
-	</div>
-	<div class="emoji-control center">
-		<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
-		<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>
+<div id="emoji" class="hide">
+		<span class="gray sml">
+			<a onclick="emojiGet('true')" class="pointer">Refresh emojis list</a>
+			<i class="material-icons waves-effect" onclick="emojiToggle()" title="Close this box" data-trans-title="post_box_close">cancel</i>
 		<br>
-		<a onclick="customEmoji()" class="pointer waves-effect" title="Custom emojis">
-		<i class="material-icons">add</i>
-		</a>
-		<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="Emojis of people">
-		<i class="material-icons">people</i>
-		</a>
-		<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="Emojis of nature">
-		<i class="material-icons">local_florist</i>
-		</a>
-		<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="Emojis of foods">
-		<i class="material-icons">restaurant</i>
-		</a>
-		<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="Emojis of activities">
-		<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>
+		</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">
+			<i class="material-icons">add</i>
+			</a>
+			<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="Emojis of people">
+			<i class="material-icons">people</i>
+			</a>
+			<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="Emojis of nature">
+			<i class="material-icons">local_florist</i>
+			</a>
+			<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="Emojis of foods">
+			<i class="material-icons">restaurant</i>
+			</a>
+			<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="Emojis of activities">
+			<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">
+	
+		</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 +339,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">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>Favourite</button>
+		<div class="col s2">
+			<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 +371,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,16 +582,17 @@ 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-Miria_17-0-0" class="release-do" style="display:none; ">
+			<div id="release-Miria_17-1-0" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Miria (17.0.0)</h5>
-					セキュリティアップデート、安定性の向上。<br>
-					<b>#InstanceTickerが使用できるように</b><br>
-					<b>フォントが直感的に選べるように</b><br>
-					<b>リンク解析をオンにしても制限がかからないように</b>(これによりデフォルトでオンになります。)<br>
+					<h5>Release Note Miria (17.1.0)</h5>
+					トゥートボックスがフロートタイプに。左下、右下以外にも自由においてください。<br>
+					いろいろとアニメーション入れた(硬派な方は設定「タイムラインの設定」からオフに)<br>
+					アンケートができるように(OK:Mastodon (2.8~)/WIP: votedon./ NG: ニコフレ)<br>
+					フォント選択機能が復活<br>
+					WindowsからiTunesやAIMP、その他CAD系のNowPlayingができるように。要プラグインのソフトもある。<br>
 			</div>
 			<br><br>
 			<h3>Support TheDesk!</h3>
@@ -681,9 +736,9 @@ var lang="en";
 	  <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
+	<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>
@@ -698,7 +753,9 @@ 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;">
+									<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>
@@ -784,9 +841,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>

app/view/en/setting.html

@@ -2,6 +2,13 @@
 <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">
@@ -14,8 +21,7 @@
 <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>var lang="en";</script>
+<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
 <h4>Preferences</h4>
 <ul class="collapsible" data-collapsible="accordion">
 	<li>
@@ -24,7 +30,7 @@
 	</div>
 	<div class="collapsible-body">
 		<h5>Languages</h5>
-		<a onclick="changelang('ja')" class="pointer">日本語</a>/<a onclick="changelang('en')" class="pointer">English</a>
+		<a href="../ja/setting.html">日本語(Japanese)</a>/<a href="../en/setting.html">English</a>/<a href="../ps/setting.html">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>
@@ -40,7 +46,7 @@
 		<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>
-		<h5>Popup notification(on window)</h5>Hide to set "0"
+		<h5>Popup notification(on Windows)</h5>Hide to set "0"
 		<br>
 		<input type="text" style="width:50px" id="popup">sec
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
@@ -53,17 +59,19 @@
 		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_no" value="no" />
 		<label for="ntf_no">No</label>
 		<br>
-		<h5>Minimam width of columns</h5>Scroll bar will be shown when your window size is more than ammounts of columns.
+		<h5>Minimum width of columns</h5>Scroll bar will be shown when your window size is more than ammounts of columns.
 		<br>
 		<input type="text" style="width:50px" id="width">pxabove
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
 		<br>
+		<h5>Minimum width of TweetDeck browser</h5>
+		<input type="text" style="width:50px" id="fixwidth">pxabove
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+		<br>
 		<h5>Font</h5>
 		Select your favorite font to 'Select'<br>
 		<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;">
-
-		</div>
+		<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>
@@ -91,12 +99,12 @@
 		<input class="with-gap" onchange="settings()" onchange="settings()" name="time" type="radio" id="relative" value="relative" />
 		<label for="relative">Relative</label>
 		<input class="with-gap" onchange="settings()" name="time" type="radio" id="absolute" value="absolute" />
-		<label for="absolute">Absoltue</label>
+		<label for="absolute">Absolute</label>
 		<input class="with-gap" onchange="settings()" name="time" type="radio" id="double" value="double" />
 		<label for="double">Both relative and absolute</label>
 		<input class="with-gap" onchange="settings()" name="time" type="radio" id="medium" value="medium" />
 		<label for="medium">Mixed</label>
-		<h5>Instance unique locale</h5>This value is available on some Japanese instances
+		<h5>Server's unique locale</h5>This value is available on some Japanese servers
 		<br>
 		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_yes" value="yes" />
 		<label for="ul_yes">Yes</label>
@@ -158,8 +166,8 @@
 		<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
+		<input type="text" style="width:50px" id="sentence">lines above or
+		<input type="text" style="width:50px" id="letters">letters above
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
 		<br>
 		<h5>Height of images
@@ -168,12 +176,17 @@
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
 		<br>
 		<h5>Enable #InstanceTicker</h5>
-		Show colorful stickers about tooters' instance. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.<br>
+		Show colorful stickers about tooters' server. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.<br>
 		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_yes" value="yes" />
 		<label for="ticker_yes">Yes</label>
 		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
 		<label for="ticker_no">No</label>
 		<br>
+		<h5>Animation of timelines</h5>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_yes" value="yes" />
+		<label for="anime_yes">Yes</label>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
+		<label for="anime_no">No</label>
 	</div>
 	</li>
 	<li>
@@ -188,8 +201,8 @@
 		<h5>Alert before posting a long toot.</h5>
 		Show dialog whether you make too-long text hidden.
 		<br>
-		<input type="text" style="width:50px" id="cw_sentence">linesaboveor
-		<input type="text" style="width:50px" id="cw_letters">lettersabove
+		<input type="text" style="width:50px" id="cw_sentence">lines above or
+		<input type="text" style="width:50px" id="cw_letters">letters above
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
 		<br>
 		<h5>Always CW set</h5>
@@ -209,9 +222,9 @@
 		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="direct" value="direct" />
 		<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>
+		<label for="memory">Memory(memorized as each server)</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>
+		<label for="server">Default of your visibility(Set on preferences of Mastodon server)</label>
 		<br>
 		<h5>Posting images preferences</h5>
 		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_url" value="url" />
@@ -309,6 +322,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>
@@ -319,8 +348,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>
-				iTunes NowPlaying:{url} is disabled, but composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre} are available.<br>
+				Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify<br>
+				macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}<br>
+				Windows:{song}:Song name/{album}:Album name/{artist}:Artist name<br>
 				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
                     CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
 			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
@@ -400,7 +430,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>

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>
-        <div id="checkbox">
-            Options:<br>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
-            <label for="portable">Poetable ver.</label><br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">Not rewrite</label><br>
-        </div>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">Installer ver.</button>
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">Portable ver.</button>
+        <span class="linux">Snap ver may be on Snapcraft<br></span>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">Start</button>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">Start</button>
+        <br>
         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 versioning=true;
-	}else{
-        var versioning=false;
-    }
-    if($('#portable:checked').val()=="true"){
-		var zip=true;
-	}else{
-        var zip=false;
-    }
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+    var remote=electron.remote;
+    var bit=process.arch;
+    var start="https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET',
+		headers: {'content-type': 'application/json'},
+    }).then(function(response) {
+       return response.json();
+    }).catch(function(error) {
+        todo(error);
+		console.error(error);
+    }).then(function(json) {
+        if(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;
-	if(platform!="win32"){
-		$('#portable').prop("disabled",true)
+    var platform=remote.process.platform;
+    var bit=process.arch;
+	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/index.html

@@ -13,20 +13,26 @@
 	<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/parse.lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.ja.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="Miria (17.0.0)";
+var ver="Miria (17.1.0) beta1";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -34,7 +40,6 @@ var ver="Miria (17.0.0)";
 var winstore=false;
 var acct_id=0;
 var tlid=0;
-var lang="ja";
   verck(ver,winstore);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
@@ -48,8 +53,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">投稿</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@@ -125,9 +132,8 @@ var lang="ja";
 		<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 +146,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 +173,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 +201,86 @@ 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="emoji" class="hide shared z-depth-4">
-	<span class="gray sml">インスタンスによって実装が異なります。
-		<a onclick="emojiGet('true')" class="pointer">絵文字更新</a>
-		<i class="material-icons waves-effect" onclick="emoji()" 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>
+<div id="emoji" class="hide">
+		<span class="gray sml">サーバーによって実装が異なります。
+			<a onclick="emojiGet('true')" class="pointer">絵文字更新</a>
+			<i class="material-icons waves-effect" onclick="emojiToggle()" title="このボックスを閉じる" data-trans-title="post_box_close">cancel</i>
 		<br>
-		<a onclick="customEmoji()" class="pointer waves-effect" title="カスタム絵文字">
-		<i class="material-icons">add</i>
-		</a>
-		<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="ひと">
-		<i class="material-icons">people</i>
-		</a>
-		<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="自然">
-		<i class="material-icons">local_florist</i>
-		</a>
-		<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="食べ物">
-		<i class="material-icons">restaurant</i>
-		</a>
-		<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="活動">
-		<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>
+		</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="カスタム絵文字">
+			<i class="material-icons">add</i>
+			</a>
+			<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="ひと">
+			<i class="material-icons">people</i>
+			</a>
+			<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="自然">
+			<i class="material-icons">local_florist</i>
+			</a>
+			<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="食べ物">
+			<i class="material-icons">restaurant</i>
+			</a>
+			<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="活動">
+			<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">
+	
+		</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 +339,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">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>お気に入り登録</button>
+		<div class="col s2">
+			<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 +371,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,16 +582,17 @@ 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-Miria_17-0-0" class="release-do" style="display:none; ">
+			<div id="release-Miria_17-1-0" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Miria (17.0.0)</h5>
-					セキュリティアップデート、安定性の向上。<br>
-					<b>#InstanceTickerが使用できるように</b><br>
-					<b>フォントが直感的に選べるように</b><br>
-					<b>リンク解析をオンにしても制限がかからないように</b>(これによりデフォルトでオンになります。)<br>
+					<h5>Release Note Miria (17.1.0)</h5>
+					トゥートボックスがフロートタイプに。左下、右下以外にも自由においてください。<br>
+					いろいろとアニメーション入れた(硬派な方は設定「タイムラインの設定」からオフに)<br>
+					アンケートができるように(OK:Mastodon (2.8~)/WIP: votedon./ NG: ニコフレ)<br>
+					フォント選択機能が復活<br>
+					WindowsからiTunesやAIMP、その他CAD系のNowPlayingができるように。要プラグインのソフトもある。<br>
 			</div>
 			<br><br>
 			<h3>ご支援ください。</h3>
@@ -681,9 +736,9 @@ var lang="ja";
 	  <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">分
+	<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>
@@ -698,7 +753,9 @@ 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;">
+									<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>
@@ -784,9 +841,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>

app/view/ja/setting.html

@@ -2,6 +2,13 @@
 <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">
@@ -14,8 +21,7 @@
 <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>var lang="ja";</script>
+<script type="text/javascript" src="../../js/lang/lang.ja.js"></script>
 <h4>設定</h4>
 <ul class="collapsible" data-collapsible="accordion">
 	<li>
@@ -24,7 +30,7 @@
 	</div>
 	<div class="collapsible-body">
 		<h5>言語</h5>
-		<a onclick="changelang('ja')" class="pointer">日本語</a>/<a onclick="changelang('en')" class="pointer">English</a>
+		<a href="../ja/setting.html">日本語(Japanese)</a>/<a href="../en/setting.html">English</a>/<a href="../ps/setting.html">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>
@@ -58,12 +64,14 @@
 		<input type="text" style="width:50px" id="width">px以上
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
 		<br>
+		<h5>TweetDeckの限定の最低横幅</h5>
+		<input type="text" style="width:50px" id="fixwidth">px以上
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
+		<br>
 		<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>
+		<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>
@@ -96,7 +104,7 @@
 		<label for="double">両方表示</label>
 		<input class="with-gap" onchange="settings()" name="time" type="radio" id="medium" value="medium" />
 		<label for="medium">混合表示</label>
-		<h5>独自ロケールを使用</h5>対応インスタンスではそのインスタンスにあわせた言語表示ができます。
+		<h5>独自ロケールを使用</h5>対応サーバーではそのサーバーにあわせた言語表示ができます。
 		<br>
 		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_yes" value="yes" />
 		<label for="ul_yes">はい</label>
@@ -130,9 +138,9 @@
 		<br>
 		<h5>タグタイムラインの表示範囲</h5>
 		<input class="with-gap" onchange="settings()" name="tag" type="radio" id="t_all" value="all" />
-		<label for="t_all">接続しているインスタンス</label>
+		<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>
+		<label for="t_local">検索対象のサーバーのみ</label>
 		<br>
 		<h5>viaを表示する</h5>
 		<input class="with-gap" onchange="settings()" name="via" type="radio" id="via_yes" value="yes" />
@@ -158,8 +166,8 @@
 		<h5>指定行数以上を折りたたむ</h5>
 		5文字以下のトゥートは折りたたみません。また、折りたたみ時は改行が描画されません。改行のみを行数とカウントします。
 		<br>
-		<input type="text" style="width:50px" id="sentence">行以上または
-		<input type="text" style="width:50px" id="letters">文字以上
+		<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>画像の高さ
@@ -168,12 +176,17 @@
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
 		<br>
 		<h5>#InstanceTickerを使う</h5>
-		トゥートした人の所属インスタンスをわかりやすく彩ります(自インスタンス以外のトゥート向け)。<a href="https://cdn.weep.me/mastodon/">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.<br>
+		トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href="https://cdn.weep.me/mastodon/">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.<br>
 		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_yes" value="yes" />
 		<label for="ticker_yes">はい</label>
 		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
 		<label for="ticker_no">いいえ</label>
 		<br>
+		<h5>タイムラインのアニメーション</h5>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_yes" value="yes" />
+		<label for="anime_yes">はい</label>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
+		<label for="anime_no">いいえ</label>
 	</div>
 	</li>
 	<li>
@@ -188,8 +201,8 @@
 		<h5>長文投稿時に警告</h5>
 		下で指定した以上のトゥートを投稿するときにCWするかのダイアログを表示します。
 		<br>
-		<input type="text" style="width:50px" id="cw_sentence">行以上または
-		<input type="text" style="width:50px" id="cw_letters">文字以上
+		<input type="text" style="width:50px" id="cw_sentence">行 以上 または
+		<input type="text" style="width:50px" id="cw_letters">文字 以上
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
 		<br>
 		<h5>標準でCWを設定</h5>
@@ -209,7 +222,7 @@
 		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="direct" value="direct" />
 		<label for="direct">ダイレクト(Direct)</label>
 		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="memory" value="memory" />
-		<label for="memory">前回の投稿設定を記憶する(インスタンスごとに記憶されます)</label>
+		<label for="memory">前回の投稿設定を記憶する(サーバーごとに記憶されます)</label>
 		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="server" value="server" />
 		<label for="server">マストドンアカウント設定の既定値</label>
 		<br>
@@ -309,6 +322,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>
@@ -319,12 +348,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>
-				iTunes NowPlayingでも{url}以外のテンプレートに従ってトゥートされます。また、作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}が有効です。<br>
+				Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<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>
@@ -348,7 +378,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>
@@ -400,7 +430,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>

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>
-        <div id="checkbox">
-            Options:<br>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
-            <label for="portable">ポータブル版</label><br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">上書きしない</label><br>
-        </div>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">インストーラー版(推奨)</button>
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">ポータブル版</button>
+        <span class="linux">snap版はSnapcraft等よりDLしてください。<br></span>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">開始</button>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">開始</button>
+        <br>
         問題が発生しますか？<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 versioning=true;
-	}else{
-        var versioning=false;
-    }
-    if($('#portable:checked').val()=="true"){
-		var zip=true;
-	}else{
-        var zip=false;
-    }
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+    var remote=electron.remote;
+    var bit=process.arch;
+    var start="https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET',
+		headers: {'content-type': 'application/json'},
+    }).then(function(response) {
+       return response.json();
+    }).catch(function(error) {
+        todo(error);
+		console.error(error);
+    }).then(function(json) {
+        if(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;
-	if(platform!="win32"){
-		$('#portable').prop("disabled",true)
+    var platform=remote.process.platform;
+    var bit=process.arch;
+	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,20 +13,26 @@
 	<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/parse.lang.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.{{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="Miria (17.0.0)";
+var ver="{{versionLetter}}";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -34,7 +40,6 @@ var ver="Miria (17.0.0)";
 var winstore=false;
 var acct_id=0;
 var tlid=0;
-var lang="{{lang}}";
   verck(ver,winstore);
  </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
@@ -48,8 +53,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">{{post-new}}</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@@ -125,9 +132,8 @@ var lang="{{lang}}";
 		<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 +146,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 +173,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 +201,86 @@ 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="emoji" class="hide shared z-depth-4">
-	<span class="gray sml">{{emojiWarn}}
-		<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>
-	<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>
+<div id="emoji" class="hide">
+		<span class="gray sml">{{emojiWarn}}
+			<a onclick="emojiGet('true')" class="pointer">{{refreshEmoji}}</a>
+			<i class="material-icons waves-effect" onclick="emojiToggle()" title="{{closeThisBox}}" data-trans-title="post_box_close">cancel</i>
 		<br>
-		<a onclick="customEmoji()" class="pointer waves-effect" title="{{customEmoji}}">
-		<i class="material-icons">add</i>
-		</a>
-		<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="{{peopleEmoji}}">
-		<i class="material-icons">people</i>
-		</a>
-		<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="{{natureEmoji}}">
-		<i class="material-icons">local_florist</i>
-		</a>
-		<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="{{foodEmoji}}">
-		<i class="material-icons">restaurant</i>
-		</a>
-		<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="{{activityEmoji}}">
-		<i class="material-icons">directions_run</i>
-		</a>
-		<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="{{placeEmoji}}">
-		<i class="material-icons">directions_car</i>
-		</a>
-		<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="{{thingsEmoji}}">
-		<i class="material-icons">attach_file</i>
-		</a>
-		<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="{{symbolEmoji}}">
-		<i class="material-icons">gesture</i>
-		</a>
-		<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="{{flagsEmoji}}">
-		<i class="material-icons">flag</i>
-		</a>
-		<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-		<i class="fa fa-fort-awesome"></i>
-		</a>
+		</span>
+		<div id="emoji-list" class="" style="">
+		</div>
+		<div class="emoji-control center">
+			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('before')" id="emoji-before">
+			<i class="material-icons">navigate_before</i>
+			</button>
+			<span id="emoji-count"></span>/
+			<span id="emoji-sum"></span>
+			<button class="btn waves-effect blue" style="width:30%; padding:0;" onclick="emojiList('next')" id="emoji-next">
+			<i class="material-icons">navigate_next</i>
+			</button>
+			</div>
+			<div id="default-emoji">
+			<span id="now-emoji"></span>{{showThisEmoji}}<br><span class="gray sml">{{emojiInsertWarn}}</span>
+			<br>
+			<a onclick="customEmoji()" class="pointer waves-effect" title="{{customEmoji}}">
+			<i class="material-icons">add</i>
+			</a>
+			<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="{{peopleEmoji}}">
+			<i class="material-icons">people</i>
+			</a>
+			<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="{{natureEmoji}}">
+			<i class="material-icons">local_florist</i>
+			</a>
+			<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="{{foodEmoji}}">
+			<i class="material-icons">restaurant</i>
+			</a>
+			<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="{{activityEmoji}}">
+			<i class="material-icons">directions_run</i>
+			</a>
+			<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="{{placeEmoji}}">
+			<i class="material-icons">directions_car</i>
+			</a>
+			<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="{{thingsEmoji}}">
+			<i class="material-icons">attach_file</i>
+			</a>
+			<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="{{symbolEmoji}}">
+			<i class="material-icons">gesture</i>
+			</a>
+			<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="{{flagsEmoji}}">
+			<i class="material-icons">flag</i>
+			</a>
+			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+			<i class="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">
+	
+		</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 +339,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">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>{{favRegist}}</button>
+		<div class="col s2">
+			<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 +371,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,16 +582,17 @@ 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-Miria_17-0-0" class="release-do" style="display:none; ">
+			<div id="release-Miria_17-1-0" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Miria (17.0.0)</h5>
-					セキュリティアップデート、安定性の向上。<br>
-					<b>#InstanceTickerが使用できるように</b><br>
-					<b>フォントが直感的に選べるように</b><br>
-					<b>リンク解析をオンにしても制限がかからないように</b>(これによりデフォルトでオンになります。)<br>
+					<h5>Release Note Miria (17.1.0)</h5>
+					トゥートボックスがフロートタイプに。左下、右下以外にも自由においてください。<br>
+					いろいろとアニメーション入れた(硬派な方は設定「タイムラインの設定」からオフに)<br>
+					アンケートができるように(OK:Mastodon (2.8~)/WIP: votedon./ NG: ニコフレ)<br>
+					フォント選択機能が復活<br>
+					WindowsからiTunesやAIMP、その他CAD系のNowPlayingができるように。要プラグインのソフトもある。<br>
 			</div>
 			<br><br>
 			<h3>{{supportme}}</h3>
@@ -681,9 +736,9 @@ var lang="{{lang}}";
 	  <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}}
+	<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>
@@ -698,7 +753,9 @@ 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;">
+									<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>
@@ -784,9 +841,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>

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",
@@ -127,6 +139,7 @@
     "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.",
     "addColumn":"Add a column",

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":"これより後の会話",
@@ -127,6 +139,7 @@
     "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>ボタンよりカラムを追加してください。",
     "addColumn":"カラム追加",

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

@@ -0,0 +1,149 @@
+{
+    "draghere": "crwdns384:0crwdne384:0",
+    "close": "crwdns385:0crwdne385:0",
+    "showSelectProf": "crwdns386:0crwdne386:0",
+    "closethisbox": "crwdns387:0crwdne387:0",
+    "toot": "crwdns388:0crwdne388: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": "crwdns1882:0crwdne1882: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",
+    "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",
+    "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/main.json

@@ -0,0 +1,199 @@
+{
+    "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",
+    "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.",
+    "lang_version_usever":"No update is found({{ver}})",
+    "lang_version_skipver":"Update was ignored.",
+    "lang_login_noauth":"Show TL of unlogined accounts",
+    "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.",
+    "lang_bbmd_misskey":"TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
+    "lang_emoji_get":"Get emojis",
+    "lang_emoji_custom":"Custom emojis",
+    "lang_postimg_previewdis":"cannot preview",
+    "lang_postimg_aftupload":"You cannot change accounts after uploading.",
+    "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",
+    "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",
+    "lang_suggest_nodata":"Please get emojis list in order to show suggestion.",
+    "lang_usetxtbox_reply":"Reply Mode. Ctrl+Shift+C to clear.",
+    "lang_cards_check":" check",
+    "lang_cards_pip":"PiP mode",
+    "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.",
+    "lang_filter_nodata":"No data",
+    "lang_filter_errordegree":"Please check a context",
+    "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",
+    "lang_notf_new":" new notifications",
+    "lang_speech_refresh":"Save value about TTS config",
+    "lang_src_ts":"chronological order",
+    "lang_src_people":" people toot",
+    "lang_tags_always":"Always toots with ",
+    "lang_tags_realtime":"Tag-stream toot",
+    "lang_tags_tagunpin":"Unpin {{tag}}",
+    "lang_tags_tagwarn":"When you toot without {{tag}}, tag-streaming mode will be off.",
+    "lang_tl_media":"Media",
+    "lang_tl_reconnect":"Reconnect to streaming API",
+    "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_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}}",
+    "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.",
+    "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.",
+    "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_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.",
+    "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_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/view/make/language/setting.en.json

@@ -11,14 +11,16 @@
     "import":"Import",
     "export":"Export",
     "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":"Select your favorite font to 'Select'",
@@ -32,11 +34,11 @@
     "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",
-    "localewarn":"This value is available on some Japanese instances",
+    "locale":"Server's unique locale",
+    "localewarn":"This value is available on some Japanese servers",
     "nswf":"Hide NSFW pictures",
     "nsfwwarn":"Strong blur effect",
     "cw":"Hide CW contents",
@@ -64,7 +66,8 @@
     "or":"or",
     "imgheight":"Height of images",
     "ticker":"Enable #InstanceTicker",
-    "tickerwarn":"Show colorful stickers about tooters' instance. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+    "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.",
@@ -75,8 +78,8 @@
     "unlisted":"Unlisted",
     "private":"Private",
     "direct":"Direct",
-    "memory":"Memory(memorized as each instance)",
-    "useapi":"Default of your visibility(Set on preferences of Mastodon instance)",
+    "memory":"Memory(memorized as each server)",
+    "useapi":"Default of your visibility(Set on preferences of Mastodon server)",
     "postimg":"Posting images preferences",
     "showurl":"Insert media URL",
     "nourl":"Insert nothig",
@@ -107,6 +110,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",
@@ -115,8 +120,9 @@
     "disconnect":"Disconnect",
     "templeteedit":"Edit a template",
     "templeteeditwarn":"",
-    "templete1":"Refer:{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.",
+    "templete1":"Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+    "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",
@@ -152,4 +158,4 @@
     "sushi":"Give me a sushi!",
     "checkup":"Check update",
     "ossJP":""
-}
+}

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

@@ -19,6 +19,8 @@
     "nntest":"通知テスト",
     "minwidth":"マルチカラムの最低横幅",
     "minwidthwarn":"画面全体の横幅÷コラム数がこの値を超えた時、横スクロールとなります。",
+    "fixwidth":"TweetDeckの限定の最低横幅",
+    "fixwidthwarn":"",
     "above":"以上",
     "font":"フォント",
     "fontwarn":"「選択」を押してフォントを選んでください。",
@@ -36,7 +38,7 @@
     "doublesel":"両方表示",
     "mixsel":"混合表示",
     "locale":"独自ロケールを使用",
-    "localewarn":"対応インスタンスではそのインスタンスにあわせた言語表示ができます。",
+    "localewarn":"対応サーバーではそのサーバーにあわせた言語表示ができます。",
     "nswf":"非表示設定の画像(NSFW)を隠す",
     "nsfwwarn":"きつめのぼかしがかかります。",
     "cw":"非表示設定のテキスト(CW)を隠す",
@@ -49,8 +51,8 @@
     "boxabs":"枠外クリックで閉じない(起動時に展開)",
     "boxno":"投稿後も隠さない",
     "tag":"タグタイムラインの表示範囲",
-    "tagfed":"接続しているインスタンス",
-    "taglocal":"検索対象のインスタンスのみ",
+    "tagfed":"接続しているサーバー",
+    "taglocal":"検索対象のサーバーのみ",
     "via":"viaを表示する",
     "mouseover":"アクションメニューを非表示",
     "mouseoverwarn":"「マウスオーバー」はすこし鬱陶しいと思うかもしれません。",
@@ -64,7 +66,8 @@
     "or":"または",
     "imgheight":"画像の高さ",
     "ticker":"#InstanceTickerを使う",
-    "tickerwarn":"トゥートした人の所属インスタンスをわかりやすく彩ります(自インスタンス以外のトゥート向け)。<a href=\"https://cdn.weep.me/mastodon/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
+    "tickerwarn":"トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://cdn.weep.me/mastodon/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
+    "animation":"タイムラインのアニメーション",
     "post":"投稿設定",
     "autocw":"長文投稿時に警告",
     "autocwwarn":"下で指定した以上のトゥートを投稿するときにCWするかのダイアログを表示します。",
@@ -75,7 +78,7 @@
     "unlisted":"未収載(Unlisted)",
     "private":"非公開(Private)",
     "direct":"ダイレクト(Direct)",
-    "memory":"前回の投稿設定を記憶する(インスタンスごとに記憶されます)",
+    "memory":"前回の投稿設定を記憶する(サーバーごとに記憶されます)",
     "useapi":"マストドンアカウント設定の既定値",
     "postimg":"画像投稿設定",
     "showurl":"画像を投稿し、画像のURLを最後に表示",
@@ -107,6 +110,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":"アカウントの連携",
@@ -115,9 +120,10 @@
     "disconnect":"切断",
     "templeteedit":"テンプレートの編集",
     "templeteeditwarn":"以下を編集してテンプレートを変更できます。",
-    "templete1":"テンプレート:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
-    "templete2":"iTunes NowPlayingでも{url}以外のテンプレートに従ってトゥートされます。また、作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}が有効です。",
-    "postartwork":"Spotifyでアルバムアートワークを添付する",
+    "templete1":"Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
+    "templete2":"macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}",
+    "templete3":"Windows:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名",
+    "postartwork":"アルバムアートワークを添付する(Spotify/Windows)",
     "tts":"読み上げの設定",
     "speed":"読み上げの速さ",
     "speedwarn":"1-100まで、デフォルトは10。",
@@ -126,7 +132,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,155 @@
+{
+    "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": "crwdns541:0crwdne541:0",
+    "minwidthwarn": "crwdns542:0crwdne542: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",
+    "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",
+    "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",
+    "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": "crwdns633:0{song}crwdnd633:0{album}crwdnd633:0{artist}crwdnd633:0{url}crwdne633:0",
+    "templete2": "crwdns634:0{url}crwdnd634:0{composer}crwdnd634:0{hz}crwdnd634:0{bitRate}crwdnd634:0{genre}crwdne634: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.",
-    "winzip":"Durling unzippng, TheDesk may freeze. It takes several seconds.",
+    "portable":"Portable ver.",
+    "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表示時まで",

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

@@ -0,0 +1,15 @@
+{
+    "updatehere": "crwdns669:0crwdne669:0",
+    "download": "crwdns670:0crwdne670:0",
+    "portable": "crwdns1950:0crwdne1950:0",
+    "winzip": "crwdns672:0crwdne672:0",
+    "unrewrite": "crwdns673:0crwdne673:0",
+    "sureupd": "crwdns674:0crwdne674:0",
+    "skipupd": "crwdns675:0crwdne675:0",
+    "nexttl": "crwdns676:0crwdne676:0",
+    "nextver": "crwdns677:0crwdne677:0",
+    "problem1": "crwdns678:0crwdne678:0",
+    "problem2": "crwdns679:0crwdne679:0",
+    "continue": "crwdns680:0crwdne680:0",
+    "dlnow": "crwdns681:0crwdne681:0"
+}

app/view/make/setting.sample.html

@@ -2,6 +2,13 @@
 <html lang="{{lang}}">
 <head>
 	<title>Settings - TheDesk</title>
+	{{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}}
 	<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">
@@ -14,8 +21,7 @@
 <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>var lang="{{lang}}";</script>
+<script type="text/javascript" src="../../js/lang/lang.{{lang}}.js"></script>
 <h4>{{setting}}</h4>
 <ul class="collapsible" data-collapsible="accordion">
 	<li>
@@ -58,12 +64,14 @@
 		<input type="text" style="width:50px" id="width">px{{above}}
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
 		<br>
+		<h5>{{fixwidth}}</h5>{{fixwidthwarn}}
+		<input type="text" style="width:50px" id="fixwidth">px{{above}}
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
+		<br>
 		<h5>{{font}}</h5>
 		{{fontwarn}}<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>
+		<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()">{{set}}</button>
@@ -158,8 +166,8 @@
 		<h5>{{autofold}}</h5>
 		{{autofoldwarn}}
 		<br>
-		<input type="text" style="width:50px" id="sentence">{{lines}}{{above}}{{or}}
-		<input type="text" style="width:50px" id="letters">{{letters}}{{above}}
+		<input type="text" style="width:50px" id="sentence">{{lines}} {{above}} {{or}}
+		<input type="text" style="width:50px" id="letters">{{letters}} {{above}}
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
 		<br>
 		<h5>{{imgheight}}
@@ -174,6 +182,11 @@
 		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
 		<label for="ticker_no">{{no}}</label>
 		<br>
+		<h5>{{animation}}</h5>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_yes" value="yes" />
+		<label for="anime_yes">{{yes}}</label>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
+		<label for="anime_no">{{no}}</label>
 	</div>
 	</li>
 	<li>
@@ -188,8 +201,8 @@
 		<h5>{{autocw}}</h5>
 		{{autocwwarn}}
 		<br>
-		<input type="text" style="width:50px" id="cw_sentence">{{lines}}{{above}}{{or}}
-		<input type="text" style="width:50px" id="cw_letters">{{letters}}{{above}}
+		<input type="text" style="width:50px" id="cw_sentence">{{lines}} {{above}} {{or}}
+		<input type="text" style="width:50px" id="cw_letters">{{letters}} {{above}}
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
 		<br>
 		<h5>{{cws}}</h5>
@@ -309,6 +322,22 @@
 			<i class="fa fa-spotify"></i>{{spotify}}
 		</div>
 		<div class="collapsible-body">
+			<!-->h5>{{npProvider}}</h5>
+			{{npPeoviderWarn}}<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-->
 			{{spotifynote1}}<i class="material-icons" style="font-size:24px;">music_note</i>{{spotifynote2}}<br>
 			<h5>{{link}}</h5>
 			{{linkwarn}}<br>
@@ -321,6 +350,7 @@
 {url}</textarea><br>
 				{{templete1}}<br>
 				{{templete2}}<br>
+				{{templete3}}<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;">{{set}}</button>
@@ -400,7 +430,7 @@ Kyash<br>
 <a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">{{checkup}}</a><br>
 <a href="oss.html">OSS License{{ossJP}}</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>

app/view/make/update.sample.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">
+{{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>
 <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>{{updatehere}}</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;">{{download}}</button>
-        <div id="checkbox">
-            Options:<br>
-            <input type="checkbox" class="filled-in" id="portable" value="true" />
-            <label for="portable">{{portable}}</label><br>
-            <input type="checkbox" class="filled-in" id="rewrite" value="true" />
-            <label for="rewrite">{{unrewrite}}</label><br>
-        </div>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">{{portable}}</button>
+        <span class="linux">{{snap}}<br></span>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">{{download}}</button>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">{{download}}</button>
+        <br>
         {{problem1}}<br>{{problem2}}
     </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 versioning=true;
-	}else{
-        var versioning=false;
-    }
-    if($('#portable:checked').val()=="true"){
-		var zip=true;
-	}else{
-        var zip=false;
-    }
-	ipc.send('download-btn', [sel,enc(localStorage.getItem("next-ver")),zip,versioning]);
+    var remote=electron.remote;
+    var bit=process.arch;
+    var start="https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET',
+		headers: {'content-type': 'application/json'},
+    }).then(function(response) {
+       return response.json();
+    }).catch(function(error) {
+        todo(error);
+		console.error(error);
+    }).then(function(json) {
+        if(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;
-	if(platform!="win32"){
-		$('#portable').prop("disabled",true)
+    var platform=remote.process.platform;
+    var bit=process.arch;
+	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/ps/acct.html

@@ -0,0 +1,100 @@
+<!doctype html>
+<html lang="ps">
+<head>
+<title>Account Manager - TheDesk</title>
+<meta content="width=device-width,initial-scale=1.0" name="viewport">
+<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+<link href="../../css/themes.css" type="text/css" rel="stylesheet">
+<link href="../../css/master.css" type="text/css" rel="stylesheet">
+<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
+<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
+<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+<style>.acct{display:flex; justify-content:space-around;}
+.card{width:400px; background-color: #9e9e9e; margin:10px; }
+body,html{overflow-y: scroll;}
+#acct-list{display:flex; flex-wrap:wrap; color:white; align-items: flex-start}
+.lts{font-size:150%}
+.colorsel{ display:flex; }
+.card .colorsel div:not(.exc){width:20px;height:20px;}
+.card .colorsel div.exc{width:40px;height:20px;}
+</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.ps.js"></script>
+<script>
+      var misskeytoken=false;
+</script>
+<script type="text/javascript" src="../../js/ui/tips.js"></script>
+<script type="text/javascript" src="../../js/common/time.js"></script>
+<script type="text/javascript" src="../../js/common/modal.js"></script>
+<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">crwdns366:0crwdne366:0</a><br>
+<h5>crwdns365:0crwdne365:0</h5>
+<div id="acct-list"></div>
+<div class="divider"></div>
+<h5>crwdns367:0crwdne367:0</h5><br>
+<div id="add">
+<div class="row">
+      <div class="col s6">
+            <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
+            <div id="ins-suggest"></div>
+            crwdns368:0crwdne368:0<br>
+            <input type="checkbox" class="filled-in" id="linux" />
+                  <label for="linux">crwdns369:0crwdne369:0</label><br>
+            <input type="checkbox" class="filled-in" id="misskey" />
+                  <label for="misskey">crwdns382:0crwdne382:0</label><br>
+            <button class="btn waves-effect" onclick="instance()">Login</button><br>
+      </div>
+      <div class="col s6">
+            <span style="font-family:Open Sans;">Supports</span>
+            <div id="support" class="collection transparent"></div>
+      </div>
+</div></div>
+<div id="auth" style="display:none">
+      crwdns372:0crwdne372:0<br>
+      <input type="text" id="code" placeholder="crwdns373:0crwdne373:0">
+      <button class="btn waves-effect" onclick="code()">Auth</button><br>
+      </div>
+      <div id="misskeylogin" style="display:none">
+                  <h5>AppSecret</h5>
+                  crwdns383:0crwdne383:0<br>
+                  <input type="hidden" id="misskey-url">
+                  <input type="text" id="misskey-key" placeholder="crwdns373:0crwdne373:0">
+                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
+            </div>
+<h5>crwdns370:0crwdne370:0</h5>
+<div class="input-field" style="width:300px"><span data-trans="your_acct">crwdns371:0crwdne371:0</span>
+      <br>
+      <select id="main-acct-sel" class="acct-sel" style="color:black" onchange="mainacct()"></select>
+      <label></label>
+</div>
+Some instance data by <a href="https://instances.social" target="_blank">instances.social API</a><br>
+<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>
+<br>
+crwdns374:0crwdne374:0:<span id="ins-name"></span><br>
+crwdns375:0crwdne375:0:<span id="ins-connect"></span>crwdns381:0crwdne381:0<br>
+crwdns376:0crwdne376:0:<span id="ins-toot"></span>crwdns381:0crwdne381:0<br>
+crwdns377:0crwdne377:0:<span id="ins-user"></span>crwdns377:0crwdne377:0<br>
+crwdns379:0crwdne379:0:<span id="ins-per"></span>%<br>
+crwdns380:0crwdne380:0:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
+<script type="text/javascript" src="../../js/ui/theme.js"></script>
+<script type="text/javascript" src="../../js/platform/end.js"></script>
+<script type="text/javascript" src="../../js/common/sha256.js"></script>
+<script type="text/javascript" src="../../js/login/tkn.js"></script>
+<script type="text/javascript" src="../../js/login/instance.js"></script>
+<script type="text/javascript" src="../../js/login/manager.js"></script>
+<script type="text/javascript" src="../../js/tl/date.js"></script>

app/view/ps/index.html

@@ -0,0 +1,881 @@
+<!doctype html>
+<html lang="ps">
+<head>
+	<title>TheDesk</title>
+	<meta content="width=device-width,initial-scale=1.0" name="viewport">
+	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
+	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
+	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
+	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/master.css" type="text/css" rel="stylesheet">
+	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="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.ps.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="Miria (17.1.0) beta1";
+//betaを入れるとバージョンチェックしない
+//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
+//var ver="beta";
+//WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
+var winstore=false;
+var acct_id=0;
+var tlid=0;
+  verck(ver,winstore);
+ </script>
+<textarea id="copy" style="top:-100px; position:fixed;"></textarea>
+<div id="tl">
+<!--TL-->
+<!--ドラッグハンドラ-->
+<div id="drag">
+<div id="drag-content" data-trans="drag_here">crwdns384:0crwdne384:0
+<br>
+<button class="btn waves-effect" onclick="closedrop()" data-trans="close">crwdns385:0crwdne385:0</button>
+</div>
+</div>
+</div>
+<div id="post-box" class="z-depth-5">
+<div id="post-bar">{{post-new}}</div>
+<!--トゥートボックス-->
+<div id="left-side">
+<div class="row" style="margin-bottom:0;">
+</span>
+<div class="" style="float:left;">
+<a onclick="profShow()" style="vertical-align:-2.5rem;" class="pointer mize">
+	<img src="../../img/missing.svg" id="acct-sel-prof" title="crwdns386:0crwdne386:0(Ctrl+Shift+P)" data-trans-title="post_box_prof" width="24px">
+</a>
+</div>
+<div class="input-field mize" style="float:left; width:calc(100% - 24px)">
+<select id="post-acct-sel" class="acct-sel" onchange="mdCheck()"></select>
+</div>
+<span class="cancel">
+		<i class="material-icons waves-effect" onclick="hide()" title="crwdns412:0crwdne412:0(X)" data-trans-title="post_box_close">cancel</i>
+	</span>
+<!--Markdown-->
+<div class="row" style="margin-bottom:0">
+<div class="markdown mize hide">
+<div class="col s12">
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('b')" title="太字(Ctrl+B)テキストボックス内を選択してから押すと囲みます。">format_bold</i>
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('i')" title="斜字(Ctrl+I)テキストボックス内を選択してから押すと囲みます。">format_italic</i>
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('u')" title="下線(Ctrl+U)テキストボックス内を選択してから押すと囲みます。">format_underlined</i>
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('s')" title="取り消し(Ctrl+S)テキストボックス内を選択してから押すと囲みます。">strikethrough_s</i>
+<i class="material-icons pointer setting waves-effect" onclick="markdown('>','no','yes')" title="引用">format_quote</i>
+<i class="material-icons pointer setting waves-effect" onclick="markdown('#','no','yes')" title="見出し">short_text</i>
+<i class="material-icons pointer setting waves-effect" onclick="markdown('`','yes','no')" title="コード挿入　テキストボックス内を選択してから押すと囲みます。">code</i>
+<i class="material-icons pointer setting waves-effect" onclick="markdown('- ','yes','yes')" title="箇条書きリスト">format_list_bulleted</i>
+<i class="material-icons pointer setting waves-effect" onclick="markdown('1. ','yes','yes')" title="番号付きリスト">format_list_numbered</i>
+<i class="pointer setting fa fa-subscript waves-effect" onclick="markdown('__','yes','no','before')" title="下付き文字　テキストボックス内を選択してから押すと囲みます。" style="font-size:1.5rem"></i>
+<i class="pointer setting fa fa-superscript waves-effect" onclick="markdown('_','yes','no','before')" title="上付き文字　テキストボックス内を選択してから押すと囲みます。" style="font-size:1.5rem"></i>
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('spin')" title="回転　テキストボックス内を選択してから押すと囲みます。">autorenew</i>
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('pulse')" title="点滅　テキストボックス内を選択してから押すと囲みます。">flare</i>
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=vertical')" title="上下反転　テキストボックス内を選択してから押すと囲みます。">swap_vert</i>
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=horizontal')" title="左右反転　テキストボックス内を選択してから押すと囲みます。">swap_horiz</i>
+<span class="sml gray pointer waves-effect">
+<a onclick="mdToggle()">Markdownエディタを隠す</a>
+</span>
+<br>
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('size')" title="文字サイズ変更　テキストボックス内を選択してから押すと囲みます。">format_size</i>
+<input id="size" style="width: calc(50% - 20px); margin: 0; height: 24px;" value="12">px 
+<i class="material-icons pointer setting waves-effect" onclick="tagsel('colorhex')" title="文字色変更　テキストボックス内を選択してから押すと囲みます。">color_lens</i>
+<input id="colorhex" style="width: calc(50% - 50px); margin: 0; height: 24px;" type="color">
+<br>
+<i class="material-icons pointer setting waves-effect" onclick="markdownLink()" title="リンク挿入">link</i>
+<input id="linkt" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="リンクテキスト">&nbsp;
+<input id="link2" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="リンクアドレス">
+<br>
+<i class="material-icons pointer setting waves-effect" onclick="markdownImage()" title="インライン画像挿入">image</i>
+<input id="image" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="代替テキスト">&nbsp;
+<input id="image2" style="width: calc(50% - 20px); margin: 0; height: 24px;" placeholder="画像アドレス">
+</div>
+</div>
+<div class="input-field col s12" id="preview-field" style="margin-top: 0;">
+<div id="md-preview">
+</div>
+<span class="sml gray pointer">
+<a onclick="previewEdit()">Edit</a>
+</span>
+</div>
+<div class="input-field col s12" id="toot-field" style="margin-top: 10px;">
+
+<textarea id="textarea" class="materialize-textarea unmize" style="margin-bottom:0;" data-length="500"></textarea>
+<label for="textarea" data-trans="toot">crwdns388:0crwdne388:0</label>
+<br>
+<span class="sml gray pointer markdown mize" id="preview-btn">
+<a onclick="preview()">Preview</a>
+</span>
+<span class="sml gray pointer anti-markdown mize">
+<a onclick="mdToggle()">Markdownエディタを表示</a>
+</span>
+<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="crwdns389:0crwdne389:0" 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="crwdns390:0crwdne390:0">CW</a>
+		<span><span id="imgup"></span><span id="imgsel"><i class="waves-effect material-icons gray" onclick="fileselect()" title="crwdns391:0crwdne391:0">photo_library</i></span></span>
+		<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn" title="crwdns393:0crwdne393:0">tag_faces</i>
+		<i class="waves-effect gray material-icons dropdown-button" data-activates='dropdown2'>more_vert</i>
+		<i class="material-icons nex gray waves-effect" title="crwdns395:0crwdne395:0(Ctrl+Shit+C)" data-trans-title="post_box_clear" id="clear">clear</i>
+</div>
+<div class="col s12 mize" style="margin-bottom:5px; padding:0;">
+	<div id="taglist"></div>
+<span id="preview" class="mize"></span>
+<span class=" sml mize"><span data-trans="reply">crwdns396:0crwdne396:0</span>:
+<span id="rec">crwdns397:0crwdne397:0</span>/<span data-trans="file">crwdns399:0crwdne399:0</span>:
+<span id="mec">crwdns400:0crwdne400:0</span>/<span data-trans="vis">crwdns401:0crwdne401:0</span>:
+<span id="vis">public</span>
+</span>
+<br>
+<input type="text" id="cw-text" placeholder="crwdns402:0crwdne402:0" class="mize" style="margin:0">
+<div id="sch-box">crwdns1886:0crwdne1886:0<br><span class="sml">crwdns1888:0crwdne1888:0</span><br>
+	<input type="datetime-local" id="sch-date" placeholder="crwdns1884:0crwdne1884:0" class="datepicker" style="margin:0">
+</div>
+</div>
+</div>
+<!-- 公開範囲 Dropdown Structure -->
+<ul id='dropdown1' class='dropdown-content'>
+<li style="font-size: 16px; display: block; line-height: 22px; padding: 14px 16px;">crwdns403:0crwdne403:0</li>
+<li>
+	<a onclick="vis('public')">crwdns404:0crwdne404:0(Public)</a>
+</li>
+<li>
+	<a onclick="vis('unlisted')">crwdns405:0crwdne405:0(Unlisted)</a>
+</li>
+<li>
+	<a onclick="vis('private')" id="private-button">crwdns406:0crwdne406:0(Private)</a>
+</li>
+<li id="limited-button" class="hide">
+	<a onclick="vis('limited')">限定公開(Limited)</a>
+</li>
+<li id="local-button" class="hide">
+	<a onclick="vis('local')">crwdns407:0crwdne407:0(Local)</a>
+</li>
+<li>
+	<a onclick="vis('direct')" class="disabled direct">crwdns408:0crwdne408:0(Direct)</a>
+</li>
+</ul>
+<!-- その他 Dropdown Structure -->
+<ul id='dropdown2' class='dropdown-content'>
+	<li>
+		<a onclick="adobe()">crwdns392:0crwdne392:0</a>
+	</li>
+	<li>
+		<a onclick="nowplaying('spotify');">crwdns1880:0crwdne1880:0</a>
+	</li>
+	<li>
+		<a onclick="nowplaying('itunes');">crwdns1882:0crwdne1882:0</a>
+	</li>
+	<li>
+		<a onclick="schedule();">crwdns1884:0crwdne1884:0</a>
+	</li>
+	<li>
+		<a onclick="pollToggle();">{{poll}}</a>
+	</li>
+	</ul>
+<!--hidden area-->
+<input type="hidden" id="reply">
+<input type="hidden" id="media">
+<!--END hidden area-->
+</div>
+<div id="toot-btn-field">
+	<button class="btn waves-effect indigo unmize toot-btn-group" onclick="post()" id="toot-post-btn">crwdns388:0crwdne388:0</button>
+	<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="crwdns1890:0crwdne1890:0">lock_open</i></button>
+</div>
+</div>
+<div id="right-side">
+<!--絵文字ピッカー-->
+<div id="emoji" class="hide">
+		<span class="gray sml">crwdns409:0crwdne409:0
+			<a onclick="emojiGet('true')" class="pointer">crwdns411:0crwdne411:0</a>
+			<i class="material-icons waves-effect" onclick="emojiToggle()" title="crwdns412:0crwdne412:0" 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>crwdns413:0crwdne413:0<br><span class="gray sml">crwdns410:0crwdne410:0</span>
+			<br>
+			<a onclick="customEmoji()" class="pointer waves-effect" title="crwdns414:0crwdne414:0">
+			<i class="material-icons">add</i>
+			</a>
+			<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="crwdns415:0crwdne415:0">
+			<i class="material-icons">people</i>
+			</a>
+			<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="crwdns416:0crwdne416:0">
+			<i class="material-icons">local_florist</i>
+			</a>
+			<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="crwdns417:0crwdne417:0">
+			<i class="material-icons">restaurant</i>
+			</a>
+			<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="crwdns418:0crwdne418:0">
+			<i class="material-icons">directions_run</i>
+			</a>
+			<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="crwdns419:0crwdne419:0">
+			<i class="material-icons">directions_car</i>
+			</a>
+			<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="crwdns420:0crwdne420:0">
+			<i class="material-icons">attach_file</i>
+			</a>
+			<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="crwdns421:0crwdne421:0">
+			<i class="material-icons">gesture</i>
+			</a>
+			<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="crwdns422:0crwdne422:0">
+			<i class="material-icons">flag</i>
+			</a>
+			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+			<i class="fa fa-fort-awesome"></i>
+			</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">
+	
+		</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">crwdns507:0crwdne507:0
+			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">crwdns508:0crwdne508:0
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">crwdns509:0crwdne509:0
+		</div>
+	</div>
+</div>
+</div>
+<!-- Modal Structure Tootdata-->
+<div id="tootmodal" class="modal modal-fixed-footer">
+	<div class="modal-content">
+	<ul class="collapsible" data-collapsible="accordion" id="det-col">
+	<li>
+		<div class="collapsible-header">
+		<i class="material-icons">arrow_upward</i>crwdns423:0crwdne423:0
+		</div>
+		<div class="collapsible-body toot-reset" id="toot-reply">
+		</div>
+	</li>
+	<li>
+		<div class="collapsible-header" id="activator">
+		<i class="material-icons">more_horiz</i>crwdns424:0crwdne424:0
+		</div>
+		<div class="collapsible-body" >
+			<div class="toot-reset" id="toot-this"></div>
+		</div>
+	</li>
+	<li>
+		<div class="collapsible-header">
+		<i class="material-icons">arrow_downward</i>crwdns425:0crwdne425:0
+		</div>
+		<div class="collapsible-body toot-reset" id="toot-after">
+		</div>
+	</li>
+	<li>
+		<div class="collapsible-header">
+		<i class="material-icons">people_outline</i>crwdns426:0crwdne426:0
+		</div>
+		<div class="collapsible-body toot-reset" id="toot-before">
+		</div>
+	</li>
+	<li>
+		<div class="collapsible-header">
+		<i class="material-icons">person_outline</i>crwdns427:0crwdne427:0
+		</div>
+		<div class="collapsible-body toot-reset" id="user-before">
+		</div>
+	</li>
+	<li>
+		<div class="collapsible-header">
+		<i class="material-icons">star</i>crwdns428:0crwdne428:0
+		</div>
+		<div class="collapsible-body toot-reset" id="toot-fav">
+		</div>
+	</li>
+	<li>
+		<div class="collapsible-header">
+		<i class="text-darken-3 fa fa-retweet"></i>crwdns429:0crwdne429:0
+		</div>
+		<div class="collapsible-body toot-reset" id="toot-rt">
+		</div>
+	</li>
+	</ul>
+	crwdns430:0crwdne430:0(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>crwdns431:0crwdne431:0)<br>
+	<div class="row">
+		<div class="col s6">
+				<select id="status-acct-sel" class="acct-sel"></select>
+		</div>
+		<div class="col s2">
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="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"></i></button>
+		</div>
+		<div class="col s2">
+			<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">
+	</div>
+	<div id="toot-after">
+	</div>
+	</div>
+	<div class="modal-footer">
+	<a href="#!" class="waves-effect waves-green btn-flat" onclick="brws()">crwdns435:0crwdne435:0</a>
+	<a href="#!" class="waves-effect waves-green btn-flat" onclick="shot()">crwdns436:0crwdne436:0</a>
+	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy()">crwdns437:0crwdne437:0</a>
+	<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy('emb')">crwdns438:0crwdne438:0</a>
+	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">crwdns385:0crwdne385:0</a>
+	</div>
+	</div>
+	<!-- Modal Structure Userdata -->
+	<div id="his-data" class="modal bottom-sheet modal-fixed-footer" style="max-height:750px; height:90%;">
+			<div id="his-data-content" class="modal-content" style="padding-bottom: 0;overflow-y:hidden;">
+			<div id="his-data-show">
+			<div class="his-float" id="his-float-data">
+			<div id="his-basic-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>
+			<span class="gray" id="his-relation"></span>
+			<br>
+			<span class="cbadge">
+			<span id="his-sta"></span>crwdns439:0crwdne439:0
+			</span>
+			<span class="cbadge">crwdns440:0crwdne440:0:
+			<span id="his-follow"></span>
+			</span>
+			<span class="cbadge">crwdns441:0crwdne441:0:
+			<span id="his-follower"></span>
+			</span><br>
+			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
+			<span id="his-since"></span>
+			</span>
+			</div>
+			<div id="his-des"></div><br>
+			<div id="his-plus-action">
+					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">crwdns472:0crwdne472:0</a>
+					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">crwdns454:0crwdne454:0</a><br>
+					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin" onclick="profbrws()">crwdns455:0crwdne455:0</a><br>
+			</div><br>
+			<div id="his-matching-list">
+					crwdns469:0crwdne469:0<br>
+					Powered by <a href="https://vinayaka.distsn.org/" target="_blank">Mastodon User Matching</a><br>
+					<div id="his-matching-list-contents" class="cont-series"></div>
+				<button class="btn waves-effect " onclick="showMat()" style="width:100%;">crwdns470:0crwdne470:0</button>
+			</div>
+			</div>
+			<div class="his-float" id="his-float-timeline">
+			<div id="my-data-nav">
+			<ul class="custom-tabs transparent">
+				<li class="custom-tab col my-data-width active-back column-first">
+					<a go="#his-tl" title="crwdns442:0crwdne442:0"><i class="material-icons">timeline</i></a>
+				</li>
+				<li class="custom-tab col my-data-width">
+					<a go="#his-follow-list" title="crwdns440:0crwdne440:0"><i class="material-icons">people</i>→</a>
+				</li>
+				<li class="custom-tab col my-data-width">
+					<a go="#his-follower-list" title="crwdns441:0crwdne441:0"><i class="material-icons">people</i>←</a>
+				</li>
+				<li class="custom-tab col my-data-width only-his-data">
+					<a go="#his-action" title="crwdns443:0crwdne443:0"><i class="material-icons">account_box</i></a>
+				</li>
+				<li class="custom-tab col my-data-width only-his-data">
+					<a go="#his-list" title="crwdns444:0crwdne444:0"><i class="material-icons">list</i></a>
+				</li>
+				<li class="custom-tab col my-data-width only-my-data">
+					<a go="#his-fav-list" title="crwdns434:0crwdne434:0"><i class="material-icons">star</i></a>
+				</li>
+				<li class="custom-tab col my-data-width only-my-data">
+					<a go="#his-blocking-list" title="crwdns446:0crwdne446:0"><i class="material-icons">block</i></a>
+				</li>
+				<li class="custom-tab col my-data-width only-my-data">
+						<a go="#his-blocking-list" title="crwdns446:0crwdne446:0"><i class="material-icons">voice_over_off</i></a>
+				</li>
+				<li class="custom-tab col my-data-width only-my-data">
+					<a go="#his-domain-list" title="crwdns450:0crwdne450:0"><i class="material-icons">language</i><i class="material-icons">block</i></a>
+				</li>
+				<li class="custom-tab col my-data-width only-my-data">
+					<a go="#his-prof-list" title="crwdns451:0crwdne451:0"><i class="material-icons">create</i></a>
+				</li>
+				<li class="custom-tab col my-data-width only-my-data">
+					<a go="#his-request-list" title="crwdns452:0crwdne452:0"><i class="material-icons">how_to_reg</i></a>
+				</li>
+				<li class="custom-tab col my-data-width only-my-data">
+					<a go="#his-follow-recom-list" title="crwdns456:0crwdne456:0"><i class="material-icons">recent_actors</i></a>
+				</li>
+			</ul>
+			</div>
+			<div id="his-tl" class="tab-content">
+			<div id="his-tl-contents" class="cont-series">
+			</div>
+			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="utl('--now','more')">crwdns457:0crwdne457:0</button>
+			</div>
+			<div id="his-follow-list" class="tab-content">
+			<div id="his-follow-list-contents" class="cont-series">
+			</div>
+			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="flw('--now','more')">crwdns457:0crwdne457:0</button>
+			</div>
+			<div id="his-follower-list" class="tab-content">
+			<div id="his-follower-list-contents" class="cont-series">
+			</div>
+			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="fer('--now','more')">crwdns457:0crwdne457:0</button>
+			</div>
+			<div id="his-action" class="tab-content">
+				crwdns430:0crwdne430:0crwdns458:0crwdne458:0crwdns440:0crwdne440:0(crwdns459:0crwdne459:0)<br>
+				<div style="max-width:500px;"><select id="user-acct-sel" class="acct-sel"></select></div>crwdns460:0crwdne460:0
+				<a href="#!" class="waves-effect btn" onclick="follow('selector','true')">crwdns440:0crwdne440:0</a><br>
+				crwdns461:0crwdne461:0<br>
+				<a href="#!" class="waves-effect btn" onclick="udgEx('selector', 'selector')">crwdns462:0crwdne462:0</a><br>
+			</div>
+			<div id="his-list" class="tab-content">
+				<div id="his-lists-a">crwdns463:0crwdne463:0</div>
+				
+				<div id="his-lists-b"></div>
+			</div>
+			<div id="his-fav-list" class="tab-content">
+			<div id="his-fav-list-contents" class="cont-series">
+			</div>
+			<button class="btn waves-effect" style="width:100%; padding:0;" onclick="showFav('more')">crwdns457:0crwdne457:0</button>
+			</div>
+			<div id="his-blocking-list" class="tab-content">
+			<div id="his-blocking-list-contents"class="cont-series" >
+			</div>
+			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showBlo('more')">crwdns457:0crwdne457:0</button>
+			</div>
+			<div id="his-muting-list" class="tab-content">
+			<div id="his-muting-list-contents" class="cont-series">
+			</div>
+			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showMut('more')">crwdns457:0crwdne457:0</button>
+			</div>
+			<div id="his-domain-list" class="tab-content">
+			<div id="his-domain-list-contents" class="cont-series">
+			</div>
+			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showDom('more')">crwdns457:0crwdne457:0</button>crwdns464:0crwdne464:0
+			<br>
+			<input type="text" placeholder="example.com" id="domainblock">
+			<button class="btn waves-effect" onclick="addDomainblock()">crwdns491:0crwdne491:0</button>
+			<br>
+			</div>
+			<div id="his-prof-list" class="tab-content">crwdns465:0crwdne465:0
+			<br>
+			<input type="text" placeholder="crwdns465:0crwdne465:0" id="his-name-val" style="max-width:250px;">
+			<br>crwdns466:0crwdne466:0
+			<br>
+			<div class="input-field col s12">
+			<textarea placeholder="crwdns466:0crwdne466:0" id="his-des-val" class="materialize-textarea"></textarea>
+			<label for="his-des-val">crwdns466:0crwdne466:0</label>
+			</div>
+			<button class="btn waves-effect" style="width:100%; padding:0;" onclick="profedit()">crwdns1892:0crwdne1892:0</button>
+			<br>crwdns467:0crwdne467:0:
+			<span id="prof-change">
+				<input type="file" onchange="imgChange(this,'avatar')">
+			</span>
+			<br>crwdns468:0crwdne468:0:
+			<span id="header-change">
+				<input type="file" onchange="imgChange(this,'header')">
+			</span>
+			</div>
+			<div id="his-request-list" class="tab-content">
+			<div id="his-request-list-contents" class="cont-series">
+			</div>
+			<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showReq('more')">crwdns457:0crwdne457:0</button>
+			</div>
+			<div id="his-follow-recom-list" class="tab-content">
+				<div id="his-follow-recom-contents" class="cont-series">
+			</div>
+			</div>
+			</div>
+			</div>
+			</div>
+			<div class="modal-footer">
+			<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn" onclick="historyShow()">crwdns471:0crwdne471:0</button>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn" onclick="follow()">crwdns440:0crwdne440:0</a>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn" onclick="mute()">crwdns449:0crwdne449:0</a>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn" onclick="block()">crwdns448:0crwdne448:0</a>
+			<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">crwdns385:0crwdne385:0</a>
+			</div>
+			</div>
+	<!-- Modal Structure Image-->
+	<div id="imagemodal" class="modal modal-fixed-footer" style="min-width:550px">
+	<div class="modal-content">
+	<div id="imagewrap">
+	<img src="" id="imgmodal">
+	</div>
+	
+	<br>
+	</div>
+	<div class="modal-footer">
+	DL:<span id="imgprog"></span>%
+	<a class="waves-effect white-text" onclick="zoom(2)">
+		<i class="material-icons">zoom_in</i>
+	</a>
+	<a class="waves-effect white-text" onclick="zoom(0.5)">
+		<i class="material-icons">zoom_out</i>
+	</a>
+	<button class="btn waves-effect purple" onclick="dlImg()">
+		<i class="material-icons">file_download</i>
+	</button>
+	<button class="btn waves-effect brown" onclick="detFromImg()">crwdns424:0crwdne424:0</button>
+	<button class="btn waves-effect orange" onclick="imgCont('prev')" id="image-prev">
+		<i class="material-icons">keyboard_arrow_left</i>
+	</button>
+	<button class="btn waves-effect orange" onclick="imgCont('next')" id="image-next">
+		<i class="material-icons">keyboard_arrow_right</i>
+	</button>
+	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">
+		<i class="material-icons">close</i>
+	</a>
+	</div>
+	</div>
+	<!-- Modal Structure Video-->
+	<div id="videomodal" class="modal modal-fixed-footer">
+	<div class="modal-content">
+	<video src="" id="video" style="max-width:100%; max-height:100%;" controls >
+	</div>
+	<div class="modal-footer">
+	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">crwdns385:0crwdne385:0</a>
+	</div>
+	</div>
+	<!-- Modal Structure Release Note-->
+	<div id="releasenote" class="modal modal-fixed-footer">
+		<div class="modal-content">
+		<h3>TheDesk</h3>
+		<a href="https://thedesk.top" target="_blank">HP</a><br>
+		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
+		<br>
+			<div id="release-Miria_17-1-0" class="release-do" style="display:none; ">
+					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
+					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
+					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
+					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
+					<h5>Release Note Miria (17.1.0)</h5>
+					トゥートボックスがフロートタイプに。左下、右下以外にも自由においてください。<br>
+					いろいろとアニメーション入れた(硬派な方は設定「タイムラインの設定」からオフに)<br>
+					アンケートができるように(OK:Mastodon (2.8~)/WIP: votedon./ NG: ニコフレ)<br>
+					フォント選択機能が復活<br>
+					WindowsからiTunesやAIMP、その他CAD系のNowPlayingができるように。要プラグインのソフトもある。<br>
+			</div>
+			<br><br>
+			<h3>crwdns473:0crwdne473:0</h3>
+			crwdns474:0crwdne474:0<br>
+			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
+  				crwdns475:0crwdne475:0
+			</a>
+			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank">
+  				crwdns479:0crwdne479:0
+			</a>
+			<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
+				crwdns476:0crwdne476:0
+			</a>
+			<br>
+			crwdns477:0crwdne477:0<a href="mailto:mstdn@thedesk.top" target="_blank">mstdn@thedesk.top</a>crwdns478:0crwdne478:0<br>
+			Kyash<br>
+			<img src="../../img/kyash.png" width="100"><br>
+		</div>
+		<div class="modal-footer">
+			<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">crwdns385:0crwdne385:0</a>
+		</div>
+	</div>
+	<!--PiP-->
+	<div id="pip" class="hide pip-bottom pip-left">
+		<i class="material-icons pip-horiz pointer" onclick="pipHoriz()">chevron_right</i>　
+		<i class="material-icons pip-vert pointer" onclick="pipVert()">expand_less</i>　
+		<i class="material-icons pointer" onclick="endPip()">close</i>
+		<div id="pip-content">
+		</div>
+    </div>
+<!--カラム追加-->
+<div id="add-box" class="hide z-depth-4 notf-box">
+<div class="input-field"><span data-trans="your_acct">crwdns494:0crwdne494:0</span>
+<br>
+<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
+<label></label>
+</div>
+<div class="input-field">
+<div id="auth">
+<select id="type-sel" style="color:black">
+	<option value="local" data-trans="local">crwdns480:0crwdne480:0</option>
+	<option value="local-media" data-trans="local-media">crwdns481:0crwdne481:0</option>
+	<option value="home" data-trans="home">crwdns482:0crwdne482:0</option>
+	<option value="pub" data-trans="public">crwdns483:0crwdne483:0</option>
+	<option value="pub-media" data-trans="public-media">crwdns484:0crwdne484:0</option>
+	<option value="dm" data-trans="dm">crwdns485:0crwdne485:0</option>
+	<option value="mix" data-trans="integrated">crwdns486:0crwdne486:0</option>
+	<option value="plus" data-trans="plus">crwdns487:0crwdne487:0</option>
+	<option value="notf" data-trans="notification">crwdns488:0crwdne488:0</option>
+</select>
+<label data-trans="show_tl">crwdns489:0crwdne489:0</label>
+</div>
+<div id="noauth" class="hide">crwdns489:0crwdne489:0
+	<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">crwdns490:0crwdne490:0
+</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>crwdns491:0crwdne491:0
+</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">crwdns492:0crwdne492:0</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>crwdns492:0crwdne492:0
+</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>crwdns493:0crwdne493:0
+</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>crwdns385:0crwdne385:0
+</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>crwdns494:0crwdne494:0</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">
+			crwdns495:0crwdne495:0
+		</button>
+	</div>
+	<br><br>
+	<div id="lists"></div>
+	<div id="lists-user"></div>
+	<input type="text" style="width:150px" id="list-add" placeholder="crwdns465:0crwdne465:0">
+		<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">crwdns445:0crwdne445:0</button>
+</div>
+<!--フィルター-->
+<div id="filter-box" class="hide notf-box z-depth-4">
+	<div class="input-field" style="width:calc( 100% - 100px);float:left">
+		<select id="filter-acct-sel" class="acct-sel"></select>
+		<label>crwdns494:0crwdne494:0</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">
+			crwdns495:0crwdne495:0
+		</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="crwdns496:0crwdne496:0"><br>
+	crwdns497:0crwdne497:0<br>
+	<input type="checkbox" class="filled-in" id="home_filter" value="home" />
+	  <label for="home_filter">crwdns482:0crwdne482:0</label>
+	<input type="checkbox" class="filled-in" id="local_filter" value="public" />
+	  <label for="local_filter">crwdns480:0crwdne480:0</label>
+	<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
+	  <label for="notf_filter">crwdns488:0crwdne488:0</label>
+	<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
+	  <label for="conv_filter">crwdns498:0crwdne498:0</label><br>
+	  crwdns499:0crwdne499:0<br>
+	<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
+	  <label for="wholeword_filter">crwdns500:0crwdne500:0</label><br>
+	<span class="sml">crwdns501:0crwdne501:0</span><br>
+	<input type="checkbox" class="filled-in" id="except_filter" value="1" />
+	  <label for="except_filter">crwdns502:0crwdne502:0</label><br>
+	<span class="sml">crwdns503:0crwdne503:0</span><br>
+	crwdns504:0crwdne504:0<span class="sml">crwdns505:0crwdne505:0<b>crwdns506:0crwdne506:0</b></span><br><br>
+	<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">crwdns507:0crwdne507:0
+	<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">crwdns508:0crwdne508:0
+	<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">crwdns509:0crwdne509:0
+	<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">crwdns491:0crwdne491:0</button><br>
+	<span class="sml">crwdns510:0crwdne510:0</span>
+</div>
+<div id="main">
+<!--TLのTL-->
+<div id="timeline-container">
+	crwdns511:0crwdne511:0
+</div>
+</div>
+</div>
+<!--bottom-->
+<div id="bottom" class="reverse">
+    <div class="leftside reverse">
+        <div id="dambox">
+								<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
+									<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>crwdns388:0crwdne388:0
+								</button>
+        </div>
+        <div class="leftside reverse" id="group">
+            <div class="btnsgroup"><span class="grouptitle">Columns:</span>
+                <a onclick="addToggle()" class="nex waves-effect" data-trans-i="add" id="add-tgl">
+                    <i class="material-icons nex" title="crwdns512:0crwdne512:0" data-trans-title="column_add">add</i>
+                </a>
+                <a onclick="sortToggle()" class="nex waves-effect">
+                    <i class="material-icons nex big-icon" title="crwdns513:0crwdne513:0" data-trans-title="sort">sort</i>
+                </a>
+            </div>
+            <div class="btnsgroup"><span class="grouptitle">Accounts:</span>
+                <a href="acct.html" class="nex waves-effect">
+                    <i class="material-icons nex big-icon" title="crwdns514:0crwdne514:0(Ctrl+Shift+M)" data-trans-title="manager">account_circle</i>
+                </a>
+                <a onclick="srcToggle()" class="nex waves-effect" id="src-tgl">
+                    <i class="material-icons" title="crwdns492:0crwdne492:0" data-trans-title="src">search</i>
+                </a>
+                <a onclick="listToggle()" class="nex waves-effect" id="list-tgl">
+                    <i class="material-icons" title="crwdns444:0crwdne444:0" data-trans-title="list">view_headline</i>
+                </a>
+                <a onclick="filterToggle()" class="nex waves-effect" id="filter-tgl">
+                    <i class="material-icons" title="crwdns515:0crwdne515:0" 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="crwdns517:0crwdne517:0" data-trans-title="reverse">swap_horiz</i>
+                </a>
+                <a href="setting.html" class="nex waves-effect">
+                    <i class="material-icons nex" title="crwdns516:0crwdne516:0(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="crwdns518:0crwdne518:0(F5/⌘+R)" data-trans-title="reload">refresh</i>
+                </a>
+                <a onclick="nano()" class="nex waves-effect">
+                    <i class="material-icons" title="crwdns519:0crwdne519:0TheDesk 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="crwdns1894:0crwdne1894:0">help_outline</i>
+				</a>
+            </div>
+        </div>
+    </div>
+    <div>
+		<div id="tips-menu">
+			<div class="btnsgroup" style="height:34px"><span class="grouptitle">Tips:</span>
+				<a onclick="tips('ver')" class="nex waves-effect">
+					<i class="material-icons nex" title="crwdns520:0crwdne520:0" data-trans-title="ver">info</i>
+				</a>
+				<a onclick="tips('clock')" class="nex waves-effect">
+					<i class="material-icons nex" title="crwdns521:0crwdne521:0" data-trans-title="clock">access_time</i>
+				</a>
+				<a onclick="tips('memory')" class="nex waves-effect">
+					<i class="material-icons nex" title="crwdns522:0crwdne522:0" data-trans-title="memory">memory</i>
+				</a>
+				<a onclick="tips('trend')" class="nex waves-effect imasonly" style="display:none;">
+						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
+				</a>
+				<a onclick="tips('spotify')" class="nex waves-effect">
+					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+				</a>
+			</div>
+		</div>
+		<div id="tips" class="hide">
+			<a onclick="tipsToggle()" class="nex waves-effect" style="float:left">
+					<i class="material-icons nex" title="crwdns523:0crwdne523:0" data-trans-title="tips">bubble_chart</i>
+			</a>
+			<div id="tips-text" style="float:left; width:300px;"></div>
+		</div>
+    </div>
+</div>
+<!--左下メッセージ-->
+<div id="message">
+</div>
+<!--Radio Happy(Yui) Taku Inoue-->
+<audio src="" id="radio"></audio>
+<!--JS-->
+<script type="text/javascript" src="../../js/ui/tips.js"></script>
+<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
+<script type="text/javascript" src="../../js/common/about.js"></script>
+<script type="text/javascript" src="../../js/tl/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>
+<script type="text/javascript" src="../../js/tl/mix.js"></script>
+<script type="text/javascript" src="../../js/tl/src.js"></script>
+<script type="text/javascript" src="../../js/tl/filter.js"></script>
+<script type="text/javascript" src="../../js/tl/tag.js"></script>
+<script type="text/javascript" src="../../js/tl/list.js"></script>
+<script type="text/javascript" src="../../js/tl/speech.js"></script>
+<script type="text/javascript" src="../../js/ui/post-box.js"></script>
+<script type="text/javascript" src="../../js/ui/layout.js"></script>
+<script type="text/javascript" src="../../js/login/instance.js"></script>
+<script type="text/javascript" src="../../js/login/login.js"></script>
+<script type="text/javascript" src="../../js/ui/img.js"></script>
+<script type="text/javascript" src="../../js/ui/theme.js"></script>
+<script type="text/javascript" src="../../js/ui/pip.js"></script>
+<script type="text/javascript" src="../../js/ui/sort.js"></script>
+<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+<script type="text/javascript" src="../../js/post/post.js"></script>
+<script type="text/javascript" src="../../js/post/use-txtbox.js"></script>
+<script type="text/javascript" src="../../js/post/secure.js"></script>
+<script type="text/javascript" src="../../js/post/img.js"></script>
+<script type="text/javascript" src="../../js/post/status.js"></script>
+<script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
+<script type="text/javascript" src="../../js/post/emoji.js"></script>
+<script type="text/javascript" src="../../js/post/suggest.js"></script>
+<script type="text/javascript" src="../../js/post/bb-md.js"></script>
+<script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>
+<script type="text/javascript" src="../../js/userdata/his-data.js"></script>
+<script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
+<script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
+<script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
+<script type="text/javascript" src="../../js/platform/end.js"></script>

app/view/ps/setting.html

@@ -0,0 +1,448 @@
+<!doctype html>
+<html lang="ps">
+<head>
+	<title>Settings - TheDesk</title>
+	{{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}}
+	<meta content="width=device-width,initial-scale=1.0" name="viewport">
+	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
+	<link href="../../css/master.css" type="text/css" rel="stylesheet">
+	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+	<meta charset="utf-8">
+</head>
+<body id="mainView" style="overflow-y:scroll">
+<script type="text/javascript" src="../../js/common/jquery.js"></script>
+<script type="text/javascript" src="../../js/platform/first.js"></script>
+<script type="text/javascript" src="../../js/common/materialize.js"></script>
+<script type="text/javascript" src="../../js/lang/lang.ps.js"></script>
+<h4>crwdns524:0crwdne524:0</h4>
+<ul class="collapsible" data-collapsible="accordion">
+	<li>
+	<div class="collapsible-header">
+			<i class="material-icons">desktop_windows</i>crwdns529:0crwdne529:0
+	</div>
+	<div class="collapsible-body">
+		<h5>crwdns530:0crwdne530:0</h5>
+		<a href="../ja/setting.html">日本語(Japanese)</a>/<a href="../en/setting.html">English</a>/<a href="../ps/setting.html">Crowdin web translate</a>/
+		<h5>crwdns531:0crwdne531:0</h5>
+		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">crwdns533:0crwdne533:0</button>
+		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">crwdns532:0crwdne532:0</button>
+		<h5>crwdns534:0crwdne534:0</h5>
+		<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" />
+		<label for="white">White</label>
+		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
+		<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
+		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
+		<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
+		<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>
+		<h5>crwdns1898:0crwdne1898:0</h5>crwdns536:0crwdne536:0
+		<br>
+		<input type="text" style="width:50px" id="popup">crwdns537:0crwdne537:0
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
+		<br>
+		<h5>crwdns538:0crwdne538:0</h5>
+		crwdns539:0crwdne539:0<br><a onclick="notftest()" class="pointer">crwdns540:0crwdne540:0</a>
+		<br>
+		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_yes" value="yes" />
+		<label for="ntf_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_no" value="no" />
+		<label for="ntf_no">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>crwdns541:0crwdne541:0</h5>crwdns542:0crwdne542:0
+		<br>
+		<input type="text" style="width:50px" id="width">pxcrwdns543:0crwdne543:0
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
+		<br>
+		<h5>{{fixwidth}}</h5>{{fixwidthwarn}}
+		<input type="text" style="width:50px" id="fixwidth">pxcrwdns543:0crwdne543:0
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
+		<br>
+		<h5>crwdns544:0crwdne544:0</h5>
+		crwdns1900:0crwdne1900:0<br>
+		<button class="btn waves-effect" style="width:100px;" onclick="font()">crwdns1896:0crwdne1896:0</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()">crwdns525:0crwdne525:0</button>
+		<br>
+		<h5>crwdns546:0crwdne546:0</h5>
+		<span style="font-size:15px">15px(crwdns549:0crwdne549:0)</span>
+		<br>
+		<input type="text" style="width:50px" id="size">px 
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button><br>
+		<h5>crwdns547:0crwdne547:0</h5>
+		crwdns548:0crwdne548:0<br>
+		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">crwdns528:0crwdne528:0</button>
+		<br>
+	</div>
+	</li>
+	<li>
+	<div class="collapsible-header">
+			<i class="material-icons">reorder</i>crwdns550:0crwdne550:0
+	</div>
+	<div class="collapsible-body">
+		<h5>crwdns551:0crwdne551:0</h5>crwdns552:0crwdne552:0
+		<br>crwdns553:0crwdne553:0
+		<br>crwdns554:0crwdne554:0
+		<br>
+		<input class="with-gap" onchange="settings()" onchange="settings()" name="time" type="radio" id="relative" value="relative" />
+		<label for="relative">crwdns555:0crwdne555:0</label>
+		<input class="with-gap" onchange="settings()" name="time" type="radio" id="absolute" value="absolute" />
+		<label for="absolute">crwdns1902:0crwdne1902:0</label>
+		<input class="with-gap" onchange="settings()" name="time" type="radio" id="double" value="double" />
+		<label for="double">crwdns557:0crwdne557:0</label>
+		<input class="with-gap" onchange="settings()" name="time" type="radio" id="medium" value="medium" />
+		<label for="medium">crwdns558:0crwdne558:0</label>
+		<h5>crwdns1904:0crwdne1904:0</h5>crwdns1906:0crwdne1906:0
+		<br>
+		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_yes" value="yes" />
+		<label for="ul_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="ul" type="radio" id="ul_no" value="no" />
+		<label for="ul_no">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>crwdns561:0crwdne561:0</h5>crwdns562:0crwdne562:0
+		<br>
+		<input class="with-gap" onchange="settings()" name="nsfw" type="radio" id="n_yes" value="yes" />
+		<label for="n_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="nsfw" type="radio" id="n_no" value="no" />
+		<label for="n_no">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>crwdns563:0crwdne563:0</h5>
+		<input class="with-gap" onchange="settings()" name="cw" type="radio" id="c_yes" value="yes" />
+		<label for="c_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="cw" type="radio" id="c_no" value="no" />
+		<label for="c_no">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>crwdns564:0crwdne564:0</h5>
+		<input class="with-gap" onchange="settings()" name="rp" type="radio" id="rp_hidden" value="hidden" />
+		<label for="rp_hidden">crwdns565:0crwdne565:0</label>
+		<input class="with-gap" onchange="settings()" name="rp" type="radio" id="rp_all" value="all" />
+		<label for="rp_all">crwdns566:0crwdne566:0</label>
+		<br>
+		<h5>crwdns567:0crwdne567:0</h5>
+		<input class="with-gap" onchange="settings()" name="gif" type="radio" id="g_yes" value="yes" />
+		<label for="g_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="gif" type="radio" id="g_no" value="no" />
+		<label for="g_no">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>crwdns572:0crwdne572:0</h5>
+		<input class="with-gap" onchange="settings()" name="tag" type="radio" id="t_all" value="all" />
+		<label for="t_all">crwdns573:0crwdne573:0</label>
+		<input class="with-gap" onchange="settings()" name="tag" type="radio" id="t_local" value="local" />
+		<label for="t_local">crwdns574:0crwdne574:0</label>
+		<br>
+		<h5>crwdns575:0crwdne575:0</h5>
+		<input class="with-gap" onchange="settings()" name="via" type="radio" id="via_yes" value="yes" />
+		<label for="via_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="via" type="radio" id="via_hide" value="hide" />
+		<label for="via_hide">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>crwdns576:0crwdne576:0</h5>
+		crwdns577:0crwdne577:0<br>
+		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_yes" value="yes" />
+		<label for="mov_yes">crwdns578:0crwdne578:0</label>
+		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_click" value="click" />
+		<label for="mov_click">crwdns579:0crwdne579:0</label>
+		<input class="with-gap" onchange="settings()" name="mov" type="radio" id="mov_no" value="no" />
+		<label for="mov_no">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>crwdns580:0crwdne580:0</h5>
+		<input class="with-gap" onchange="settings()" name="notfm" type="radio" id="notfm_yes" value="yes" />
+		<label for="notfm_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="notfm" type="radio" id="notfm_no" value="no" />
+		<label for="notfm_no">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>crwdns581:0crwdne581:0</h5>
+		crwdns582:0crwdne582:0
+		<br>
+		<input type="text" style="width:50px" id="sentence">crwdns583:0crwdne583:0 crwdns543:0crwdne543:0 crwdns585:0crwdne585:0
+		<input type="text" style="width:50px" id="letters">crwdns584:0crwdne584:0 crwdns543:0crwdne543:0
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
+		<br>
+		<h5>crwdns586:0crwdne586:0
+        </h5>
+		<input type="text" style="width:50px" id="img-height">px
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
+		<br>
+		<h5>crwdns1908:0crwdne1908:0</h5>
+		crwdns1910:0crwdne1910:0<br>
+		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_yes" value="yes" />
+		<label for="ticker_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
+		<label for="ticker_no">crwdns527:0crwdne527:0</label>
+		<br>
+		<h5>{{animation}}</h5>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_yes" value="yes" />
+		<label for="anime_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
+		<label for="anime_no">crwdns527:0crwdne527:0</label>
+	</div>
+	</li>
+	<li>
+	<div class="collapsible-header">
+			<i class="material-icons">send</i>crwdns587:0crwdne587:0
+	</div>
+	<div class="collapsible-body">
+		<h5>crwdns590:0crwdne590:0</h5>
+		<input type="text" style="width:150px" id="cw-text">
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
+		<br>
+		<h5>crwdns588:0crwdne588:0</h5>
+		crwdns589:0crwdne589:0
+		<br>
+		<input type="text" style="width:50px" id="cw_sentence">crwdns583:0crwdne583:0 crwdns543:0crwdne543:0 crwdns585:0crwdne585:0
+		<input type="text" style="width:50px" id="cw_letters">crwdns584:0crwdne584:0 crwdns543:0crwdne543:0
+		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
+		<br>
+		<h5>crwdns591:0crwdne591:0</h5>
+		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_yes" value="yes" />
+		<label for="cws_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_no" value="no" />
+		<label for="cws_no">crwdns527:0crwdne527:0
+		</label>
+		<br>
+		<h5>crwdns592:0crwdne592:0</h5>
+		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="public" value="public" />
+		<label for="public">crwdns593:0crwdne593:0</label>
+		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="unlisted" value="unlisted" />
+		<label for="unlisted">crwdns594:0crwdne594:0</label>
+		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="private" value="private" />
+		<label for="private">crwdns595:0crwdne595:0</label>
+		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="direct" value="direct" />
+		<label for="direct">crwdns596:0crwdne596:0</label>
+		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="memory" value="memory" />
+		<label for="memory">crwdns1912:0crwdne1912:0</label>
+		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="server" value="server" />
+		<label for="server">crwdns1914:0crwdne1914:0</label>
+		<br>
+		<h5>crwdns599:0crwdne599:0</h5>
+		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_url" value="url" />
+		<label for="i_url">crwdns600:0crwdne600:0</label>
+		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_no-act" value="no-act" />
+		<label for="i_no-act">crwdns601:0crwdne601:0</label>
+		<br>
+		<input class="with-gap" onchange="settings()" name="img" type="radio" id="i_inline" value="inline" disabled />
+		<label for="i_inline">crwdns602:0crwdne602:0 
+			<!--画像を投稿し、インラインで表示(Markdownに対応したインスタンスのみ。マルチアカウント環境では非推奨。)-->
+		</label>
+		<br>
+		<h5>crwdns568:0crwdne568:0</h5>
+		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_yes" value="yes" />
+		<label for="bx_yes">crwdns569:0crwdne569:0</label>
+		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_no" value="no" />
+		<label for="bx_no">crwdns571:0crwdne571:0
+		</label>
+		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_abs" value="absolute" />
+		<label for="bx_abs">crwdns570:0crwdne570:0</label>
+		<br>
+		<h5>crwdns603:0crwdne603:0</h5>
+		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_simple" value="simple" />
+		<label for="q_simple">crwdns604:0crwdne604:0</label>
+		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_mention" value="mention" />
+		<label for="q_mention">crwdns605:0crwdne605:0</label>
+		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_full" value="full" />
+		<label for="q_full">crwdns606:0crwdne606:0
+		</label>
+		<br>
+		<h5>crwdns607:0crwdne607:0</h5>
+		crwdns608:0crwdne608:0<br>
+		<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_remain" value="remain" />
+		<label for="mn_remain">crwdns609:0crwdne609:0</label>
+		<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_main" value="main" />
+		<label for="mn_main">crwdns610:0crwdne610:0</label>
+		</label>
+		<h5>crwdns1916:0crwdne1916:0</h5>
+		crwdns1918:0crwdne1918:0<br>
+		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-nothing" value="nothing" />
+		<label for="sec-nothing">crwdns1920:0crwdne1920:0</label>
+		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-public" value="public" />
+		<label for="sec-public">crwdns593:0crwdne593:0</label>
+		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-unlisted" value="unlisted" />
+		<label for="sec-unlisted">crwdns594:0crwdne594:0</label>
+		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-private" value="private" />
+		<label for="sec-private">crwdns595:0crwdne595:0</label>
+		<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-direct" value="direct" />
+		<label for="sec-direct">crwdns596:0crwdne596:0</label>
+		<input class="with-gap hide kirishima" onchange="settings()" name="sec" type="radio" id="sec-local" value="local" />
+		<label for="sec-local">crwdns1922:0crwdne1922:0</label><span class="hide kirishima">非対応インスタンスでは「未収載」になります。</span>
+		<br>
+	</div>
+	</li>
+	<li>
+		<div class="collapsible-header">
+				<i class="material-icons">keyboard</i>crwdns611:0crwdne611:0
+		</div>
+		<div class="collapsible-body">
+			<h5>crwdns612:0crwdne612:0</h5>
+			crwdns613:0crwdne613:0<br>
+			Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
+			<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
+			Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
+			<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
+			Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
+			<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
+
+		</div>
+	</li>
+	<li>
+		<div class="collapsible-header">
+				<i class="material-icons">bookmark</i>crwdns614:0crwdne614:0
+		</div>
+		<div class="collapsible-body">
+			<h5>crwdns615:0crwdne615:0</h5>
+			<div id="mute-cli"></div>
+			<h5>crwdns616:0crwdne616:0</h5>
+			crwdns617:0crwdne617:0
+			<h5>crwdns619:0crwdne619:0</h5>
+			crwdns618:0crwdne618:0<br>
+			<div class="chips" id="wordmute" style="background-color:gray;"></div>
+			<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
+			<h5>crwdns620:0crwdne620:0</h5>
+			crwdns618:0crwdne618:0<br>
+			<div class="chips" id="wordemp" style="background-color:gray;"></div>
+			<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
+			<h5>crwdns621:0crwdne621:0</h5>
+			crwdns622:0crwdne622:0
+			<span class="emphasized">　crwdns623:0crwdne623:0　</span>
+		</div>
+	</li>
+	<li>
+		<div class="collapsible-header">
+			<i class="fa fa-spotify"></i>crwdns624:0crwdne624:0
+		</div>
+		<div class="collapsible-body">
+			<!-->h5>{{npProvider}}</h5>
+			{{npPeoviderWarn}}<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-->
+			crwdns625:0crwdne625:0<i class="material-icons" style="font-size:24px;">music_note</i>crwdns626:0crwdne626:0<br>
+			<h5>crwdns627:0crwdne627:0</h5>
+			crwdns628:0crwdne628:0<br>
+			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button></div>
+			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>crwdns629:0crwdne629:0</a>
+			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>crwdns630:0crwdne630:0</a>
+			<h5>crwdns631:0crwdne631:0</h5>
+			crwdns632:0crwdne632:0<br>
+			<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
+{url}</textarea><br>
+				crwdns633:0{song}crwdnd633:0{album}crwdnd633:0{artist}crwdnd633:0{url}crwdne633:0<br>
+				crwdns634:0{url}crwdnd634:0{composer}crwdnd634:0{hz}crwdnd634:0{bitRate}crwdnd634:0{genre}crwdne634:0<br>
+				{{templete3}}<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;">crwdns525:0crwdne525:0</button>
+			<h5>crwdns635:0crwdne635:0</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">crwdns526:0crwdne526:0</label>
+			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+			<label for="awk_no">crwdns527:0crwdne527:0</label>
+			<br>
+		</div>
+	</li>
+	<li>
+		<div class="collapsible-header">
+			<i class="material-icons">hearing</i>crwdns636:0crwdne636:0
+		</div>
+		<div class="collapsible-body">
+			<h5>crwdns637:0crwdne637:0</h5>
+			crwdns638:0crwdne638:0<br>
+			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
+			<h5>crwdns639:0crwdne639:0</h5>
+			crwdns640:0crwdne640:0<br>
+			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
+			<h5>crwdns641:0crwdne641:0</h5>
+			crwdns642:0crwdne642:0<br>
+			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
+			<h5>crwdns643:0crwdne643:0</h5>
+			<input type="text" style="width:350px" id="voicetxt" value="crwdns644:0crwdne644:0">
+			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">crwdns645:0crwdne645:0</button><br>
+			<br>
+			<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">crwdns525:0crwdne525:0</button>
+		</div>
+	</li>
+</ul>
+<br>
+<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>crwdns646:0crwdne646:0</a>
+<br>
+<br>crwdns647:0crwdne647:0
+<li>Ctrl+1-9:crwdns648:0crwdne648:0</li>
+<li>N:crwdns649:0crwdne649:0</li>
+<li>X:crwdns650:0crwdne650:0</li>
+<li>Ctrl+Enter:crwdns651:0crwdne651:0</li>
+<li>Ctrl+Enter+Shift:crwdns1924:0crwdne1924:0</li>
+<li>Ctrl+E:crwdns652:0crwdne652:0</li>
+<li>Esc:crwdns653:0crwdne653:0</li>
+<li>F5:crwdns654:0crwdne654:0</li>
+<li>Ctrl+Shift+C:crwdns655:0crwdne655:0</li>
+<li>Ctrl+Shift+S:crwdns524:0crwdne524:0</li>
+<li>Ctrl+Shift+M:crwdns656:0crwdne656:0</li>
+<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
+<li>Ctrl+Shift+P:crwdns657:0crwdne657:0</li>
+<li>←/→:crwdns658:0crwdne658:0</li>
+<li>crwdns659:0crwdne659:0</li>
+<div class="hide kirishima">
+以下Markdownに対応したインスタンスのみ。
+<br>
+<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
+<li>Shift+Enter:全角スペースを入れて改行</li>
+<li>Shift+Space:ゼロ幅スペース</li>
+以下アスタルテにログインしている場合のみ 
+<br>
+<li>Ctrl+R: 
+<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
+</li><br>
+</div>
+<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('crwdns661:0crwdne661:0')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>crwdns660:0crwdne660:0</button><br><br>
+<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>crwdns662:0crwdne662:0</button>
+<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>crwdns663:0crwdne663:0</a>
+<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Enty)</a>
+<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>crwdns665:0crwdne665:0/Docs(Constructing)</a>
+<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
+<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">crwdns666:0crwdne666:0</a>
+<br>
+Kyash<br>
+			<img src="../../img/kyash.png" width="100"><br>
+<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">crwdns667:0crwdne667:0</a><br>
+<a href="oss.html">OSS Licensecrwdns668:0crwdne668:0</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://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>
+</span><br>
+TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
+タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+<script type="text/javascript" src="../../js/common/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/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/ps/update.html

@@ -0,0 +1,224 @@
+<!doctype html>
+<html lang="en">
+<head>
+<title>Update - TheDesk</title>
+<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
+<link href="../../css/master.css" type="text/css" rel="stylesheet">
+<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" 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>
+<style>
+body{
+    font-family:'Open Sans';
+    -webkit-app-region: drag;
+    cursor: move;
+    padding:10px;
+    text-align:right;
+}
+#start{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width:100vw;
+    height: calc(100vh - 2.5rem);
+    text-align:center;
+}
+#checkbox{
+    text-align:left;
+}
+a,button,input,label,i{
+    -webkit-app-region: no-drag;
+}
+#updskip{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.skipbtn{
+    display:block;
+    float:left;
+    width:200px;
+    height:200px;
+    border:1px solid;
+    margin-left:5px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border: 1px solid;
+    overflow: hidden;
+}
+.skipbtn:hover{
+    background-color: #b3e5fc;
+    transition: all 0.3s ease-in-out;
+}
+#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>
+<script type="text/javascript" src="../../js/common/materialize.js"></script>
+<i class="material-icons pointer waves-effect" onclick="about();">info</i>
+<i class="material-icons pointer waves-effect" onclick="skipper();">clear</i>
+<!--a href="update.html">Reload</a-->
+<div id="start">
+    <div id="box" class="show">
+        <h2>TheDesk</h2>
+        <p>crwdns669:0crwdne669:0</p>
+        <span id="now"></span>→<b id="ver"></b><br>
+        <span id="det"></span><br>
+        <button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
+        <button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">crwdns1950:0crwdne1950:0</button>
+        <span class="linux">{{snap}}<br></span>
+        <button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
+        <button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
+        <br>
+        crwdns678:0crwdne678:0<br>crwdns679:0crwdne679:0
+    </div>
+    <div id="skipper" class="hide">
+        <h4>crwdns674:0crwdne674:0</h4>
+        crwdns675:0crwdne675:0<br>
+        <div id="updskip">
+                <a onclick="window.close();" class="pointer skipbtn waves-effect waves-light"><div>crwdns676:0crwdne676:0</div></a>
+                <a onclick="nextv();" class="pointer skipbtn waves-effect waves-light"><div>crwdns677:0crwdne677:0</div></a>
+        </div>
+        <a class="pointer waves-effect" onclick="skipper();" style="margin-top:5px">crwdns680:0crwdne680:0</a>
+    </div>
+    <div id="dlnow" class="hide">
+        <h4>crwdns681:0crwdne681:0</h4>
+        <h4 id="prog"></h4>
+    </div>
+</div>
+<script type="text/javascript" src="../../js/common/about.js"></script>
+  <script type="text/javascript" src="../../js/platform/end.js"></script>
+<script>
+function skipper(){
+    $("#dlnow").addClass("hide");
+    $("#box").toggleClass("show");
+    if($("#box").hasClass("hide") && $("#skipper").hasClass("hide")){
+        $("#skipper").removeClass("hide");
+        $("#skipper").addClass("show");
+    }else{
+        $("#box").toggleClass("hide");
+        $("#skipper").toggleClass("hide");
+        $("#skipper").toggleClass("show");
+    }
+}
+var electron = require("electron");
+var ipc = electron.ipcRenderer;
+verck();
+function update(sel){
+    $("#box").toggleClass("show");
+    $("#box").toggleClass("hide");
+    $("#dlnow").toggleClass("hide");
+    $("#dlnow").toggleClass("show");
+    $("#prog").text("");
+    var remote=electron.remote;
+    var bit=process.arch;
+    var start="https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET',
+		headers: {'content-type': 'application/json'},
+    }).then(function(response) {
+       return response.json();
+    }).catch(function(error) {
+        todo(error);
+		console.error(error);
+    }).then(function(json) {
+        if(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');
+    }
+ipc.on('prog', function (event, arg) {
+    console.log(arg);
+    $("body").css('background','linear-gradient(#fff 0%,#fff '+(1-arg)*100+'%, #d7ccc8 '+(1-arg)*100+'%, #d7ccc8 100%)');
+    $("#prog").text(Math.floor(arg*100)+"%");
+})
+ipc.on('mess', function (event, arg) {
+    console.log(arg);
+	$("#prog").text(arg);
+})
+function verck(){
+    var remote=electron.remote;
+    var platform=remote.process.platform;
+    var bit=process.arch;
+	if(platform=="linux"){
+        $('.windows').hide()
+        $('.linux').show()
+	}else if(platform=="mac"){
+        $('.windows').hide()
+        $('.mac').show()
+	}
+	var start="https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET',
+		headers: {'content-type': 'application/json'},
+    }).then(function(response) {
+       return response.json();
+    }).catch(function(error) {
+        todo(error);
+		console.error(error);
+    }).then(function(json) {
+		    console.log(json);
+             $("#ver").text(json.desk);
+             localStorage.setItem("next-ver",json.desk);
+			 $("#det").html(json.detail);
+             $("#now").text(localStorage.getItem("ver"));
+             
+    });
+}
+function nextv(){
+    localStorage.setItem("new-ver-skip","true");
+    window.close();
+}
+function enc(ver){
+    var ver = ver.replace( /\s/g , "" );
+    var ver = ver.replace( /\(/g , "-" );
+    var ver = ver.replace( /\)/g , "" );
+    var ver = ver.replace( /\[/g , "_" );
+    var ver = ver.replace( /\]/g , "" );
+    return ver;
+}
+</script>

package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

snap/snapcraft.yaml

@@ -0,0 +1,13 @@
+
+  # After registering a name on build.snapcraft.io, commit an uncommented line:
+  name: thedesk
+  version: '17.0.1' # just for humans, typically '1.2+git' or '1.3.2'
+  summary: TheDesk is an open source client for Mastodon.  # 79 char long summary
+  description: |
+    TheDesk is an open source client for Mastodon. 
+
+  parts:
+    my-part:
+      # See 'snapcraft plugins'
+      plugin: nil
+  

trial.travis.yml

@@ -0,0 +1,52 @@
+language: objective-c
+cache:
+  directories:
+    - node_modules
+env:
+  - NODE_VERSION="9.9.0"
+before_install:
+  # nvm をインストールする。Travis の OS X 環境には nvm はデフォルトで入っていない
+  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
+  - source /tmp/.nvm/nvm.sh
+  # 指定バージョンの Node をインストールする
+  - nvm install $NODE_VERSION
+  # 指定バージョンの Node を有効にする
+  - nvm use --delete-prefix $NODE_VERSION
+  - node --version
+script:
+  - node --version
+before_deploy:
+  - brew update
+  - brew install wine
+  - wine --version
+  - brew install makensis
+  - npm install electron-builder -g
+  - cd app
+  - 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
+  - electron-builder --linux --x64
+  - mv ../build/thedesk*.snap ../TheDesk.snap
+  - electron-builder --mac --x64
+  - mv ../build/TheDesk*.dmg ../TheDesk.dmg
+  - cd ../
+deploy:
+  provider: releases
+  # GitHub にリリースするための API KEY を暗号化した値
+  api_key:
+    secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
+  # Releases ページにアップロードするファイル
+  file:
+    - TheDesk.exe
+    - TheDesk-setup.exe
+    - TheDesk-ia32.exe
+    - TheDesk-setup-ia32.exe
+    - TheDesk.snap
+    - TheDesk.dmg
+  skip_cleanup: true
+  on:
+    repo: cutls/TheDesk