push

package.json
Add: node_modules
2019-09-13 21:54:11 +09:00 · 2019-09-12 23:43:10 +09:00 · 2019-09-12 23:38:13 +09:00 · 2019-09-12 23:35:42 +09:00 · 2019-09-12 23:35:13 +09:00 · 2019-09-12 23:30:43 +09:00
8071 changed files with 962198 additions and 11739 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report-english.md
+++ b/.github/ISSUE_TEMPLATE/bug-report-english.md
@@ -0,0 +1,27 @@
+---
+name: Bug report English
+about: Create a report to help us improve
+title: ''
+labels: "\U0001F41Bbug"
+assignees: ''
+
+---
+
+Describe the bug: a clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Click on '....'
+2. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Environment**
+ - OS: [e.g. macOS High Sierra , Windows 10 Pro 1903, Ubuntu 19.04]
+ - Version: [e.g. Usamin (18.0.0)]  
+Check at 'Application,' 'About TheDesk' at top of the window.
+- Your instance: [e.g. mastodon.social]
+
+**Additional context**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/bug-report-japanese----------.md
+++ b/.github/ISSUE_TEMPLATE/bug-report-japanese----------.md
@@ -0,0 +1,27 @@
+---
+name: Bug report Japanese(日本語のバグ報告)
+about: 迅速なバグ撲滅のために
+title: ''
+labels: "\U0001F41Bbug"
+assignees: ''
+
+---
+
+バグの簡単な説明を最初に入れます。
+
+**再現方法**
+このようにするとバグが発生しました。
+1. '....'をクリックすると
+2. エラーが出ます
+
+**本来の挙動**
+本来どのように動くのが望ましいかを記入
+
+**環境**
+ - OS: [例 macOS High Sierra , Windows 10 Pro 1903, Ubuntu 19.04]
+ - バージョン: [例 Usamin (18.0.0)]  
+TheDesk画面上部の「アプリケーション」から「TheDeskについて」で確認
+- インスタンス: [例. mastodon.social]
+
+**追記**
+追記
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,12 @@ app/.DS_Store
 .vscode/*
 enq.md
 app/.tkn
-app/node_modules
 app/js/login/tkn.js
-app/package-lock.json
+app/package-lock.json
+app/view/en
+app/view/ja
+app/view/de
+app/view/bg
+app/view/cs
+app/view/ps
+app/git
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ before_deploy:
  - cd app
  - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
  - npm install
+  - npm run construct
  - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
  - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@
 
 [![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)
+[![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
 [![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
-[![Download](https://flat.badgen.net/github/assets-dl/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
 ![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)  
@@ -14,6 +14,7 @@ Mastodon/Misskey client for PC(Windows/Linux/macOS)
 Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)    

 <a href="https://www.patreon.com/cutls"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160"></a>  
+<a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a>
 ![Screenshots1](https://thedesk.top/img/scr1.png)  

 ## License
@@ -21,12 +22,13 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
 [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  

 The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/)
-[Press Kit](https://dl.thedesk.top/press/TheDesk+PressKit.zip)  
+[Press Kit](https://d2upiril6ywqp9.cloudfront.net/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)
+* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
+* [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
+* [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
+* [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
+* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)

 The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)

@@ -39,6 +41,7 @@ The default sounds of notifications is provided [Creative Commons BY](https://cr

 * 日本語(Japanese)
 * English
+* de, cs, bg(from Crowdin)

 ### Translation

@@ -73,7 +76,7 @@ Build for Linux

 Fellow coder

-* [kPherox](https://www.kr-kp.com/)
+* [kPherox](https://pl.kpherox.dev/kPherox)

 ## Build

@@ -82,6 +85,7 @@ git clone https://github.com/cutls/TheDesk
 cd TheDesk/app
 npm install
 npm install --only=dev
+npm run construct
 ```

 ### electron-builder(Recommended)
@@ -123,4 +127,9 @@ macOS

 Did you find a bug with Pleroma accounts?  
 Pleroma **does not** follow Mastodon API rules completely although Pleroma developers say so.  
-Please write issues to improve TheDesk affinity with Pleroma.  
+Please write issues to improve TheDesk affinity with Pleroma.
+
+## Vulnerabilities when `npm i`???
+
+No, if your npm says materialize-css has vulnerabilities(CVE-2019-11002/3/4), look at [here](https://github.com/Dogfalo/materialize/issues/6286) under discussion.
+
--- a/README_ja.md
+++ b/README_ja.md
@@ -5,8 +5,8 @@
 
 [![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)
+[![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
 [![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
-[![Download](https://flat.badgen.net/github/assets-dl/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
 ![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント  
@@ -21,12 +21,13 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
 [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)  

 アイコンは[クリエイティブ・コモンズ 表示-非営利-継承](https://creativecommons.org/licenses/by-nc-sa/4.0/)で提供されています。  
-[プレスキット](https://dl.thedesk.top/press/TheDesk+PressKit.zip)  
+[プレスキット](https://d2upiril6ywqp9.cloudfront.net/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)
+* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
+* [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
+* [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
+* [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
+* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)

 標準の通知音は [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) で提供されています。

@@ -39,6 +40,7 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge

 * 日本語
 * English(英語)
+* ドイツ語, チェコ語, ブルガリア語(from Crowdin)

 ### 翻訳
  
@@ -71,9 +73,9 @@ Linuxビルダー

 * [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)

-iTunes NowPlayingにアルバムアートワークを付けてくれた人
+コーダー

-* [kPherox](https://www.kr-kp.com/)
+* [kPherox](https://pl.kpherox.dev/kPherox)

 ## ビルド

@@ -83,6 +85,7 @@ git clone https://github.com/cutls/TheDesk
 cd TheDesk/app
 npm install
 npm install --only=dev
+npm run construct
 ```

 ### electron-builder(推奨)
@@ -130,3 +133,8 @@ Issuesに書いてある問題についてはなるべく対処しますので
 ## 詳しく

 [TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
+
+## `npm i`したら脆弱性あるって言われた
+
+materialize-cssの脆弱性(CVE-2019-11002/3/4)については[こちら](https://github.com/Dogfalo/materialize/issues/6286)で本当に脆弱性かどうか議論しています。  
+実際には害が無いものと思われます。
--- a/app/about.html
+++ b/app/about.html
@@ -15,6 +15,8 @@
            font-family: 'Open Sans';
            -webkit-app-region: drag;
            cursor: move;
+            padding: 5px;
+            padding-top: 15px;
        }

        a,
@@ -27,7 +29,7 @@
            display: grid;
            grid-template-columns: 1fr 1fr;
            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5';
+            grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5''name6 data6';
            text-align: left;
            margin: 5px;
        }
@@ -71,6 +73,14 @@
        .area-data5 {
            grid-area: data5;
        }
+
+        .area-name6 {
+            grid-area: name6;
+        }
+
+        .area-data6 {
+            grid-area: data6;
+        }
    </style>
 </head>

@@ -78,24 +88,26 @@
    <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
    <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
    <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
-    <img src="./img/desk.png" style="max-width:62%;">
+    <img src="./img/desk.svg" style="max-width:62%;">
    <h5>TheDesk</h5>
    <div class="container">
        <div class="area-name1">Display version</div>
        <div class="area-data1" id="now"></div>
        <div class="area-name2">Internal version</div>
        <div class="area-data2" id="ver"></div>
-        <div class="area-name3">Chromium</div>
-        <div class="area-data3" id="chrome"></div>
-        <div class="area-name4">Electron</div>
-        <div class="area-data4" id="electron"></div>
-        <div class="area-name5">Node.js</div>
-        <div class="area-data5" id="node"></div>
+        <div class="area-name3">Commit(7chars)</div>
+        <div class="area-data3" id="hash"></div>
+        <div class="area-name4">Chromium</div>
+        <div class="area-data4" id="chrome"></div>
+        <div class="area-name5">Electron</div>
+        <div class="area-data5" id="electron"></div>
+        <div class="area-name6">Node.js</div>
+        <div class="area-data6" id="node"></div>
    </div>
    <div class="cp">Copyright &copy; TheDesk 2018<br>
        Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
        Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a
-            href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pawoo.net/@kPherox"
+            href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pl.kpherox.dev/kPherox"
            target="_blank">kPherox</a> and all users
        <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️"
            title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
@@ -114,6 +126,7 @@
            var ver = m[1];
            $("#ver").text(ver);
        }
+        $("#hash").html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>');
        $(document).on('click', 'a', e => {
            var url = $(e.target).attr('href');
            postMessage(["openUrl", url], "*")
--- a/app/build/thedesk.ico
+++ b/app/build/thedesk.ico
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -7,12 +7,8 @@ body {
  cursor: default;
  font-size: 13px;
  height: 100vh;
-  background-color: var(--bg);
  color: var(--color);
 }
-body {
-  border: thin solid gray;
-}
 .btn {
  margin: 5px;
  text-transform: none;
@@ -76,6 +72,9 @@ option {
  min-width: 0 !important;
  margin-left: 5px !important;
 }
+.unvisible{
+  opacity: 0;
+}
 .bbcode-pulse-loadings,
 .bbcode-pulse-loading,
 .fa-pulse {
@@ -221,6 +220,17 @@ blockquote:before,
  right: 0;
  top: 0;
 }
+#start {
+  display: none;
+  position: fixed;
+  width: 100vw;
+  height: calc(100vh - 40px);
+  background-color: var(--bg);
+  color: var(--color);
+  z-index: 99999;
+  justify-content: center;
+  align-items: center;
+}
 #drag {
  display: none;
  position: fixed;
@@ -235,9 +245,6 @@ blockquote:before,
 #drag-content {
  font-size: 2rem;
 }
-.radio {
-  font-family: "Baloo Bhai";
-}
 #pip {
  z-index: 504;
  width: 418px;
@@ -304,6 +311,9 @@ blockquote:before,
 .tabs {
  background-color: var(--subcolor);
 }
+.collapsible-header:focus {
+  background-color: var(--subcolor) !important;
+}
 .modal-footer {
  background-color: var(--modalfooter) !important;
 }
@@ -333,13 +343,16 @@ blockquote:before,
  padding: 5px;
  border: thin solid gray;
  border-radius: 5px;
+  overflow: hidden;
 }
 #menu-wrapper {
  margin-left: -5px;
  display: flex;
+  height: calc(100% - 3.5rem);
+  overflow: hidden;
 }
 #left-menu {
-  width: 170px;
+  width: 230px;
 }
 #left-menu div {
  padding-left: 5px;
@@ -359,8 +372,7 @@ blockquote:before,
  background-color: var(--emphasized);
 }
 #right-menu {
-  width: 380px;
-  max-height: 375px;
+  width: 100%;
  overflow-y: scroll;
  overflow-x: hidden;
  padding: 5px;
@@ -397,7 +409,8 @@ blockquote:before,
  text-align: center;
  width: calc(100% + 10px);
  border-radius: 5px;
-  background-color: var(--bg);
+  background-color: var(--box);
+  filter: brightness(80%);
  margin-left: -5px;
  margin-right: -5px;
  margin-top: -5px;
@@ -470,3 +483,32 @@ input, textarea {
  background: #607d8b;
  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
 }
+/* Web Fonts */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(https://fonts.gstatic.com/s/opensans/v17/mem5YaGs126MiZpBA-UN_r8OUuhp.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: 'Material Icons';
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
+}
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
+}
--- a/app/css/post.css
+++ b/app/css/post.css
@@ -7,15 +7,18 @@
  background-color: var(--postbox);
  border: thin solid gray;
  z-index: 501;
-  min-width: 300px;
  max-width: 100%;
  padding: 5px;
  border-radius: 5px;
+  overflow: hidden;
 }
-textarea{
+textarea {
  min-height: 100px !important;
  font-family: inherit;
 }
+#post-box .ui-resizable-s, #post-box .ui-resizable-se{
+  display: none !important;
+}

 .cancel {
  font-size: 0.5rem;
@@ -108,23 +111,20 @@ textarea{
 }
 #left-side {
  float: left;
-  width: 300px;
+  overflow-x: hidden;
+  height: calc(100% - 32px);
 }
 #right-side {
  display: none;
  float: left;
  width: 300px;
  padding: 5px;
+  overflow-x: hidden;
+  height: calc(100% - 32px);
 }
-#poll {
+#posttgl,#toot-post-btn {
+  background-color: var(--accentbtn);
 }
-.poll-provider {
-  position: absolute;
-  height: calc(100% - 90px);
-  overflow-y: scroll;
-  top: 90px;
-}
-
 /*mini*/
 .mini-post .mize {
  display: none !important;
--- a/app/css/themes.css
+++ b/app/css/themes.css
@@ -14,6 +14,10 @@
  --active: #e6ee9c;
  --postbox: white;
  --modalfooter: #fafafa;
+  --accentbtn: #009688;
+  --selected: #c0c0c0;
+  --selectedWithShare: #b2babd;
+  --gray: #757575;
 }
 #imagemodal {
  background: url("../img/pixel.white.svg");
@@ -34,6 +38,10 @@
  --active: #757575;
  --postbox: #424242;
  --modalfooter: #212121;
+  --accentbtn: #3f51b5;
+  --selected: #3f3f3f;
+  --selectedWithShare: #003a30;
+  --gray: #cccccc;
 }
 .blacktheme #imagemodal {
  background: url("../img/pixel.svg");
@@ -54,6 +62,10 @@
  --active: #757575;
  --postbox: #1a237e;
  --modalfooter: #031833;
+  --accentbtn: #00acc1;
+  --selected: #214f8a;
+  --selectedWithShare: #003a30;
+  --gray: #cccccc ;
 }
 .indigotheme #imagemodal {
  background: url("../img/pixel.svg");
@@ -74,6 +86,10 @@
  --active: #757575;
  --postbox: #4e342e;
  --modalfooter: #261411;
+  --accentbtn: #827717;
+  --selected: #6d352b;
+  --selectedWithShare: #003a30;
+  --gray: #cccccc;
 }
 .browntheme #imagemodal {
  background: url("../img/pixel.svg");
@@ -86,7 +102,7 @@
  --modal: #81c784;
  --subcolor: #a5d6a7;
  --box: #81c784;
-  --sidebar: #81c784;
+  --sidebar: #c5e1a5;
  --shared: #ffcc80;
  --notfbox: #a5d6a7;
  --emphasized: #9e9d24;
@@ -94,7 +110,35 @@
  --active: #e6ee9c;
  --postbox: #a5d6a7;
  --modalfooter: #81c784;
+  --accentbtn: #33691e;
+  --selected: #78c17a;
+  --selectedWithShare: #caa266;
+  --gray: #757575;
 }
 .greentheme #imagemodal {
  background: url("../img/pixel.white.svg");
 }
+.bluetheme {
+  --bg: #c9e1ec;
+  --drag: rgba(255, 255, 255, 0.8);
+  --color: black;
+  --beforehover: #757575;
+  --modal: #b2ebf2;
+  --subcolor: #90caf9;
+  --box: #90caf9;
+  --sidebar: #b6e6f5;
+  --shared: #e0ffe4;
+  --notfbox: #90caf9;
+  --emphasized: #c5e1a5;
+  --his-data: rgba(255, 255, 255, 0.9);
+  --active: #b39ddb;
+  --postbox: #dff1ff;
+  --modalfooter: #2196f3;
+  --accentbtn: #2f7bb7;
+  --selected: #9dcade;
+  --selectedWithShare: #c1dac4;
+  --gray: #757575;
+}
+.bluetheme #imagemodal {
+  background: url("../img/pixel.white.svg");
+}
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -24,6 +24,10 @@
  z-index: 500;
  box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2);
 }
+#demobottom {
+  width: 500px;
+  display: flex;
+}
 #bottom.reverse {
  padding-left: 0;
  padding-right: 40px;
@@ -41,16 +45,20 @@
 #bottom .trendtag {
  height: 40px;
 }
-#bottom #group {
+#bottom #group, #demogroup {
  margin-right: 40px;
 }
 #bottom .leftside {
  display: flex;
 }
+#tips {
+  display: flex;
+  align-items: center;
+}
 #bottom #tips img {
  vertical-align: -3px;
 }
-#bottom a {
+#bottom a, #demogroup a {
  color: var(--color);
 }
 #bottom i {
@@ -62,9 +70,9 @@
 .exc-chb {
  padding-left: 24px !important;
 }
-#bottom .btnsgroup {
+.btnsgroup {
  border: 1px solid;
-  padding: 1px;
+  padding-top: 1px;
  padding-left: 5px;
  padding-right: 5px;
  margin-right: 15px;
@@ -94,8 +102,10 @@
    display: none;
  }
 }
-iframe {
+iframe,
+.cvo video {
  max-width: 100%;
+  max-height: 300px;
 }
@media screen and (max-width: 600px) {
  .mobile #timeline-container {
@@ -126,7 +136,7 @@ iframe {
 }
 .marquee {
  width: 100%;
-  padding: .5em 0;
+  padding: 0.5em 0;
  overflow: hidden;
  margin-bottom: 0;
  position: relative;
@@ -142,14 +152,15 @@ iframe {
  animation-iteration-count: infinite;
 }
@keyframes marquee {
-0% {
-  -webkit-transform: translate(0);
-  transform: translate(0);
-}
-99%, 100% {
-  -webkit-transform: translate(-100%);
-  transform: translate(-100%);
-}
+  0% {
+    -webkit-transform: translate(0);
+    transform: translate(0);
+  }
+  99%,
+  100% {
+    -webkit-transform: translate(-100%);
+    transform: translate(-100%);
+  }
 }
 .boxIn {
  display: flex;
@@ -157,6 +168,7 @@ iframe {
  height: 100%;
  border: thin solid gray;
  overflow: hidden;
+  border-top: none;
 }
 .box .pin,
 #his-data .pin {
@@ -207,7 +219,8 @@ iframe {
  width: 100%;
  display: grid;
  grid-template-columns: 43px 2fr 1fr;
-  grid-template-areas: "notice notice notice" "icon display_name display_name" "icon toot toot" "vis additional additional" "actions actions side";
+  grid-template-rows: auto 1.6rem 1fr auto 2.5rem;
+  grid-template-areas: "notice notice notice" "icon display_name display_name" "space toot toot" "space additional additional" "vis actions side";
 }
 .cvo h1,
 .cvo h2,
@@ -252,7 +265,8 @@ iframe {
 .area-toot {
  cursor: text;
  user-select: auto;
-  margin: 2px;
+  margin-top: 5px;
+  margin-bottom: 5px;
  margin-left: 5px;
  grid-area: toot;
 }
@@ -270,32 +284,49 @@ iframe {
  white-space: nowrap;
  text-overflow: ellipsis;
 }
+.acct-note p {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.area-toot.acct-note p:not(:first-child) {
+  display: none;
+}
+.area-toot.acct-note p:first-child:after {
+  content: "...";
+  color: var(--gray);
+}

 .area-actions {
  padding: 0;
  margin: 0;
-  top: -20px;
+  top: -5px;
+  position: relative;
  display: flex;
  justify-content: space-around;
-  width: 250px;
  max-width: 100%;
  grid-area: actions;
 }
 .area-vis {
  margin: 2px;
  grid-area: vis;
+  text-align: center;
 }
 .area-side {
  display: flex;
+  top: -5px;
+  position: relative;
  justify-content: flex-end;
  margin: 2px;
  grid-area: side;
 }
-
+.quote-inline {
+  display: none;
+}
 .quote-renote {
  display: grid;
-  grid-template-columns: 43px 2fr 1fr;
-  grid-template-areas: "ricon ruser" "ricon rtext";
+  grid-template-columns: 43px 2fr 25px;
+  grid-template-areas: "ricon ruser rdet" "ricon rtext rdet";
  border: 1px solid;
  margin-top: 3px;
  padding: 1px;
@@ -303,9 +334,13 @@ iframe {
 }
 .renote-icon {
  grid-area: ricon;
+  padding: 5px;
+}
+.renote-details {
+  grid-area: rdet;
 }
 .renote-icon img {
-  width: 43px;
+  width: 100%;
 }
 .renote-user {
  grid-area: ruser;
@@ -339,7 +374,7 @@ iframe {
 }

 .gray {
-  color: gray;
+  color: var(--gray);
 }
 .sml {
  font-size: 0.8em;
@@ -373,6 +408,7 @@ iframe {
  white-space: nowrap;
  text-overflow: ellipsis;
  height: calc(0.8em + 8px);
+  user-select: none;
 }
 .cbadge-hover {
  color: var(--color);
@@ -410,7 +446,7 @@ p:not(:last-child) {
  z-index: 500;
  padding: 5px;
  display: grid;
-  grid-template-columns: 40px 48px 1fr 24px;
+  grid-template-columns: 40px 1fr 1fr 24px;
  grid-template-rows: 30px 30px;
  grid-template-areas: "notice notice_name notice_name a2" "notice a1 sta a3" "notf-box notf-box notf-box notf-box";
 }
@@ -425,6 +461,9 @@ p:not(:last-child) {

 .area-notice_name {
  grid-area: notice_name;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }

 .area-notice_acct {
@@ -432,7 +471,6 @@ p:not(:last-child) {
 }

 .area-a1 {
-  text-align: center;
  grid-area: a1;
 }
 .area-sta {
@@ -502,11 +540,6 @@ p:not(:last-child) {
    0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.3),
    0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset;
 }
-#src-contents {
-  min-height: 100px;
-  max-height: 190px;
-  overflow-y: scroll;
-}
 .type-b {
  display: none;
 }
@@ -581,6 +614,7 @@ p:not(:last-child) {
  display: block;
  margin-right: 1px;
  float: left;
+  overflow: hidden;
 }
 .nsfw-media {
  position: absolute;
@@ -594,9 +628,32 @@ p:not(:last-child) {
  width: 100%;
  height: 100%;
 }
-audio{
+.shared.selectedToot {
+  background-color: var(--selectedWithShare);
+}
+.selectedToot {
+  background-color: var(--selected);
+}
+audio {
  height: 2rem;
 }
+.translate {
+  white-space: normal;
+}
+.cw_btn {
+  margin: 3px;
+  background-color: var(--emphasized);
+  color: var(--color);
+  padding-left: 3px;
+  padding-right: 3px;
+  border-radius: 3px;
+  border: 1px solid var(--color);
+}
+.vis-data {
+  font-size: 1rem !important;
+  margin: 5px;
+  user-select: none;
+}
@keyframes jump {
  0% {
    transform: translateY(0);
@@ -649,3 +706,9 @@ audio{
  animation-duration: 0.1s;
  animation-name: fadeInDown;
 }
+.urbadge {
+  line-height: normal;
+  height: 2rem;
+  font-size: 1rem;
+  background-color: #009688;
+}
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@@ -4,6 +4,10 @@
  background-image: url("../../loading.svg");
  overflow-y: hidden;
 }
+#his-data-content {
+  display: flex;
+  justify-content: center;
+}
 #his-name {
  font-size: 1.5rem;
 }
@@ -13,16 +17,17 @@
  margin-right: 5px;
 }
 .his-float {
-  float: left;
  overflow-y: scroll;
  padding: 5px;
 }
 #his-float-data {
-  width: 400px;
  height: 100%;
 }
+#his-leftside {
+  width: 500px;
+}
 #his-float-timeline {
-  width: calc(100% - 400px);
+  max-width: 775px;
  height: 100%;
  overflow-y: hidden;
 }
@@ -61,21 +66,30 @@
 #his-data a:not(.mention) span:last-of-type {
  display: none;
 }
+#his-data a .rep_ct,
+#his-data a .rt_ct,
+#his-data a .fav_ct {
+  display: inline !important;
+}
 #his-data-show {
  margin: 20px;
+  margin-left: 50px;
+  margin-right: 50px;
  background-color: var(--his-data);
-  width: calc(100% - 20px);
  height: calc(100% - 20px);
  margin-bottom: 0;
  padding: 5px;
 }
-.tab-content {
+#his-data-wrap {
+  display: flex;
+}
+.his-var-content {
  overflow-y: scroll;
  overflow-x: hidden;
-  height: calc(100% - 240px);
+  height: calc(100% - 45px);
 }
-.my-data-width {
-  width: 10%;
+#my-data-nav .btn {
+  width: 140px;
 }
 .active-back {
  background-color: var(--active);
@@ -102,7 +116,11 @@
  justify-content: center;
  align-items: center;
  font-size: 2rem;
-  width: 90%;
  height: 100%;
-  position: absolute;
 }
+#hisdropdown{
+  background-color: var(--bg);
+}
+#hisdropdown li:hover{
+  background-color: var(--active);
+}
--- a/app/fonts/roboto/Roboto-Bold.woff
+++ b/app/fonts/roboto/Roboto-Bold.woff
--- a/app/fonts/roboto/Roboto-Bold.woff2
+++ b/app/fonts/roboto/Roboto-Bold.woff2
--- a/app/fonts/roboto/Roboto-Light.woff
+++ b/app/fonts/roboto/Roboto-Light.woff
--- a/app/fonts/roboto/Roboto-Light.woff2
+++ b/app/fonts/roboto/Roboto-Light.woff2
--- a/app/fonts/roboto/Roboto-Medium.woff
+++ b/app/fonts/roboto/Roboto-Medium.woff
--- a/app/fonts/roboto/Roboto-Medium.woff2
+++ b/app/fonts/roboto/Roboto-Medium.woff2
--- a/app/fonts/roboto/Roboto-Regular.woff
+++ b/app/fonts/roboto/Roboto-Regular.woff
--- a/app/fonts/roboto/Roboto-Regular.woff2
+++ b/app/fonts/roboto/Roboto-Regular.woff2
--- a/app/fonts/roboto/Roboto-Thin.woff
+++ b/app/fonts/roboto/Roboto-Thin.woff
--- a/app/fonts/roboto/Roboto-Thin.woff2
+++ b/app/fonts/roboto/Roboto-Thin.woff2
--- a/app/img/desk.png
+++ b/app/img/desk.png
--- a/app/img/desk.svg
+++ b/app/img/desk.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
+	.st3{fill:#F0842E;}
+	.st4{fill:#364C9F;}
+	.st5{fill:#FFFFFF;stroke:#040000;stroke-miterlimit:10;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#040000;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
+</style>
+<g id="レイヤー_1" class="st0">
+</g>
+<g id="レイヤー_2">
+	<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+	<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
+	
+		<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
+	
+		<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
+	<path class="st5" d="M714.5,2953.5"/>
+	<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
+		c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
+		c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
+		c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
+		c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
+		c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
+		c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
+	<rect class="st7" width="4096" height="4096"/>
+	<path class="st1" d="M-58,1122"/>
+</g>
+</svg>
--- a/app/img/desk_full.svg
+++ b/app/img/desk_full.svg
@@ -1,122 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-              "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="7.11022in" height="7.11022in"
-     viewBox="0 0 512 512">
-  <path id="選択範囲 #1"
-        fill="white" stroke="white" stroke-width="1"
-        d="M 96.00,16.00
-           C 99.85,16.01 102.39,15.12 104.00,19.00
-             104.00,19.00 97.00,19.00 97.00,19.00
-             97.00,19.00 108.00,22.07 108.00,22.07
-             108.00,22.07 144.00,43.08 144.00,43.08
-             144.00,43.08 181.83,64.31 181.83,64.31
-             181.83,64.31 223.00,88.26 223.00,88.26
-             223.00,88.26 247.00,102.22 247.00,102.22
-             247.00,102.22 257.00,107.00 257.00,107.00
-             260.09,110.36 266.43,114.39 271.00,115.00
-             271.00,115.00 298.00,133.00 298.00,133.00
-             298.00,133.00 300.00,132.00 300.00,132.00
-             300.00,132.00 312.00,141.00 312.00,141.00
-             312.00,141.00 314.00,140.00 314.00,140.00
-             318.40,144.39 334.83,152.80 341.00,156.45
-             341.00,156.45 404.00,192.94 404.00,192.94
-             404.00,192.94 425.67,205.63 425.67,205.63
-             428.70,208.64 426.87,211.86 425.12,215.00
-             425.12,215.00 412.26,237.00 412.26,237.00
-             410.65,240.07 409.02,245.62 404.90,245.68
-             401.70,245.72 396.83,242.47 394.00,240.87
-             394.00,240.87 370.00,226.89 370.00,226.89
-             370.00,226.89 282.00,176.51 282.00,176.51
-             282.00,176.51 271.00,169.52 271.00,169.52
-             271.00,169.52 261.00,164.31 261.00,164.31
-             257.45,162.08 251.05,157.46 247.00,157.00
-             247.00,157.00 234.00,148.55 234.00,148.55
-             234.00,148.55 208.17,133.78 208.17,133.78
-             208.17,133.78 190.00,124.00 190.00,124.00
-             190.00,124.00 163.00,107.60 163.00,107.60
-             163.00,107.60 103.00,73.00 103.00,73.00
-             103.00,73.00 103.00,453.00 103.00,453.00
-             103.00,453.00 127.00,439.42 127.00,439.42
-             127.00,439.42 170.00,414.58 170.00,414.58
-             170.00,414.58 237.17,376.24 237.17,376.24
-             237.17,376.24 256.00,364.59 256.00,364.59
-             256.00,364.59 264.00,360.53 264.00,360.53
-             264.00,360.53 285.00,348.20 285.00,348.20
-             285.00,348.20 292.99,344.12 292.99,344.12
-             292.99,344.12 299.28,339.83 299.28,339.83
-             299.28,339.83 320.00,328.41 320.00,328.41
-             320.00,328.41 362.00,304.05 362.00,304.05
-             362.00,304.05 371.91,297.68 371.91,297.68
-             371.91,297.68 379.04,294.41 379.04,294.41
-             379.04,294.41 410.00,276.00 410.00,276.00
-             410.00,276.00 416.00,285.00 416.00,285.00
-             416.81,288.83 421.21,296.21 424.00,299.00
-             424.00,299.00 423.00,301.00 423.00,301.00
-             427.24,303.72 430.62,312.17 432.00,317.00
-             432.00,317.00 388.00,342.67 388.00,342.67
-             388.00,342.67 317.00,383.55 317.00,383.55
-             317.00,383.55 279.00,405.32 279.00,405.32
-             279.00,405.32 264.00,415.00 264.00,415.00
-             264.00,415.00 262.00,414.00 262.00,414.00
-             262.00,414.00 250.00,423.00 250.00,423.00
-             250.00,423.00 248.00,422.00 248.00,422.00
-             248.00,422.00 238.00,428.92 238.00,428.92
-             238.00,428.92 218.00,440.67 218.00,440.67
-             218.00,440.67 207.00,448.00 207.00,448.00
-             207.00,448.00 193.00,455.18 193.00,455.18
-             193.00,455.18 176.00,465.08 176.00,465.08
-             176.00,465.08 166.09,470.31 166.09,470.31
-             166.09,470.31 137.00,487.31 137.00,487.31
-             137.00,487.31 103.00,506.00 103.00,506.00
-             103.00,506.00 104.00,509.00 104.00,509.00
-             104.00,509.00 57.00,509.00 57.00,509.00
-             57.00,509.00 57.00,16.00 57.00,16.00
-             57.00,16.00 96.00,16.00 96.00,16.00 Z
-           M 102.00,72.00
-           C 102.00,72.00 103.00,73.00 103.00,73.00
-             103.00,73.00 103.00,72.00 103.00,72.00
-             103.00,72.00 102.00,72.00 102.00,72.00 Z
-           M 261.00,190.61
-           C 270.30,188.63 274.03,177.15 280.77,179.78
-             284.36,181.18 284.28,187.65 284.72,191.00
-             285.35,195.85 287.64,207.99 286.57,212.00
-             285.51,216.00 282.42,218.30 280.78,222.00
-             277.54,229.29 282.79,236.85 282.99,245.00
-             283.38,261.24 274.02,264.52 266.36,276.00
-             261.36,283.50 258.58,297.05 259.09,306.00
-             259.91,320.41 263.09,322.38 271.02,333.00
-             273.09,335.77 275.09,339.39 272.11,342.37
-             269.94,344.63 266.39,343.51 264.00,342.37
-             258.40,339.52 252.76,332.51 249.91,327.00
-             246.61,320.60 248.26,314.37 244.57,310.23
-             240.72,305.90 235.19,306.50 231.18,310.23
-             225.69,315.34 221.16,325.22 218.00,332.00
-             226.04,333.96 232.79,331.61 234.00,342.00
-             234.00,342.00 175.00,342.00 175.00,342.00
-             166.62,341.85 166.77,339.11 162.00,338.56
-             158.39,338.15 148.72,341.68 145.00,343.05
-             138.31,345.53 120.54,352.22 119.64,360.00
-             119.01,365.49 125.06,367.91 127.00,374.00
-             115.41,373.03 104.20,364.93 108.88,352.00
-             111.36,345.12 117.06,343.57 123.00,340.75
-             132.86,336.05 141.94,332.38 149.58,323.96
-             151.40,321.95 154.62,318.26 155.92,316.00
-             155.92,316.00 166.03,283.00 166.03,283.00
-             169.87,271.08 179.16,256.26 189.00,248.52
-             199.37,240.36 208.38,237.36 221.00,234.66
-             226.45,233.50 237.77,232.36 240.99,227.79
-             244.55,222.75 241.98,216.26 240.34,211.00
-             237.46,201.77 234.64,193.69 237.00,184.00
-             244.82,185.47 252.94,192.32 261.00,190.61 Z
-           M 102.00,453.00
-           C 102.00,453.00 103.00,454.00 103.00,454.00
-             103.00,454.00 103.00,453.00 103.00,453.00
-             103.00,453.00 102.00,453.00 102.00,453.00 Z
-           M 102.00,505.00
-           C 102.00,505.00 103.00,506.00 103.00,506.00
-             103.00,506.00 103.00,505.00 103.00,505.00
-             103.00,505.00 102.00,505.00 102.00,505.00 Z" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{fill:none;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#FFFFFF;}
+	.st4{fill:#FFFFFF;}
+	.st5{fill:#none;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
+</style>
+<g id="レイヤー_1" class="st0">
+</g>
+<g id="レイヤー_2">
+	<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+	<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
+	
+		<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
+	
+		<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
+	<path class="st5" d="M714.5,2953.5"/>
+	<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
+		c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
+		c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
+		c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
+		c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
+		c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
+		c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
+	<rect class="st7" width="4096" height="4096"/>
+	<path class="st1" d="M-58,1122"/>
+</g>
 </svg>
--- a/app/img/osushi_qr.png
+++ b/app/img/osushi_qr.png
--- a/app/img/sticker.png
+++ b/app/img/sticker.png
--- a/app/img/thinking.svg
+++ b/app/img/thinking.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#040000;}
+	.st1{fill:#040000;stroke:#040000;stroke-miterlimit:10;}
+	.st2{clip-path:url(#SVGID_2_);}
+	.st3{clip-path:url(#SVGID_4_);}
+	.st4{fill:none;}
+	.st5{fill:#FFFFFF;}
+	.st6{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
+	.st7{fill:#F0842E;}
+	.st8{fill:#3D4FA0;}
+	.st9{fill:#63451F;stroke:#FFFFFF;stroke-width:20;stroke-miterlimit:10;}
+	.st10{fill:#63451F;}
+</style>
+<g id="DrawBlack">
+	<polyline id="BG_1_" class="st0" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+	<rect id="Left_1_" x="678.5" y="128.48" class="st1" width="450" height="3821.5"/>
+	
+		<rect id="Top_1_" x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st0" width="450" height="3117.62"/>
+	<g id="Finger_1_">
+		<g>
+			<defs>
+				
+					<rect id="SVGID_1_" x="-626.54" y="666.18" transform="matrix(0.9063 -0.4226 0.4226 0.9063 -723.8983 1097.2598)" width="5478.6" height="3030.2"/>
+			</defs>
+			<clipPath id="SVGID_2_">
+				<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+			</clipPath>
+			<g id="g14_3_" class="st2">
+				<g id="g44_1_" transform="translate(17.2764,0.8682)">
+					<path id="path46_1_" class="st0" d="M2605.11,3533.86c0,0,159.85-112.71,149-195.05c-10.68-85.2-127.58-48.89-127.58-48.89
+						s136.18-82.82,112.7-180.35c-22.17-91.83-167.38-48.54-167.38-48.54s119.56-92.9,85.39-182.75
+						c-28.87-75.6-188.03-44.94-188.03-44.94s651.47-417.09,718.51-459.5c66.86-42.42,160.29-131.95,87.28-198.12
+						c-72.76-66.37-205.83-7.85-269.88,32.69c-64.01,40.62-874.42,553.28-1153.93,730.24c-29.84,18.84-169.66,107.16-186.59,118.03
+						c-69.96,44.42-112.22,42.02-74.07-13.01c51.14-73.63,74.73-139.7,55.45-222.1c-20.44-86.69-114.31-161.6-159.65-186.44
+						c-84.35-46.21-197.27-61.16-306.71-33.34c-170.83,43.44-256.98,149.65-157.15,218.26c149.29,102.66,148.88,244.02,37.82,381.07
+						c-261.05,322.06-363.57,512.7-142.28,713.95c241.24,219.53,812.72,166.75,1276.35-126.35
+						C2218.92,3773.38,2605.11,3533.86,2605.11,3533.86"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g id="Eyes_1_">
+		<g>
+			<defs>
+				<rect id="SVGID_3_" x="95.01" y="544.01" width="3526.99" height="3526.99"/>
+			</defs>
+			<clipPath id="SVGID_4_">
+				<use xlink:href="#SVGID_3_"  style="overflow:visible;"/>
+			</clipPath>
+			<g id="g14_2_" class="st3">
+				<g id="g24_1_" transform="translate(15.4063,25.5)">
+					<path id="path26_1_" class="st0" d="M1588.99,1547.21c0,135.3-87.78,244.93-195.94,244.93
+						c-108.16,0-195.94-109.63-195.94-244.93c0-135.2,87.78-244.93,195.94-244.93C1501.21,1302.28,1588.99,1412.01,1588.99,1547.21"
+						/>
+				</g>
+				<g id="g32_1_" transform="translate(9.6709,29.667)">
+					<path id="path34_1_" class="st0" d="M1032.82,1134.8c-16.07-8.52-29.69-21.85-38.31-38.99c-21.16-42.03-3.92-90.82,38.5-109.04
+						c417.95-179.29,754.29-4.21,768.39,3.33c42.42,22.63,59.57,73.28,38.31,113.06c-21.16,39.68-72.5,53.49-114.92,31.16
+						c-12.05-6.27-277.46-140.3-615.07,4.6C1084.54,1149.59,1056.13,1147.24,1032.82,1134.8"/>
+				</g>
+				<g id="g36_1_" transform="translate(14.7427,16.4277)">
+					<path id="path38_1_" class="st0" d="M1524.64,2445.12c-13.32-12.44-23.12-28.71-27.04-47.61c-9.7-45.95,19.4-88.76,65.15-95.42
+						c449.89-66.43,730.09,188.99,741.94,199.86c35.27,32.72,38.7,85.92,8.03,119.04c-30.57,32.92-83.77,33.11-118.94,0.59
+						c-10.19-9.01-232.39-206.52-595.87-152.93C1570.78,2472.65,1543.94,2463.15,1524.64,2445.12"/>
+				</g>
+				<g id="g40_1_" transform="translate(20.4307,25.917)">
+					<path id="path42_1_" class="st0" d="M2076.21,1505.94c-15.28-9.6-28.02-23.81-35.47-41.54c-18.32-43.3,2.25-90.92,45.75-106.2
+						c429.22-150.48,752.91,47.03,766.53,55.55c40.66,25.47,54.28,77.1,30.47,115.41c-23.71,38.21-76.03,48.5-116.68,23.32
+						c-11.76-7.15-267.27-158.81-613.99-37.23C2126.96,1524.26,2098.75,1519.95,2076.21,1505.94"/>
+				</g>
+				<g id="g28_1_" transform="translate(26,24.5)">
+					<path id="path30_1_" class="st0" d="M2616.28,1646.19c0,135.3-87.69,244.93-195.94,244.93
+						c-108.16,0-195.94-109.63-195.94-244.93c0-135.2,87.78-244.93,195.94-244.93C2528.6,1401.26,2616.28,1510.99,2616.28,1646.19"
+						/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+<g id="Path">
+	<path id="CutLine" class="st4" d="M528,128C532-14,669,0,669,0h346l2629,1464c0,0,78,34,28,108s-217,359-217,359s-22,9,9,226
+		s-204,313-204,313l-545,356c0,0,421.37,492.67,29.68,732.33S1798,4056,1798,4056s28.13,15-290.94,15s-828.56,0-828.56,0
+		S531,4102,528,3904S528,128,528,128z"/>
+</g>
+<g id="Draw">
+	<polyline id="BG" class="st5" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+	<rect id="Left" x="678.5" y="128.48" class="st6" width="450" height="3821.5"/>
+	
+		<rect id="Top" x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st7" width="450" height="3117.62"/>
+	<g id="Finger">
+		<g id="g44" transform="translate(17.2764,0.8682)">
+			<path id="path46" class="st8" d="M2605.11,3533.86c0,0,159.85-112.71,149-195.05c-10.68-85.2-127.58-48.89-127.58-48.89
+				s136.18-82.82,112.7-180.35c-22.17-91.83-167.38-48.54-167.38-48.54s119.56-92.9,85.39-182.75
+				c-28.87-75.6-188.03-44.94-188.03-44.94s651.47-417.09,718.51-459.5c66.86-42.42,160.29-131.95,87.28-198.12
+				c-72.76-66.37-205.83-7.85-269.88,32.69c-64.01,40.62-874.42,553.28-1153.93,730.24c-29.84,18.84-169.66,107.16-186.59,118.03
+				c-69.96,44.42-112.22,42.02-74.07-13.01c51.14-73.63,74.73-139.7,55.45-222.1c-20.44-86.69-114.31-161.6-159.65-186.44
+				c-84.35-46.21-197.27-61.16-306.71-33.34c-170.83,43.44-256.98,149.65-157.15,218.26c149.29,102.66,148.88,244.02,37.82,381.07
+				c-261.05,322.06-363.57,512.7-142.28,713.95c241.24,219.53,812.72,166.75,1276.35-126.35
+				C2218.92,3773.38,2605.11,3533.86,2605.11,3533.86"/>
+		</g>
+	</g>
+	<g id="Eyes">
+		<g id="g24" transform="translate(15.4063,25.5)">
+			<path id="path26" class="st9" d="M1588.99,1547.21c0,135.3-87.78,244.93-195.94,244.93c-108.16,0-195.94-109.63-195.94-244.93
+				c0-135.2,87.78-244.93,195.94-244.93C1501.21,1302.28,1588.99,1412.01,1588.99,1547.21"/>
+		</g>
+		<g id="g32" transform="translate(9.6709,29.667)">
+			<path id="path34" class="st9" d="M1032.82,1134.8c-16.07-8.52-29.69-21.85-38.31-38.99c-21.16-42.03-3.92-90.82,38.5-109.04
+				c417.95-179.29,754.29-4.21,768.39,3.33c42.42,22.63,59.57,73.28,38.31,113.06c-21.16,39.68-72.5,53.49-114.92,31.16
+				c-12.05-6.27-277.46-140.3-615.07,4.6C1084.54,1149.59,1056.13,1147.24,1032.82,1134.8"/>
+		</g>
+		<g id="g36" transform="translate(14.7427,16.4277)">
+			<path id="path38" class="st9" d="M1524.64,2445.12c-13.32-12.44-23.12-28.71-27.04-47.61c-9.7-45.95,19.4-88.76,65.15-95.42
+				c449.89-66.43,730.09,188.99,741.94,199.86c35.27,32.72,38.7,85.92,8.03,119.04c-30.57,32.92-83.77,33.11-118.94,0.59
+				c-10.19-9.01-232.39-206.52-595.87-152.93C1570.78,2472.65,1543.94,2463.15,1524.64,2445.12"/>
+		</g>
+		<g id="g40" transform="translate(20.4307,25.917)">
+			<path id="path42" class="st9" d="M2076.21,1505.94c-15.28-9.6-28.02-23.81-35.47-41.54c-18.32-43.3,2.25-90.92,45.75-106.2
+				c429.22-150.48,752.91,47.03,766.53,55.55c40.66,25.47,54.28,77.1,30.47,115.41c-23.71,38.21-76.03,48.5-116.68,23.32
+				c-11.76-7.15-267.27-158.81-613.99-37.23C2126.96,1524.26,2098.75,1519.95,2076.21,1505.94"/>
+		</g>
+		<g id="g28" transform="translate(26,24.5)">
+			<path id="path30" class="st10" d="M2616.28,1646.19c0,135.3-87.69,244.93-195.94,244.93c-108.16,0-195.94-109.63-195.94-244.93
+				c0-135.2,87.78-244.93,195.94-244.93C2528.6,1401.26,2616.28,1510.99,2616.28,1646.19"/>
+		</g>
+	</g>
+</g>
+</svg>
--- a/app/img/thinkingdesk.png
+++ b/app/img/thinkingdesk.png
--- a/app/index.html
+++ b/app/index.html
@@ -0,0 +1,3 @@
+<script>
+location.href="./view/ja"
+</script>
--- a/app/js/common/keyshortcut.js
+++ b/app/js/common/keyshortcut.js
@@ -1,3 +1,5 @@
+selectedColumn = 0
+selectedToot = 0
 $(function ($) {
 	//キーボードショートカット
 	$(window).keydown(function (e) {
@@ -118,7 +120,7 @@ $(function ($) {
 				}
 			}
 			//Ctrl+Sift+P:プロフ
-			if ((event.ctrlKey) && event.shiftKey) {
+			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 80) {
 					profShow()
 					return false;
@@ -132,30 +134,82 @@ $(function ($) {
 					return false;
 				}
 			}
+			//矢印:選択
+			if (e.code == "ArrowLeft") {
+				//left
+				if ($("#imagemodal").hasClass("open")) {
+					imgCont('prev');
+					return false;
+				}
+				if (selectedColumn > 0) {
+					selectedColumn--
+				}
+				tootSelector(selectedColumn, selectedToot)
+				return false;
+			} else if (e.code == "ArrowUp") {
+				//up
+				if ($("#imagemodal").hasClass("open")) {
+					return false;
+				}
+				if (selectedToot > 0) {
+					selectedToot--
+				}
+				tootSelector(selectedColumn, selectedToot)
+				return false;
+			} else if (e.code == "ArrowRight") {
+				//right
+				if ($("#imagemodal").hasClass("open")) {
+					imgCont('next');
+					return false;
+				}
+				if (selectedColumn < $(".tl-box").length - 1) {
+					selectedColumn++
+				}
+				tootSelector(selectedColumn, selectedToot)
+				return false;
+			} else if (e.code == "ArrowDown") {
+				//down
+				if ($("#imagemodal").hasClass("open")) {
+					return false;
+				}
+				selectedToot++
+				tootSelector(selectedColumn, selectedToot)
+				return false;
+			}
+			//Ctrl+U:0,0選択
+			if (event.ctrlKey || event.metaKey) {
+				if (e.keyCode === 85) {
+					selectedToot = 0
+					selectedColumn = 0
+					tootSelector(0, 0)
+					return false;
+				}
+			}
+			//選択時
+			if (e.keyCode == 70) {
+				var id = $(".selectedToot").attr('unique-id')
+				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				fav(id, acct_id, false)
+				return false;
+			}
+			if (e.keyCode == 66) {
+				var id = $(".selectedToot").attr('unique-id')
+				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				rt(id, acct_id, false)
+				return false;
+			}
+			if (e.keyCode == 82) {
+				var id = $(".selectedToot").attr('unique-id')
+				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var ats_cm = $('.selectedToot .rep-btn').attr("data-men")
+				var mode = $('.selectedToot .rep-btn').attr("data-visen")
+				re(id, ats_cm, acct_id, mode)
+				return false;
+			}
 		}
 		//textareaフォーカス時
 		if (hasFocus2 && wv) {
 			if (event.metaKey || event.ctrlKey) {
-				//Ctrl+B:太字
-				if (e.keyCode === 66) {
-					tagsel('b');
-					return false;
-				}
-				//Ctrl+I:斜字
-				if (e.keyCode === 73) {
-					tagsel('i');
-					return false;
-				}
-				//Ctrl+U:下線
-				if (e.keyCode === 85) {
-					tagsel('u');
-					return false;
-				}
-				//Ctrl+S:取り消し線
-				if (e.keyCode === 83) {
-					tagsel('s');
-					return false;
-				}
 				//C+S+(No):ワンクリ
 				if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 					if (e.keyCode >= 49 && e.keyCode <= 51) {
@@ -166,22 +220,28 @@ $(function ($) {
 				}
 			}
 		}
-		//イメージビューワー切り替え
-		if (e.keyCode === 37 && wv) {
-			if ($("#imagemodal").hasClass("open")) {
-				imgCont('prev');
-				return false;
-			}
-		}
-		if (e.keyCode === 39 && wv) {
-			if ($("#imagemodal").hasClass("open")) {
-				imgCont('next');
-				return false;
-			}
-		}
 	});
 	//クリアボタン
 	$("#clear").click(function () {
 		clear();
 	});
-});
+});
+//選択する
+function tootSelector(column, toot) {
+	$('.cvo').removeClass("selectedToot")
+	$('#timeline_' + column + ' .cvo').eq(toot).addClass("selectedToot")
+	var scr = $('.tl-box[tlid=' + column + ']').scrollTop()
+	var elem = $('.selectedToot').offset().top
+	var top = elem - $('.tl-box').height() + scr
+	if (top > 0) {
+		top = top + $('.selectedToot').height()
+		if (top > scr) {
+			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: top })
+		}
+	} else if (elem < 0) {
+		var to = scr + elem - $('.selectedToot').height()
+		if (to < scr) {
+			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
+		}
+	}
+}
--- a/app/js/common/time.js
+++ b/app/js/common/time.js
@@ -37,7 +37,6 @@
    }
  };
  var $t = $.timeago;
-
  $.extend($.timeago, {
    settings: {
      refreshMillis: 60000,
@@ -47,22 +46,22 @@
      cutoff: 0,
      autoDispose: true,
      strings: {
-        prefixAgo: null,
-        prefixFromNow: "今から",
-        suffixAgo: "",
-        suffixFromNow: "",
-        inPast: '',
-        seconds: "%d秒前",
-        minute: "1分前",
-        minutes: "%d分前",
-        hour: "1時間前",
-        hours: "%d時間前",
-        day: "昨日",
-        days: "%d日前",
-        month: "昨月",
-        months: "%dヶ月前",
-        year: "去年",
-        years: "%d年前",
+        prefixAgo: lang.lang_time_prefixAgo,
+        prefixFromNow: lang.lang_time_prefixFromNow,
+        suffixAgo: lang.lang_time_suffixAgo,
+        suffixFromNow: lang.lang_time_suffixFromNow,
+        inPast: lang.lang_time_inPast,
+        seconds: lang.lang_time_seconds,
+        minute: lang.lang_time_minute,
+        minutes: lang.lang_time_minutes,
+        hour: lang.lang_time_hour,
+        hours: lang.lang_time_hours,
+        day: lang.lang_time_day,
+        days: lang.lang_time_days,
+        month: lang.lang_time_month,
+        months: lang.lang_time_months,
+        year: lang.lang_time_year,
+        years: lang.lang_time_years,
        wordSeparator: " ",
        numbers: []
      }
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -1,5 +1,6 @@
 //バージョンチェッカー
 function verck(ver) {
+	localStorage.setItem("ver", ver);
 	console.log("%c Welcome😊", "color: red;font-size:200%;")
 	var date = new Date();
 	var show = false
@@ -15,11 +16,12 @@ function verck(ver) {
 			}
 		}
 		//ちょっと削除とリンク解析の都合上アレ(e)
-		localStorage.setItem("ver", ver);
 		show = true
 		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
 		$(document).ready(function () {
-			$('#releasenote').modal('open');
+			if (localStorage.getItem("winstore")) {
+				$('#releasenote').modal('open');
+			}
 			verp = ver.replace('(', '');
 			verp = verp.replace('.', '-');
 			verp = verp.replace('.', '-');
@@ -59,7 +61,7 @@ function verck(ver) {
 	var platform = localStorage.getItem("platform");
 	console.log("Your platform:" + platform)
 	if (!localStorage.getItem("winstore")) {
-		storeDialog(platform, ver)
+		$("#start").css('display', 'flex');
 	}
 	if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
 		var winstore = true;
@@ -133,6 +135,59 @@ function verck(ver) {
 				if (obj.ID * 1 <= last) {
 					break;
 				} else {
+					if (obj.type == "textv2") {
+						if (~obj.languages.indexOf(lang.language)) {
+							var show = true;
+							if (obj.toot != "") {
+								var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + '\',\'main\')">Show</button>';
+							} else {
+								var toot = "";
+							}
+							if (obj.ver != "") {
+								if (obj.ver == ver) {
+									show = true;
+								} else {
+									show = false;
+								}
+							}
+							if (obj.domain != "") {
+								var multi = localStorage.getItem("multi");
+								if (multi) {
+									show = false;
+									var accts = JSON.parse(multi);
+									Object.keys(accts).forEach(function (key) {
+										var acct = accts[key];
+										if (acct.domain == obj.domain) {
+											show = true;
+										}
+									});
+								}
+							}
+							if (show) {
+								M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
+							}
+						}
+					}
+				}
+
+			}
+		}
+	});
+}
+var infostreaming = false;
+function infowebsocket() {
+	infows = new WebSocket("wss://thedesk.top/ws/");
+	infows.onopen = function (mess) {
+		console.log([tlid, ":Connect Streaming Info:", mess]);
+		infostreaming = true;
+	}
+	infows.onmessage = function (mess) {
+		console.log([tlid, ":Receive Streaming:", JSON.parse(mess.data)]);
+		var obj = JSON.parse(mess.data);
+		if (obj.type != "counter") {
+			if (obj.type == "textv2") {
+				if (~obj.languages.indexOf(lang.language)) {
+					localStorage.setItem("last-notice-id", obj.id)
 					var show = true;
 					if (obj.toot != "") {
 						var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + '\',\'main\')">Show</button>';
@@ -160,54 +215,11 @@ function verck(ver) {
 						}
 					}
 					if (show) {
+						console.log(obj.text)
+						console.log(escapeHTML(obj.text))
 						M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
 					}
 				}
-
-			}
-		}
-	});
-}
-var infostreaming = false;
-function infowebsocket() {
-	infows = new WebSocket("wss://thedesk.top/ws/");
-	infows.onopen = function (mess) {
-		console.log([tlid, ":Connect Streaming Info:", mess]);
-		infostreaming = true;
-	}
-	infows.onmessage = function (mess) {
-		console.log([tlid, ":Receive Streaming:", JSON.parse(mess.data)]);
-		var obj = JSON.parse(mess.data);
-		if (obj.type != "counter") {
-			localStorage.setItem("last-notice-id", obj.id)
-			var show = true;
-			if (obj.toot != "") {
-				var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + '\',\'main\')">Show</button>';
-			} else {
-				var toot = "";
-			}
-			if (obj.ver != "") {
-				if (obj.ver == ver) {
-					show = true;
-				} else {
-					show = false;
-				}
-			}
-			if (obj.domain != "") {
-				var multi = localStorage.getItem("multi");
-				if (multi) {
-					show = false;
-					var accts = JSON.parse(multi);
-					Object.keys(accts).forEach(function (key) {
-						var acct = accts[key];
-						if (acct.domain == obj.domain) {
-							show = true;
-						}
-					});
-				}
-			}
-			if (show) {
-				M.toast({ html: escapeHTML(obj.Text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
 			}
 		} else {
 			$("#persons").text(obj.text);
@@ -299,4 +311,10 @@ function storeDialog(platform, ver) {
 			}
 		});
 	})
+}
+function closeStart() {
+	$("#start").css('display', 'none');
+	var platform = localStorage.getItem("platform");
+	var ver = localStorage.getItem("ver");
+	storeDialog(platform, ver)
 }
--- a/app/js/emoji/default-emoji.js
+++ b/app/js/emoji/default-emoji.js
@@ -50,6 +50,10 @@ function customEmoji() {
    emojiList('home')
 }
 function defEmoji(target) {
+    var selin = $("#textarea").prop('selectionStart');
+    if (!selin) {
+        selin = 0;
+    }
    var emojiraw = newpack.filter(function (item, index) {
        if (item.short_name == target) return true;
    });
@@ -60,22 +64,11 @@ function defEmoji(target) {
        emoji = twemoji.convert.fromCodePoint(hex[0]);
    }
    var now = $("#textarea").val();
-    var selin = localStorage.getItem("cursor");
-    var now = $("#textarea").val();
-    if (selin > 0) {
-        var before = now.substr(0, selin);
-        var after = now.substr(selin, now.length);
-        newt = before + emoji + after;
-    } else {
-        newt = emoji + now;
-    }
+    var before = now.substr(0, selin);
+    var after = now.substr(selin, now.length);
+    newt = before + emoji + after;
    $("#textarea").val(newt);
    $("#textarea").focus();
-    var selin = $("#textarea").prop('selectionStart');
-    if (!selin) {
-        selin = 0;
-    }
-    localStorage.setItem("cursor", selin);
 }
 function faicon() {
    var json = faicons;
--- a/app/js/lang/json5Tojson.js
+++ b/app/js/lang/json5Tojson.js
@@ -0,0 +1,3 @@
+const JSON5 = require('json5')
+const fs = require("fs")
+fs.writeFileSync("main.json", JSON.stringify(JSON5.parse(fs.readFileSync("lang." + process.argv[2] + ".js", 'utf8').replace("var lang = ", ""))))
--- a/app/js/lang/lang.bg.js
+++ b/app/js/lang/lang.bg.js
@@ -0,0 +1,247 @@
+var lang={
+    "language": "en",
+    "lang_toot": "Раздумай",
+    "lang_there": "Да",
+    "lang_nothing": "Няма",
+    "lang_yesno": "Да",
+    "lang_no": "Не",
+    "lang_progress": "Изчакайте...",
+    "lang_edit": "Редактиране",
+    "lang_del": "Изтрий",
+    "lang_add": "Добави",
+    "lang_fatalerroroccured": "Възникнаха някои грешки, моля рестартирайте Desk.",
+    "lang_speech": "Google US English",
+    "lang_lang": "Език",
+    "lang_langlocale": "Английски",
+    "lang_back": "Назад",
+    "lang_set": "Задай",
+    "lang_langadd": "Преведете TheDesk на други езици или проверете TheDesk на <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\"> GitHub </a>. TheDesk се нуждае от вашата помощ.",
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": null,
+    "lang_time_suffixAgo": null,
+    "lang_time_suffixFromNow": null,
+    "lang_time_inPast": null,
+    "lang_time_seconds": "%d s",
+    "lang_time_minute": "1 m",
+    "lang_time_minutes": "%d m",
+    "lang_time_hour": "1 h",
+    "lang_time_hours": "%d h",
+    "lang_time_day": "1 d",
+    "lang_time_days": "%d d",
+    "lang_time_month": "1 month",
+    "lang_time_months": "%d months",
+    "lang_time_year": "y",
+    "lang_time_years": "%d y",
+    "lang_version_usever": "Не е намерена актуализация({{ver}})",
+    "lang_version_skipver": "Актуализацията бе игнорирана.",
+    "lang_version_platform": "Искате ли автоматични актуализации? (За потребителите инсталирали от Microsoft Store, изберете „Не“)",
+    "lang_version_platform_linux": "Искате ли автоматични актуализации? (За потребителите инсталирали от Snapcraft, изберете „Не“)",
+    "lang_version_platform_mac": "Искате ли автоматични актуализации? (За потребителите на Homebrew Cask изберете „Не“)",
+    "lang_login_noauth": "Показване на TL на нерегистрирани профили",
+    "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": "Отворете DevCenter на Misskey. Ние показваме официални документи, на които се позоваваме.",
+    "lang_manager_logout": "Излизане",
+    "lang_bbmd_misskey": "TheDesk разглежда \"@\" като отговор, но поставя друг параметър. Ако не е включено в Mastodon това означава, че е в Home на Misskey.",
+    "lang_emoji_get": "Вземи емотикони",
+    "lang_emoji_custom": "Персонализирани емотикони",
+    "lang_defaultemojis_text": "Още емотикони {{cat}}",
+    "lang_postimg_previewdis": "не може да се визуализира",
+    "lang_postimg_aftupload": "Не можете да променяте профилите след качването.",
+    "lang_postimg_delete": "Изтрийте това изображение.",
+    "lang_post_tagTL": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?",
+    "lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.",
+    "lang_post_cwtitle": "Авто CW Сигнал",
+    "lang_post_cwtxt": "На път сте да публикувате по-дълга раздумка, отколкото е зададена.\nТекст на предупреждението:",
+    "lang_post_btn1": "Отказ (няма да се публикува)",
+    "lang_post_btn2": "Текстът да се скрива автоматично",
+    "lang_post_btn3": "Продължете към публикуването",
+    "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_redraftTitle": "Изтрий & върни",
+    "lang_status_redraft": "Продължете да изтривате & преработвате? Ще изгубите статуса на тази раздумка. В тази функция може да се съдържат някои грешки. Снимките от тази раздумка ще бъдат изтрити на по-стари от 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_status_followers": "Followers",
+    "lang_status_active": "Last status",
+    "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_add_misskey": "(perhaps this user has been listed)",
+    "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_unrealtime": "Disable TsT",
+    "lang_tags_tagwarn": "Автоматично попълване на {{tag}}, ако раздумката няма {{tag}}",
+    "lang_tl_media": "Media",
+    "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_img_DLDone": "Downloaded:",
+    "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_layout_unread": "Unread",
+    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excludingbt": "Показване в BT режим (ИЗКЛ./Изключване BT/ Само в BT)",
+    "lang_layout_leftFold": "Стъпка наляво",
+    "lang_layout_leftUnfold": "Док отдясно",
+    "lang_layout_deleteColumn": "Премахване на тази колона",
+    "lang_layout_deleteColumnDesc": "Премахване на тази колона",
+    "lang_sort_gothis": "Отидете в тази колона",
+    "lang_sort_remthis": "Премахване на тази колона",
+    "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": "Готово:шаблон на 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_hisdata_key": "This user is proofed by {{set}}",
+    "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_showontl_verified": "This website is verified by owner at ",
+    "lang_parse_mentioned": " replied to you",
+    "lang_parse_faved": " favourited your toot",
+    "lang_parse_bted": " boosted your toot",
+    "lang_parse_btedsimple": " boosted",
+    "lang_parse_polled": "'s poll",
+    "lang_parse_notftime": "Actioned at",
+    "lang_parse_cwshow": "Show",
+    "lang_parse_fulltext": "Full size text:",
+    "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": "Изтрийте тази раздумка",
+    "lang_parse_pin": "Pin this toot",
+    "lang_parse_det": "Details via your main account.",
+    "lang_parse_redraft": "Изтрий & върни",
+    "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": "Vote",
+    "lang_parse_unvoted": "Show the result without voting",
+    "lang_parse_endedvote": "Expired",
+    "lang_parse_thread": "Show thread",
+    "lang_parse_unknown": "Attached file",
+    "lang_parse_nsfw": "NSFW media",
+    "lang_parse_notffilter": "Show this user's notifications",
+    "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": "Автоматично сгъване:{{set1}} линии по-нагоре,{{set2}} букви по-нагоре",
+    "lang_setting_autocw": "Автоматично CW:{{set1}} линии по-нагоре, {{set2}} букви по-нагоре",
+    "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": "Всички данни ще бъдат изтрити."
+}
--- a/app/js/lang/lang.cs.js
+++ b/app/js/lang/lang.cs.js
@@ -0,0 +1,247 @@
+var lang={
+    "language": "cs",
+    "lang_toot": "Toot",
+    "lang_there": "Ano",
+    "lang_nothing": "Nic",
+    "lang_yesno": "Ano",
+    "lang_no": "Ne",
+    "lang_progress": "Čekejte...",
+    "lang_edit": "Upravit",
+    "lang_del": "Smazat",
+    "lang_add": "Přidat",
+    "lang_fatalerroroccured": "Vyskytly se nějaké chyby, prosím restartujte TheDesk.",
+    "lang_speech": "Google Čeština",
+    "lang_lang": "Jazyk",
+    "lang_langlocale": "Čeština",
+    "lang_back": "Zpět",
+    "lang_set": "Nastavit",
+    "lang_langadd": "Přeložte TheDesk do jiných jazyků nebo opravte existující překlad na <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHubu</a> nebo <a href=\"https://translate.thedesk.top/\" target=\"_blank\">Crowdinu</a>. TheDesk potřebuje vaši pomoc.",
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": null,
+    "lang_time_suffixAgo": null,
+    "lang_time_suffixFromNow": null,
+    "lang_time_inPast": null,
+    "lang_time_seconds": "%d s",
+    "lang_time_minute": "1 m",
+    "lang_time_minutes": "%d m",
+    "lang_time_hour": "1 h",
+    "lang_time_hours": "%d h",
+    "lang_time_day": "1 d",
+    "lang_time_days": "%d d",
+    "lang_time_month": "1 month",
+    "lang_time_months": "%d months",
+    "lang_time_year": "y",
+    "lang_time_years": "%d y",
+    "lang_version_usever": "Nebyla nalezena žádná aktualizace ({{ver}})",
+    "lang_version_skipver": "Aktualizace byla ignorována.",
+    "lang_version_platform": "Do you want auto-updates?(users installed on Microsoft Store select 'No')",
+    "lang_version_platform_linux": "Do you want auto-updates?(users installed on Snapcraft select 'No')",
+    "lang_version_platform_mac": "Do you want auto-updates?(Homebrew Cask users select 'No')",
+    "lang_login_noauth": "Zobrazit časové osy nepřihlášených účtů",
+    "lang_manager_info": "O tomto serveru",
+    "lang_manager_refresh": "Obnovit",
+    "lang_manager_delete": "Odhlásit",
+    "lang_manager_color": "Barva účtu",
+    "lang_manager_confirm": "se chce odhlásit. Pokračovat?",
+    "lang_manager_mainAcct": "Hotovo: vyberte hlavní účet",
+    "lang_manager_def": "Výchozí",
+    "lang_manager_none": "Žádný",
+    "lang_manager_godev": "Otevřené vývojářské centrum softwaru Misskey. Zobrazujeme také oficiální dokumentaci.",
+    "lang_manager_logout": "Logout",
+    "lang_bbmd_misskey": "TheDesk považuje „@“ za odpověď, ale vkládá ho do jiných parametrů. „Neuvedeno“ na Mastodonu znamená „Domů“ na Misskey.",
+    "lang_emoji_get": "Získat emoji",
+    "lang_emoji_custom": "Vlastní emoji",
+    "lang_defaultemojis_text": "Emojis about {{cat}}",
+    "lang_postimg_previewdis": "nelze vytvořit náhled",
+    "lang_postimg_aftupload": "Po nahrání nemůžete změnit účty.",
+    "lang_postimg_delete": "Delete this image.",
+    "lang_post_tagTL": "Tento toot neobsahuje výchozí hashtag. Tento toot nebude zobrazen na výchozí časové ose. Pokračovat?",
+    "lang_post_tagVis": "Tento toot (ne „veřejný“ toot) není zobrazen na časové ose tohoto hashtagu.",
+    "lang_post_cwtitle": "Automatické varování o obsahu",
+    "lang_post_cwtxt": "Chcete napsat delší toot, než jste nastavil/a.\nText varování:",
+    "lang_post_btn1": "Zrušit (příspěvek nebude publikován)",
+    "lang_post_btn2": "Skrýt text automaticky",
+    "lang_post_btn3": "Pokračovat k přispívání",
+    "lang_status_favWarn": "Oblíbení vzdáleného tootu bude chvíli trvat.",
+    "lang_status_btWarn": "Boostnutí vzdáleného tootu bude chvíli trvat.",
+    "lang_status_follow": "Sledovat",
+    "lang_status_unfollow": "Přestat sledovat",
+    "lang_status_block": "Blokovat",
+    "lang_status_unblock": "Odblokovat",
+    "lang_status_mute": "Ignorovat",
+    "lang_status_unmute": "Přestat ignorovat",
+    "lang_status_redraftTitle": "Delete & redraft",
+    "lang_status_redraft": "Chcete pokračovat k vymazání a přepsání? Ztratíte odpovědi na tento toot. Tato funkce může obashovat několik chyb. Obrázky v tomto tootu budou na verzi Mastodonu starší než 2.4.1 smazány.",
+    "lang_status_emphas": ": tooty tohoto uživatele jsou zdůrazněny. Po této akci prosím obnovte stránku.",
+    "lang_status_unemphas": ": tooty tohoto uživatele nejsou zdůrazněny. Po této akci prosím obnovte stránku.",
+    "lang_status_unendorse": "Nepředstavit na profilu",
+    "lang_status_endorse": "Představit na profilu",
+    "lang_status_followers": "Followers",
+    "lang_status_active": "Last status",
+    "lang_suggest_nodata": "Pro zobrazení návrhu prosím získejte seznam emoji.",
+    "lang_usetxtbox_reply": "Režim odpovězení. Pro vymazání stiskněte Ctrl+Shift+C.",
+    "lang_cards_check": " kontrolovat",
+    "lang_cards_pip": "Režim PiP",
+    "lang_details_nodata": "Žádná data",
+    "lang_details_filtered": "Filtrovaný toot",
+    "lang_details_embed": "HTML pro vložení je zkopírován.",
+    "lang_details_url": "URL adresa tohoto tootu je zkopírována.",
+    "lang_details_txt": "Obsah tohoto tootu je zkopírován.",
+    "lang_filter_nodata": "Žádná data",
+    "lang_filter_errordegree": "Prosím zkontrolujte kontext",
+    "lang_list_nodata": "Žádná data",
+    "lang_list_show": "Zobrazit",
+    "lang_list_users": "Seznam uživatelů",
+    "lang_list_nouser": "Žádní uživatelé na tomto seznamu.",
+    "lang_list_add": "Přidat na seznam",
+    "lang_list_add_misskey": "(perhaps this user has been listed)",
+    "lang_list_remove": "Odstranit ze seznamu",
+    "lang_notf_new": " nových oznámení",
+    "lang_speech_refresh": "Uložit hodnotu nastavení TTS",
+    "lang_src_ts": "chronologické pořadí",
+    "lang_src_people": " lidí tootují",
+    "lang_tags_always": "Vždy tootnout s ",
+    "lang_tags_realtime": "Tag-stream toot",
+    "lang_tags_tagunpin": "Odepnout {{tag}}",
+    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_tagwarn": "Auto complete {{tag}}, if toot without {{tag}}",
+    "lang_tl_media": "Média",
+    "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_img_DLDone": "Downloaded:",
+    "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
+    "lang_layout_thisacct": "{{notf}} tohoto účtu",
+    "lang_layout_delthis": "Odstranit tento sloupec",
+    "lang_layout_setthis": "Nastavení tohoto sloupce",
+    "lang_layout_mediafil": "Filtrování médií",
+    "lang_layout_linkana": "Automatický analyzátor odkazů",
+    "lang_layout_linkanades": "Automatický analyzátor odkazů",
+    "lang_layout_tts": "Převod textu na řeč ",
+    "lang_layout_reconnect": "Reconnect to streaming API",
+    "lang_layout_headercolor": "Header color of this column",
+    "lang_layout_nodata": "[Žádná data]<br>Obnovte stránku klávesami F5/⌘+R",
+    "lang_layout_dm": "Přímá zpráva",
+    "lang_layout_webviewmode": "Preferovat WebView",
+    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_leftFold": "Stack to the left",
+    "lang_layout_leftUnfold": "Dock on the right",
+    "lang_layout_deleteColumn": "Delete this column",
+    "lang_layout_deleteColumnDesc": "Delete this column",
+    "lang_layout_unread": "Unread",
+    "lang_sort_gothis": "Go to this column",
+    "lang_sort_remthis": "Delete this column",
+    "lang_spotify_img": "Attach an album artwork",
+    "lang_spotify_imgno": "Not attach an album artwork",
+    "lang_spotify_acct": "Spojit TheDesk se Spotify",
+    "lang_spotify_np": "Hotovo: šablona NowPlaying",
+    "lang_setting_npprovide": "NowPlaying provider:{{set}}",
+    "lang_hisdata_frcreq": "Vyžaduje Mastodon 2.4.3 nebo vyšší verzi",
+    "lang_hisdata_frcwarn": "Budou zobrazeny již nesledované účty.",
+    "lang_hisdata_taketime": "It will take 30s ~ several minutes",
+    "lang_hisdata_notonmisskey": "Misskey is unable to request.",
+    "lang_hisdata_key": "This user is proofed by {{set}}",
+    "lang_showontl_movetxt": "Tento účet byl přesunut",
+    "lang_showontl_movebtn": "Continue on the new account",
+    "lang_showontl_botacct": "[robot]",
+    "lang_showontl_followed": "Sledují vás",
+    "lang_showontl_notf": "Oznámení ",
+    "lang_showontl_domain": "Doména ",
+    "lang_showontl_listwarn": "Follow to add this user to lists.",
+    "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_parse_mentioned": " vám odpověděl/a",
+    "lang_parse_faved": " si oblíbil/a váš toot",
+    "lang_parse_bted": " boostnul/a váš toot",
+    "lang_parse_btedsimple": " boostnul/a",
+    "lang_parse_polled": "'s poll",
+    "lang_parse_notftime": "Provedeno",
+    "lang_parse_cwshow": "Zobrazit",
+    "lang_parse_fulltext": "Celý text:",
+    "lang_parse_autofold": "Auto folded",
+    "lang_parse_more": "Více",
+    "lang_parse_url": "Analyzátor URL",
+    "lang_parse_tagTL": "Časová osa {{tag}}",
+    "lang_parse_tagtoot": "Tootnout s hashtagem {{tag}}",
+    "lang_parse_tagpin": "Připnout {{tag}}",
+    "lang_parse_public": "Veřejný",
+    "lang_parse_unlisted": "Neuvedený",
+    "lang_parse_private": "Soukromý",
+    "lang_parse_direct": "Přímý",
+    "lang_parse_clickcopy": "Klikněte pro zkopírování textu tohoto tootu",
+    "lang_parse_clickcopyurl": "Klikněte pro zkopírování URL adresy tohoto tootu",
+    "lang_parse_trans": "Přeložit do japonštiny",
+    "lang_parse_replyto": "Odpovědět na tento toot",
+    "lang_parse_bt": "Boostnout tento toot",
+    "lang_parse_fav": "Oblíbit si tento toot",
+    "lang_parse_quote": "Citovat tento toot",
+    "lang_parse_del": "Smazat tento toot",
+    "lang_parse_pin": "Připnout tento toot",
+    "lang_parse_det": "Details via your main account.",
+    "lang_parse_redraft": "Vymazat a přepsat",
+    "lang_parse_followed": "vás nyní sleduje",
+    "lang_parse_clientop": "Operace tohoto klienta",
+    "lang_parse_clienttxt": " bude",
+    "lang_parse_clientno": "nic nedělat",
+    "lang_parse_clientemp": "zdůrazněna (nebo nezdůrazněna)",
+    "lang_parse_clientmute": "ztlumena",
+    "lang_parse_mute": " bude ztlumena. To můžete odstranit v nastavení.",
+    "lang_parse_voted": "Voted",
+    "lang_parse_vote": "Vote",
+    "lang_parse_unvoted": "Show the result without voting",
+    "lang_parse_endedvote": "Expired",
+    "lang_parse_thread": "Show thread",
+    "lang_parse_unknown": "Attached file",
+    "lang_parse_nsfw": "NSFW media",
+    "lang_parse_notffilter": "Show this user's notifications",
+    "lang_misskeyparse_renote": "Znovusdílení",
+    "lang_misskeyparse_renoteqt": "Renotování",
+    "lang_misskeyparse_reaction": "Reakce",
+    "lang_misskeyparse_tagnostr": "Žádné streamovací API na časových osách hashtagů",
+    "lang_misskeyparse_listnostr": "Žádné streamovací API na časových osách seznamů",
+    "lang_misskeyparse_home": "Domů",
+    "lang_misskeyparse_followers": "Sledující",
+    "lang_misskeyparse_specified": "Určený uživatel",
+    "lang_misskeyparse_qt": "Režim renotování (citace) Misskey: pro vymazání stiskněte Ctrl+Shift+Enter",
+    "lang_misskeyparse_renoted": " renotoval/a váš následující příspěvek.",
+    "lang_misskeyparse_quoted": " citoval/a váš následující příspěvek.",
+    "lang_misskeyparse_reacted": " reagoval/a na váš následující příspěvek.",
+    "lang_setting_time": "Časový formát: {{set}}",
+    "lang_setting_theme": "Motiv: {{set}}",
+    "lang_setting_nsfw": "Citlivý obsah: {{set}}",
+    "lang_setting_cw": "Varování: {{set}}",
+    "lang_setting_cwtext": "Výchozí text varování: {{set}}",
+    "lang_setting_cws": "Vždy zapnout varování na: {{set}}",
+    "lang_setting_rp": "Počitadlo odpovědí: {{set}}",
+    "lang_setting_vis": "Výchozí viditelnost: {{set}}",
+    "lang_setting_popup": "Popupové oznámení: {{set}}",
+    "lang_setting_off": "Vyl",
+    "lang_setting_s": "s",
+    "lang_setting_box": "Výchozí akce tootového pole: {{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": "Písma: {{set}}",
+    "lang_setting_default": "výchozí písmo",
+    "lang_setting_size": "Velikost písma: {{set}} px",
+    "lang_setting_imgheight": "Výška obrázků: {{set}} px",
+    "lang_setting_ticker": "#InstanceTicker: {{set}} px",
+    "lang_setting_animation": "Animation: {{set}}",
+    "lang_setting_tag": "Časová osa hashtagu: {{set}}",
+    "lang_setting_boxConfirm": "Post box:{{set}}",
+    "lang_setting_ul": "Native locale:{{set}}",
+    "lang_setting_notf": "Native notification:{{set}}",
+    "lang_setting_quote": "Formát citace: {{set}}",
+    "lang_setting_via": "Přes: {{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": "Žádný klient není ztlumen.",
+    "lang_setting_notftest": " Test oznámení ",
+    "lang_setting_notftestprof": "Vaše ikona je zobrazena.",
+    "lang_setting_exportwarn": "Budou exportována pouze důležitá data. Tato data musíte udržet v bezpečí.",
+    "lang_setting_importwarn": "Všechna data budou smazána."
+}
--- a/app/js/lang/lang.de.js
+++ b/app/js/lang/lang.de.js
@@ -0,0 +1,247 @@
+var lang={
+    "language": "en",
+    "lang_toot": "Tröt",
+    "lang_there": "Ja",
+    "lang_nothing": "Ohne",
+    "lang_yesno": "Ja",
+    "lang_no": "Nein",
+    "lang_progress": "Warten...",
+    "lang_edit": "Bearbeiten",
+    "lang_del": "Löschen",
+    "lang_add": "Hinzufügen",
+    "lang_fatalerroroccured": "Ein Fehler ist aufgetreten, bitte starten Sie TheDesk neu.",
+    "lang_speech": "Google US Englisch",
+    "lang_lang": "Sprache",
+    "lang_langlocale": "Englisch",
+    "lang_back": "Zurück",
+    "lang_set": "Setzen",
+    "lang_langadd": "Übersetzen oder korrigieren Sie TheDesk in andere Sprachen auf <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk benötigt Ihre Hilfe.",
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": null,
+    "lang_time_suffixAgo": null,
+    "lang_time_suffixFromNow": null,
+    "lang_time_inPast": null,
+    "lang_time_seconds": "%d s",
+    "lang_time_minute": "1 m",
+    "lang_time_minutes": "%d m",
+    "lang_time_hour": "1 h",
+    "lang_time_hours": "%d h",
+    "lang_time_day": "1 d",
+    "lang_time_days": "%d d",
+    "lang_time_month": "1 month",
+    "lang_time_months": "%d months",
+    "lang_time_year": "y",
+    "lang_time_years": "%d y",
+    "lang_version_usever": "Keine Aktualisierung gefunden({{ver}})",
+    "lang_version_skipver": "Update wurde ignoriert.",
+    "lang_version_platform": "Möchten Sie automatische Updates?(Benutzer im Microsoft Store wählen 'Nein')",
+    "lang_version_platform_linux": "Möchten Sie automatische Updates?(Benutzer auf Snapcraft wählen 'Nein')",
+    "lang_version_platform_mac": "Möchten Sie automatische Updates?(Homebrew Cask Benutzer wählen 'Nein')",
+    "lang_login_noauth": "Verläufe von nicht angemeldeten Konten anzeigen",
+    "lang_manager_info": "Über diese Instanz",
+    "lang_manager_refresh": "Aktualisieren",
+    "lang_manager_delete": "Abmelden",
+    "lang_manager_color": "Kontofarbe",
+    "lang_manager_confirm": "ist im Begriff, sich auszuloggen. Fortfahren?",
+    "lang_manager_mainAcct": "Fertig:Hauptkonto wählen",
+    "lang_manager_def": "Standard",
+    "lang_manager_none": "Ohne",
+    "lang_manager_godev": "Öffnen Sie das DevCenter von Misskey. Wir zeigen auch ein offizielles Dokument als Referenz.",
+    "lang_manager_logout": "Abmelden",
+    "lang_bbmd_misskey": "TheDesk betrachtet \"@\" als Antwort, setzt aber einen anderen Parameter. Nicht auf Mastodon gelistet bedeutet Home on Misskey.",
+    "lang_emoji_get": "Hole Emojis",
+    "lang_emoji_custom": "Eigene Emojis",
+    "lang_defaultemojis_text": "Emojis über {{cat}}",
+    "lang_postimg_previewdis": "keine Vorschau",
+    "lang_postimg_aftupload": "Sie können die Konten nach dem Hochladen nicht mehr ändern.",
+    "lang_postimg_delete": "Dieses Bild löschen.",
+    "lang_post_tagTL": "Dieses Tröt enthält keinen Standard-Tag. Er wird in dem lokalen Verlauf nicht angezeigt. Fortfahren?",
+    "lang_post_tagVis": "Dieser Tröt (nicht 'öffentlicher' Tröt) wird nicht in diesem Tag-Verlauf angezeigt.",
+    "lang_post_cwtitle": "Auto CW Alert",
+    "lang_post_cwtxt": "Du bist dabei, länger zu posten, als du eingestellt hast.\nWarntext:",
+    "lang_post_btn1": "Abbrechen (wird nicht gesendet)",
+    "lang_post_btn2": "Text automatisch ausblenden",
+    "lang_post_btn3": "Weiter mit Senden",
+    "lang_status_favWarn": "Es braucht einen Moment, um ein entferntes Tröt zu favorisieren.",
+    "lang_status_btWarn": "Es braucht einen Moment, um ein entferntes Tröt zu verstärken.",
+    "lang_status_follow": "Folgen",
+    "lang_status_unfollow": "Nicht mehr folgen",
+    "lang_status_block": "Blockieren",
+    "lang_status_unblock": "Freigeben",
+    "lang_status_mute": "Stummschalten",
+    "lang_status_unmute": "Stummschalten aufheben",
+    "lang_status_redraftTitle": "Löschen & Neuentwerfen",
+    "lang_status_redraft": "Weiter mit löschen & neu entwerfen? Du verlierst den Status dieses Tröts. Diese Aktion kann einige Fehler enthalten. Bilder dieses Tröts werden auf älteren Versionen als Mastodon 2.4.1 gelöscht.",
+    "lang_status_emphas": "'s Tröts werden hervorgehoben. Bitte laden Sie nach dieser Aktion neu.",
+    "lang_status_unemphas": "'s Tröts werden nicht hervorgehoben. Bitte laden Sie nach dieser Aktion neu.",
+    "lang_status_unendorse": "Nicht auf dem Profil zeigen",
+    "lang_status_endorse": "Auf dem Profil zeigen",
+    "lang_status_followers": "Followers",
+    "lang_status_active": "Last status",
+    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
+    "lang_usetxtbox_reply": "Antwortmodus. Strg+Umschalt+C zum Löschen.",
+    "lang_cards_check": " überprüfen",
+    "lang_cards_pip": "PiP mode",
+    "lang_details_nodata": "Keine Daten",
+    "lang_details_filtered": "Gefilterter Tröt",
+    "lang_details_embed": "Eingefügtes HTML wurde entfernt.",
+    "lang_details_url": "URL dieses Tröts wurde entfernt.",
+    "lang_details_txt": "Inhalt dieses Tröts wurde entfernt.",
+    "lang_filter_nodata": "Keine Daten",
+    "lang_filter_errordegree": "Bitte überprüfen Sie den Kontext",
+    "lang_list_nodata": "Keine Daten",
+    "lang_list_show": "Anzeigen",
+    "lang_list_users": "Benutzerliste",
+    "lang_list_nouser": "Keine Benutzer in dieser Liste.",
+    "lang_list_add": "Zur Liste hinzufügen",
+    "lang_list_add_misskey": "(vielleicht wurde dieser Benutzer aufgelistet)",
+    "lang_list_remove": "Aus Liste entfernen",
+    "lang_notf_new": " neue Benachrichtigungen",
+    "lang_speech_refresh": "Sichern der Vorlesefunktionseinstellungen",
+    "lang_src_ts": "chronologische Reihenfolge",
+    "lang_src_people": " Leute Tröt",
+    "lang_tags_always": "Immer Tröten mit ",
+    "lang_tags_realtime": "Tag-Stream Tröt",
+    "lang_tags_tagunpin": "{{tag}} entsperren",
+    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_tagwarn": "Automatisch {{tag}} anfügen, wenn Tröt ohne {{tag}} ist",
+    "lang_tl_media": "Medien",
+    "lang_tl_reconnect": "Mit Streaming API erneut verbinden",
+    "lang_img_DLDone": "Heruntergeladen:",
+    "lang_layout_gotop": "Gehen Sie zum Anfang dieser Spalte. Wenn das Symbol rot ist, kann diese Spalte keine Verbindung zur Streaming-API herstellen. Bitte neu laden.",
+    "lang_layout_thisacct": "{{notf}} dieses Kontos",
+    "lang_layout_delthis": "Diese Spalte löschen",
+    "lang_layout_setthis": "Einstellungen dieser Spalte",
+    "lang_layout_mediafil": "Medien filtern",
+    "lang_layout_linkana": "Automatische Link-Analyse",
+    "lang_layout_linkanades": "Automatische Link-Analyse",
+    "lang_layout_tts": "Sprachausgabe ",
+    "lang_layout_reconnect": "Mit Streaming API erneut verbinden",
+    "lang_layout_headercolor": "Kopfzeilenfarbe dieser Spalte",
+    "lang_layout_nodata": "[Keine Daten]<br>F5/⌘+R zum Neu laden",
+    "lang_layout_dm": "Direkte Nachricht",
+    "lang_layout_webviewmode": "Web-Ansicht bevorzugen",
+    "lang_excluded": "Ausgeschlossene Benachrichtigungsart",
+    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_leftFold": "Nach links Stapeln",
+    "lang_layout_leftUnfold": "Rechts Anheften",
+    "lang_layout_deleteColumn": "Diese Spalte löschen",
+    "lang_layout_deleteColumnDesc": "Diese Spalte löschen",
+    "lang_layout_unread": "Unread",
+    "lang_sort_gothis": "Gehe zu dieser Spalte",
+    "lang_sort_remthis": "Diese Spalte löschen",
+    "lang_spotify_img": "Albumcover anhängen",
+    "lang_spotify_imgno": "Kein Albumcover anhängen",
+    "lang_spotify_acct": "TheDesk mit Spotify verbinden",
+    "lang_spotify_np": "Done:Vorlage für NowPlaying",
+    "lang_setting_npprovide": "NowPlaying Provider:{{set}}",
+    "lang_hisdata_frcreq": "Benötigte Mastodon 2.4.3 und höher",
+    "lang_hisdata_frcwarn": "Unfollow accounts will be shown.",
+    "lang_hisdata_taketime": "Es dauert 30s bis mehrere Minuten",
+    "lang_hisdata_notonmisskey": "Misskey kann nicht angefordert werden.",
+    "lang_hisdata_key": "Dieser Benutzer ist von {{set}} überprüft",
+    "lang_showontl_movetxt": "Dieses Konto wurde verschoben",
+    "lang_showontl_movebtn": "Auf dem neuen Konto fortfahren",
+    "lang_showontl_botacct": "[bot]",
+    "lang_showontl_followed": "Folgt dir",
+    "lang_showontl_notf": "Benachrichtigung ",
+    "lang_showontl_domain": "Domain ",
+    "lang_showontl_listwarn": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
+    "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_parse_mentioned": " hat dir geantwortet",
+    "lang_parse_faved": " favorisierte deinen Tröt",
+    "lang_parse_bted": " hat deinen Tröt verstärkt",
+    "lang_parse_btedsimple": " verstärkt",
+    "lang_parse_polled": "'s Umfrage",
+    "lang_parse_notftime": "Bearbeitet am",
+    "lang_parse_cwshow": "Anzeigen",
+    "lang_parse_fulltext": "Full size text:",
+    "lang_parse_autofold": "Automatisches Zusammenfalten",
+    "lang_parse_more": "Mehr",
+    "lang_parse_url": "URL-Analyse",
+    "lang_parse_tagTL": "Verlauf von {{tag}}",
+    "lang_parse_tagtoot": "Tröt mit {{tag}}",
+    "lang_parse_tagpin": "Pin {{tag}}",
+    "lang_parse_public": "Öffentlich",
+    "lang_parse_unlisted": "Nicht aufgeführt",
+    "lang_parse_private": "Privat",
+    "lang_parse_direct": "Direkt",
+    "lang_parse_clickcopy": "Klicken, um den Text dieses Tröts zu kopieren",
+    "lang_parse_clickcopyurl": "Klicken, um die URL dieses Tröts zu kopieren",
+    "lang_parse_trans": "Übersetzen nach Japanisch",
+    "lang_parse_replyto": "Auf diesen Tröt antworten",
+    "lang_parse_bt": "Diesen Tröt verstärken",
+    "lang_parse_fav": "Diesen Tröt favorisieren",
+    "lang_parse_quote": "Diesen Tröt zitieren",
+    "lang_parse_del": "Diesen Tröt löschen",
+    "lang_parse_pin": "Dieses Tröt fixieren",
+    "lang_parse_det": "Details über Ihr Hauptkonto.",
+    "lang_parse_redraft": "Löschen & Neuentwerfen",
+    "lang_parse_followed": "Folgt dir",
+    "lang_parse_clientop": "Aktion dieses Clients",
+    "lang_parse_clienttxt": " wird",
+    "lang_parse_clientno": "Nichts unternehmen",
+    "lang_parse_clientemp": "Hervorgehoben(/nicht hervorgehoben)",
+    "lang_parse_clientmute": "Stumm",
+    "lang_parse_mute": " wird stumm gemacht. Kann in den Einstellungen wieder entfernt werden.",
+    "lang_parse_voted": "Abgestimmt",
+    "lang_parse_vote": "Abstimmen",
+    "lang_parse_unvoted": "Ergebnis ohne Abstimmung anzeigen",
+    "lang_parse_endedvote": "Abgelaufen",
+    "lang_parse_thread": "Konversation anzeigen",
+    "lang_parse_unknown": "Angehängte Datei",
+    "lang_parse_nsfw": "NSFW Medien",
+    "lang_parse_notffilter": "Benachrichtigungen dieses Benutzers anzeigen",
+    "lang_misskeyparse_renote": "Weiterleiten",
+    "lang_misskeyparse_renoteqt": "Renote",
+    "lang_misskeyparse_reaction": "Reaktion",
+    "lang_misskeyparse_tagnostr": "Keine Streaming-API für Tag-Verläufe",
+    "lang_misskeyparse_listnostr": "Keine Streaming-API fpr Listen-Verläufe",
+    "lang_misskeyparse_home": "Startseite",
+    "lang_misskeyparse_followers": "Abonnent",
+    "lang_misskeyparse_specified": "Ausgewählte Benutzer",
+    "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
+    "lang_misskeyparse_renoted": " hat deinen folgenden Beitrag zurückgewiesen.",
+    "lang_misskeyparse_quoted": " zitierte deinen folgenden Beitrag.",
+    "lang_misskeyparse_reacted": " hat auf Ihren folgenden Beitrag reagiert.",
+    "lang_setting_time": "Zeitformat:{{set}}",
+    "lang_setting_theme": "Design:{{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": "Antwortzähler:{{set}}",
+    "lang_setting_vis": "Standardsichtbarkeit:{{set}}",
+    "lang_setting_popup": "Popup-Benachrichtigung:{{set}}",
+    "lang_setting_off": "Aus",
+    "lang_setting_s": "s",
+    "lang_setting_box": "Standard-Tröt-Box-Aktion:{{set}}",
+    "lang_setting_gif": "GIF:{{set}}",
+    "lang_setting_selt": "Auto-Falten:{{set1}} Zeilen und höher, {{set2}} Buchstaben und höher",
+    "lang_setting_autocw": "Auto CW:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_width": "Minimale Breite:{{set}}",
+    "lang_setting_fixwidth": "TweetDeck feste Breite:{{set}}px",
+    "lang_setting_img": "Nach dem Posten eines Bildes:{{set}}",
+    "lang_setting_font": "Schriftart:{{set}}",
+    "lang_setting_default": "Standard-Schriftart",
+    "lang_setting_size": "Schriftgröße:{{set}}px",
+    "lang_setting_imgheight": "Bildhöhe:{{set}}px",
+    "lang_setting_ticker": "#InstanceTicker:{{set}}px",
+    "lang_setting_animation": "Animation: {{set}}",
+    "lang_setting_tag": "Tag-Verlauf:{{set}}",
+    "lang_setting_boxConfirm": "Postfach:{{set}}",
+    "lang_setting_ul": "Muttersprache:{{set}}",
+    "lang_setting_notf": "System Benachrichtigungen:{{set}}",
+    "lang_setting_quote": "Zitierformat:{{set}}",
+    "lang_setting_via": "Via:{{set}}",
+    "lang_setting_mov": "Aktionstasten verstecken:{{set}}",
+    "lang_setting_setasread": "Benachrichtigungs-Markierungen:{{set}}",
+    "lang_setting_main": "Standard-Konto:{{set}}",
+    "lang_setting_sec": "Zweite Tröt-Taste:{{set}}",
+    "lang_setting_ksref": "Tastaturkürzel werden aktualisiert.",
+    "lang_setting_nomuting": "Kein Client ist stumm.",
+    "lang_setting_notftest": " Benachrichtigungen testen ",
+    "lang_setting_notftestprof": "Ihr Symbol wird angezeigt.",
+    "lang_setting_exportwarn": "Nur wichtige Daten werden exportiert. Sie müssen diese Daten sichern.",
+    "lang_setting_importwarn": "Alle Daten werden gelöscht."
+}
--- a/app/js/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@@ -18,6 +18,23 @@ var lang = {
    "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/time.js
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": null,
+    "lang_time_suffixAgo": null,
+    "lang_time_suffixFromNow": null,
+    "lang_time_inPast": null,
+    "lang_time_seconds": "%d s",
+    "lang_time_minute": "1 m",
+    "lang_time_minutes": "%d m",
+    "lang_time_hour": "1 h",
+    "lang_time_hours": "%d h",
+    "lang_time_day": "1 d",
+    "lang_time_days": "%d d",
+    "lang_time_month": "1 month",
+    "lang_time_months": "%d months",
+    "lang_time_year": "y",
+    "lang_time_years": "%d y",
    //common/version.js
    "lang_version_usever": "No update is found({{ver}})",
    "lang_version_skipver": "Update was ignored.",
@@ -47,6 +64,7 @@ var lang = {
    //post/img.js
    "lang_postimg_previewdis": "cannot preview",
    "lang_postimg_aftupload": "You cannot change accounts after uploading.",
+    "lang_postimg_failupload": "Failed",
    "lang_postimg_delete": "Delete this image.",
    //post/post.js
    "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
@@ -71,6 +89,8 @@ var lang = {
    "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_status_followers": "Followers",
+    "lang_status_active": "Last status",
    //post/suggest.js
    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
    //post/use-txtbox.js
@@ -122,7 +142,7 @@ var lang = {
    "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_reconnect": "Reload this column",
    "lang_layout_headercolor": "Header color of this column",
    "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
    "lang_layout_dm": "Direct Message",
@@ -131,8 +151,9 @@ var lang = {
    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
    "lang_layout_leftFold": "Stack to the left",
    "lang_layout_leftUnfold": "Dock on the right",
-    "lang_layout_deleteColumn":"Delete this column",
-    "lang_layout_deleteColumnDesc":"Delete this column",
+    "lang_layout_deleteColumn": "Delete this column",
+    "lang_layout_deleteColumnDesc": "Delete this column",
+    "lang_layout_unread": "Unread",
    //ui/sort.js
    "lang_sort_gothis": "Go to this column",
    "lang_sort_remthis": "Delete this column",
@@ -200,8 +221,8 @@ var lang = {
    "lang_parse_endedvote": "Expired",
    "lang_parse_thread": "Show thread",
    "lang_parse_unknown": "Attached file",
-    "lang_parse_nsfw": "NSFW media",
-    "lang_parse_notffilter":"Show this user's notifications",
+    "lang_parse_nsfw": "sensitive media",
+    "lang_parse_notffilter": "Show this user's notifications",
    //misskey
    "lang_misskeyparse_renote": "Repost",
    "lang_misskeyparse_renoteqt": "Renote",
@@ -218,7 +239,7 @@ var lang = {
    //setting
    "lang_setting_time": "Time format:{{set}}",
    "lang_setting_theme": "Theme:{{set}}",
-    "lang_setting_nsfw": "NSFW:{{set}}",
+    "lang_setting_nsfw": "Sensitive media:{{set}}",
    "lang_setting_cw": "CW:{{set}}",
    "lang_setting_cwtext": "Default CW text:{{set}}",
    "lang_setting_cws": "Always CW on:{{set}}",
--- a/app/js/lang/lang.ja.js
+++ b/app/js/lang/lang.ja.js
@@ -18,6 +18,23 @@ var lang = {
    "lang_back": "戻る",
    "lang_set": "設定",
    "lang_langadd": "<a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>から翻訳に参加できます。英語の校正(緊急)や他言語に翻訳していただける方を募集しております。",
+    //common/time.js
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": "今から",
+    "lang_time_suffixAgo": "",
+    "lang_time_suffixFromNow": "",
+    "lang_time_inPast": '',
+    "lang_time_seconds": "%d秒前",
+    "lang_time_minute": "1分前",
+    "lang_time_minutes": "%d分前",
+    "lang_time_hour": "1時間前",
+    "lang_time_hours": "%d時間前",
+    "lang_time_day": "昨日",
+    "lang_time_days": "%d日前",
+    "lang_time_month": "昨月",
+    "lang_time_months": "%dヶ月前",
+    "lang_time_year": "去年",
+    "lang_time_years": "%d年前",
    //common/version.js
    "lang_version_usever": "お使いのバージョン{{ver}}は最新です。",
    "lang_version_skipver": "アップデートはスキップされました。",
@@ -47,6 +64,7 @@ var lang = {
    //post/img.js
    "lang_postimg_previewdis": "プレビューできません。",
    "lang_postimg_aftupload": "アップロード後はアカウントを切り替えられません。",
+    "lang_postimg_failupload": "アップロードに失敗しました。",
    "lang_postimg_delete": "この画像を削除します",
    //post/post.js
    "lang_post_tagTL": "デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。",
@@ -71,6 +89,8 @@ var lang = {
    "lang_status_unemphas": "を強調解除します。リロードしてください。",
    "lang_status_unendorse": "紹介解除",
    "lang_status_endorse": "プロフで紹介する",
+    "lang_status_followers": "フォロワー",
+    "lang_status_active": "最新トゥート",
    //post/suggest.js
    "lang_suggest_nodata": "サジェストのために絵文字リストを取得してください。",
    //post/use-txtbox.js
@@ -122,7 +142,7 @@ var lang = {
    "lang_layout_linkana": "リンク解析",
    "lang_layout_linkanades": "リンクの解析を切り替え",
    "lang_layout_tts": "読み上げ",
-    "lang_layout_reconnect": "ストリーミング再接続",
+    "lang_layout_reconnect": "カラム再読込",
    "lang_layout_headercolor": "TLヘッダーカラー",
    "lang_layout_nodata": "[ここにトゥートはありません。]<br>F5/⌘+Rで再読込できます。",
    "lang_layout_dm": "ダイレクトメッセージ",
@@ -131,8 +151,9 @@ var lang = {
    "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTのみ)",
    "lang_layout_leftFold": "左へ重ねる",
    "lang_layout_leftUnfold": "右へ出す",
-    "lang_layout_deleteColumn":"カラム削除",
-    "lang_layout_deleteColumnDesc":"カラムを削除しますか？",
+    "lang_layout_deleteColumn": "カラム削除",
+    "lang_layout_deleteColumnDesc": "カラムを削除しますか？",
+    "lang_layout_unread": "未読",
    //ui/sort.js
    "lang_sort_gothis": "このカラムへ",
    "lang_sort_remthis": "このカラムを削除",
@@ -201,7 +222,7 @@ var lang = {
    "lang_parse_thread": "会話を表示",
    "lang_parse_unknown": "添付ファイル",
    "lang_parse_nsfw": "閲覧注意",
-    "lang_parse_notffilter":"このユーザーの通知のみを表示",
+    "lang_parse_notffilter": "このユーザーの通知のみを表示",
    //misskey
    "lang_misskeyparse_renote": "再投稿",
    "lang_misskeyparse_renoteqt": "引用",
--- a/app/js/login/instance.js
+++ b/app/js/login/instance.js
@@ -9,22 +9,11 @@ var idata = {
 	"kirishima.cloud_public": "パブリックタイムライン",
 	"minohdon.jp": "instance",
 	"minohdon.jp_name": "箕面どん",
-	"minohdon.jp_letters": "500",
-	"minohdon.jp_bbcode": "disabled",
-	"minohdon.jp_markdown": "disabled",
-	"minohdon.jp_glitch": "disabled",
-	"knzk.me": "instance",
-	"knzk.me_name": "Knzk",
-	"knzk.me_letters": "5000",
-	"knzk.me_bbcode": "disabled",
-	"knzk.me_markdown": "disabled",
-	"knzk.me_glitch": "disabled",
+	"fedibird.com":"instance",
+	"fedibird.com_name":"Fedibird",
+	"fedibird.com_quote":"enabled",
 	"mastodos.com": "instance",
 	"mastodos.com_name": "マストどす",
-	"mastodos.com_letters": "500",
-	"mastodos.com_bbcode": "disabled",
-	"mastodos.com_markdown": "disabled",
-	"mastodos.com_glitch": "disabled",
 	"dev.kirishima.cloud": "hidden",
 	"dev.kirishima.cloud_name": "アスタルテ(Dev)",
 	"dev.kirishima.cloud_letters": "6229",
@@ -33,15 +22,8 @@ var idata = {
 	"dev.kirishima.cloud_glitch": "enabled",
 	"mstdn.y-zu.org": "instance",
 	"mstdn.y-zu.org_name": "Yづドン(Y-zuDon)",
-	"mstdn.y-zu.org_letters": "500",
-	"mstdn.y-zu.org_bbcode": "disabled",
-	"mstdn.y-zu.org_markdown": "enabled",
-	"mstdn.y-zu.org_glitch": "disabled",
 	"imastodon.net": "instance",
 	"imastodon.net_name": "im@stodon",
-	"imastodon.net_letters": "500",
-	"imastodon.net_bbcode": "disabled",
-	"imastodon.net_markdown": "disabled",
 	"imastodon.net_home": "オフィス",
 	"imastodon.net_local": "楽屋",
 	"imastodon.net_notification": "ホワイトボード",
@@ -50,12 +32,6 @@ var idata = {
 	"imastodon.net_fav": "の頭にティンときたようです",
 	"imastodon.net_bt": ":「わかるわ」",
 	"imastodon.net_follow": "名刺をいただきました",
-	"imastodon.net_glitch": "disabled",
-	"mstdn.osaka": "instance",
-	"mstdn.osaka_name": "大阪丼",
-	"mstdn.osaka_letters": "500",
-	"mstdn.osaka_bbcode": "disabled",
-	"mstdn.osaka_markdown": "disabled",
 	"mstdn.osaka_home": "ウチ",
 	"mstdn.osaka_local": "近所",
 	"mstdn.osaka_notification": "あめちゃん",
@@ -64,12 +40,9 @@ var idata = {
 	"mstdn.osaka_fav": "がええやん言いました",
 	"mstdn.osaka_bt": "がしばいた",
 	"mstdn.osaka_follow": "ツルまれました",
-	"mstdn.osaka_glitch": "disabled",
 	"mstdn.kemono-friends.info": "instance",
 	"mstdn.kemono-friends.info_name": "ますとどんちほー",
 	"mstdn.kemono-friends.info_letters": "1024",
-	"mstdn.kemono-friends.info_bbcode": "disabled",
-	"mstdn.kemono-friends.info_markdown": "disabled",
 	"mstdn.kemono-friends.info_home": "なわばり",
 	"mstdn.kemono-friends.info_local": "ますとどんちほー",
 	"mstdn.kemono-friends.info_notification": "ねえねえ!",
@@ -77,19 +50,13 @@ var idata = {
 	"mstdn.kemono-friends.info_post": "がおー！",
 	"mstdn.kemono-friends.info_fav": ":「すごーい」",
 	"mstdn.kemono-friends.info_bt": ":「たーのしー」",
-	"mstdn.kemono-friends.info_glitch": "disabled",
 	"itabashi.0j0.jp": "instance",
 	"itabashi.0j0.jp_name": "板橋丼",
 	"itabashi.0j0.jp_letters": "1024",
-	"itabashi.0j0.jp_bbcode": "disabled",
-	"itabashi.0j0.jp_markdown": "disabled",
-	"itabashi.0j0.jp_glitch": "disabled",
+	"itabashi.0j0.jp_quote":"enabled",
 	"dtp-mstdn.jp": "instance",
-	"dtp-mstdn.jp_name": "DTP鯖",
-	"dtp-mstdn.jp_letters": "500",
-	"dtp-mstdn.jp_bbcode": "disabled",
-	"dtp-mstdn.jp_markdown": "disabled",
-	"dtp-mstdn.jp_glitch": "disabled",
+	"dtp-mstdn.jp_name": "dtp-mstdn.jp",
+	"dtp-mstdn.jp_quote":"enabled",
 	"misskey.io": "misskey",
 	"misskey.io_name": "misskey.io",
 	"misskey.io_letters": "1000",
@@ -99,7 +66,7 @@ var idata = {
 	"misskey.io_post": "Post",
 	"misskey.io_fav": " reacted your post.",
 	"misskey.io_bt": " reposted your post.",
-	"misskey.dev": "misskey.dev",
+	"misskey.dev": "misskey",
 	"misskey.dev_name": "misskey.dev",
 	"misskey.dev_letters": "1024",
 	"misskey.dev_bbcode": "disabled",
@@ -111,16 +78,11 @@ var idata = {
 	"precure.ml": "instance",
 	"precure.ml_name": "キュアスタ！",
 	"precure.ml_letters": "1024",
-	"precure.ml_bbcode": "disabled",
-	"precure.ml_markdown": "disabled",
 	"precure.ml_post": "キュア！",
-	"precure.ml_glitch": "disabled",
-	"best-friends.chat": "instance",
-	"best-friends.chat_name": "Best Friends",
-	"best-friends.chat_letters": "500",
-	"best-friends.chat_bbcode": "disabled",
-	"best-friends.chat_markdown": "disabled",
-	"best-friends.chat_glitch": "disabled",
+	"odakyu.app_quote":"enabled",
+	"nitiasa.com_quote":"enabled",
+	"biwakodon.com_quote":"enabled",
+	"comm.cx_quote":"enabled"
 };

 localStorage.setItem("instance", JSON.stringify(idata));
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@@ -3,6 +3,7 @@
 //アスタルテ判定初期化

 localStorage.removeItem("kirishima")
+localStorage.removeItem("quoters")
 localStorage.removeItem("imas")
 localStorage.removeItem("image");
 localStorage.removeItem("stable")
@@ -40,9 +41,10 @@ function ck() {
 		if (obj[0].domain) {
 			$("#tl").show();
 			ticker();
-			multiSelector();
+			multiSelector(false);
 			verck(ver);
-			$("#something-wrong img").attr("src", "../../img/thinkingdesk.png")
+			$(".stw").show()
+			$("#something-wrong img").attr("src", "../../img/thinking.svg")
 		}
 	}
 }
@@ -289,7 +291,7 @@ function refresh(target, loadskip) {
 		localStorage.setItem("user-id_" + target, json["id"]);
 		localStorage.setItem("prof_" + target, avatar);
 		localStorage.setItem("follow_" + target, json["following_count"]);
-		obj[target] = ref;
+		console.log(obj)
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
 		if (!loadskip) {
@@ -313,7 +315,6 @@ function ckdb(acct_id) {
 	localStorage.removeItem("followlocale_" + acct_id);
 	if (domain == "kirishima.cloud") {
 		localStorage.setItem("kirishima", "true");
-		$("#ranking-btn").show();
 	} else if (domain == "imastodon.net") {
 		localStorage.setItem("imas", "true");
 		$(".imasonly").show();
@@ -321,8 +322,13 @@ function ckdb(acct_id) {
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var bbcode = domain + "_bbcode";
 	var letters = domain + "_letters";
+	var quoteMarker = domain + "_quote";
 	if (localStorage.getItem("instance")) {
 		var json = JSON.parse(localStorage.getItem("instance"));
+		if (json[quoteMarker] == "enabled") {
+			localStorage.setItem("quoters", "true");
+			localStorage.setItem("quote_" + acct_id, "true");
+		}
 		if (json[bbcode]) {
 			if (json[bbcode] == "enabled") {
 				localStorage.setItem("bb_" + acct_id, "true");
@@ -403,7 +409,7 @@ function ckdb(acct_id) {
 }

 //アカウントを選択…を実装
-function multiSelector() {
+function multiSelector(parseC) {
 	var multi = localStorage.getItem("multi");
 	if (!multi) {
 		var obj = [];
@@ -450,7 +456,7 @@ function multiSelector() {
 					$("#local-button").removeClass("hide")
 				}
 				var profimg = acct.prof;
-				localStorage.setItem("prof_" + key, profimg);
+				//localStorage.setItem("prof_" + key, profimg);
 				if (!profimg) {
 					profimg = "../../img/missing.svg";
 				}
@@ -488,9 +494,12 @@ function multiSelector() {
 		});
 		$("#src-acct-sel").append('<option value="tootsearch">Tootsearch</option>');
 		$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
+		$("#dir-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option>');
 	}
 	$('select').formSelect();
-	parseColumn(true);
+	if(!parseC){
+		parseColumn(null, true);
+	}
 }

 //バージョンエンコ
@@ -511,13 +520,12 @@ function ticker() {
 			'content-type': 'application/json'
 		},
 	}).then(function (response) {
+
 		return response.json();
 	}).catch(function (error) {
 		console.error(error);
 	}).then(function (json) {
-		if (json.error) {
-			return;
-		}
+		console.log(json)
 		if (json) {
 			localStorage.setItem("ticker", JSON.stringify(json));
 		}
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -286,10 +286,6 @@ function support() {
 			templete = '<a onclick="login(\'' + key +
 				'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
 			$("#support").append(templete);
-		} else if (instance == "misskey") {
-			templete = '<a onclick="misskeyLogin(\'' + key +
-				'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
-			$("#support").append(templete);
 		}
 	});
 }
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -10,16 +10,20 @@ $(document).on('click', 'a', e => {
 	if (url) {
 		urls = url.match(/https?:\/\/(.+)/);
 		//トゥートのURLぽかったら
-		toot = url.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/);
+		toot = url.match(/https:\/\/([^+_]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/);
+		if(!toot){
+			//Pleroma対策
+			toot = url.match(/https:\/\/([^+_]+)\/users\/([a-zA-Z0-9_]+)\/statuses\/([0-9]+)/);
+		}
 		//タグのURLぽかったら
 		var tags = [];
 		tags = url.match(
-			/https:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
+			/https:\/\/([^+_]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
 		);
 		//メンションっぽかったら
 		var ats = [];
 		ats = url.match(
-			/https:\/\/([-a-zA-Z0-9.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
+			/https:\/\/([^+_]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
 		);
 		if (toot) {
 			if (toot[1]) {
@@ -135,10 +139,13 @@ onmessage = function (e) {
 	} else if (e.data[0] == "toastSaved") {
 		M.toast({ html: lang.lang_img_DLDone + e.data[1][0] + '<button class="btn-flat toast-action" onclick="openFinder(\'' + e.data[1][1] + '\')">Show</button>', displayLength: 5000 })
 	} else if (e.data[0] == "parseColumn") {
-		parseColumn()
+		parseColumn(e.data[1])
 	} else if (e.data[0] == "exportSettingsCore") {
-		exportSettingsCore()
-	} else if (e.data[0] == "fontList") {
+		var exp = exportSettingsCore()
+		postMessage(["exportSettingsCoreComplete", [e.data[1], exp]], "*")
+	} else if (e.data[0] == "importSettingsCore") {
+		importSettingsCore(e.data[1])
+	}else if (e.data[0] == "fontList") {
 		fontList(e.data[1])
 	} else if (e.data[0] == "customSoundSave") {
 		customSoundSave(e.data[1][0], e.data[1][1])
@@ -166,4 +173,14 @@ onmessage = function (e) {
 			title: e.data[1]
 		})
 	}
-}
+}
+window.addEventListener('load', function() {
+	if ('serviceWorker' in navigator) {
+		navigator.serviceWorker.register("/sw.js")
+			.then(function(registration) {
+				console.log("serviceWorker registed.");
+			}).catch(function(error) {
+				console.warn("serviceWorker error.", error);
+			});
+		}
+	});
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -1,3 +1,10 @@
+function postMessage(e){
+	if(e[0]=="openUrl"){
+		window.open(e[1])
+	}
+	return false;
+}
+document.title="TheDesk"
 $.strip_tags = function (str, allowed) {
 	if (!str) {
 		return "";
@@ -170,4 +177,29 @@ $.mb_substr = function (str, begin, end) {
 	}
 	return ret;
 };
+//ソートするやつ
+function object_array_sort(data, key, order, fn) {
+	var num_a = -1;
+	var num_b = 1;
+	if (order === 'asc') {
+		num_a = 1;
+		num_b = -1;
+	}
+	data = data.sort(function (a, b) {
+		var x = a[key];
+		var y = b[key];
+		if (x > y) return num_a;
+		if (x < y) return num_b;
+		return 0;
+	});
+	var arrObj = {};
+	for (var i = 0; i < data.length; i++) {
+		arrObj[data[i]['family']] = data[i];
+	}
+	data = [];
+	for (var key in arrObj) {
+		data.push(arrObj[key]);
+	}
+	fn(data);
+}
 localStorage.removeItem("errors");
--- a/app/js/platform/preload.js
+++ b/app/js/platform/preload.js
@@ -30,6 +30,8 @@ onmessage = function (e) {
        ipc.send('lang', e.data[1]);
    } else if (e.data[0] == "exportSettings") {
        ipc.send('exportSettings', e.data[1]);
+    }  else if (e.data[0] == "exportSettingsCoreComplete") {
+        ipc.send('export', e.data[1]);
    } else if (e.data[0] == "importSettings") {
        ipc.send('importSettings', e.data[1]);
    } else if (e.data[0] == "customSound") {
@@ -45,14 +47,12 @@ onmessage = function (e) {
    } else if (e.data[0] == "aboutData") {
        ipc.send('aboutData', "");
    } else if (e.data[0] == "itunes") {
-        console.log("NowPlaying" + ipc.listenerCount('itunes-np'))
-        if (ipc.listenerCount('itunes-np') > 1) {
-            return false;
-        } else {
-            ipc.send("itunes", e.data[1])
-        }
+        console.log("NowPlaying")
+        ipc.send("itunes", e.data[1])
    } else if (e.data[0] == "themeCSSRequest") {
        ipc.send('theme-css-request', e.data[1]);
+    } else if (e.data[0] == "customCSSRequest") {
+        ipc.send('custom-css-request', e.data[1]);
    } else if (e.data[0] == "downloadButton") {
        ipc.send('download-btn', e.data[1]);
    } else if (e.data[0] == "nano") {
@@ -64,7 +64,7 @@ ipc.send("getPlatform", "")
 ipc.on('platform', function (event, args) {
    localStorage.setItem("platform", args[0])
    localStorage.setItem("bit", args[1])
-    localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4]]))
+    localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4], args[5]]))
 })

 ipc.on('reload', function (event, arg) {
@@ -113,14 +113,13 @@ ipc.on('general-dl-message', function (event, arg) {
 })
 //setting.js
 ipc.on('langres', function (event, arg) {
-    location.href = "../" + lang + "/setting.html"
+    location.href = "../" + arg + "/setting.html"
 });
-ipc.on('exportSettingsFile', function (event, savedFiles) {
-    var exp = exportSettingsCore()
-    ipc.send('export', [savedFiles, JSON.stringify(exp)]);
-    postMessage(["alert", "Done"], "*")
-    //cards
-    //lang
+ipc.on('exportSettingsFile', function (event, arg) {
+    postMessage(["exportSettingsCore", arg], "*")
+});
+ipc.on('exportAllComplete', function (event, arg) {
+    postMessage(["alert", "Complete"], "*")
 });
 ipc.on('config', function (event, arg) {
    postMessage(["importSettingsCore", arg], "*")
@@ -148,7 +147,7 @@ ipc.on('theme-json-create-complete', function (event, args) {
    postMessage(["ctLoad", ""], "*")
 });
 //spotify.js
-ipc.once('itunes-np', function (event, arg) {
+ipc.on('itunes-np', function (event, arg) {
    postMessage(["npCore", arg], "*")
 })
 //tips.js
@@ -160,7 +159,6 @@ ipc.on('memory', function (event, arg) {
 })
 //update.html
 ipc.on('prog', function (event, arg) {
-    console.log(arg)
    postMessage(["updateProg", arg], "*")
 })
 ipc.on('mess', function (event, arg) {
--- a/app/js/platform/punycode.js
+++ b/app/js/platform/punycode.js
@@ -0,0 +1,533 @@
+/*! https://mths.be/punycode v1.4.1 by @mathias */
+;(function(root) {
+
+	/** Detect free variables */
+	var freeExports = typeof exports == 'object' && exports &&
+		!exports.nodeType && exports;
+	var freeModule = typeof module == 'object' && module &&
+		!module.nodeType && module;
+	var freeGlobal = typeof global == 'object' && global;
+	if (
+		freeGlobal.global === freeGlobal ||
+		freeGlobal.window === freeGlobal ||
+		freeGlobal.self === freeGlobal
+	) {
+		root = freeGlobal;
+	}
+
+	/**
+	 * The `punycode` object.
+	 * @name punycode
+	 * @type Object
+	 */
+	var punycode,
+
+	/** Highest positive signed 32-bit float value */
+	maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
+
+	/** Bootstring parameters */
+	base = 36,
+	tMin = 1,
+	tMax = 26,
+	skew = 38,
+	damp = 700,
+	initialBias = 72,
+	initialN = 128, // 0x80
+	delimiter = '-', // '\x2D'
+
+	/** Regular expressions */
+	regexPunycode = /^xn--/,
+	regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
+	regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
+
+	/** Error messages */
+	errors = {
+		'overflow': 'Overflow: input needs wider integers to process',
+		'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
+		'invalid-input': 'Invalid input'
+	},
+
+	/** Convenience shortcuts */
+	baseMinusTMin = base - tMin,
+	floor = Math.floor,
+	stringFromCharCode = String.fromCharCode,
+
+	/** Temporary variable */
+	key;
+
+	/*--------------------------------------------------------------------------*/
+
+	/**
+	 * A generic error utility function.
+	 * @private
+	 * @param {String} type The error type.
+	 * @returns {Error} Throws a `RangeError` with the applicable error message.
+	 */
+	function error(type) {
+		throw new RangeError(errors[type]);
+	}
+
+	/**
+	 * A generic `Array#map` utility function.
+	 * @private
+	 * @param {Array} array The array to iterate over.
+	 * @param {Function} callback The function that gets called for every array
+	 * item.
+	 * @returns {Array} A new array of values returned by the callback function.
+	 */
+	function map(array, fn) {
+		var length = array.length;
+		var result = [];
+		while (length--) {
+			result[length] = fn(array[length]);
+		}
+		return result;
+	}
+
+	/**
+	 * A simple `Array#map`-like wrapper to work with domain name strings or email
+	 * addresses.
+	 * @private
+	 * @param {String} domain The domain name or email address.
+	 * @param {Function} callback The function that gets called for every
+	 * character.
+	 * @returns {Array} A new string of characters returned by the callback
+	 * function.
+	 */
+	function mapDomain(string, fn) {
+		var parts = string.split('@');
+		var result = '';
+		if (parts.length > 1) {
+			// In email addresses, only the domain name should be punycoded. Leave
+			// the local part (i.e. everything up to `@`) intact.
+			result = parts[0] + '@';
+			string = parts[1];
+		}
+		// Avoid `split(regex)` for IE8 compatibility. See #17.
+		string = string.replace(regexSeparators, '\x2E');
+		var labels = string.split('.');
+		var encoded = map(labels, fn).join('.');
+		return result + encoded;
+	}
+
+	/**
+	 * Creates an array containing the numeric code points of each Unicode
+	 * character in the string. While JavaScript uses UCS-2 internally,
+	 * this function will convert a pair of surrogate halves (each of which
+	 * UCS-2 exposes as separate characters) into a single code point,
+	 * matching UTF-16.
+	 * @see `punycode.ucs2.encode`
+	 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+	 * @memberOf punycode.ucs2
+	 * @name decode
+	 * @param {String} string The Unicode input string (UCS-2).
+	 * @returns {Array} The new array of code points.
+	 */
+	function ucs2decode(string) {
+		var output = [],
+		    counter = 0,
+		    length = string.length,
+		    value,
+		    extra;
+		while (counter < length) {
+			value = string.charCodeAt(counter++);
+			if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
+				// high surrogate, and there is a next character
+				extra = string.charCodeAt(counter++);
+				if ((extra & 0xFC00) == 0xDC00) { // low surrogate
+					output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
+				} else {
+					// unmatched surrogate; only append this code unit, in case the next
+					// code unit is the high surrogate of a surrogate pair
+					output.push(value);
+					counter--;
+				}
+			} else {
+				output.push(value);
+			}
+		}
+		return output;
+	}
+
+	/**
+	 * Creates a string based on an array of numeric code points.
+	 * @see `punycode.ucs2.decode`
+	 * @memberOf punycode.ucs2
+	 * @name encode
+	 * @param {Array} codePoints The array of numeric code points.
+	 * @returns {String} The new Unicode string (UCS-2).
+	 */
+	function ucs2encode(array) {
+		return map(array, function(value) {
+			var output = '';
+			if (value > 0xFFFF) {
+				value -= 0x10000;
+				output += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800);
+				value = 0xDC00 | value & 0x3FF;
+			}
+			output += stringFromCharCode(value);
+			return output;
+		}).join('');
+	}
+
+	/**
+	 * Converts a basic code point into a digit/integer.
+	 * @see `digitToBasic()`
+	 * @private
+	 * @param {Number} codePoint The basic numeric code point value.
+	 * @returns {Number} The numeric value of a basic code point (for use in
+	 * representing integers) in the range `0` to `base - 1`, or `base` if
+	 * the code point does not represent a value.
+	 */
+	function basicToDigit(codePoint) {
+		if (codePoint - 48 < 10) {
+			return codePoint - 22;
+		}
+		if (codePoint - 65 < 26) {
+			return codePoint - 65;
+		}
+		if (codePoint - 97 < 26) {
+			return codePoint - 97;
+		}
+		return base;
+	}
+
+	/**
+	 * Converts a digit/integer into a basic code point.
+	 * @see `basicToDigit()`
+	 * @private
+	 * @param {Number} digit The numeric value of a basic code point.
+	 * @returns {Number} The basic code point whose value (when used for
+	 * representing integers) is `digit`, which needs to be in the range
+	 * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
+	 * used; else, the lowercase form is used. The behavior is undefined
+	 * if `flag` is non-zero and `digit` has no uppercase form.
+	 */
+	function digitToBasic(digit, flag) {
+		//  0..25 map to ASCII a..z or A..Z
+		// 26..35 map to ASCII 0..9
+		return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
+	}
+
+	/**
+	 * Bias adaptation function as per section 3.4 of RFC 3492.
+	 * https://tools.ietf.org/html/rfc3492#section-3.4
+	 * @private
+	 */
+	function adapt(delta, numPoints, firstTime) {
+		var k = 0;
+		delta = firstTime ? floor(delta / damp) : delta >> 1;
+		delta += floor(delta / numPoints);
+		for (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {
+			delta = floor(delta / baseMinusTMin);
+		}
+		return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+	}
+
+	/**
+	 * Converts a Punycode string of ASCII-only symbols to a string of Unicode
+	 * symbols.
+	 * @memberOf punycode
+	 * @param {String} input The Punycode string of ASCII-only symbols.
+	 * @returns {String} The resulting string of Unicode symbols.
+	 */
+	function decode(input) {
+		// Don't use UCS-2
+		var output = [],
+		    inputLength = input.length,
+		    out,
+		    i = 0,
+		    n = initialN,
+		    bias = initialBias,
+		    basic,
+		    j,
+		    index,
+		    oldi,
+		    w,
+		    k,
+		    digit,
+		    t,
+		    /** Cached calculation results */
+		    baseMinusT;
+
+		// Handle the basic code points: let `basic` be the number of input code
+		// points before the last delimiter, or `0` if there is none, then copy
+		// the first basic code points to the output.
+
+		basic = input.lastIndexOf(delimiter);
+		if (basic < 0) {
+			basic = 0;
+		}
+
+		for (j = 0; j < basic; ++j) {
+			// if it's not a basic code point
+			if (input.charCodeAt(j) >= 0x80) {
+				error('not-basic');
+			}
+			output.push(input.charCodeAt(j));
+		}
+
+		// Main decoding loop: start just after the last delimiter if any basic code
+		// points were copied; start at the beginning otherwise.
+
+		for (index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
+
+			// `index` is the index of the next character to be consumed.
+			// Decode a generalized variable-length integer into `delta`,
+			// which gets added to `i`. The overflow checking is easier
+			// if we increase `i` as we go, then subtract off its starting
+			// value at the end to obtain `delta`.
+			for (oldi = i, w = 1, k = base; /* no condition */; k += base) {
+
+				if (index >= inputLength) {
+					error('invalid-input');
+				}
+
+				digit = basicToDigit(input.charCodeAt(index++));
+
+				if (digit >= base || digit > floor((maxInt - i) / w)) {
+					error('overflow');
+				}
+
+				i += digit * w;
+				t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+
+				if (digit < t) {
+					break;
+				}
+
+				baseMinusT = base - t;
+				if (w > floor(maxInt / baseMinusT)) {
+					error('overflow');
+				}
+
+				w *= baseMinusT;
+
+			}
+
+			out = output.length + 1;
+			bias = adapt(i - oldi, out, oldi == 0);
+
+			// `i` was supposed to wrap around from `out` to `0`,
+			// incrementing `n` each time, so we'll fix that now:
+			if (floor(i / out) > maxInt - n) {
+				error('overflow');
+			}
+
+			n += floor(i / out);
+			i %= out;
+
+			// Insert `n` at position `i` of the output
+			output.splice(i++, 0, n);
+
+		}
+
+		return ucs2encode(output);
+	}
+
+	/**
+	 * Converts a string of Unicode symbols (e.g. a domain name label) to a
+	 * Punycode string of ASCII-only symbols.
+	 * @memberOf punycode
+	 * @param {String} input The string of Unicode symbols.
+	 * @returns {String} The resulting Punycode string of ASCII-only symbols.
+	 */
+	function encode(input) {
+		var n,
+		    delta,
+		    handledCPCount,
+		    basicLength,
+		    bias,
+		    j,
+		    m,
+		    q,
+		    k,
+		    t,
+		    currentValue,
+		    output = [],
+		    /** `inputLength` will hold the number of code points in `input`. */
+		    inputLength,
+		    /** Cached calculation results */
+		    handledCPCountPlusOne,
+		    baseMinusT,
+		    qMinusT;
+
+		// Convert the input in UCS-2 to Unicode
+		input = ucs2decode(input);
+
+		// Cache the length
+		inputLength = input.length;
+
+		// Initialize the state
+		n = initialN;
+		delta = 0;
+		bias = initialBias;
+
+		// Handle the basic code points
+		for (j = 0; j < inputLength; ++j) {
+			currentValue = input[j];
+			if (currentValue < 0x80) {
+				output.push(stringFromCharCode(currentValue));
+			}
+		}
+
+		handledCPCount = basicLength = output.length;
+
+		// `handledCPCount` is the number of code points that have been handled;
+		// `basicLength` is the number of basic code points.
+
+		// Finish the basic string - if it is not empty - with a delimiter
+		if (basicLength) {
+			output.push(delimiter);
+		}
+
+		// Main encoding loop:
+		while (handledCPCount < inputLength) {
+
+			// All non-basic code points < n have been handled already. Find the next
+			// larger one:
+			for (m = maxInt, j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+				if (currentValue >= n && currentValue < m) {
+					m = currentValue;
+				}
+			}
+
+			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
+			// but guard against overflow
+			handledCPCountPlusOne = handledCPCount + 1;
+			if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
+				error('overflow');
+			}
+
+			delta += (m - n) * handledCPCountPlusOne;
+			n = m;
+
+			for (j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+
+				if (currentValue < n && ++delta > maxInt) {
+					error('overflow');
+				}
+
+				if (currentValue == n) {
+					// Represent delta as a generalized variable-length integer
+					for (q = delta, k = base; /* no condition */; k += base) {
+						t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+						if (q < t) {
+							break;
+						}
+						qMinusT = q - t;
+						baseMinusT = base - t;
+						output.push(
+							stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
+						);
+						q = floor(qMinusT / baseMinusT);
+					}
+
+					output.push(stringFromCharCode(digitToBasic(q, 0)));
+					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
+					delta = 0;
+					++handledCPCount;
+				}
+			}
+
+			++delta;
+			++n;
+
+		}
+		return output.join('');
+	}
+
+	/**
+	 * Converts a Punycode string representing a domain name or an email address
+	 * to Unicode. Only the Punycoded parts of the input will be converted, i.e.
+	 * it doesn't matter if you call it on a string that has already been
+	 * converted to Unicode.
+	 * @memberOf punycode
+	 * @param {String} input The Punycoded domain name or email address to
+	 * convert to Unicode.
+	 * @returns {String} The Unicode representation of the given Punycode
+	 * string.
+	 */
+	function toUnicode(input) {
+		return mapDomain(input, function(string) {
+			return regexPunycode.test(string)
+				? decode(string.slice(4).toLowerCase())
+				: string;
+		});
+	}
+
+	/**
+	 * Converts a Unicode string representing a domain name or an email address to
+	 * Punycode. Only the non-ASCII parts of the domain name will be converted,
+	 * i.e. it doesn't matter if you call it with a domain that's already in
+	 * ASCII.
+	 * @memberOf punycode
+	 * @param {String} input The domain name or email address to convert, as a
+	 * Unicode string.
+	 * @returns {String} The Punycode representation of the given domain name or
+	 * email address.
+	 */
+	function toASCII(input) {
+		return mapDomain(input, function(string) {
+			return regexNonASCII.test(string)
+				? 'xn--' + encode(string)
+				: string;
+		});
+	}
+
+	/*--------------------------------------------------------------------------*/
+
+	/** Define the public API */
+	punycode = {
+		/**
+		 * A string representing the current Punycode.js version number.
+		 * @memberOf punycode
+		 * @type String
+		 */
+		'version': '1.4.1',
+		/**
+		 * An object of methods to convert from JavaScript's internal character
+		 * representation (UCS-2) to Unicode code points, and back.
+		 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+		 * @memberOf punycode
+		 * @type Object
+		 */
+		'ucs2': {
+			'decode': ucs2decode,
+			'encode': ucs2encode
+		},
+		'decode': decode,
+		'encode': encode,
+		'toASCII': toASCII,
+		'toUnicode': toUnicode
+	};
+
+	/** Expose `punycode` */
+	// Some AMD build optimizers, like r.js, check for specific condition patterns
+	// like the following:
+	if (
+		typeof define == 'function' &&
+		typeof define.amd == 'object' &&
+		define.amd
+	) {
+		define('punycode', function() {
+			return punycode;
+		});
+	} else if (freeExports && freeModule) {
+		if (module.exports == freeExports) {
+			// in Node.js, io.js, or RingoJS v0.8.0+
+			freeModule.exports = punycode;
+		} else {
+			// in Narwhal or RingoJS v0.7.0-
+			for (key in punycode) {
+				punycode.hasOwnProperty(key) && (freeExports[key] = punycode[key]);
+			}
+		}
+	} else {
+		// in Rhino or a web browser
+		root.punycode = punycode;
+	}
+
+}(this));
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@@ -10,11 +10,18 @@ function emojiToggle(reaction) {
 	if (!selin) {
 		selin = 0;
 	}
-	localStorage.setItem("cursor", selin);
-
 	if ($("#emoji").hasClass("hide")) {
 		$("#emoji").removeClass("hide")
 		$("#right-side").show()
+		$("#right-side").css("width", "300px")
+		$("#left-side").css("width", "calc(100% - 300px)")
+		var width = localStorage.getItem("postbox-width");
+		if (width) {
+			width = width.replace("px", "") * 1 + 300
+		} else {
+			width = 600
+		}
+		$("#post-box").css("width", width + "px")
 		$("#suggest").html("");
 		if (!localStorage.getItem("emoji_" + acct_id)) {
 			var html =
@@ -25,9 +32,18 @@ function emojiToggle(reaction) {
 		}
 	} else {
 		$("#poll").addClass("hide")
+		$("#right-side").hide()
+		$("#right-side").css("width", "300px")
 		$("#emoji").addClass("hide")
 		$("#suggest").html("");
-		$("#right-side").hide()
+		$("#left-side").css("width", "100%")
+		var width = localStorage.getItem("postbox-width");
+		if (width) {
+			width = width.replace("px", "") * 1
+		} else {
+			width = 300
+		}
+		$("#post-box").css("width", width + "px")
 	}


@@ -173,35 +189,31 @@ function emojiList(target, reaction) {
 //絵文字など様々なものをテキストボックスに挿入
 function emojiInsert(code, del) {
 	var now = $("#textarea").val();
-	var selin = localStorage.getItem("cursor");
+	var selin = $("#textarea").prop('selectionStart');
 	if (localStorage.getItem("emoji-zero-width") == "yes") {
-		var brank = "";
+		var blank = "";
 	} else {
-		var brank = " ";
+		var blank = " ";
 	}
-	var now = $("#textarea").val();
-	if (selin > 0) {
-		var before = now.substr(0, selin);
-		var after = now.substr(selin, now.length);
-		newt = before + brank + code + brank + after;
-	} else {
-		newt = code + brank;
+	var before = now.substr(0, selin);
+	if (before.slice(-1) != " ") {
+		before = before + blank
 	}
+	var after = now.substr(selin, now.length);
+	if (after.slice(-1) != " ") {
+		after = blank + after
+	}
+	newt = before + code + after;
 	if (!del) {
 		$("#textarea").val(newt);
 		//emoji();
 	} else {
 		var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
 		var now = now.replace(regExp, "");
-		$("#textarea").val(now + brank + code);
+		$("#textarea").val(now + blank + code);
 	}

 	$("#textarea").focus();
-	var selin = $("#textarea").prop('selectionStart');
-	if (!selin) {
-		selin = 0;
-	}
-	localStorage.setItem("cursor", selin);
 }
 //改行挿入
 function brInsert(code) {
--- a/app/js/post/img.js
+++ b/app/js/post/img.js
@@ -120,6 +120,16 @@ function media(b64, type, no) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
+			if (!json.id) {
+				todc();
+				$("#imgup").text("");
+				$(".toot-btn-group").prop("disabled", false);
+				$("#post-acct-sel").prop("disabled", false);
+				$('select').formSelect();
+				$("#imgsel").show();
+				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
+				return false
+			}
 			var img = localStorage.getItem("img");
 			if (json.type.indexOf("image") != -1) {
 				var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';
--- a/app/js/post/post.js
+++ b/app/js/post/post.js
@@ -29,7 +29,6 @@ function post(mode, postvis) {
 	}
 	if (domain != "kirishima.cloud") {
 		if (mode != "pass" && !$("#cw").hasClass("cw-avail") && (str.length > cw_sent || (str.split("\n").length - 1) > cw_ltres)) {
-			console.log("out")
 			var plus = str.replace(/\n/g, "").slice(0, 10) + "...";
 			Swal.fire({
 				title: lang.lang_post_cwtitle,
@@ -43,7 +42,6 @@ function post(mode, postvis) {
 				showCloseButton: true,
 				focusConfirm: false,
 			}).then((result) => {
-				console.log(result)
 				if (result.dismiss == "cancel") {
 					//btn3:sonomama
 					post("pass")
@@ -81,6 +79,10 @@ function post(mode, postvis) {
 	if (media) {
 		toot.media_ids = media.split(",");
 	}
+	var quote = $("#quote").val();
+	if (quote) {
+		toot.quote_id = quote;
+	}
 	if ($("#nsfw").hasClass("nsfw-avail")) {
 		var nsfw = "true";
 		toot.sensitive = nsfw;
@@ -112,7 +114,7 @@ function post(mode, postvis) {
 	} else {
 		var scheduled = "";
 	}
-	if ($("#poll-sel").val() == "mastodon-poll") {
+	if (!$("#poll").hasClass("hide")) {
 		var options = [];
 		$(".mastodon-choice").map(function () {
 			var choice = $(this).val();
@@ -245,6 +247,7 @@ function clear() {
 	}
 	$("#textarea").attr("placeholder", lang.lang_toot);
 	$("#reply").val("");
+	$("#quote").val("");
 	$("#media").val("");
 	var cwt = localStorage.getItem("cw-text");
 	if (cwt) {
@@ -276,6 +279,8 @@ function clear() {
 	$("#days_poll").val(0);
 	$("#hours_poll").val(0);
 	$("#mins_poll").val(6);
+	$("#poll").addClass("hide")
+	$("#pollsta").text(lang.lang_no)
 	$(".mastodon-choice").map(function () {
 		$(this).val("");
 	});
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@@ -84,10 +84,10 @@ function rt(id, acct_id, remote) {

 				if ($("[toot-id=" + id + "]").hasClass("rted")) {
 					$("[toot-id=" + id + "]").removeClass("rted");
-					$(".rt_" + id).removeClass("teal-text");
+					$(".rt_" + id).removeClass("light-blue-text");
 				} else {
 					$("[toot-id=" + id + "]").addClass("rted");
-					$(".rt_" + id).addClass("teal-text");
+					$(".rt_" + id).addClass("light-blue-text");
 				}
 			} else {
 				M.toast({ html: lang.lang_status_btWarn, displayLength: 1000 })
@@ -116,16 +116,12 @@ function follow(acct_id, remote) {
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var user = $("#his-acct").text();
+	var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
 		var start = "https://" + domain + "/api/following/" + flagm;
-		var user = $("#his-acct").text();
 		var ent = { "i": at, "userId": id }
 	} else if (remote == "true" && flag == "follow") {
-		var start = "https://" + domain + "/api/v1/follows";
-		var user = $("#his-acct").text();
-		var ent = { "uri": user }
-	} else {
-		var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
 		var ent = {}
 	}
 	var httpreq = new XMLHttpRequest();
@@ -151,77 +147,109 @@ function follow(acct_id, remote) {

 //ブロック
 function block(acct_id) {
-	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
-	}
-	var id = $("#his-data").attr("user-id");
 	if ($("#his-data").hasClass("blocking")) {
 		var flag = "unblock";
+		var txt = lang.lang_status_unmute
 	} else {
 		var flag = "block";
+		var txt = lang.lang_status_block
 	}
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
-	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();
-	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState === 4) {
-			if ($("#his-data").hasClass("blocking")) {
-				$("#his-data").removeClass("blocking");
-				$("#his-block-btn").text(lang.lang_status_block);
-			} else {
-				$("#his-data").addClass("blocking");
-				$("#his-block-btn").text(lang.lang_status_unblock);
+	Swal.fire({
+		title: txt,
+		text: "",
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			if (!acct_id) {
+				var acct_id = $('#his-data').attr("use-acct");
+			}
+			var id = $("#his-data").attr("user-id");
+			var domain = localStorage.getItem("domain_" + acct_id);
+			var at = localStorage.getItem("acct_" + acct_id + "_at");
+			var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
+			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();
+			httpreq.onreadystatechange = function () {
+				if (httpreq.readyState === 4) {
+					if ($("#his-data").hasClass("blocking")) {
+						$("#his-data").removeClass("blocking");
+						$("#his-block-btn").text(lang.lang_status_block);
+					} else {
+						$("#his-data").addClass("blocking");
+						$("#his-block-btn").text(lang.lang_status_unblock);
+					}
+				}
 			}
 		}
-	}
+	});
+	
 }

 //ミュート
 function muteDo(acct_id) {
-	if (!acct_id) {
-		var acct_id = $('#his-data').attr("use-acct");
-	}
-	var id = $("#his-data").attr("user-id");
 	if ($("#his-data").hasClass("muting")) {
 		var flag = "unmute";
 		var flagm = "delete";
+		var txt = lang.lang_status_unmute
 	} else {
 		var flag = "mute";
 		var flagm = "create";
+		var txt = lang.lang_status_mute
 	}
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	if (localStorage.getItem("mode_" + domain) == "misskey") {
-		var start = "https://" + domain + "/api/mute/" + flagm;
-		var ent = { "i": at, "userId": id }
-		var rq = JSON.stringify(ent);
-	} else {
-		var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
-		var rq = "";
-	}
-	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(rq);
-	httpreq.onreadystatechange = function () {
-		if (httpreq.readyState === 4) {
-			if ($("#his-data").hasClass("muting")) {
-				$("#his-data").removeClass("muting");
-				$("#his-mute-btn").text(lang.lang_status_mute);
+	Swal.fire({
+		title: txt,
+		text: "",
+		type: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: lang.lang_yesno,
+		cancelButtonText: lang.lang_no
+	}).then((result) => {
+		if (result.value) {
+			if (!acct_id) {
+				var acct_id = $('#his-data').attr("use-acct");
+			}
+			var id = $("#his-data").attr("user-id");
+			var domain = localStorage.getItem("domain_" + acct_id);
+			var at = localStorage.getItem("acct_" + acct_id + "_at");
+			if (localStorage.getItem("mode_" + domain) == "misskey") {
+				var start = "https://" + domain + "/api/mute/" + flagm;
+				var ent = { "i": at, "userId": id }
+				var rq = JSON.stringify(ent);
 			} else {
-				$("#his-data").addClass("muting");
-				$("#his-mute-btn").text(lang.lang_status_unmute);
+				var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
+				var rq = "";
+			}
+			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(rq);
+			httpreq.onreadystatechange = function () {
+				if (httpreq.readyState === 4) {
+					if ($("#his-data").hasClass("muting")) {
+						$("#his-data").removeClass("muting");
+						$("#his-mute-btn").text(lang.lang_status_mute);
+					} else {
+						$("#his-data").addClass("muting");
+						$("#his-mute-btn").text(lang.lang_status_unmute);
+					}
+				}
 			}
 		}
-	}
+	});
+	
 }

 //投稿削除
@@ -471,7 +499,9 @@ function staEx(mode) {
 }
 function toggleAction(id, tlid, acct_id) {
 	if (tlid == "notf") {
-		var tlide = "[data-notf=" + acct_id + "]";
+		var tlide = "[data-acct=" + acct_id + "] .notf-timeline";
+	} else if (tlid == "user") {
+		var tlide = "#his-tl-contents";
 	} else {
 		var tlide = "[tlid=" + tlid + "]";
 	}
--- a/app/js/post/suggest.js
+++ b/app/js/post/suggest.js
@@ -8,6 +8,7 @@ var oldSuggest;
 var suggest;

 input.addEventListener("focus", function () {
+	localStorage.removeItem("cursor");
 	var acct_id = $("#post-acct-sel").val();
 	$("#suggest").html("");
 	window.clearInterval(timer);
@@ -17,6 +18,15 @@ input.addEventListener("focus", function () {
 			$("#suggest").html("");
 			if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 				$("#right-side").hide()
+				$("#right-side").css("width", "300px")
+				$("#left-side").css("width", "100%")
+				var width = localStorage.getItem("postbox-width");
+				if (width) {
+					width = width.replace("px", "") * 1
+				} else {
+					width = 300
+				}
+				$("#post-box").css("width", width + "px")
 			}
 			return;
 		}
@@ -41,11 +51,29 @@ input.addEventListener("focus", function () {
 				}
 				if (ehtml != "") {
 					$("#right-side").show()
+					$("#right-side").css("width", "200px")
+					$("#left-side").css("width", "calc(100% - 200px)")
+					var width = localStorage.getItem("postbox-width");
+					if (width) {
+						width = width.replace("px", "") * 1 + 200
+					} else {
+						width = 600
+					}
+					$("#post-box").css("width", width + "px")
 					$("#poll").addClass("hide")
 					$("#emoji").addClass("hide")
 				} else {
 					if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 						$("#right-side").hide()
+						$("#right-side").css("width", "300px")
+						$("#left-side").css("width", "100%")
+						var width = localStorage.getItem("postbox-width");
+						if (width) {
+							width = width.replace("px", "") * 1
+						} else {
+							width = 300
+						}
+						$("#post-box").css("width", width + "px")
 					}
 				}
 				$("#suggest").html(ehtml);
@@ -61,12 +89,21 @@ input.addEventListener("focus", function () {
 				$("#suggest").html("");
 				if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 					$("#right-side").hide()
+					$("#right-side").css("width", "300px")
+					$("#left-side").css("width", "100%")
+					var width = localStorage.getItem("postbox-width");
+					if (width) {
+						width = width.replace("px", "") * 1
+					} else {
+						width = 300
+					}
+					$("#post-box").css("width", width + "px")
 				}
 				return;
 			}
 			var domain = localStorage.getItem("domain_" + acct_id);
 			var at = localStorage.getItem("acct_" + acct_id + "_at");
-			suggest = "https://" + domain + "/api/v1/search?q=" + q
+			suggest = "https://" + domain + "/api/v2/search?q=" + q
 			if (suggest != oldSuggest) {
 				console.log("Try to get suggest at " + suggest)
 				fetch(suggest, {
@@ -81,18 +118,52 @@ input.addEventListener("focus", function () {
 					todo(error);
 					console.error(error);
 				}).then(function (json) {
+					console.log(["Search", json]);
+					//ハッシュタグ
 					if (json.hashtags[0] && tag) {
 						if (tag[1]) {
-							var tags = "";
+							var tags = [];
 							Object.keys(json.hashtags).forEach(function (key4) {
 								var tag = json.hashtags[key4];
-								if (tag != q) {
-									tags = tags + '<a onclick="tagInsert(\'#' + tag + '\',\'#' + q +
-										'\')" class="pointer">#' + tag + '</a><br>';
+								var his = tag.history;
+								var uses = his[0].uses * 1 + his[1].uses * 1 + his[2].uses * 1 + his[3].uses * 1 + his[4].uses * 1 + his[5].uses * 1 + his[6].uses * 1;
+								tagHTML = '<br><a onclick="tagInsert(\'#' + escapeHTML(tag.name) + '\',\'#' + q + '\')" class="pointer">#' +
+									escapeHTML(tag.name) + '</a>&nbsp;' + uses + 'toot(s)'
+								var item = {
+									"uses": uses,
+									"html": tagHTML
+								}
+								tags.push(item)
+							});
+							var num_a = -1;
+							var num_b = 1;
+							tags = tags.sort(function (a, b) {
+								var x = a["uses"];
+								var y = b["uses"];
+								if (x > y) return num_a;
+								if (x < y) return num_b;
+								return 0;
+							});
+							var ins = ""
+							var nev = false
+							Object.keys(tags).forEach(function (key7) {
+								ins = ins + tags[key7].html
+								if (key7 <= 0 && !nev) {
+									ins = ins + '<br>'
+									nev = true
 								}
 							});
+							$("#suggest").html(ins);
 							$("#right-side").show()
-							$("#suggest").html("Tags:<br>" + tags);
+							$("#right-side").css("width", "200px")
+							$("#left-side").css("width", "calc(100% - 200px)")
+							var width = localStorage.getItem("postbox-width");
+							if (width) {
+								width = width.replace("px", "") * 1 + 200
+							} else {
+								width = 600
+							}
+							$("#post-box").css("width", width + "px")
 							$("#poll").addClass("hide")
 							$("#emoji").addClass("hide")
 						}
@@ -101,17 +172,38 @@ input.addEventListener("focus", function () {
 						Object.keys(json.accounts).forEach(function (key3) {
 							var acct = json.accounts[key3];
 							if (acct.acct != q) {
-								accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
-									'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
+								//Instance Actorって…
+								if (acct.username.indexOf(".") < 0) {
+									accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
+										'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
+								}
 							}
 						});
 						$("#right-side").show()
+						$("#right-side").css("width", "200px")
+						$("#left-side").css("width", "calc(100% - 200px)")
+						var width = localStorage.getItem("postbox-width");
+						if (width) {
+							width = width.replace("px", "") * 1 + 200
+						} else {
+							width = 600
+						}
+						$("#post-box").css("width", width + "px")
 						$("#suggest").html(accts);
 						$("#poll").addClass("hide")
 						$("#emoji").addClass("hide")
 					} else {
 						if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 							$("#right-side").hide()
+							$("#right-side").css("width", "300px")
+							$("#left-side").css("width", "100%")
+							var width = localStorage.getItem("postbox-width");
+							if (width) {
+								width = width.replace("px", "") * 1
+							} else {
+								width = 300
+							}
+							$("#post-box").css("width", width + "px")
 						}
 					}
 				});
@@ -146,6 +238,13 @@ function tagInsert(code, del) {
 	$("#textarea").focus();
 	if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 		$("#right-side").hide()
+		$("#right-side").css("width", "300px")
+		$("#left-side").css("width", "50%")
+		var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
+		if (!width) {
+			width = 300
+		}
+		$("#post-box").css("width", width + "px")
 	}
 	$("#suggest").html("");
 }
--- a/app/js/post/use-txtbox.js
+++ b/app/js/post/use-txtbox.js
@@ -57,8 +57,23 @@ function qt(id, acct_id, at, url) {
 		html = html.replace(/<\/p>/, "\n");
 		html = $.strip_tags(html);
 		$("#textarea").val("\n" + "@" + at + " " + html + "\n" + url);
+	} else if (qt == "apiQuote") {
+		clear();
+		localStorage.setItem("nohide", true);
+		show();
+		$("#quote").val(id);
+		$("#post-acct-sel").val(acct_id);
+		$("#post-acct-sel").prop("disabled", true);
+		$('select').formSelect();
+		$("#textarea").attr("placeholder", lang.lang_usetxtbox_reply);
+		$("#textarea").focus();
+		var profimg = localStorage.getItem("prof_" + acct_id);
+		if (!profimg) {
+			profimg = "../../img/missing.svg";
+		}
+		$("#acct-sel-prof").attr("src", profimg);
 	}
-	$("#textarea").focus();
 	$("#post-acct-sel").val(acct_id);
 	$('select').formSelect();
+	$("#textarea").focus();
 }
--- a/app/js/tl/card.js
+++ b/app/js/tl/card.js
@@ -155,7 +155,7 @@ function additionalIndv(tlid, acct_id, id) {
 			});
 		} else {
 			var id = $("[toot-id=" + id + "] .toot a").parents('.cvo').attr("toot-id");
-			var start = "https://" + domain + "/api/v1/statuses/" + id + "/card";
+			var start = "https://" + domain + "/api/v1/statuses/" + id;
 			fetch(start, {
 				method: 'GET',
 				headers: {
@@ -169,6 +169,7 @@ function additionalIndv(tlid, acct_id, id) {
 				todo(error);
 				console.error(error);
 			}).then(function (json) {
+				json = json.card;
 				//このリンク鳥やんけ、ってとき
 				if (json.provider_name == "Twitter") {
 					if (json.image) {
--- a/app/js/tl/datails.js
+++ b/app/js/tl/datails.js
@@ -82,7 +82,7 @@ function details(id, acct_id, tlid, mode) {
 		} else {
 			$("#tootmodal").attr("data-user", scn);
 		}
-		context(id, acct_id);
+		getContext(id, acct_id);
 		var dom = null;
 		if (!local) {
 			dom = scn.replace(/.+@/g, '');
@@ -99,7 +99,9 @@ function details(id, acct_id, tlid, mode) {
 		if ($("#toot-this div").hasClass("cvo")) {
 			$("#toot-this").removeClass("cvo");
 		} else {
-			$("#toot-this").addClass("cvo");
+			if(!$("#toot-this .cvo").hasClass("cvo")){
+				$("#toot-this").addClass("cvo");
+			}
 		}
 		if (!$("#activator").hasClass("active")) {
 			$('#det-col').collapsible('open', 4);
@@ -125,14 +127,7 @@ function replyTL(id, acct_id) {
 			})
 		}
 	} else {
-		var start = "https://" + domain + "/api/v1/statuses/" + id;
-		var i = {
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			},
-		}
+		return false
 	}
 	fetch(start, i).then(function (response) {
 		return response.json();
@@ -155,27 +150,13 @@ function replyTL(id, acct_id) {
 			if (json[rep]) {
 				replyTL(json[rep][0], acct_id);
 			}
-		} else {
-			var templete = parse([json], '', acct_id, "", "", mute);
-			if (templete != "") {
-				$("#toot-reply .no-data").hide();
-			}
-			$("#toot-reply").prepend(templete);
-			$("#toot-reply .hide").html(lang.lang_details_filtered);
-			$("#toot-reply .by_filter").css("display", "block");
-			$("#toot-reply .by_filter").removeClass("hide");
-			jQuery("time.timeago").timeago();
-			var rep = "in_reply_to_id";
-			if (json[rep]) {
-				replyTL(json[rep], acct_id);
-			}
 		}

 	});
 }

 //コンテクストってなんですか
-function context(id, acct_id) {
+function getContext(id, acct_id) {
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
@@ -228,6 +209,14 @@ function context(id, acct_id) {
 			$("#toot-after .hide").html(lang.lang_details_filtered);
 			$("#toot-after .by_filter").css("display", "block");
 			$("#toot-after .by_filter").removeClass("hide");
+			var templete = parse(json.ancestors, '', acct_id, "", "", mute);
+			if (templete != "") {
+				$("#toot-reply .no-data").hide();
+			}
+			$("#toot-reply").prepend(templete);
+			$("#toot-reply .hide").html(lang.lang_details_filtered);
+			$("#toot-reply .by_filter").css("display", "block");
+			$("#toot-reply .by_filter").removeClass("hide");
 			jQuery("time.timeago").timeago();
 		}

@@ -433,6 +422,7 @@ function faved(id, acct_id) {
 			$("#toot-fav .no-data").hide();
 		}
 		$("#toot-fav").html(templete);
+		jQuery("time.timeago").timeago();
 	});
 }

@@ -456,6 +446,7 @@ function rted(id, acct_id) {
 	}).then(function (json) {
 		var templete = userparse(json, '', acct_id);
 		$("#toot-rt").html(templete);
+		jQuery("time.timeago").timeago();
 	});
 }
 //URL等のコピー
@@ -513,7 +504,7 @@ function trans(tar, to) {
 		todo(error);
 		console.error(error);
 	}).then(function (text) {
-		$("#toot-this .additional").html('<span class="gray">' + text.text + '</span>');
+		$("#toot-this .additional").html('<span class="gray translate">' + text.text + '</span>');
 	});
 }
 //ブラウザで開く
--- a/app/js/tl/directory.js
+++ b/app/js/tl/directory.js
@@ -0,0 +1,69 @@
+//ディレクトリ
+//ディレクトリトグル
+function dirMenu() {
+    $("#dir-contents").html("");
+    directory();
+    $("#left-menu div").removeClass("active");
+    $("#dirMenu").addClass("active");
+    $(".menu-content").addClass("hide");
+    $("#dir-box").removeClass("hide");
+}
+function dirselCk() {
+    var acct = $("#dir-acct-sel").val();
+    if (acct == "noauth") {
+        $("#dirNoAuth").removeClass("hide");
+    } else {
+        $("#dirNoAuth").addClass("hide");
+        directory();
+    }
+}
+function directory(isMore) {
+    var order = $("[name=sort]:checked").val()
+    if (!order) {
+        order = "active"
+    }
+    var local_only = $("#local_only:checked").val()
+    if (local_only) {
+        local_only = "true"
+    } else {
+        local_only = "false"
+    }
+    var acct_id = $("#dir-acct-sel").val();
+    if (acct_id == "noauth") {
+        var domain = $("#dirNoAuth-url").val();
+        var at = "";
+    } else {
+        var domain = localStorage.getItem("domain_" + acct_id);
+        var at = localStorage.getItem("acct_" + acct_id + "_at");
+    }
+    if (isMore) {
+        var addOffset = $("#dir-contents .cvo").length
+    } else {
+        var addOffset = 0
+        $("#dir-contents").html("");
+    }
+    var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset
+    console.log(start)
+    fetch(start, {
+        method: 'GET',
+        headers: {
+            'content-type': 'application/json',
+            'Authorization': 'Bearer ' + at
+        },
+    }).then(function (response) {
+        return response.json();
+    }).catch(function (error) {
+        //todo(error);
+        console.error(error);
+    }).then(function (json) {
+        if (json) {
+            $("#moreDir").removeClass("disabled")
+            var html = userparse(json, null, acct_id, "dir", null)
+            $("#dir-contents").append(html)
+            jQuery("time.timeago").timeago();
+        } else {
+            $("#moreDir").addClass("disabled")
+        }
+
+    });
+}
--- a/app/js/tl/filter.js
+++ b/app/js/tl/filter.js
@@ -77,12 +77,12 @@ function catchToggle(tlid) {
 		localStorage.removeItem("catch_" + tlid);
 		$("#sta-del-" + tlid).text("Off");
 		$("#sta-del-" + tlid).css("color", 'red');
-		parseColumn();
+		parseColumn(tlid);
 	} else {
 		localStorage.setItem("catch_" + tlid, "true");
 		$("#sta-del-" + tlid).text("On");
 		$("#sta-del-" + tlid).css("color", '#009688');
-		parseColumn();
+		parseColumn(tlid);
 	}
 }
 function catchCheck(tlid) {
@@ -421,7 +421,7 @@ function exclude(key) {
 	} else {
 	}
 	localStorage.setItem("exclude-" + key, excludetxt)
-	parseColumn();
+	parseColumn(key);
 }
 function excludeCk(key, target) {
 	var exc = localStorage.getItem("exclude-" + key);
@@ -444,7 +444,7 @@ function checkNotfFilter(tlid){
 }
 function resetNotfFilter(tlid){
 	localStorage.setItem("exclude-" + tlid, "")
-	parseColumn();
+	parseColumn(tlid);
 }
 function notfFilter(id,tlid,acct_id){
 	var excludetxt = localStorage.getItem("exclude-" + tlid);
@@ -454,5 +454,5 @@ function notfFilter(id,tlid,acct_id){
 		excludetxt = "?account_id="+id
 	}
 	localStorage.setItem("exclude-" + tlid, excludetxt)
-	parseColumn();
+	parseColumn(tlid);
 }
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@@ -135,6 +135,7 @@ function listUser(id, acct_id) {
 				templete = lang.lang_list_nouser;
 			}
 			$("#lists-user").html(templete);
+			jQuery("time.timeago").timeago();
 		} else {
 			$("#lists-user").html(lang.lang_list_nouser);
 		}
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -184,9 +184,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				noticeavatar = toot.user.avatarUrl;
 			}
 			noticeavatar = '<a onclick="udg(\'' + toot.user.id +
-				'\',' + acct_id + ');" user="' + toot.user.username + '" class="udg">' +
+				'\',' + acct_id + ');" user="' + toot.user.username + '" class="udg notf-icon">' +
 				'<img src="' + noticeavatar +
-				'" width="20" class="notf-icon prof-img" user="' + toot.user.username +
+				'" width="20" class="prof-img" user="' + toot.user.username +
 				'"></a>';
 			if (toot.type == "reply") {
 				var what = lang.lang_parse_mentioned;
@@ -375,7 +375,7 @@ 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.lang_parse_cwshow + '</a><br>';
+				'\')" class="nex parsed cw_btn">' + 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;
@@ -387,7 +387,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					'</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>';
+					'\')" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
 			} else {
 				var content = escapeHTMLtemp(toot.text);
 				if (toot.cw) {
@@ -510,7 +510,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
 						'" data-type="image" class="img-parsed"><img src="' +
 						purl + '" class="' + sense +
-						' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;"></a></span>';
+						' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;" onerror="this.src=\'../../img/loading.svg\'"></a></span>';
 				}

 			});
@@ -581,7 +581,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		var rt_app = "";
        /*
 		if (toot.reblogged) {
-			var if_rt = "teal-text";
+			var if_rt = "light-blue-text";
 			var rt_app = "rted";
 		} else {
 			var if_rt = "";
@@ -788,7 +788,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'\',' + acct_id + ');" user="' + toot.user.username + '" class="udg">' +
 			'<img src="' + avatar +
 			'" width="40" class="prof-img" user="' + toot.user.username +
-			'"></a></div>' +
+			'" onerror="this.src=\'../../img/loading.svg\'"></a></div>' +
 			'<div class="area-display_name"><div class="flex-name"><span class="user">' +
 			dis_name +
 			'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' +
@@ -832,10 +832,10 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'<div class="action ' + disp["re"] + ' ' + noauth + '"><a onclick="misskeyreply(\'' + toot.id +
 			'\',\'' + acct_id + '\',' +
 			acct_id + ',\'' + visen +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat rep-btn" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i></a></div>' +
 			'<div class="action ' + can_rt + ' ' + disp["rt"] + ' ' + noauth + '"><a onclick="renote(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_misskeyparse_renote + '"><i class="text-darken-3 fas fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat bt-btn" style="padding:0" title="' + lang.lang_misskeyparse_renote + '"><i class="text-darken-3 fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' +
 			'<div class="action ' + can_rt + ' ' + disp["qt"] + ' ' + noauth + '"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id +
 			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_misskeyparse_renoteqt + '"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
@@ -979,7 +979,7 @@ function goGoogle(id) {
 }
 var misskeyws = []
 var misskeywsstate = []
-function connectMisskey(acct_id) {
+function connectMisskey(acct_id, re) {
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "wss://" + domain +
@@ -1001,7 +1001,6 @@ function connectMisskey(acct_id) {
 		var mute = [];
 		if (data.body.id.indexOf("notf:") !== -1) {
 			var obj = JSON.parse(mess.data).body;
-			console.log(obj);
 			var popup = localStorage.getItem("popup");
 			if (!popup) {
 				popup = 0;
@@ -1063,13 +1062,17 @@ function connectMisskey(acct_id) {
 		console.error("Error closing " + tlid);
 		console.error(error);
 		misskeywsstate[wsid] = false
-		connectMisskey(acct_id)
+		if(!re){
+			connectMisskey(acct_id, true)
+		}
 		return false;
 	};
 	misskeyws[wsid].onclose = function () {
 		console.warn("Closing " + tlid);
 		misskeywsstate[wsid] = false
-		connectMisskey(acct_id)
+		if(!re){
+			connectMisskey(acct_id, true)
+		}
 		return false;
 	};

--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -66,7 +66,7 @@ function notfColumn(acct_id, tlid, sys) {
 						if (os == "darwin") {
 							var n = new Notification('TheDesk:' + domain, options);
 						} else {
-							var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
+							var nativeNotfOpt = ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
 							postMessage(["nativeNotf", nativeNotfOpt], "*")
 						}

@@ -98,6 +98,16 @@ function notfColumn(acct_id, tlid, sys) {
 			}
 			$("#notf-box").addClass("fetched");
 			todc();
+			//Markers
+			var markers = localStorage.getItem("markers");
+			if (markers == "no") {
+				markers = false;
+			} else {
+				markers = true
+			}
+			if (markers) {
+				getMarker(tlid, "notf", acct_id)
+			}
 		}
 	}
 	if (!misskey) {
@@ -171,7 +181,7 @@ function notfCommon(acct_id, tlid, sys) {
 					if (os == "darwin") {
 						var n = new Notification('TheDesk:' + domain, options);
 					} else {
-						var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
+						var nativeNotfOpt = ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
 						postMessage(["nativeNotf", nativeNotfOpt], "*")
 					}

@@ -224,7 +234,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {

 		}
 		websocketNotf[acct_id].onmessage = function (mess) {
-			console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
+			//console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
 			var popup = localStorage.getItem("popup");
 			if (!popup) {
 				popup = 0;
@@ -234,16 +244,19 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 			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 (!$("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+					//markers show中はダメ
+					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) {
+						$("div[data-notf=" + acct_id + "]").prepend(templete);
+						$("div[data-const=notf_" + acct_id + "]").prepend(templete);
+					}
+					jQuery("time.timeago").timeago();
 				}
-				if (!$("div[data-notfIndv=" + acct_id + "_" + obj.id + "]").length) {
-					$("div[data-notf=" + acct_id + "]").prepend(templete);
-					$("div[data-const=notf_" + acct_id + "]").prepend(templete);
-				}
-				jQuery("time.timeago").timeago();
 			} else if (type == "delete") {
 				$("[toot-id=" + obj + "]").hide();
 				$("[toot-id=" + obj + "]").remove();
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
--- a/app/js/tl/poll.js
+++ b/app/js/tl/poll.js
@@ -2,11 +2,31 @@
 function pollToggle() {
    if ($("#poll").hasClass("hide")) {
        $("#right-side").show()
+        $("#right-side").css("width", "300px")
+        $("#left-side").css("width", "calc(100% - 300px)")
+        var width = localStorage.getItem("postbox-width");
+        if (width) {
+            width = width.replace("px", "") * 1 + 300
+        } else {
+            width = 600
+        }
+        $("#post-box").css("width", width + "px")
        $("#poll").removeClass("hide")
+        $("#pollsta").text(lang.lang_yesno)
    } else {
        $("#right-side").hide()
+        $("#left-side").css("width", "100%")
+        $("#right-side").css("width", "300px")
+        var width = localStorage.getItem("postbox-width");
+        if (width) {
+            width = width.replace("px", "") * 1
+        } else {
+            width = 300
+        }
+        $("#post-box").css("width", width + "px")
        $("#emoji").addClass("hide")
        $("#poll").addClass("hide")
+        $("#pollsta").text(lang.lang_no)
    }
 }
 function pollProviderCk() {
@@ -89,8 +109,9 @@ function voteMastodonrefresh(acct_id, id) {
    var start = "https://" + domain + "/api/v1/polls/" + id;
    httpreqd.open('GET', start, true);
    httpreqd.setRequestHeader('Content-Type', 'application/json');
+    httpreqd.setRequestHeader('Authorization', 'Bearer ' + at);
    httpreqd.responseType = 'json';
-    httpreqd.send(JSON.stringify({ i: at, noteId: id }));
+    httpreqd.send();
    httpreqd.onreadystatechange = function () {
        if (httpreqd.readyState == 4) {
            var json = httpreqd.response;
@@ -109,7 +130,7 @@ function voteMastodonrefresh(acct_id, id) {
                }
                poll = poll + '<div class="pointer vote vote_' + acct_id + '_' + json.id + '_' + keyc + '" onclick="' + votesel + '">' + escapeHTML(choice.title) + '<span class="vote_' + acct_id + '_' + json.id + '_result ' + result_hide + '">(' + choice.votes_count + ')</span></div>';
            });
-            poll = poll + myvote + '<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
+            poll = poll + myvote + '<a onclick="voteMastodonrefresh(\'' + acct_id + '\',\'' + json.id + '\')" class="pointer">' + lang.lang_manager_refresh + '</a><span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
                '"><i class="far fa-calendar-times"></i>' +
                date(json.expires_at, datetype) + '</span>';
            $('.vote_' + acct_id + '_' + json.id).html(poll)
--- a/app/js/tl/speech.js
+++ b/app/js/tl/speech.js
@@ -56,12 +56,12 @@ function voiceToggle(tlid) {
        speechSynthesis.cancel()
        $("#sta-voice-" + tlid).text("Off");
        $("#sta-voice-" + tlid).css("color", 'red');
-        parseColumn();
+        parseColumn(tlid);
    } else {
        localStorage.setItem("voice_" + tlid, "true");
        $("#sta-voice-" + tlid).text("On");
        $("#sta-voice-" + tlid).css("color", '#009688');
-        parseColumn();
+        parseColumn(tlid);
    }
 }
 function voiceCheck(tlid) {
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -1,17 +1,24 @@
 //検索
 //検索ボックストグル
 function searchMenu() {
+	$("#src-contents").html("");
+	trend();
 	$("#left-menu div").removeClass("active");
 	$("#searchMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#src-box").removeClass("hide");
-	$('ul.tabs').tabs('select_tab', 'src-sta');
-	$("#src-contents").html("");
+	//$('ul.tabs').tabs('select_tab', 'src-sta');
 }

 //検索取得
-function src(mode) {
-	$("#src-contents").html("");
+function src(mode, offset) {
+	if(!offset){
+		$("#src-contents").html("");
+		var add = ""
+	}else{
+		var add = "&type=accounts&offset=" + $("#src-accts .cvo").length
+	}
+	
 	var q = $("#src").val();
 	var acct_id = $("#src-acct-sel").val();
 	if (acct_id == "tootsearch") {
@@ -27,7 +34,7 @@ function src(mode) {
 		var user = $('#his-data').attr("user-id");
 	}
 	if (!mode) {
-		var start = "https://" + domain + "/api/v2/search?q=" + q
+		var start = "https://" + domain + "/api/v2/search?q=" + q + add
 	} else {
 		var start = "https://" + domain + "/api/v1/search?q=" + q
 	}
@@ -68,7 +75,12 @@ function src(mode) {
 		//アカウント
 		if (json.accounts[0]) {
 			var templete = userparse(json.accounts, '', acct_id);
-			$("#src-contents").append("<br>Accounts<br>" + templete);
+			if(!offset){
+				$("#src-contents").append("<br>Accounts<div id=\"src-accts\">" + templete + '</div><a onclick="src(false,\'more\')" class="pointer">more...</a>');
+			}else{
+				$("#src-accts").append(templete)
+			}
+			
 		}
 		jQuery("time.timeago").timeago();
 	});
@@ -85,7 +97,7 @@ function tsAdd(q) {
 	obj.push(add);
 	var json = JSON.stringify(obj);
 	localStorage.setItem("column", json);
-	parseColumn();
+	parseColumn('add');
 }
 function tootsearch(tlid, q) {
 	var start = "https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=" + q
@@ -177,12 +189,12 @@ function graphDraw(tag, acct_id) {
 	var zero = 50 - (his[0].uses / max * 50);
 	if (max === 0) {
 		tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
-			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
+			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toot(s)&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
 			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
 	} else {
 		tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
 			'<g><path d="M0,' + six + ' L10,' + five + ' 20,' + four + ' 30,' + three + ' 40,' + two + ' 50,' + one + ' 60,' + zero + '" style="stroke: #9e9e9e; stroke-width: 1;fill: none;"></path></g>' +
-			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
+			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toot&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
 			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
 	}

@@ -192,4 +204,49 @@ function graphDraw(tag, acct_id) {
 <svg version="1.1" viewbox="0 0 50 300" width="100%" height="50">
 	<path d="M0,0 L10,0 20,10 20,50" fill="#3F51B5"></path>
 </svg>
-*/
+*/
+function trend(){
+	console.log("get trend")
+	$("#src-contents").html("");
+	var acct_id = $("#src-acct-sel").val();
+	if(acct_id=="tootsearch"){
+		return false;
+	}
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/trends"
+	console.log(start)
+	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 tags = "";
+			Object.keys(json).forEach(function(keye) {
+				var tag = json[keye];
+				var his=tag.history;
+				var max=Math.max.apply(null, [his[0].uses,his[1].uses,his[2].uses,his[3].uses,his[4].uses,his[5].uses,his[6].uses]);
+				var six=50-(his[6].uses/max*50);
+				var five=50-(his[5].uses/max*50);
+				var four=50-(his[4].uses/max*50);
+				var three=50-(his[3].uses/max*50);
+				var two=50-(his[2].uses/max*50);
+				var one=50-(his[1].uses/max*50);
+				var zero=50-(his[0].uses/max*50);
+				tags = '<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.lang_src_people+"<br><br>";
+
+					$("#src-contents").append(tags);
+			});
+
+	});
+}
--- a/app/js/tl/tag.js
+++ b/app/js/tl/tag.js
@@ -10,7 +10,7 @@ if (location.search) {
 }
 //よく使うタグ
 function tagShow(tag) {
-    $("[data-tag=" + decodeURI(tag) + "]").toggleClass("hide");
+    $("[data-tag=" + decodeURI(tag).toLowerCase() + "]").toggleClass("hide");
 }
 //タグ追加
 function tagPin(tag) {
@@ -127,4 +127,27 @@ function autoToot(tag) {
        brInsert('#' + tag + " ")
    }
    favTag();
+}
+//タグをフィーチャー
+function tagFeature(name, acct_id){
+    var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/featured_tags"
+	fetch(start, {
+		method: 'POST',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+        },
+        body: JSON.stringify({
+            name: name
+        })
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		return false;
+	}).then(function (json) {
+        console.log(json)
+		M.toast({ html: "Complete: " + escapeHTML(name), displayLength: 3000 })
+	});
 }
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -2,6 +2,7 @@
 moreloading = false;
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	scrollevent();
+	$("#unread_" + tlid + " .material-icons").removeClass("teal-text")
 	localStorage.removeItem("morelock");
 	localStorage.removeItem("pool");
 	var domain = localStorage.getItem("domain_" + acct_id);
@@ -20,7 +21,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		obj.push(add);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("column", json);
-		parseColumn();
+		parseColumn('add');
 		return;
 	}

@@ -149,6 +150,18 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		jQuery("time.timeago").timeago();
 		todc();
 		reload(type, '', acct_id, tlid, data, mute, delc, voice);
+		if (type == "home" || type == "notf") {
+			//Markers
+			var markers = localStorage.getItem("markers");
+			if (markers == "no") {
+				markers = false;
+			} else {
+				markers = true
+			}
+			if (markers) {
+				getMarker(tlid, type, acct_id)
+			}
+		}
 		$(window).scrollTop(0);
 	});
 }
@@ -217,7 +230,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		websocket[wsid] = new WebSocket(start);
 		websocket[wsid].onopen = function (mess) {
 			console.table({ "tlid": tlid, "type": "Connect Streaming API" + type, "domain": domain, "message": [mess] })
-			$("#notice_icon_" + tlid).removeClass("red-text");
+			$("#notice_icon_" + tlid).removeClass("red-text")
 		}
 		websocket[wsid].onmessage = function (mess) {
 			console.log([tlid + ":Receive Streaming API:", JSON.parse(mess.data)]);
@@ -256,37 +269,40 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 						$("#timeline_" + tlid + " [toot-id=" + JSON.parse(mess.data).payload + "]").addClass("emphasized");
 						$("#timeline_" + tlid + " [toot-id=" + JSON.parse(mess.data).payload + "]").addClass("by_delcatch");
 					} else {
-						$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
-						$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
+						$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide()
+						$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove()
 					}

 				} else if (typeA == "update" || typeA == "conversation") {
-					localStorage.removeItem("delete");
-					var obj = JSON.parse(JSON.parse(mess.data).payload);
-					if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
-						if (voice) {
-							say(obj.content)
-						}
-						var templete = parse([obj], type, acct_id, tlid, "", mute, type);
-						if ($("timeline_box_" + tlid + "_box .tl-box").scrollTop() === 0) {
-							$("#timeline_" + tlid).prepend(templete);
-						} else {
-							var pool = localStorage.getItem("pool_" + tlid);
-							if (pool) {
-								pool = templete + pool;
-							} else {
-								pool = templete
+					localStorage.removeItem("delete")
+					if (!$("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+						//markers show中はダメ
+						var obj = JSON.parse(JSON.parse(mess.data).payload);
+						if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
+							if (voice) {
+								say(obj.content)
 							}
-							localStorage.setItem("pool_" + tlid, pool);
+							var templete = parse([obj], type, acct_id, tlid, "", mute, type);
+							if ($("timeline_box_" + tlid + "_box .tl-box").scrollTop() === 0) {
+								$("#timeline_" + tlid).prepend(templete);
+							} else {
+								var pool = localStorage.getItem("pool_" + tlid);
+								if (pool) {
+									pool = templete + pool;
+								} else {
+									pool = templete
+								}
+								localStorage.setItem("pool_" + tlid, pool);
+							}
+							scrollck();
+							additional(acct_id, tlid);
+							jQuery("time.timeago").timeago();
+						} else {
+							todo("二重取得発生中");
 						}
-						scrollck();
-						additional(acct_id, tlid);
-						jQuery("time.timeago").timeago();
-					} else {
-						todo("二重取得発生中");
-					}

-					todc();
+						todc();
+					}
 				} else if (typeA == "filters_changed") {
 					filterUpdate(acct_id);
 				}
@@ -298,7 +314,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			console.error("Error closing");
 			console.error(error);
 			if (mode == "error") {
-				$("#notice_icon_" + tlid).addClass("red-text");
+				$("#notice_icon_" + tlid).addClass("red-text")
 				todo('WebSocket Error ' + error);
 			} else {
 				var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
@@ -312,7 +328,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		websocket[wsid].onclose = function () {
 			console.warn("Closing " + tlid);
 			if (mode == "error") {
-				$("#notice_icon_" + tlid).addClass("red-text");
+				$("#notice_icon_" + tlid).addClass("red-text")
 				todo('WebSocket Closed');
 			} else {
 				var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
@@ -822,6 +838,231 @@ function reconnector(tlid, type, acct_id, data, mode) {
 		reload(type, '', acct_id, tlid, data, mute, "", voice, mode);
 	}
 	M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
-	
+
 }
-strAliveInt()
+function columnReload(tlid, type) {
+	$("#notice_icon_" + tlid).addClass("red-text");
+	$("#unread_" + tlid + " .material-icons").removeClass("teal-text")
+	if (type == "mix" || type == "integrated" || type == "plus") {
+		if (localStorage.getItem("voice_" + tlid)) {
+			var voice = true;
+		} else {
+			var voice = false;
+		}
+		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+		} else {
+			var mute = [];
+		}
+		var wssh = localStorage.getItem("wssH_" + tlid);
+		websocketHome[wssh].close();
+		var wssl = localStorage.getItem("wssL_" + tlid);
+		websocketLocal[wssl].close();
+		parseColumn(tlid)
+	} else if (type == "notf") {
+		$("#notice_icon_" + tlid).removeClass("red-text");
+		notfColumn(acct_id, tlid, "")
+	} else {
+		var wss = localStorage.getItem("wss_" + tlid);
+		websocket[wss].close();
+		if (localStorage.getItem("voice_" + tlid)) {
+			var voice = true;
+		} else {
+			var voice = false;
+		}
+		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+		} else {
+			var mute = [];
+		}
+		parseColumn(tlid)
+	}
+}
+strAliveInt()
+//Markers
+function getMarker(tlid, type, acct_id) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if (type == "home") {
+		var add = "home"
+	} else if (type == "notf") {
+		var add = "notifications"
+	}
+	var start = "https://" + domain + "/api/v1/markers?timeline=" + add
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		$("#unread_" + tlid).attr("title", lang.lang_layout_unread + ":" + lang.lang_nothing)
+		$("#unread_" + tlid).attr("data-id", "")
+		return false;
+	}).then(function (json) {
+		if (json) {
+			if (json[add]) {
+				json = json[add]
+				$("#unread_" + tlid).attr("title", lang.lang_layout_unread + ":" + json.updated_at + ' v' + json.version)
+				$("#unread_" + tlid).attr("data-id", json.last_read_id)
+			} else {
+				$("#unread_" + tlid).attr("title", lang.lang_layout_unread + ":" + lang.lang_nothing)
+				$("#unread_" + tlid).attr("data-id", "")
+			}
+		} else {
+			$("#unread_" + tlid).attr("title", lang.lang_layout_unread + ":" + lang.lang_nothing)
+			$("#unread_" + tlid).attr("data-id", "")
+		}
+	});
+}
+function showUnread(tlid, type, acct_id) {
+	if ($("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+		goTop(tlid)
+		return
+	}
+	$("#unread_" + tlid + " .material-icons").addClass("teal-text")
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var id = $("#unread_" + tlid).attr("data-id")
+	if (type == "home") {
+		var add = "timelines/home?min_id=" + id
+	} else if (type == "notf") {
+		var add = "notifications?min_id=" + id
+	}
+	var start = "https://" + domain + "/api/v1/" + add
+	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) {
+		if (!json || !json.length) {
+			columnReload(tlid, type)
+		}
+		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+		} else {
+			var mute = [];
+		}
+		var templete = parse(json, type, acct_id, tlid, "", mute, type);
+		var len = json.length - 1
+		$("#timeline_" + tlid).html(templete);
+		if ($("#timeline_" + tlid + " .cvo:eq(" + len + ")").length) {
+			var to = $("#timeline_" + tlid + " .cvo:eq(" + len + ")").offset().top
+			$("#timeline_box_" + tlid + "_box .tl-box").scrollTop(to)
+		}
+		additional(acct_id, tlid);
+		jQuery("time.timeago").timeago();
+		todc();
+	});
+}
+var ueloadlock = false
+function ueload(tlid) {
+	if (ueloadlock) {
+		return false
+	}
+	ueloadlock = true
+	var multi = localStorage.getItem("column")
+	var obj = JSON.parse(multi)
+	var acct_id = obj[tlid * 1].domain
+	var type = obj[tlid * 1].type
+	var domain = localStorage.getItem("domain_" + acct_id)
+	var at = localStorage.getItem("acct_" + acct_id + "_at")
+	var id = $("#timeline_" + tlid + " .cvo:eq(0)").attr("unique-id")
+	if (type == "home") {
+		var add = "timelines/home?min_id=" + id
+	} else if (type == "notf") {
+		var add = "notifications?min_id=" + id
+	}
+	var start = "https://" + domain + "/api/v1/" + add
+	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) {
+		if (!json) {
+			columnReload(tlid, type)
+		}
+		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+		} else {
+			var mute = [];
+		}
+		var templete = parse(json, '', acct_id, tlid, "", mute, type);
+		var len = json.length - 1
+		$("#timeline_" + tlid).prepend(templete);
+		if ($("#timeline_" + tlid + " .cvo:eq(" + len + ")").length) {
+			var to = $("#timeline_" + tlid + " .cvo:eq(" + len + ")").offset().top
+			$("#timeline_box_" + tlid + "_box .tl-box").scrollTop(to)
+		}
+		additional(acct_id, tlid);
+		jQuery("time.timeago").timeago();
+		todc();
+		ueloadlock = false
+	});
+}
+function asRead() {
+	//Markers
+	var markers = localStorage.getItem("markers");
+	if (markers == "no") {
+		markers = false;
+	} else {
+		markers = true
+	}
+	if (markers) {
+		var multi = localStorage.getItem("column")
+		var obj = JSON.parse(multi)
+		for (var i = 0; i < obj.length; i++) {
+			var acct_id = obj[i].domain
+			var type = obj[i].type
+			if (type == "home" || type == "notf") {
+				if (type == "home") {
+					var id = $("#timeline_" + i + " .cvo:eq(0)").attr("unique-id")
+					var poster = {
+						home: {
+							last_read_id: id
+						}
+					}
+				} else {
+					var id = $("#timeline_" + i + " .cvo:eq(0)").attr("data-notf")
+					var poster = {
+						notifications: {
+							last_read_id: id
+						}
+					}
+				}
+				var domain = localStorage.getItem("domain_" + acct_id);
+				var at = localStorage.getItem("acct_" + acct_id + "_at");
+				var httpreq = new XMLHttpRequest();
+				var start = "https://" + domain + "/api/v1/markers"
+				httpreq.open('POST', start, true);
+				httpreq.setRequestHeader('Content-Type', 'application/json');
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+				httpreq.responseType = "json";
+				httpreq.send(JSON.stringify(poster));
+				httpreq.onreadystatechange = function () {
+					if (httpreq.readyState === 4) {
+						var json = httpreq.response;
+						console.log(json)
+					}
+				}
+			}
+		}
+	}
+}
+cbTimer1 = setInterval(asRead, 60000);
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -20,7 +20,11 @@ $('.type').click(function () {
 	$("#type-sel").val($(this).attr("data-type"))
 })
 //最初、カラム変更時に発火
-function parseColumn(dontclose) {
+function parseColumn(target, dontclose) {
+	if (target === 0) {
+		//this is kuso
+		target = "zero"
+	}
 	console.log("%c Parse column", "color:red;font-size:125%");
 	var size = localStorage.getItem("size");
 	if (size) {
@@ -31,7 +35,7 @@ function parseColumn(dontclose) {
 	if (localStorage.getItem("menu-done")) {
 		$("#fukidashi").addClass("hide")
 	}
-	if (!dontclose) {
+	if (!dontclose && !target) {
 		tlCloser();
 	}

@@ -55,7 +59,7 @@ function parseColumn(dontclose) {
 			var domain = localStorage.getItem("domain_" + key);
 			if (localStorage.getItem("mode_" + domain) == "misskey") {
 				localStorage.removeItem("misskey_wss_" + key)
-				connectMisskey(key)
+				connectMisskey(key, false)
 			}
 		});
 	}
@@ -76,13 +80,36 @@ function parseColumn(dontclose) {
 	} else {
 		var obj = JSON.parse(col);
 	}
-	if ($("#timeline-container").length) {
-		$("#timeline-container").html("");
+	var numtarget = false
+	if (target == "add") {
+		var tlidtar = obj.length - 1
+		obj = [obj[tlidtar]]
+	} else if (target) {
+		var tlidtar = target
+		if (target == "zero") {
+			target = 0
+		}
+		obj = [obj[target]]
+		numtarget = true
+	} else {
+		var tlidtar = null
+		if ($("#timeline-container").length) {
+			$("#timeline-container").html("");
+		}
 	}
 	var basekey = 0;
 	for (var key = 0; key < obj.length; key++) {
 		var next = key + 1;
+		//acctって言いながらタイムライン
 		var acct = obj[key];
+		if (tlidtar) {
+			if (tlidtar == "zero") {
+				key = 0
+			} else {
+				key = tlidtar
+			}
+
+		}
 		if (acct.type == "notf") {
 			var notf_attr = ' data-notf=' + acct.domain;
 			var if_notf = "hide";
@@ -163,6 +190,7 @@ function parseColumn(dontclose) {
 			} else {
 				var animecss = "";
 			}
+			var unread = '<a id="unread_' + key + '" onclick="showUnread(' + key + ',\'' + acct.type + '\',\'' + acct.domain + '\')" class="setting nex" title="' + lang.lang_layout_unread + '"><i class="material-icons waves-effect nex">more</i></a>'
 			if (acct.type == "notf") {
 				var exclude = lang.lang_excluded + ':<br><label><input type="checkbox" class="filled-in" id="exc-reply-' + key + '" ' + excludeCk(key, "mention") + ' /><span><i class="fas fa-share exc-icons"></i></span></label> ' +
 					'<label><input type="checkbox" class="filled-in" id="exc-fav-' + key + '"  ' + excludeCk(key, "favourite") + ' /><span><i class="fas fa-star exc-icons"></i></span></label> ' +
@@ -174,17 +202,31 @@ function parseColumn(dontclose) {
 					exclude = exclude + '<button class="btn red waves-effect" style="width:60px; padding:0;" onclick="resetNotfFilter(' + key + ')">Clear all</button>'
 				}
 				exclude = exclude + "<br>";
+
 			} else if (acct.type == "home") {
 				var exclude = '<a onclick="ebtToggle(' + key +
 					')" class="setting nex"><i class="fas fa-retweet waves-effect nex" title="' + lang.lang_layout_excludingbt + '" style="font-size:24px"></i><span id="sta-bt-' +
 					key + '">Off</span></a>' + lang.lang_layout_excludingbt + '<br>';
+
 			} else {
 				var exclude = "";
+				unread = ""
+			}
+			var markers = localStorage.getItem("markers");
+			if (markers == "no") {
+				markers = false;
+			} else {
+				markers = true
+			}
+			if (!markers) {
+				unread = ""
 			}
 			if (!acct.left_fold) {
 				basekey = key;
-				var basehtml = '<div style="' + css + '" class="box ' + animecss + '" id="timeline_box_' + basekey + '_parentBox"></div>';
-				$("#timeline-container").append(basehtml);
+				if (!numtarget) {
+					var basehtml = '<div style="' + css + '" class="box ' + animecss + '" id="timeline_box_' + basekey + '_parentBox"></div>';
+					$("#timeline-container").append(basehtml);
+				}
 				var left_hold = '<a onclick="leftFoldSet(' + key + ')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_leftFold + '">view_agenda</i></a>' + lang.lang_layout_leftFold + '</span><br>';
 			} else {
 				var left_hold = '<a onclick="leftFoldRemove(' + key + ')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_leftUnfold + '">view_column</i></a>' + lang.lang_layout_leftUnfold + '</span><br>';
@@ -206,7 +248,7 @@ function parseColumn(dontclose) {
 				'<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>' +
+				acct.domain + '">notifications</i></a>' + unread + '</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></div>' +
 				'<div class="area-a2"><a onclick="removeColumn(' + key +
 				')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_delthis + '"' + icnsert + '>cancel</i></a></div>' +
 				'<div class="area-a3"><a onclick="setToggle(' + key +
@@ -220,10 +262,14 @@ function parseColumn(dontclose) {
 				')" 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 + '\',\'' + escapeHTML(acct.data) + '\')" class="setting nex ' + if_notf + ' ' + if_misskey_hide + '"><i class="material-icons waves-effect nex ' + if_notf + '" title="' + lang.lang_layout_reconnect + '">low_priority</i></a><span class="' + if_notf + '">' + lang.lang_layout_reconnect + '</span><br>' + lang.lang_layout_headercolor + '<br><div id="picker_' + key + '" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+				key + ',\'' + acct.type + '\'">On</span></a>' + lang.lang_layout_tts + 'TL<br><a onclick="columnReload(' + key +
+				',\'' + acct.type + '\')" class="setting nex ' + if_misskey_hide + '"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_reconnect + '">refresh</i></a><span>' + 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 + '" data-const="' + acct.type + '_' + acct.domain + '"><div id="landing_' + key + '" style="text-align:center">' + lang.lang_layout_nodata + '</div></div></div>'
-			$('#timeline_box_' + basekey + '_parentBox').append(html);
+			if (numtarget) {
+				$('timeline_box_' + key + '_box').html(html)
+			} else {
+				$('#timeline_box_' + basekey + '_parentBox').append(html)
+			}
 			localStorage.removeItem("pool_" + key);
 			if (acct.data) {
 				var data = acct.data;
@@ -257,6 +303,7 @@ function parseColumn(dontclose) {
 		$("#bottom").removeClass("reverse");
 		$(".leftside").removeClass("reverse");
 	}
+	$("#bottom").removeClass("hide");
 	if (localStorage.getItem("sec") && localStorage.getItem("sec") != "nothing") {
 		secvis(localStorage.getItem("sec"));
 	}
@@ -336,7 +383,7 @@ function addColumn() {
 		localStorage.setItem("column", json);
 	}

-	parseColumn();
+	parseColumn('add');
 }
 function addselCk() {
 	var acct = $("#add-acct-sel").val();
@@ -380,8 +427,8 @@ function removeColumn(tlid) {
 			obj.splice(tlid, 1);
 			var json = JSON.stringify(obj);
 			localStorage.setItem("column", json);
-			parseColumn()
 			sortLoad()
+			$("#timeline_box_" + tlid + "_parentBox").remove()
 		}
 		$("#sort-box").removeClass("hide");
 		$("#sort-box").addClass("show");
@@ -396,23 +443,23 @@ function setToggle(tlid) {
 		$("#util-box_" + tlid).animate({
 			'height': '200px'
 		}, {
-				'duration': 300,
-				'complete': function () {
-					$("#util-box_" + tlid).css("overflow-y", "scroll")
-					$("#util-box_" + tlid).removeClass("column-hide")
-				}
-			});
+			'duration': 300,
+			'complete': function () {
+				$("#util-box_" + tlid).css("overflow-y", "scroll")
+				$("#util-box_" + tlid).removeClass("column-hide")
+			}
+		});
 	} else {
 		$("#util-box_" + tlid).css("overflow-y", "hidden")
 		$("#util-box_" + tlid).animate({
 			'height': '0'
 		}, {
-				'duration': 300,
-				'complete': function () {
-					$("#util-box_" + tlid).addClass("column-hide")
-					$("#util-box_" + tlid).css("display", "none")
-				}
-			});
+			'duration': 300,
+			'complete': function () {
+				$("#util-box_" + tlid).addClass("column-hide")
+				$("#util-box_" + tlid).css("display", "none")
+			}
+		});
 	}
 }
 function colorpicker(key) {
--- a/app/js/ui/menu.js
+++ b/app/js/ui/menu.js
@@ -17,6 +17,16 @@ function menu() {
    }
    $('#menu').css("left", left + "px")
    $('#menu').css("top", top + "px")
+    var height = localStorage.getItem("menu-height");
+    var width = localStorage.getItem("menu-width");
+    if(height){
+      $('#menu').css("height", height + "px")
+    }else{
+      $('#menu').css("height", "460px")
+    }
+    if(width){
+      $('#menu').css("width", width + "px")
+    }
    $('#menu').fadeIn();
    $("#menu-bar").html("TheDesk " + localStorage.getItem("ver"));
    $(".menu-content").addClass("hide");
@@ -49,6 +59,14 @@ $(function () {
      localStorage.setItem("menu-top", top);
    }
  });
+  $("#menu").resizable({
+    minHeight: 150,
+    minWidth: 200,
+    stop: function (event, ui) {
+      localStorage.setItem("menu-height", ui.size.height);
+      localStorage.setItem("menu-width", ui.size.width);
+    }
+  });
 });
 function help() {
  postMessage(["openUrl", "https://docs.thedesk.top"], "*")
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -2,6 +2,15 @@
 //✕隠す
 function hide() {
 	$("#right-side").hide()
+	$("#right-side").css("width", "300px")
+	$("#left-side").css("width", "100%")
+	var width = localStorage.getItem("postbox-width");
+	if(width){
+		width = width.replace("px", "") * 1
+	} else {
+		width = 300
+	}
+	$("#post-box").css("width", width)
 	$('#post-box').fadeOut()
 	$("#post-box").removeClass("appear")
 	$("#emoji").addClass("hide")
@@ -38,6 +47,12 @@ function show() {
 	}
 	$('#post-box').css("left", left + "px")
 	$('#post-box').css("top", top + "px")
+	var width = localStorage.getItem("postbox-width");
+	if (width) {
+		$('#post-box').css("width", width + "px")
+	} else {
+		$('#post-box').css("width", "300px")
+	}
 	$('#post-box').fadeIn();
 	$('#textarea').characterCounter();
 }
@@ -62,6 +77,14 @@ $(function () {
 			localStorage.setItem("postbox-top", top);
 		}
 	});
+	$("#post-box").resizable({
+		minHeight: 150,
+		minWidth: 100,
+		stop: function (event, ui) {
+			$("#textarea").blur()
+			localStorage.setItem("postbox-width", ui.size.width);
+		}
+	});
 });

 //コード受信
@@ -70,7 +93,6 @@ if (location.search) {
 	var mode = m[1];
 	var codex = m[2];
 	if (mode == "share") {
-		console.log(codex);
 		$('textarea').focus();
 		$("#textarea").val(decodeURI(codex));
 		show();
@@ -84,15 +106,20 @@ $('#posttgl').click(function (e) {
 	} else {
 		hide();
 	}
+	$('.cvo').removeClass("selectedToot")
+	selectedColumn = 0
+	selectedToot = 0
 });

 $("#timeline-container,#group").click(function (e) {
-
 	if (localStorage.getItem("box") != "absolute") {
 		if ($('#post-box').hasClass("appear") && !localStorage.getItem("nohide")) {
 			hide();
 		}
 	}
+	$('.cvo').removeClass("selectedToot")
+	selectedColumn = 0
+	selectedToot = 0
 	localStorage.removeItem("nohide")
 });
 $('#textarea,#cw-text').focusout(function (e) {
@@ -101,4 +128,7 @@ $('#textarea,#cw-text').focusout(function (e) {
 		localStorage.removeItem("nohide")
 	}
 	//setTimeout(remove, 100);
+	$('.cvo').removeClass("selectedToot")
+	selectedColumn = 0
+	selectedToot = 0
 });
--- a/app/js/ui/scroll.js
+++ b/app/js/ui/scroll.js
@@ -9,13 +9,17 @@ scrollevent();
 function scrollck() {
 	$(".tl-box").each(function (i, elem) {
 		var tlid = $(this).attr('tlid');
-		//一番上ならためていた新しいトゥートを表示
+		//一番上ならためていた新しいトゥートを表示ないしtealなら未読管理モード
 		if ($(this).scrollTop() === 0) {
-			var pool = localStorage.getItem("pool_" + tlid);
-			if (pool) {
-				$("#timeline_" + tlid).prepend(pool);
-				jQuery("time.timeago").timeago();
-				localStorage.removeItem("pool_" + tlid);
+			if (!$("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+				var pool = localStorage.getItem("pool_" + tlid);
+				if (pool) {
+					$("#timeline_" + tlid).prepend(pool);
+					jQuery("time.timeago").timeago();
+					localStorage.removeItem("pool_" + tlid);
+				}
+			} else {
+				ueload(tlid)
 			}
 			//自動リフレッシュ
 			if ($("#timeline_" + tlid + " .cvo").length > 30) {
@@ -35,6 +39,15 @@ function scrollck() {
 }

 function goTop(id) {
+	if ($("#unread_" + id + " .material-icons").hasClass("teal-text")) {
+		$("#unread_" + id + " .material-icons").removeClass("teal-text")
+		var multi = localStorage.getItem("column")
+		var obj = JSON.parse(multi)
+		var acct_id = obj[id * 1].domain
+		var type = obj[id * 1].type
+		console.log(id, type)
+		columnReload(id, type)
+	}
 	if ($("#timeline_box_" + id + "_box .tl-box").scrollTop() > 500) {
 		$("#timeline_box_" + id + "_box .tl-box").scrollTop(500)
 	}
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -45,7 +45,7 @@ var tlView = new Vue({
 });
 var postView = new Vue({
 	el: '#postView',
-	data: { config: postConstruction, kirishima: localStorage.getItem('kirishima') },
+	data: { config: postConstruction, kirishima: localStorage.getItem('kirishima'), quoters: localStorage.getItem('quoters') },
 	methods: {
 		complete: function (i, val) {
 			var ls = postView.config[i];
@@ -113,6 +113,7 @@ function load() {
 	}
 	var max = tlView.config.length;
 	for (var i = 0; i < max; i++) {
+		var ls = tlView.config[i].storage;
 		if (ls) {
 			if (localStorage.getItem(ls)) {
 				tlView.config[i].setValue = localStorage.getItem(ls)
@@ -120,7 +121,9 @@ function load() {
 		} else {
 			ls = tlView.config[i].data
 			for (var j = 0; j < ls.length; j++) {
-				tlView.config[i].data[j].setValue = localStorage.getItem(ls[j].storage)
+				if (localStorage.getItem(tlView.config[i].data[j].storage)) {
+					tlView.config[i].data[j].setValue = localStorage.getItem(tlView.config[i].data[j].storage)
+				}
 			}
 		}
 	}
@@ -320,6 +323,11 @@ function exportSettingsCore() {
 	var tagarr = localStorage.getItem("tag");
 	var favtag = JSON.parse(tagarr);
 	exp.favoriteTags = favtag;
+	exp.revisons = 2.1
+	exp.meta = {}
+	exp.meta.date = new Date()
+	exp.meta.thedesk = localStorage.getItem("ver")
+	exp.meta.platform = localStorage.getItem("platform")
 	return exp;
 }
 function importSettings() {
@@ -337,8 +345,7 @@ function importSettings() {
 		}
 	})
 }
-function importSettingsCore(arg) {
-	var obj = JSON.parse(arg);
+function importSettingsCore(obj) {
 	if (obj) {
 		localStorage.clear();
 		localStorage.setItem("multi", JSON.stringify(obj.accts));
@@ -353,7 +360,7 @@ function importSettingsCore(arg) {
 		}
 		localStorage.setItem("column", JSON.stringify(obj.columns));
 		if (obj.config) {
-			//Version 2
+			//Version 2~
 			var max = envView.config.length;
 			for (var i = 0; i < max; i++) {
 				var ls = envView.config[i].storage;
@@ -656,7 +663,6 @@ window.onload = function () {
 	checkSpotify();
 	voiceSettingLoad();
 	oksload();
-	npprovider();
 	ctLoad()
 };

--- a/app/js/ui/sort.js
+++ b/app/js/ui/sort.js
@@ -1,5 +1,6 @@
 //ソートデータ読み込み
-function sortload() {
+function sortLoad () {
+	$("#sort").html("");
 	var col = localStorage.getItem("column");
 	if (col) {
 		var obj = JSON.parse(col);
@@ -104,7 +105,7 @@ function sort() {
 	localStorage.setItem("column", json);
 	$("#sort").html("");
 	M.toast({ html: "Sorted", displayLength: 3000 })
-	sortload();
+	sortLoad();
 	parseColumn();
 	sortMenu()
 }
@@ -115,5 +116,5 @@ function sortMenu() {
 	$(".menu-content").addClass("hide");
 	$("#sort-box").removeClass("hide");
 	$("#sort").html("");
-	sortload();
+	sortLoad();
 }
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@@ -165,24 +165,6 @@ function spotifySave() {
    localStorage.setItem("np-temp", temp);
    M.toast({ html: lang.lang_spotify_np, displayLength: 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")) {
-            M.toast({ html: lang.lang_setting_npprovide.replace("{{set}}", provd), displayLength: 3000 })
-        }
-        localStorage.setItem("np_provider", provd);
-        postMessage(["itunes", ["set", provd]], "*")
-
-    }
-}
 if (location.search) {
    var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
    var mode = m[1];
@@ -195,11 +177,4 @@ if (location.search) {

    }

-}
-$("#npbtn").click(function () {
-    nowplaying('spotify');
-});
-$("#npbtn").bind('contextmenu', function () {
-    nowplaying('itunes');
-    return false;
-});
+}
--- a/app/js/ui/theme.js
+++ b/app/js/ui/theme.js
@@ -7,22 +7,26 @@ function themes(theme) {
 			localStorage.setItem("theme", "black");
 		}
 	}
-	$("html").removeClass("indigotheme");
-	$("html").removeClass("greentheme");
-	$("html").removeClass("browntheme");
-	$("html").removeClass("blacktheme");
-	$("html").removeClass("customtheme");
-	$("html").addClass(theme + "theme");
+	var el = document.getElementsByTagName("html")[0]
+
+	el.classList.remove('indigotheme');
+	el.classList.remove('greentheme');
+	el.classList.remove('browntheme');
+	el.classList.remove('blacktheme');
+	el.classList.remove('bluetheme');
+	el.classList.remove('customtheme');
+	el.classList.add(theme + "theme");
 	var font = localStorage.getItem("font");
 	if (font) {
-		$("html").css("font-family", font);
+		el.style.fontFamily = font;
 	} else {
-		$("html").css("font-family", "");
+		el.style.fontFamily = "";
 	}
 	if (theme == "custom") {
 		if (localStorage.getItem("customtheme-id")) {
 			postMessage(["themeCSSRequest", localStorage.getItem("customtheme-id")], "*")
 		}
 	}
+	el.style.backgroundColor = "var(--bg)";
 }
-themes();
+themes();
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -25,7 +25,7 @@ function tips(mode) {
 	clearInterval(spotStart);
 	if (mode == "ver") {
 		tipsToggle()
-		$("#tips-text").html('<img src="../../img/desk.png" width="20" onclick="todo(\'!TheDesk! It\\\'s a nice client!\')"><span style="font-size:20px">TheDesk</span> ' + localStorage.getItem("ver") + '[<i class="material-icons" style="font-size:1.2rem;top: 3px;position: relative;">supervisor_account</i><span id="persons">1+</span>]')
+		$("#tips-text").html('<img src="../../img/desk.png" width="20" onclick="todo(\'TheDesk is a nice client!: TheDesk ' + localStorage.getItem("ver") + ' git: '+ gitHash +'\')">TheDesk ' + localStorage.getItem("ver") + ' {'+ gitHash.slice(0, 7) +'} [<i class="material-icons" style="font-size:1.2rem;top: 3px;position: relative;">supervisor_account</i><span id="persons">1+</span>]')
 		localStorage.setItem("tips", "ver")
 	} else if (mode == "clock") {
 		tipsToggle()
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -162,7 +162,7 @@ function flw(user, more, acct_id) {
 		} else {
 			$("#his-follow-list-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();

 	});
 }
@@ -228,7 +228,7 @@ function fer(user, more, acct_id) {
 		} else {
 			$("#his-follower-list-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();
 	});
 }

@@ -390,7 +390,7 @@ function showBlo(more, acct_id) {
 		} else {
 			$("#his-blocking-list-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();
 	});
 }

@@ -453,7 +453,7 @@ function showReq(more, acct_id) {
 		} else {
 			$("#his-request-list-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();
 	});
 }

@@ -550,15 +550,19 @@ function showFrl(more, acct_id) {
 		} else {
 			$("#his-follow-recom-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();
 	});
 }
 //Keybase
-function udAdd(start) {
-	fetch(start, {
+function udAdd(acct_id, id, start) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var proof = "https://" + domain + "/api/v1/accounts/" + id + "/identity_proofs"
+	fetch(proof, {
 		method: 'GET',
 		headers: {
-			'Accept': 'application/json'
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
 		},
 		//body: JSON.stringify({})
 	}).then(function (response) {
@@ -567,16 +571,10 @@ function udAdd(start) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		var fields = json.attachment;
+		var fields = json;
 		for (var i = 0; i < fields.length; i++) {
-			if (fields[i].type == "IdentityProof") {
-				if (fields[i].signatureAlgorithm == "keybase") {
-					var html = '<a href="https://keybase.io/' + fields[i].name + '" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].signatureAlgorithm)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].signatureAlgorithm) + ':' + escapeHTML(fields[i].name) + '</a>';
-				} else {
-					var html = '<span class="cbadge teal" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].signatureAlgorithm)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].signatureAlgorithm) + ':' + escapeHTML(fields[i].name) + '</span>';
-				}
-				$("#his-proof-prof").append(html)
-			}
+			var html = '<a href="' + fields[i].proof_url + '" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].provider)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].provider) + ':' + escapeHTML(fields[i].provider_username) + '</a>';
+			$("#his-proof-prof").append(html)
 		}
 	});
 	fetch("https://notestock.osa-p.net/api/v1/isstock.json?id=" + start.replace("@", "users/"), {
@@ -622,12 +620,17 @@ function showMat() {
 		var templete = "";
 		Object.keys(json).forEach(function (key) {
 			var user = json[key];
+			if (user.avatar) {
+				var avatar = user.avatar
+			} else {
+				var avatar = "../../img/loading.svg"
+			}
 			templete = templete +
 				'<div class="" style="padding-top:5px;">' +
 				'<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' +
 				'<div style="flex-basis:40px;"><a onclick="udgEx(\'' + user.user + '\',' +
 				acct_id + ');" user="' + user.user + '" class="udg">' +
-				'<img src="' + user.avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' +
+				'<img src="' + avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' +
 				'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"><big>' +
 				escapeHTML(user.screen_name) + '</big></div>' +
 				'<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' +
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -79,8 +79,10 @@ function udg(user, acct_id) {
 		}
 		//moved設定時
 		if (json.moved) {
-			M.toast({ html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' +
-			json.moved.id + '\',\'' + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>', displayLength: 4000 })
+			M.toast({
+				html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' +
+					json.moved.id + '\',\'' + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>', displayLength: 4000
+			})
 		}
 		$('#his-data').modal('open');
 		$('#his-data').attr("user-id", user);
@@ -164,7 +166,7 @@ function udg(user, acct_id) {
 		}
 		$("#his-des").attr("data-acct", acct_id);
 		$('#his-data').css('background-size', 'cover');
-		$("#his-data .tab-content").css("height", $("#his-float-timeline").height() - 70 + "px")
+		$("#his-float-timeline").css("height", $("#his-data-show").height() + "px")
 		localStorage.setItem("history", user);
 		//自分の時
 		if (json.acct == localStorage.getItem("user_" + acct_id)) {
@@ -193,6 +195,9 @@ function udg(user, acct_id) {
 			$("#his-emp-btn").hide();
 			$(".only-my-data").show();
 			$(".only-his-data").hide();
+			if (localStorage.getItem("main") == acct_id) {
+				$("#his-main-acct").hide();
+			}
 		} else {
 			relations(user, acct_id);
 			$(".only-my-data").hide();
@@ -200,7 +205,7 @@ function udg(user, acct_id) {
 		}
 		todc();
 		//外部データ取得(死かもしれないので)
-		udAdd(json.url);
+		udAdd(acct_id, user, json.url);
 	});
 }
 function misskeyUdg(user, acct_id) {
@@ -293,6 +298,9 @@ function misskeyUdg(user, acct_id) {
 			$("#his-emp-btn").hide();
 			$(".only-my-data").show();
 			$(".only-his-data").hide();
+			if (localStorage.getItem("main") == acct_id) {
+				$("#his-main-acct").hide();
+			}
 		} else {
 			if (json.isFollowing) {
 				//自分がフォローしている
@@ -351,7 +359,6 @@ function relations(user, acct_id) {
 		console.error(error);
 	}).then(function (json) {
 		var json = json[0];
-		console.log(json);
 		if (json.following) {
 			//自分がフォローしている
 			$("#his-data").addClass("following");
@@ -398,8 +405,9 @@ function relations(user, acct_id) {
 		}
 		//Blocked
 		if (json.blocked_by) {
-			$("#his-float-timeline").hide();
-			$("#his-float-blocked").show();
+			$("#my-data-nav .btn").addClass("disabled")
+			$(".his-var-content").hide();
+			$("#his-float-blocked").show()
 			$("#his-follow-btn").hide()
 		}

@@ -409,6 +417,12 @@ function profbrws() {
 	var url = $("#his-openin").attr("data-href")
 	postMessage(["openUrl", url], "*")
 }
+function setMain() {
+	var acct_id = $("#his-data").attr("use-acct")
+	localStorage.setItem("main", acct_id);
+	multiSelector(true)
+	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
+}
 //オールリセット
 function hisclose() {
 	$('#his-data').modal('close');
@@ -417,8 +431,9 @@ function hisclose() {
 	localStorage.removeItem("history");
 }
 function reset() {
-	$(".tab-content:eq(0)").show();
-	$(".tab-content:gt(0)").hide();
+	$(".his-var-content:eq(0)").show();
+	$(".his-var-content:gt(0)").hide();
+	$("#my-data-nav .btn").removeClass("disabled")
 	$(".active-back").removeClass("active-back");
 	$(".column-first").addClass("active-back");
 	$("#his-name").text("Loading");
@@ -464,12 +479,16 @@ function reset() {
 	$("#his-openin").attr("data-href", "");
 	$("#his-float-timeline").show();
 	$("#his-float-blocked").hide();
+	$("#his-main-acct").show();
 	$("#his-proof-prof").html("")
 }
-$('#my-data-nav .tab').on('click', function () {
-	var target = $(this).find("a").attr("go");
-	$("#my-data-nav .tab").removeClass("active-back");
-	$(this).addClass("active-back");
-	$(target).show();
-	$(".tab-content:not(" + target + ")").hide();
+$('#my-data-nav .anc-link').on('click', function () {
+	var target = $(this).attr("go");
+	if (target) {
+		$("#my-data-nav .anc-link").removeClass("active-back");
+		$(this).addClass("active-back");
+		$(target).show();
+		$(".his-var-content:not(" + target + ")").hide();
+	}
+
 });
--- a/app/main.js
+++ b/app/main.js
@@ -18,6 +18,44 @@ const app = electron.app;
 const BrowserWindow = electron.BrowserWindow;
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow;
+
+// アプリが多重起動しないようにする
+const gotTheLock = app.requestSingleInstanceLock()
+
+if (!gotTheLock) {
+	app.quit()
+} else {
+	app.on('second-instance', () => {
+		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
+		// Someone tried to run a second instance, we should focus our window.
+		if (mainWindow) {
+		if (mainWindow.isMinimized()) mainWindow.restore()
+		mainWindow.focus()
+		}
+	})
+}
+
+if (process.argv.indexOf("--dev") === -1) {
+	var packaged = true;
+} else {
+	var packaged = false;
+	console.log(
+		"||\\\\\\ \n"+
+		"||||  \\\\\\\\ \n"+
+		"||||     \\\\\\\\ \n"+
+		"|||| Am I a \\\\\\\\ \n"+
+		"|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n"+
+		"||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n"+
+		"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n"+
+		"|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/\__ \\   < \n"+
+		"||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n"+
+		"||||          /////         \n"+
+		"||||       /////\n"+
+		"||||     /////\n"+
+		"||||//////"
+	)
+	console.log("Welcome!")
+}
 var info_path = join(app.getPath("userData"), "window-size.json");
 var max_info_path = join(app.getPath("userData"), "max-window-size.json");
 var lang_path = join(app.getPath("userData"), "language");
@@ -25,9 +63,9 @@ var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
 try {
 	fs.readFileSync(ha_path, 'utf8');
 	app.disableHardwareAcceleration()
-	console.log("disabled: HA");
+	if(!packaged) console.log("disabled: Hardware Acceleration");
 } catch{
-	console.log("enabled: HA");
+	if(!packaged) console.log("enabled: Hardware Acceleration");
 }
 var window_size;
 try {
@@ -74,13 +112,18 @@ app.on('activate', function () {

 function createWindow() {
 	if (isFile(lang_path)) {
-		console.log("exist");
 		var lang = fs.readFileSync(lang_path, 'utf8');
 	} else {
 		var langs = app.getLocale();
 		console.log(langs);
 		if (~langs.indexOf("ja")) {
 			lang = "ja";
+		} else if (~langs.indexOf("de")) {
+			lang = "de";
+		} else if (~langs.indexOf("cs")) {
+			lang = "cs";
+		} else if (~langs.indexOf("bg")) {
+			lang = "bg";
 		} else {
 			lang = "en";
 		}
@@ -88,8 +131,8 @@ function createWindow() {
 			fs.writeFileSync(lang_path, lang);
 		});
 	}
-	console.log(app.getLocale());
-	console.log("launch:" + lang);
+	if(!packaged) console.log("your lang:" + app.getLocale());
+	if(!packaged) console.log("launch:" + lang);
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
 	var platform = process.platform;
 	var bit = process.arch;
@@ -101,7 +144,7 @@ function createWindow() {
 				contextIsolation: true,
 				preload: join(__dirname, "js", "platform", "preload.js")
 			},
-			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png'
+			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png', show: false
 		}
 	} else if (platform == "win32") {
 		var arg = {
@@ -111,7 +154,7 @@ function createWindow() {
 				contextIsolation: true,
 				preload: join(__dirname, "js", "platform", "preload.js")
 			},
-			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true
+			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false
 		}
 	} else if (platform == "darwin") {
 		var arg = {
@@ -121,10 +164,16 @@ function createWindow() {
 				contextIsolation: true,
 				preload: join(__dirname, "js", "platform", "preload.js")
 			},
-			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true
+			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false
 		}
 	}
 	mainWindow = new BrowserWindow(arg);
+	mainWindow.once('page-title-updated', () => {
+		mainWindow.show()
+		if (window_size.max) {
+			mainWindow.maximize();
+		}
+	  })
 	electron.session.defaultSession.clearCache(() => { })
 	if (process.argv) {
 		if (process.argv[1]) {
@@ -146,9 +195,6 @@ function createWindow() {
 	if (!window_size.x && !window_size.y) {
 		mainWindow.center();
 	}
-	if (window_size.max) {
-		mainWindow.maximize();
-	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function () {
 		electron.ipcMain.removeAllListeners();
@@ -173,12 +219,7 @@ function createWindow() {

 	var platform = process.platform;
 	var bit = process.arch;
-	if (process.argv.indexOf("--dev") === -1) {
-		packaged = true;
-	} else {
-		packaged = false;
-	}
-	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir)));
+	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname)));
 	//CSS
 	css.css(mainWindow);
 	//アップデータとダウンロード
--- a/app/main/css.js
+++ b/app/main/css.js
@@ -53,9 +53,15 @@ function css(mainWindow) {
 			if (json.base == "light") {
 				var drag = "rgba(255, 255, 255, 0.8)";
 				var beforehover = "#757575";
+				var selected = "#3f3f3f"
+				var selectedWithShare = "#b2babd"
+				var gray = "#757575"
 			} else {
 				var drag = "rgba(0, 0, 0, 0.8)";
 				var beforehover = "#9e9e9e";
+				var selected = "#c0c0c0"
+				var selectedWithShare = "#003a30"
+				var gray = "#cccccc"
 			}
 			if (json.props) {
 				if (json.props.TheDeskAccent) {
@@ -75,7 +81,9 @@ function css(mainWindow) {
 				secondary +
 				";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
 				primary +
-				";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}";
+				";--accentbtn:" + primary + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
+				"--gray:" + gray + ";"+
+				".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
 			e.sender.webContents.send('theme-css-response', css);
 		} catch (e) {
 			var css = "";
--- a/app/main/dl.js
+++ b/app/main/dl.js
@@ -26,11 +26,9 @@ function dl(mainWindow, lang_path, base, dirname) {
 				"transparent": false, // ウィンドウの背景を透過
 				"frame": false, // 枠の無いウィンドウ
 				"resizable": false
-			});
-			//updatewin.openDevTools()
+			})
 			var lang = fs.readFileSync(lang_path, 'utf8');
 			updatewin.loadURL(base + lang + '/update.html');
-
 			return "true"
 		} else {
 			return false;
--- a/app/main/language.js
+++ b/app/main/language.js
@@ -1,8 +1,12 @@
 // Create the Application's main menu
-function templete(lang, mainWindow, packaged, dir) {
+function templete(lang, mainWindow, packaged, dir, dirname) {
+    if(lang !="ja" && lang != "en"){
+        lang = "en"
+    }
    const electron = require("electron");
    const app = electron.app;
    const BrowserWindow = electron.BrowserWindow;
+    const join = require('path').join;
    const dict = {
        "application": {
            "ja": "アプリケーション",
@@ -98,9 +102,9 @@ function templete(lang, mainWindow, packaged, dir) {
                            webviewTag: false,
                            nodeIntegration: false,
                            contextIsolation: true,
-                            preload: "../js/platform/preload.js"
+                            preload: join(dirname , "js", "platform", "preload.js")
                        },
-                        width: 300, height: 460,
+                        width: 300, height: 500,
                        "transparent": false,    // ウィンドウの背景を透過
                        "frame": false,     // 枠の無いウィンドウ
                        "resizable": false
--- a/app/main/np.js
+++ b/app/main/np.js
@@ -8,19 +8,7 @@ function np(mainWindow) {
        //Verified on Windows
        console.log("Access");
        if (args[0] == "set") {
-            var { NowPlaying, PlayerName } = require("nowplaying-node");
-            var nppath = join(app.getPath("userData"), "nowplaying");
-            var npProvider;
-            try {
-                npProvider = args[1];
-            } catch (e) {
-                npProvider = "AIMP";
-            }
-            var myAIMP = new NowPlaying({
-                fetchCover: true,
-                player: PlayerName[npProvider],
-            });
-            fs.writeFileSync(nppath, npProvider);
+            
        } else {
            var platform = process.platform;
            var bit = process.arch;
@@ -35,34 +23,7 @@ function np(mainWindow) {
                    e.sender.webContents.send('itunes-np', error);
                }
            } else {
-                var { NowPlaying, PlayerName } = require("nowplaying-node");
-                var nppath = join(app.getPath("userData"), "nowplaying");
-                var npProvider;
-                try {
-                    npProvider = fs.readFileSync(nppath, 'utf8');
-                } catch (e) {
-                    npProvider = "AIMP";
-                }
-                var myAIMP = new NowPlaying({
-                    fetchCover: true,
-                    player: PlayerName[npProvider],
-                });
-                myAIMP.update();
-                var path = myAIMP.getCoverPath();
-                if (path) {
-                    var bin = fs.readFileSync(path, 'base64');
-                } else {
-                    var bin = false;
-                }
-
-                var value = {
-                    win: true,
-                    name: myAIMP.getTitle(),
-                    artist: myAIMP.getArtist(),
-                    album: myAIMP.getAlbum(),
-                    path: bin
-                }
-                e.sender.webContents.send('itunes-np', value);
+                
            }
        }

--- a/app/main/system.js
+++ b/app/main/system.js
@@ -4,6 +4,7 @@ function system(mainWindow, dir, lang, dirname) {
 	const join = require('path').join;
 	var Jimp = require("jimp");
 	const fs = require("fs");
+	var JSON5 = require('json5');
 	var ipc = electron.ipcMain;
 	var tmp_img = join(app.getPath("userData"), "tmp.png");
 	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
@@ -42,21 +43,26 @@ function system(mainWindow, dir, lang, dirname) {
 	});
 	//プラットフォーム
 	ipc.on('getPlatform', function (e, arg) {
-		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron]);
+		try {
+			var gitHash = fs.readFileSync("git", 'utf8')
+		} catch{
+			var gitHash = null
+		}
+		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash]);
 	})
 	//言語
 	ipc.on('lang', function (e, arg) {

 		console.log("set:" + arg);
 		fs.writeFileSync(lang_path, arg);
-		e.sender.webContents.send('langres', "");
+		e.sender.webContents.send('langres', arg);
 	})
 	//エクスポートのダイアログ
 	ipc.on('exportSettings', function (e, args) {
 		dialog.showSaveDialog(null, {
 			title: 'Export',
 			properties: ['openFile', 'createDirectory'],
-			defaultPath: "export.thedeskconfigv2"
+			defaultPath: "export.thedeskconfig.json5"
 		}, (savedFiles) => {
 			if (!savedFiles) {
 				return false;
@@ -70,13 +76,13 @@ function system(mainWindow, dir, lang, dirname) {
 			title: 'Import',
 			properties: ['openFile'],
 			filters: [
-				{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2'] },
+				{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2', 'json5'] },
 			]
 		}, (fileNames) => {
 			if (!fileNames) {
 				return false;
 			}
-			e.sender.webContents.send('config', fs.readFileSync(arg, 'utf8'));
+			e.sender.webContents.send('config', JSON5.parse(fs.readFileSync(fileNames[0], 'utf8')));
 		})
 	})
 	//保存フォルダのダイアログ
@@ -125,10 +131,12 @@ function system(mainWindow, dir, lang, dirname) {
 		var window = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
-				nodeIntegration: false
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(dirname, "js", "platform", "preload.js")
 			},
 			width: 300,
-			height: 480,
+			height: 500,
 			"transparent": false, // ウィンドウの背景を透過
 			"frame": false, // 枠の無いウィンドウ
 			"resizable": false
@@ -151,7 +159,7 @@ function system(mainWindow, dir, lang, dirname) {
 				webviewTag: false,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(dirname,"js", "platform", "preload.js")
+				preload: join(dirname, "js", "platform", "preload.js")
 			},
 			width: 350,
 			height: 200,
@@ -187,7 +195,8 @@ function system(mainWindow, dir, lang, dirname) {


 	ipc.on('export', (e, args) => {
-		fs.writeFileSync(args[0], args[1]);
+		fs.writeFileSync(args[0], JSON5.stringify(args[1]));
+		e.sender.webContents.send('exportAllComplete', "");
 	});
 	//フォント
 	function object_array_sort(data, key, order, fn) {
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -0,0 +1,21 @@
+{
+  "name": "TheDesk",
+  "short_name": "TheDesk",
+  "icons": [
+    {
+      "src": "./img/desk.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": "/",
+  "display": "standalone",
+  "orientation": "portrait-primary",
+  "background_color": "#212121",
+  "theme_color": "#212121",
+  "description": "TheDesk",
+  "dir": "ltr",
+  "lang": "ja-jp",
+  "related_applications": [],
+  "prefer_related_applications": false
+}
--- a/app/node_modules/.bin/electron
+++ b/app/node_modules/.bin/electron
@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron/cli.js" "$@"
+  ret=$?
+fi
+exit $ret
--- a/app/node_modules/.bin/electron-builder
+++ b/app/node_modules/.bin/electron-builder
@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron-builder/out/cli/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron-builder/out/cli/cli.js" "$@"
+  ret=$?
+fi
+exit $ret
--- a/app/node_modules/.bin/electron-builder.cmd
+++ b/app/node_modules/.bin/electron-builder.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\electron-builder\out\cli\cli.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\electron-builder\out\cli\cli.js" %*
+)
--- a/app/node_modules/.bin/electron-download
+++ b/app/node_modules/.bin/electron-download
@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron-download/lib/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron-download/lib/cli.js" "$@"
+  ret=$?
+fi
+exit $ret
--- a/app/node_modules/.bin/electron-download.cmd
+++ b/app/node_modules/.bin/electron-download.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\electron-download\lib\cli.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\electron-download\lib\cli.js" %*
+)
--- a/app/node_modules/.bin/electron.cmd
+++ b/app/node_modules/.bin/electron.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\electron\cli.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\electron\cli.js" %*
+)
--- a/app/node_modules/.bin/esparse
+++ b/app/node_modules/.bin/esparse
@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../esprima/bin/esparse.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../esprima/bin/esparse.js" "$@"
+  ret=$?
+fi
+exit $ret
--- a/app/node_modules/.bin/esparse.cmd
+++ b/app/node_modules/.bin/esparse.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\esprima\bin\esparse.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\esprima\bin\esparse.js" %*
+)
--- a/app/node_modules/.bin/esvalidate
+++ b/app/node_modules/.bin/esvalidate
@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../esprima/bin/esvalidate.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../esprima/bin/esvalidate.js" "$@"
+  ret=$?
+fi
+exit $ret
--- a/app/node_modules/.bin/esvalidate.cmd
+++ b/app/node_modules/.bin/esvalidate.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\esprima\bin\esvalidate.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\esprima\bin\esvalidate.js" %*
+)
--- a/app/node_modules/.bin/extract-zip
+++ b/app/node_modules/.bin/extract-zip
@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../extract-zip/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../extract-zip/cli.js" "$@"
+  ret=$?
+fi
+exit $ret
--- a/app/node_modules/.bin/extract-zip.cmd
+++ b/app/node_modules/.bin/extract-zip.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\extract-zip\cli.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\extract-zip\cli.js" %*
+)
--- a/app/node_modules/.bin/install-app-deps
+++ b/app/node_modules/.bin/install-app-deps
@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron-builder/out/cli/install-app-deps.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron-builder/out/cli/install-app-deps.js" "$@"
+  ret=$?
+fi
+exit $ret
--- a/app/node_modules/.bin/install-app-deps.cmd
+++ b/app/node_modules/.bin/install-app-deps.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\electron-builder\out\cli\install-app-deps.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\electron-builder\out\cli\install-app-deps.js" %*
+)
--- a/app/node_modules/.bin/is-ci
+++ b/app/node_modules/.bin/is-ci
@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../is-ci/bin.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../is-ci/bin.js" "$@"
+  ret=$?
+fi
+exit $ret
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Cutls	74fe12c896	push	2019-09-13 21:54:11 +09:00
Cutls	f250d69af8	package.json	2019-09-12 23:43:10 +09:00
Cutls	25a1db84a4	Add: node_modules	2019-09-12 23:38:13 +09:00
Cutls	4769c83958	Merge branch 'master' into gh-pages	2019-09-12 23:35:42 +09:00
Cutls	8b1d5b3cb4	Change: make.js	2019-09-12 23:35:13 +09:00
Cutls	a448924514	Change: PWA package.json	2019-09-12 23:30:43 +09:00
Cutls	467033a366	Merge branch 'master' into gh-pages	2019-09-12 23:28:02 +09:00
Cutls	bf69d23379	Add: Welcome guide	2019-09-12 23:25:27 +09:00
Cutls	a4e3031796	Add: some CORS error	2019-09-12 21:30:48 +09:00
Cutls	e355d717c5	Merge: master	2019-09-12 21:21:52 +09:00
Cutls	286e7956f2	Add: featured tag	2019-09-09 23:26:57 +09:00
Cutls	e04b64a326	Unread misc	2019-09-08 09:39:26 +09:00
Cutls	c86a99df06	Add: markers and columnReload on notf	2019-09-08 01:44:28 +09:00
Cutls	3b69c4e7c1	Add: quote	2019-09-08 01:33:01 +09:00
Cutls	bc5be9449d	Add: some supported instance and add 'quote' support or not info	2019-09-08 01:02:40 +09:00
Cutls	b968e59db1	Merge pull request #110 from cutls/dependabot/npm_and_yarn/app/jimp-tw-0.7.0 Update jimp requirement from ^0.6.4 to ^0.7.0 in /app	2019-09-07 05:28:47 +09:00
dependabot-preview[bot]	fa06c4a729	Update jimp requirement from ^0.6.4 to ^0.7.0 in /app Updates the requirements on [jimp](https://github.com/oliver-moran/jimp) to permit the latest version. - [Release notes](https://github.com/oliver-moran/jimp/releases) - [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md) - [Commits](https://github.com/oliver-moran/jimp/compare/v0.6.4...v0.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-06 20:26:15 +00:00
Cutls	81b99515cd	Add: POST markers	2019-09-07 01:46:50 +09:00
Cutls	5e6c713f9d	Merge branch 'master' of https://github.com/cutls/TheDesk	2019-09-07 01:33:41 +09:00
Cutls	376425cc98	Add: demo: unread reader	2019-09-07 01:33:30 +09:00
Cutls	38cff550e1	Add: identity_proof	2019-09-05 23:55:34 +09:00
Cutls	64781c1cca	Developer -> Main author	2019-09-03 09:57:56 +09:00
Cutls	e82e85b5ea	Fix: replycount	2019-09-02 00:14:33 +09:00
Cutls	2b84a27cdc	TheDesk Usain (18.9.2)	2019-09-01 21:27:18 +09:00
Cutls	6f7f5cbabc	Fix: poll UI	2019-09-01 01:46:42 +09:00
Cutls	174a8696b0	fix	2019-09-01 01:32:05 +09:00
Cutls	d5a27ba814	TheDesk Usamin (18.9.1)	2019-09-01 01:31:19 +09:00
Cutls	6e2e488565	Fix: instance actor	2019-09-01 00:02:34 +09:00
Cutls	7d02ef2b3e	TheDesk Usamin (18.9.0)	2019-08-31 23:35:18 +09:00
Cutls	f8f2719c5d	Merge branch 'master' of https://github.com/cutls/TheDesk	2019-08-31 00:10:37 +09:00
Cutls	da6faaf1a5	Add: timeago on acct	2019-08-31 00:10:24 +09:00
Cutls	350068d6f1	Add: locale	2019-08-31 00:10:16 +09:00
Cutls	70bee4265b	Add: custom CSS request	2019-08-31 00:10:01 +09:00
Cutls	18ce8cf2f4	Add: show note and last-status on acct	2019-08-31 00:09:37 +09:00
Cutls	b50a55cce7	Add: multi-lang relative time	2019-08-31 00:09:01 +09:00
Cutls	e6f0e18aed	Update README.md	2019-08-30 09:59:21 +09:00
Cutls	fd7daa407a	Update README_ja.md	2019-08-30 09:58:51 +09:00
Cutls	0dead93606	Add: resizable menu	2019-08-30 01:46:30 +09:00
Cutls	5d6e8cf9b3	Add: search offset	2019-08-30 01:46:19 +09:00
Cutls	a0544e21e3	Add: directory	2019-08-30 01:46:04 +09:00
Cutls	d54112d41c	Fix: bottom buttons group padding(top)	2019-08-30 01:45:32 +09:00
Cutls	1a0ba40b43	Introduce: via npm	2019-08-30 01:45:07 +09:00
Cutls	5d8ca9566a	Add and fix	2019-08-29 01:33:06 +09:00
Cutls	834fa719b2	Introduce: JSON5 and export v2.1	2019-08-29 01:20:47 +09:00
Cutls	89bde2739a	Merge branch 'master' of https://github.com/cutls/TheDesk	2019-08-26 21:06:11 +09:00
Cutls	46dbc9ae62	Add: GIt hash	2019-08-26 21:06:07 +09:00
Cutls	71554fca59	Merge pull request #109 from yzrsng/master Enforce single instance for linux and windows	2019-08-26 13:10:20 +09:00
yzrsng	1c76b5886f	Enforce single instance for linux and windows	2019-08-26 12:58:04 +09:00
Cutls	5007b70683	Add: git hash	2019-08-26 00:09:01 +09:00
Cutls	5694cbd945	Delete: can make file	2019-08-26 00:08:51 +09:00
Cutls	eee3c34dd7	TheDesk Usamin (18.8.3)	2019-08-25 22:40:33 +09:00
Cutls	cac39ad539	Fix: cannot follow at Pawoo	2019-08-25 22:22:44 +09:00
Cutls	1b68cdf7db	Change: move user matching to More dropdown	2019-08-24 21:19:52 +09:00
Cutls	845c9a0f2e	Merge branch 'master' of https://github.com/cutls/TheDesk	2019-08-24 01:10:08 +09:00
Cutls	24c69af942	Fix and Improve: show user data	2019-08-24 01:09:56 +09:00
Cutls	c656bc4bb6	Fix: toggle actions of toots	2019-08-24 01:09:40 +09:00
Cutls	025b60e564	README	2019-08-24 01:09:20 +09:00
Cutls	1e86964d8f	Update issue templates	2019-08-23 02:54:29 +09:00
Cutls	61d4d7005e	Fix: #108 NowPlaying of iTunes on macOS	2019-08-23 02:00:22 +09:00
Cutls	d0ed9faf50	TheDesk Usamin (18.8.2)	2019-08-22 01:44:37 +09:00
Cutls	8ed12170de	TheDesk Usamin (18.8.2)	2019-08-22 01:34:03 +09:00
Cutls	d2ba5cbe4d	Fix: ugly layout when display-area is not wide	2019-08-22 01:30:05 +09:00
Cutls	6b6d3c7307	Fix: when hashtags is not lower case	2019-08-22 00:00:08 +09:00
Cutls	362b5b9c69	NSFW media->sensitive media	2019-08-21 23:07:18 +09:00
Cutls	3cde12e893	TheDesk Usain (18.8.1)	2019-08-21 21:51:36 +09:00
Cutls	d2214480f6	Fix: gray color	2019-08-21 00:36:47 +09:00
Cutls	b8bd1a8ae6	Fix CSS	2019-08-21 00:02:29 +09:00
Cutls	0bfef0c2ce	Remove: log	2019-08-19 23:31:42 +09:00
Cutls	f2ce98fda5	Fix: some CSS	2019-08-19 23:27:53 +09:00
Cutls	5f08215571	Fix: muting list	2019-08-19 23:09:46 +09:00
Cutls	9567a6ddf9	Fix: emojis	2019-08-19 23:09:34 +09:00
Cutls	4416c56884	Add: show dialogs when muting and blocking	2019-08-19 22:55:50 +09:00
Cutls	68328a9449	Fix: Fontawesome	2019-08-14 02:49:51 +09:00
Cutls	141f2a3f39	Change: CDN	2019-08-14 02:36:01 +09:00
Cutls	7bbca06033	Add: FOSSA	2019-08-14 02:14:34 +09:00
Cutls	ebb72265b9	package.json update	2019-08-14 01:47:21 +09:00
Cutls	c98f433da6	Delete assets	2019-08-14 01:35:01 +09:00
Cutls	2346ef7089	Remove: NowPlaying on Windows	2019-08-14 01:23:25 +09:00
Cutls	8aac6474da	TheDesk Usamin (18.8.0)	2019-08-14 00:53:36 +09:00
Cutls	ffcecf38c8	Add: Change: live column add and remove	2019-08-14 00:40:21 +09:00
Cutls	77342206b1	Add: reload this column	2019-08-14 00:25:58 +09:00
Cutls	b6a44e7a7c	Fix: vote display refresh	2019-08-14 00:24:11 +09:00
Cutls	e138d357c7	Remove: /follows	2019-08-14 00:23:34 +09:00
Cutls	66645982e9	Fix: arrow key img selector(reversed)	2019-08-14 00:23:05 +09:00
Cutls	4347f55077	Speed up	2019-08-11 02:52:32 +09:00
Cutls	ab9d45c775	Update: CSS about #InstanceTicker	2019-08-11 00:12:11 +09:00
Cutls	9c0c662f25	Update: icons	2019-08-09 10:58:55 +09:00
Cutls	63abdb2d53	Add: Liberapay	2019-08-08 02:06:13 +09:00
Cutls	47e2693368	Fix: about blue theme	2019-08-08 01:55:47 +09:00
Cutls	b909cbe666	Introduce: TheDesk notice v2	2019-08-07 23:27:00 +09:00
Cutls	95f5ce13ba	Add: detecting languages[de/cs/bg]	2019-08-07 23:14:20 +09:00
Cutls	fed1496e68	Update: de and Change: algo of locale	2019-08-07 12:14:07 +09:00
Cutls	da6993730c	Add: bg/cs/de locales	2019-08-07 09:24:52 +09:00
Cutls	0a1d462ace	Add: trending tags	2019-08-06 23:06:09 +09:00
Cutls	1387482db0	TheDesk Usamin (18.7.1)	2019-08-02 00:02:52 +09:00
Cutls	b7a86324dd	Merge pull request #105 from cutls/dependabot/npm_and_yarn/app/readline-sync-1.4.10 Update readline-sync requirement from 1.4.9 to 1.4.10 in /app	2019-08-01 22:56:12 +09:00
Cutls	babc5a6424	Merge pull request #107 from cutls/dependabot/npm_and_yarn/app/electron-tw-6.0.0 Update electron requirement from ^5.0.4 to ^6.0.0 in /app	2019-08-01 22:55:31 +09:00
dependabot-preview[bot]	74a468383c	Update electron requirement from ^5.0.4 to ^6.0.0 in /app Updates the requirements on [electron](https://github.com/electron/electron) to permit the latest version. - [Release notes](https://github.com/electron/electron/releases) - [Commits](https://github.com/electron/electron/compare/v5.0.4...v6.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-31 20:26:05 +00:00
Cutls	4dcec3f240	Merge branch 'master' of https://github.com/cutls/TheDesk into gh-pages	2019-07-31 00:31:27 +09:00
Cutls	c325d4a8e7	gh-pages	2019-07-31 00:31:01 +09:00
dependabot-preview[bot]	3a48f0ff0d	Update readline-sync requirement from 1.4.9 to 1.4.10 in /app Updates the requirements on [readline-sync](https://github.com/anseki/readline-sync) to permit the latest version. - [Release notes](https://github.com/anseki/readline-sync/releases) - [Commits](https://github.com/anseki/readline-sync/compare/1.4.9...1.4.10) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-29 20:25:25 +00:00
Cutls	e26363adf6	Fix: when open an image modal, disabled toot selector	2019-07-29 01:13:53 +09:00
Cutls	35d97d42c5	Fix: context func is pollted	2019-07-29 01:09:12 +09:00
Cutls	4fa7d07500	Improve: sorting	2019-07-29 00:52:12 +09:00
Cutls	15f428528b	Add: video loop(on modal and Pleroma) and autoplay on modal	2019-07-29 00:42:52 +09:00
Cutls	7fa805fe3a	Change: sort suggest	2019-07-29 00:42:17 +09:00
Cutls	fd9c97a126	Add: tag suggest with v2	2019-07-29 00:16:49 +09:00
Cutls	f081154804	init	2019-07-28 23:48:44 +09:00
Cutls	866affdf45	Add: mute by emoji(custom/default)	2019-07-28 23:47:50 +09:00
Cutls	30aee556f1	Fix: if account is null #102	2019-07-25 23:55:25 +09:00
Cutls	b12c18aa08	Add: NSFW warning when not blurhashed sensitive toots	2019-07-25 23:52:44 +09:00
Cutls	f17a47d088	Change: NSFW images on not blurhash supported instance	2019-07-25 23:20:38 +09:00
Cutls	d79f096749	Merge pull request #104 from cutls/dependabot/npm_and_yarn/app/electron-builder-tw-21.1.5 Update electron-builder requirement from ^20.44.4 to ^21.1.5 in /app	2019-07-25 23:16:23 +09:00
dependabot-preview[bot]	5b82b91c6a	Update electron-builder requirement from ^20.44.4 to ^21.1.5 in /app Updates the requirements on [electron-builder](https://github.com/electron-userland/electron-builder) to permit the latest version. - [Release notes](https://github.com/electron-userland/electron-builder/releases) - [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-builder/compare/v20.44.4...v21.1.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-24 20:25:27 +00:00
Cutls	5f20f04c34	for pwa	2019-07-20 21:32:43 +09:00
Cutls	0e8a241bfa	for pwa	2019-07-20 21:22:48 +09:00
Cutls	946862efde	post message	2019-07-20 21:13:46 +09:00
Cutls	cda29e87e6	move	2019-07-20 21:11:17 +09:00
Cutls	601d4ac001	manifest	2019-07-20 21:09:24 +09:00
Cutls	c2dcd52da1	introduce PWA	2019-07-20 21:08:14 +09:00
Cutls	4a6b87ac1c	Fix: emoji-including URL	2019-07-15 00:56:19 +09:00
Cutls	1bea06354e	TheDesk Usamin (18.7.0)	2019-07-13 00:01:16 +09:00
Cutls	5fbd5aaf10	Fix: layout	2019-07-13 00:01:09 +09:00
Cutls	0290a6d918	shortcut key desc	2019-07-13 00:00:26 +09:00
Cutls	2576c48441	Pleroma URL	2019-07-12 23:16:27 +09:00
Cutls	eb02dd2986	Fix: when failed to upload	2019-07-12 01:01:24 +09:00
Cutls	d92570fa3b	Add: keyboard-control	2019-07-12 00:53:55 +09:00
Cutls	38c988d2a2	Fix: desc hidden	2019-07-10 22:48:36 +09:00
Cutls	0927282d41	Change: overflow of column name	2019-07-09 22:48:57 +09:00
Cutls	5ffd59619c	TheDesk Usamin (18.6.7)	2019-07-09 00:35:33 +09:00
Cutls	a739926ad4	sub-button color	2019-07-09 00:35:20 +09:00
Cutls	e41c38f41d	Change: remove get card API	2019-07-09 00:27:31 +09:00
Cutls	2de05b84aa	Misskey streaming leak	2019-07-09 00:27:18 +09:00
Cutls	0e9bdef9ca	Add: set main account on showOnTL	2019-07-06 23:16:41 +09:00
Cutls	8e70e005c1	TheDesk Usamin (18.6.6)	2019-07-02 00:37:58 +09:00
Cutls	3817dbc925	Some bugs about Vue	2019-07-02 00:32:28 +09:00
Cutls	63ec669c52	boost-btn	2019-07-02 00:32:06 +09:00
Cutls	afc5702796	boost-btn	2019-07-02 00:31:54 +09:00
Cutls	41ec66b58a	Add theme: [渚の花嫁] 新田美波	2019-07-02 00:31:44 +09:00
Cutls	936d3ca7fc	Change: flexible color of toot-btn	2019-07-02 00:31:08 +09:00
Cutls	f8b4b7b74d	Change: unboostable toot btn(hidden to unvisible)	2019-07-02 00:26:41 +09:00
Cutls	bd865977b0	Remove: best-friends.chat from TheDesk support instance	2019-07-01 23:19:47 +09:00
Cutls	d056db5617	Do not ... on translate results #96	2019-07-01 21:46:00 +09:00
Cutls	7685677ada	Merge branch 'master' of https://github.com/cutls/TheDesk	2019-07-01 21:40:46 +09:00
Cutls	eb0aa81492	Remove knzk.me from support instances	2019-07-01 21:40:28 +09:00
Cutls	dc52531f28	Merge pull request #99 from kPherox/update-kpherox-links Update kPherox's links	2019-06-29 16:22:34 +09:00
kPherox	5a20034b9f	Update kPherox's links	2019-06-29 16:11:52 +09:00
Cutls	5cd0ef0d8a	Update README	2019-06-27 23:17:07 +09:00