TheDesk Usamin (18.11.4)

* New translations update.json (Hebrew)

* New translations update.json (Italian)

* New translations setting.json (Italian)

* New translations update.json (Hungarian)

* New translations setting.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations update.json (Greek)

* New translations setting.json (Greek)

* New translations update.json (German)

* New translations setting.json (German)

* New translations update.json (Romanian)

* New translations setting.json (Romanian)

* New translations update.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Norwegian)

* New translations update.json (Portuguese)

* New translations setting.json (Portuguese)

* New translations update.json (Polish)

* New translations setting.json (Polish)

* New translations update.json (Norwegian)

* New translations update.json (French)

* New translations update.json (Bulgarian)

* New translations update.json (Chinese Simplified)

* New translations setting.json (Chinese Simplified)

* New translations update.json (Catalan)

* New translations setting.json (Catalan)

* New translations setting.json (Bulgarian)

* New translations update.json (Arabic)

* New translations setting.json (Arabic)

* New translations setting.json (French)

* New translations update.json (Afrikaans)

* New translations setting.json (Afrikaans)

* New translations setting.json (Chinese Traditional)

* New translations update.json (Finnish)

* New translations setting.json (Finnish)

* New translations update.json (Dutch)

* New translations setting.json (Dutch)

* New translations setting.json (Czech)

* New translations update.json (Danish)

* New translations update.json (Czech)

* New translations setting.json (Danish)

* New translations update.json (Chinese Traditional)

* New translations update.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations update.json (Turkish)

* New translations setting.json (Ukrainian)

* New translations update.json (Vietnamese)

* New translations setting.json (Vietnamese)

* New translations setting.json (English)

* New translations update.json (Swedish)

* New translations setting.json (Swedish)

* New translations setting.json (Russian)

* New translations update.json (Russian)

* New translations setting.json (Serbian (Cyrillic))

* New translations update.json (Serbian (Cyrillic))

* New translations setting.json (Spanish)

* New translations update.json (Spanish)

* New translations setting.json (Spanish, Argentina)

* New translations update.json (Spanish, Argentina)

* New translations update.json (English)

.gitignore

@@ -10,12 +10,15 @@ app/.DS_Store
 .vscode/*
 enq.md
 app/.tkn
+app/node_modules
 app/js/login/tkn.js
-app/package-lock.json
 app/view/en
 app/view/ja
 app/view/de
 app/view/bg
 app/view/cs
 app/view/ps
+app/view/es-AR
 app/git
+*.code-workspace
+releasenote.md

.travis.yml

@@ -3,21 +3,26 @@ os:
  - linux
  - osx
 language: node_js
+env:
+  - YARN_GPG=no
 node_js:
 - '10.15.2'
+cache:
+  yarn: true
 script: node -v
 before_deploy:
-  - npm install electron-builder -g
+  - yarn global add electron-builder
   - 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
+  - yarn install --no-lockfile --prod
+  - yarn construct
   - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then ls;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv thedesk-*.zip thedesk.zip;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then yarn add electron-builder;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win --ia32 -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then ls;else :;fi
@@ -44,5 +49,5 @@ deploy:
   skip_cleanup: true
   on:
     repo: cutls/TheDesk
-    tags: true
-    all_branches: true
+branches:
+  only: "/^v?[0-9\\.]+/"

README.md

@@ -80,6 +80,10 @@ Fellow coder
 
 ## Build
 
+You have to use either **npm** or **yarn**. Whichever you use, it works well.
+
+### npm
+
 ```sh
 git clone https://github.com/cutls/TheDesk
 cd TheDesk/app
@@ -88,8 +92,25 @@ npm install --only=dev
 npm run construct
 ```
 
+### yarn
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+# Linux or macOS
+yarn install --no-lockfile
+# Windows
+yarn install
+
+yarn construct
+```
+
+run `npm run dev` or `yarn dev` to launch developer version with console(click `view`)
+
 ### electron-builder(Recommended)
-Use npm scripts.  
+Use scripts(they can work well with npm, **yarn**).  
+
+#### npm
 
 ```sh
 # Build for current platform
@@ -103,6 +124,21 @@ npm run build:win
 npm run build:all
 ```
 
+#### yarn
+
+```sh
+# Build for current platform
+yarn build
+
+# Select build target
+## Windows
+yarn build:win
+
+## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
+yarn build:all
+```
+
+
 Config is all on package.json  
 
 ### electron-packager

README_ja.md

@@ -79,6 +79,9 @@ Linuxビルダー
 
 ## ビルド
 
+npmでもyarnでも好きな方を選んでください。
+
+### npm
 
 ```sh
 git clone https://github.com/cutls/TheDesk
@@ -88,8 +91,24 @@ npm install --only=dev
 npm run construct
 ```
 
+### yarn
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+# Linux or macOS
+yarn install --no-lockfile
+# Windows
+yarn install
+
+yarn construct
+```
+
 ### electron-builder(推奨)
-npm scriptsを利用します
+
+scriptsを利用します
+
+#### npm
 
 ```sh
 # 実行している環境向けにビルド
@@ -103,6 +122,20 @@ npm run build:win
 npm run build:all
 ```
 
+#### yarn
+
+```sh
+# 実行している環境向けにビルド
+yarn build
+
+# ターゲットを指定してビルド
+## Windows
+yarn build:win
+
+## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
+yarn build:all
+```
+
 ビルド設定はすべてpackage.jsonに記載しています。  
 
 ### electron-packager(非推奨)

app/css/master.css

@@ -72,7 +72,7 @@ option {
   min-width: 0 !important;
   margin-left: 5px !important;
 }
-.unvisible{
+.unvisible {
   opacity: 0;
 }
 .bbcode-pulse-loadings,
@@ -336,7 +336,7 @@ blockquote:before,
 #menu {
   position: fixed;
   z-index: 9999;
-  background-color: var(--box);
+  background-color: var(--postbox);
   width: 540px;
   top: calc(50% - 150px);
   left: calc(50% - 250px);
@@ -389,6 +389,9 @@ blockquote:before,
   height: 40px;
   cursor: pointer;
 }
+#tltype .type span {
+  width: calc(100% - 30px);
+}
 #tltype .type:hover {
   background-color: var(--beforehover);
 }
@@ -400,9 +403,11 @@ blockquote:before,
 }
 #tltype i.sub-icon {
   font-size: 20px;
-  position: relative;
+  position: absolute;
   color: var(--beforehover);
-  left: -15px;
+  left: 10px;
+  bottom: 5px;
+  background-color: #fff;
 }
 .drag-bar {
   cursor: move;
@@ -454,17 +459,28 @@ blockquote:before,
 .select-wrapper .dropdown-content {
   width: 250px !important;
 }
-input, textarea {
+input,
+textarea {
   color: var(--color);
   font-size: 1rem !important;
   font-family: inherit;
 }
-.swal2-popup{
+.swal2-popup {
   background-color: var(--notfbox) !important;
 }
-.swal2-title, .swal2-content{
+.swal2-title,
+.swal2-content {
   color: var(--color) !important;
 }
+#src-contents svg {
+  margin-right: 5px;
+}
+.contributor {
+  cursor: pointer;
+}
+.contributor img {
+  width: 1rem;
+}
 
 /*スクロールバー*/
 ::-webkit-scrollbar {
@@ -485,20 +501,25 @@ input, textarea {
 }
 /* Web Fonts */
 @font-face {
-  font-family: 'Open Sans';
+  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;
+  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-family: "Material Icons";
   font-style: normal;
   font-weight: 400;
-  src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
+  src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2)
+    format("woff2");
 }
 .material-icons {
-  font-family: 'Material Icons';
+  font-family: "Material Icons";
   font-weight: normal;
   font-style: normal;
   font-size: 24px;
@@ -509,6 +530,6 @@ input, textarea {
   white-space: nowrap;
   word-wrap: normal;
   direction: ltr;
-  -webkit-font-feature-settings: 'liga';
+  -webkit-font-feature-settings: "liga";
   -webkit-font-smoothing: antialiased;
-}
+}

app/css/tl.css

@@ -45,7 +45,8 @@
 #bottom .trendtag {
   height: 40px;
 }
-#bottom #group, #demogroup {
+#bottom #group,
+#demogroup {
   margin-right: 40px;
 }
 #bottom .leftside {
@@ -58,7 +59,8 @@
 #bottom #tips img {
   vertical-align: -3px;
 }
-#bottom a, #demogroup a {
+#bottom a,
+#demogroup a {
   color: var(--color);
 }
 #bottom i {
@@ -188,6 +190,9 @@ iframe,
   vertical-align: middle;
   margin: -1px 0;
 }
+.bigemoji {
+  width: 60px !important;
+}
 .faicon_FTL {
   display: none;
 }
@@ -222,6 +227,18 @@ iframe,
   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";
 }
+.hide-actions{
+  grid-template-rows: auto 1.6rem 1fr auto 0;
+}
+.hide-actions .area-actions{
+  display:none;
+}
+.hide-actions .area-vis{
+  display:none;
+}
+.hide-actions .area-side{
+  display:none;
+}
 .cvo h1,
 .cvo h2,
 .cvo h3,
@@ -320,6 +337,7 @@ iframe,
   margin: 2px;
   grid-area: side;
 }
+
 .quote-inline {
   display: none;
 }
@@ -698,8 +716,8 @@ audio {
   }
 }
 .box-anime {
-  animation-duration: 1s;
-  animation-name: fadeInLeft;
+  /*animation-duration: 1s;
+  animation-name: fadeInLeft;*/
 }
 
 .cvo-anime {
@@ -712,3 +730,15 @@ audio {
   font-size: 1rem;
   background-color: #009688;
 }
+.box .ui-resizable-s {
+  display: none !important;
+}
+.boxIn .ui-resizable-e {
+  display: none !important;
+}
+.boxIn .ui-resizable-s {
+  display: block !important;
+}
+.box .ui-resizable-se {
+  display: none !important;
+}

app/css/userdata.css

@@ -4,6 +4,9 @@
   background-image: url("../../loading.svg");
   overflow-y: hidden;
 }
+#his-data .btn .material-icons{
+  float:left;
+}
 #his-data-content {
   display: flex;
   justify-content: center;
@@ -22,6 +25,7 @@
 }
 #his-float-data {
   height: 100%;
+  overflow-y: hidden;
 }
 #his-leftside {
   width: 500px;
@@ -60,10 +64,10 @@
   padding: 0;
   padding-left: 5px;
 }
-#his-data a span.ellipsis:after {
+.his-var-content a span.ellipsis:after {
   content: "...";
 }
-#his-data a:not(.mention) span:last-of-type {
+.his-var-content a:not(.mention) span:last-of-type {
   display: none;
 }
 #his-data a .rep_ct,
@@ -99,7 +103,8 @@
   width: 20px;
 }
 #his-plus-action .btn {
-  width: 170px;
+  padding-right: 5px;
+  padding-left: 5px;
 }
 .tabs {
   display: flex;
@@ -107,10 +112,30 @@
 .tabs .tab a {
   padding: 8px 12px;
 }
+#his-des {
+  max-height: 250px;
+  overflow-y: scroll;
+}
+#his-sign-action {
+  border: 1px solid;
+  border-radius: 5px;
+  display: flex;
+  align-items: center;
+  padding-left: 10px;
+  padding-right: 10px;
+  flex-wrap: wrap;
+}
+#his-sign-action .btn {
+  flex-basis: 31.2%;
+}
 #his-des .mention {
   color: #039be5;
   cursor: pointer;
 }
+#his-table{
+  max-height: 150px;
+  overflow-y: scroll;
+}
 #his-float-blocked {
   display: flex;
   justify-content: center;

app/index.html

@@ -1,3 +0,0 @@
-<script>
-location.href="./view/ja"
-</script>

app/js/common/keyshortcut.js

@@ -14,6 +14,17 @@ $(function ($) {
 		} else {
 			var wv = true;
 		}
+		//Enter
+		if (e.keyCode === 13) {
+			if($("#src").is(':focus')){
+				src()
+				return false;
+			}
+			if($("#list-add").is(':focus')){
+				makeNewList()
+				return false;
+			}
+		}
 		//Ctrl+Shift+Enter:Lgen
 		if (event.metaKey || event.ctrlKey && wv) {
 			if (event.shiftKey) {

app/js/common/modal.js

@@ -23,4 +23,7 @@ $(document).ready(function () {
   }
   );
   $('.collapsible').collapsible();
+  $('#videomodal').modal({
+    onCloseEnd: stopVideo
+  });
 });

app/js/common/version.js

@@ -1,6 +1,5 @@
 //バージョンチェッカー
-function verck(ver) {
-	localStorage.setItem("ver", ver);
+function verck(ver, jp) {
 	console.log("%c Welcome😊", "color: red;font-size:200%;")
 	var date = new Date();
 	var show = false
@@ -37,6 +36,7 @@ function verck(ver) {
 			}
 		});
 	}
+	localStorage.setItem("ver", ver);
 	if (!show) {
 		console.log(show)
 		if (date.getMonth() + 1 >= localStorage.getItem("showSupportMe") || !localStorage.getItem("showSupportMe")) {
@@ -87,6 +87,11 @@ function verck(ver) {
 	}).then(function (mess) {
 		console.table(mess);
 		if (mess) {
+			//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
+			if(jp && mess.jp_ua && !localStorage.getItem("askjp_jp_ua")){
+				localStorage.setItem("askjp_jp_ua", true)
+				$("#askjp_jp_ua").removeClass("hide")
+			}
 			var platform = localStorage.getItem("platform");
 			if (platform == "darwin") {
 				var newest = mess.desk_mac;

app/js/lang/json5Tojson.js

@@ -1,3 +0,0 @@
-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 = ", ""))))

app/js/lang/lang.bg.js

@@ -1,247 +0,0 @@
-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": "Всички данни ще бъдат изтрити."
-}

app/js/lang/lang.cs.js

@@ -1,247 +0,0 @@
-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."
-}

app/js/lang/lang.de.js

@@ -1,247 +0,0 @@
-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."
-}

app/js/lang/lang.en.js

@@ -1,280 +0,0 @@
-//commonError
-var lang = {
-    "language": "en",
-    "lang_toot": "Toot",
-    "lang_there": "Yes",
-    "lang_nothing": "None",
-    "lang_yesno": "Yes",
-    "lang_no": "No",
-    "lang_progress": "Wait...",
-    "lang_edit": "Edit",
-    "lang_del": "Delete",
-    "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
-    "lang_speech": "Google US English",
-    //language.html
-    "lang_lang": "Language",
-    "lang_langlocale": "English",
-    "lang_back": "Back",
-    "lang_set": "Set",
-    "lang_langadd": "Translate TheDesk to other languages or proofread TheDesk on <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk needs your help.",
-    //common/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.",
-    "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')",
-    //login
-    //login/login.js
-    "lang_login_noauth": "Show TL of unlogined accounts",
-    //login/manager.js
-    "lang_manager_info": "About this instance",
-    "lang_manager_refresh": "Refresh",
-    "lang_manager_delete": "Logout",
-    "lang_manager_color": "Account Color",
-    "lang_manager_confirm": "is about to logout. Continue?",
-    "lang_manager_mainAcct": "Done:choose main account",
-    "lang_manager_def": "Default",
-    "lang_manager_none": "None",
-    "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
-    "lang_manager_logout": "Logout",
-    //post/bb-md.js
-    "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
-    //post/emoji.js
-    "lang_emoji_get": "Get emojis",
-    "lang_emoji_custom": "Custom emojis",
-    "lang_defaultemojis_text": "Emojis about {{cat}}",
-    //post/img.js
-    "lang_postimg_previewdis": "cannot preview",
-    "lang_postimg_aftupload": "You cannot change accounts after uploading.",
-    "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?",
-    "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
-    "lang_post_cwtitle": "Auto CW Alert",
-    "lang_post_cwtxt": "You are about to post longer toot than you set.\nWarning text:",
-    "lang_post_btn1": "Cancel (will not post)",
-    "lang_post_btn2": "Make text hidden automatically",
-    "lang_post_btn3": "Continue to post",
-    //post/status.js
-    "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
-    "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
-    "lang_status_follow": "Follow",
-    "lang_status_unfollow": "Unfollow",
-    "lang_status_block": "Block",
-    "lang_status_unblock": "Unblock",
-    "lang_status_mute": "Mute",
-    "lang_status_unmute": "Unmute",
-    "lang_status_redraftTitle": "Delete & redraft",
-    "lang_status_redraft": "Continue to delete & redraft? You lose statuses of this toot. This fanction may contain some bugs. Images of this toot will be deleted on older than Mastodon 2.4.1.",
-    "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
-    "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
-    "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
-    "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
-    //tl/card.js
-    "lang_cards_check": " check",
-    "lang_cards_pip": "PiP mode",
-    //tl/details.js
-    "lang_details_nodata": "No data",
-    "lang_details_filtered": "Filtered toot",
-    "lang_details_embed": "Embed HTML is cliped.",
-    "lang_details_url": "URL of this toot is cliped.",
-    "lang_details_txt": "Content of this toot is cliped.",
-    //tl/filter.js
-    "lang_filter_nodata": "No data",
-    "lang_filter_errordegree": "Please check a context",
-    //tl/list.js
-    "lang_list_nodata": "No data",
-    "lang_list_show": "Show",
-    "lang_list_users": "Users list",
-    "lang_list_nouser": "No users in this list.",
-    "lang_list_add": "Add to the list",
-    "lang_list_add_misskey": "(perhaps this user has been listed)",
-    "lang_list_remove": "Remove from the list",
-    //tl/notification.js
-    "lang_notf_new": " new notifications",
-    //tl/speech.js
-    "lang_speech_refresh": "Save value about TTS config",
-    //tl/src.js
-    "lang_src_ts": "chronological order",
-    "lang_src_people": " people toot",
-    //tl/tag.js
-    "lang_tags_always": "Always toots with ",
-    "lang_tags_realtime": "Tag-stream toot",
-    "lang_tags_tagunpin": "Unpin {{tag}}",
-    "lang_tags_unrealtime": "Disable TsT",
-    "lang_tags_tagwarn": "Auto complete {{tag}}, if toot without {{tag}}",
-    //tl/tl.js
-    "lang_tl_media": "Media",
-    "lang_tl_reconnect": "Reconnect to streaming API",
-    //ui/img.js
-    "lang_img_DLDone": "Downloaded:",
-    //ui/layout.js
-    "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
-    "lang_layout_thisacct": "{{notf}} of this account",
-    "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": "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",
-    "lang_layout_webviewmode": "Prefer 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",
-    //ui/sort.js
-    "lang_sort_gothis": "Go to this column",
-    "lang_sort_remthis": "Delete this column",
-    //ui/spotify.js
-    "lang_spotify_img": "Attach an album artwork",
-    "lang_spotify_imgno": "Not attach an album artwork",
-    "lang_spotify_acct": "Connect TheDesk to Spotify",
-    "lang_spotify_np": "Done:templete of NowPlaying",
-    "lang_setting_npprovide": "NowPlaying provider:{{set}}",
-    //userdata/his-data.js
-    "lang_hisdata_frcreq": "Required Mastodon 2.4.3 and above",
-    "lang_hisdata_frcwarn": "Unfollow accounts will be shown.",
-    "lang_hisdata_taketime": "It will take 30s ~ several minutes",
-    "lang_hisdata_notonmisskey": "Misskey is unable to request.",
-    "lang_hisdata_key": "This user is proofed by {{set}}",
-    //userdata/showOnTL.js
-    "lang_showontl_movetxt": "This account was moved",
-    "lang_showontl_movebtn": "Continue on the new account",
-    "lang_showontl_botacct": "[bot]",
-    "lang_showontl_followed": "Following you",
-    "lang_showontl_notf": "Notification ",
-    "lang_showontl_domain": "Domain ",
-    "lang_showontl_listwarn": "Follow to add this user to lists.",
-    "lang_showontl_verified": "This website is verified by owner at ",
-    //parse
-    "lang_parse_mentioned": " replied to you",
-    "lang_parse_faved": " favourited your toot",
-    "lang_parse_bted": " boosted your toot",
-    "lang_parse_btedsimple": " boosted",
-    "lang_parse_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": "Delete this toot",
-    "lang_parse_pin": "Pin this toot",
-    "lang_parse_det": "Details via your main account.",
-    "lang_parse_redraft": "Delete & re-draft",
-    "lang_parse_followed": "Followed you",
-    "lang_parse_clientop": "Operation of this client",
-    "lang_parse_clienttxt": " will be",
-    "lang_parse_clientno": "done nothing",
-    "lang_parse_clientemp": "emphasized(/not emphasized)",
-    "lang_parse_clientmute": "muted",
-    "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "Voted",
-    "lang_parse_vote": "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": "sensitive media",
-    "lang_parse_notffilter": "Show this user's notifications",
-    //misskey
-    "lang_misskeyparse_renote": "Repost",
-    "lang_misskeyparse_renoteqt": "Renote",
-    "lang_misskeyparse_reaction": "Reaction",
-    "lang_misskeyparse_tagnostr": "No streaming API on Tag TLs",
-    "lang_misskeyparse_listnostr": "No streaming API on List TLs",
-    "lang_misskeyparse_home": "Home",
-    "lang_misskeyparse_followers": "Follower",
-    "lang_misskeyparse_specified": "Specified User",
-    "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
-    "lang_misskeyparse_renoted": " renoted your following post.",
-    "lang_misskeyparse_quoted": " quoted your following post.",
-    "lang_misskeyparse_reacted": " reacted your following post.",
-    //setting
-    "lang_setting_time": "Time format:{{set}}",
-    "lang_setting_theme": "Theme:{{set}}",
-    "lang_setting_nsfw": "Sensitive media:{{set}}",
-    "lang_setting_cw": "CW:{{set}}",
-    "lang_setting_cwtext": "Default CW text:{{set}}",
-    "lang_setting_cws": "Always CW on:{{set}}",
-    "lang_setting_rp": "Reply counter:{{set}}",
-    "lang_setting_vis": "Default visibility:{{set}}",
-    "lang_setting_popup": "Popup notification:{{set}}",
-    "lang_setting_off": "Off",
-    "lang_setting_s": "s",
-    "lang_setting_box": "Default toot box action:{{set}}",
-    "lang_setting_gif": "GIF:{{set}}",
-    "lang_setting_selt": "Auto fold:{{set1}} lines and above, {{set2}} letters and above",
-    "lang_setting_autocw": "Auto CW:{{set1}} lines and above, {{set2}} letters and above",
-    "lang_setting_width": "Minimam width:{{set}}",
-    "lang_setting_fixwidth": "TweetDeck fixed width:{{set}}px",
-    "lang_setting_img": "After posting an image:{{set}}",
-    "lang_setting_font": "Fonts:{{set}}",
-    "lang_setting_default": "default font",
-    "lang_setting_size": "Font size:{{set}}px",
-    "lang_setting_imgheight": "Image height:{{set}}px",
-    "lang_setting_ticker": "#InstanceTicker:{{set}}px",
-    "lang_setting_animation": "Animation: {{set}}",
-    "lang_setting_tag": "Tag TL:{{set}}",
-    "lang_setting_boxConfirm": "Post box:{{set}}",
-    "lang_setting_ul": "Native locale:{{set}}",
-    "lang_setting_notf": "Native notification:{{set}}",
-    "lang_setting_quote": "Quote format:{{set}}",
-    "lang_setting_via": "Via:{{set}}",
-    "lang_setting_mov": "Action buttons hiding:{{set}}",
-    "lang_setting_setasread": "Notification markers:{{set}}",
-    "lang_setting_main": "Default account:{{set}}",
-    "lang_setting_sec": "Secondary toot button:{{set}}",
-    "lang_setting_ksref": "Keyboard shortcuts are refreshed.",
-    "lang_setting_nomuting": "No client is muted.",
-    "lang_setting_notftest": " Notification test ",
-    "lang_setting_notftestprof": "Your icon is shown.",
-    "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted.",
-}

app/js/lang/lang.ja.js

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

app/js/lang/lang.ps.js

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

app/js/login/login.js

@@ -13,8 +13,7 @@ function ck() {
 	if (!main) {
 		localStorage.setItem("main", 0)
 	}
-	var domainz = localStorage.getItem("domain_0");
-	var at = localStorage.getItem("acct_0_at");
+	
 	//コード受信
 	if (location.search) {
 		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
@@ -32,17 +31,21 @@ function ck() {
 		location.href = "acct.html?mode=first&code=true"
 	} else {
 		var obj = JSON.parse(multi);
+		var jp=false
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key];
 			if (acct.domain) {
 				refresh(key, true)
 			}
+			if(acct.domain=="mstdn.jp"){
+				jp=true
+			}
 		});
 		if (obj[0].domain) {
 			$("#tl").show();
 			ticker();
 			multiSelector(false);
-			verck(ver);
+			verck(ver, jp);
 			$(".stw").show()
 			$("#something-wrong img").attr("src", "../../img/thinking.svg")
 		}
@@ -291,7 +294,12 @@ function refresh(target, loadskip) {
 		localStorage.setItem("user-id_" + target, json["id"]);
 		localStorage.setItem("prof_" + target, avatar);
 		localStorage.setItem("follow_" + target, json["following_count"]);
-		console.log(obj)
+		if(json["source"]["sensitive"]){
+			localStorage.setItem("nsfw_" + target, "true");
+		}else{
+			localStorage.removeItem("nsfw_" + target);
+		}
+		obj[target] = ref;
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
 		if (!loadskip) {
@@ -398,6 +406,8 @@ function ckdb(acct_id) {
 				}
 				if (json["urls"]["streaming_api"]) {
 					localStorage.setItem("streaming_" + acct_id, json["urls"]["streaming_api"]);
+				}else{
+					localStorage.removeItem("streaming_" + acct_id);
 				}
 			}
 		});
@@ -525,7 +535,6 @@ function ticker() {
 	}).catch(function (error) {
 		console.error(error);
 	}).then(function (json) {
-		console.log(json)
 		if (json) {
 			localStorage.setItem("ticker", JSON.stringify(json));
 		}

app/js/platform/end.js

@@ -18,12 +18,12 @@ $(document).on('click', 'a', e => {
 		//タグのURLぽかったら
 		var tags = [];
 		tags = url.match(
-			/https:\/\/([^+_]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
+			/https:\/\/([^+_]+)\/tags\/([_a-zA-Z0-9\&=+\%]+)/
 		);
 		//メンションっぽかったら
 		var ats = [];
 		ats = url.match(
-			/https:\/\/([^+_]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
+			/https:\/\/([^+_]+)\/@([_a-zA-Z0-9\&=+\%]+)/
 		);
 		if (toot) {
 			if (toot[1]) {
@@ -48,7 +48,7 @@ $(document).on('click', 'a', e => {
 			if (ats[2]) {
 				//Quesdon判定
 				if (!~ats[2].indexOf("@")) {
-					udgEx(ats[2] + "@" + ats[1], "main");
+					udgEx(url, "main");
 					return false
 				} else {
 					postMessage(["openUrl", url], "*")
@@ -81,11 +81,8 @@ $(document).on('click', 'a', e => {
 
 //コピー
 function execCopy(string) {
-	var temp = $("#copy");
-	temp.val(string);
-	temp.select();
-	var result = document.execCommand('copy');
-	return result;
+	postMessage(["copy", string], "*")
+	return true;
 }
 function progshow(e) {
 	if (e.lengthComputable) {
@@ -108,12 +105,16 @@ function opendev() {
 	  });
 	  */
 }
+var soundFile
 function playSound() {
 	window.AudioContext = window.AudioContext || window.webkitAudioContext;
+	if(soundFile){
+		soundFile.stop()
+	}
 	context = new AudioContext();
 	context.createBufferSource().start(0);
 	context.decodeAudioData(request.response, function (buf) {
-		console.log("Playing:" + source)
+		//console.log("Playing:" , source)
 		source.buffer = buf;
 		source.loop = false;
 	});
@@ -121,8 +122,20 @@ function playSound() {
 	volumeControl = context.createGain();
 	source.connect(volumeControl);
 	volumeControl.connect(context.destination);
-	volumeControl.gain.value = 0.8
+	var cvol = localStorage.getItem("customVol")
+	if (cvol) {
+		vol = cvol
+	}else{
+		vol = 0.8
+	}
+	volumeControl.gain.value = vol
 	source.start(0);
+	soundFile = source;
+
+	function newFunction() {
+		var source;
+		return source;
+	}
 }
 function nano() {
 	postMessage(["nano", null], "*")
@@ -167,20 +180,14 @@ onmessage = function (e) {
 		updateMess(e.data[1]);
 	} else if (e.data[0] == "renderAbout") {
 		renderAbout(e.data[1]);
+	} else if (e.data[0] == "asRead") {
+		asRead()
+	} else if (e.data[0] == "asReadEnd") {
+		asReadEnd()
 	} else if (e.data[0] == "alert") {
 		Swal.fire({
 			type: 'info',
 			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);
-			});
-		}
-	});
+}

app/js/platform/first.js

@@ -1,9 +1,3 @@
-function postMessage(e){
-	if(e[0]=="openUrl"){
-		window.open(e[1])
-	}
-	return false;
-}
 document.title="TheDesk"
 $.strip_tags = function (str, allowed) {
 	if (!str) {

app/js/platform/nano.js

@@ -1,7 +1,11 @@
 
 //TL取得
+var websocket;
 function tl(data) {
 	var tlid = 0;
+	if(websocket){
+		websocket.close()
+	}
 	var acct_id = $("#post-acct-sel").val();
 	var type = $("#type-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
@@ -28,9 +32,9 @@ function tl(data) {
 		var templete = parse([json[0]], '', acct_id, tlid);
 		$("#timeline_nano").html(templete);
 		jQuery("time.timeago").timeago();
+		$("#menu").addClass("hide");
 	});
 	//Streaming接続
-	var websocket = [];
 	var tlid = 0;
 	if (type == "home") {
 		var start = "wss://" + domain +
@@ -45,29 +49,26 @@ function tl(data) {
 		var start = "wss://" + domain +
 			"/api/v1/streaming/?stream=hashtag&tag=" + data + "&access_token=" + at;
 	}
-	var wsid = websocket.length;
-	websocket[wsid] = new WebSocket(start);
-	websocket[wsid].onopen = function (mess) {
+	websocket = new WebSocket(start);
+	websocket.onopen = function (mess) {
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
-	websocket[wsid].onmessage = function (mess) {
+	websocket.onmessage = function (mess) {
 		var typeA = JSON.parse(mess.data).event;
-		if (typeA == "delete") {
-			var obj = JSON.parse(mess.data).payload;
-			$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
-			$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
-		} else if (typeA == "update") {
+		if (typeA == "update") {
 			var obj = JSON.parse(JSON.parse(mess.data).payload);
 			var templete = parse([obj], '', acct_id, tlid);
+			jQuery("time.timeago").timeago();
 			$("#timeline_nano").html(templete);
 		}
-		websocket[wsid].onclose = function (mess) {
-			console.error("Close Streaming API:" + type);
-		}
+		
 	}
-	websocket[wsid].onerror = function (error) {
+	websocket.onerror = function (error) {
 		console.error('WebSocket Error ' + error);
 	};
+	websocket.onclose = function (mess) {
+		console.error("Close Streaming API:" + type);
+	}
 }
 //TLのタイトル
 function cap(type, data) {
@@ -134,3 +135,122 @@ $(function ($) {
 		}
 	});
 });
+function set() {
+	$("#menu").toggleClass("hide");
+	if($("#menu").hasClass("hide")){
+		$("#setting").text("Setting")
+	}else{
+		$("#setting").text("Close")
+	}
+}
+
+var multi = localStorage.getItem("multi");
+if (!multi) {
+	var obj = [
+		{
+			at: localStorage.getItem(localStorage.getItem("domain_" + acct_id) + "_at"),
+			name: localStorage.getItem("name_" + acct_id),
+			domain: localStorage.getItem("domain_" + acct_id),
+			user: localStorage.getItem("user_" + acct_id),
+			prof: localStorage.getItem("prof_" + acct_id)
+		}
+	];
+	var json = JSON.stringify(obj);
+	localStorage.setItem("multi", json);
+} else {
+	var obj = JSON.parse(multi);
+}
+var templete;
+var last = localStorage.getItem("last-use");
+var sel;
+Object.keys(obj).forEach(function(key) {
+	var acct = obj[key];
+	var list = key * 1 + 1;
+	if (key == last) {
+		sel = "selected";
+	} else {
+		sel = "";
+	}
+	templete = '<option value="' + key + '" ' + sel + ">" + acct.user + "@" + acct.domain + "</option>";
+	$("#post-acct-sel").append(templete);
+});
+function mov() {
+	return false;
+}
+function resetmv() {
+	return false;
+}
+function post() {
+	var acct_id = $("#post-acct-sel").val();
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/statuses";
+	var str = $("#textarea").val();
+	var toot = {
+		status: str
+	};
+	var vis = loadVis(acct_id);
+	toot.visibility = vis;
+	var httpreq = new XMLHttpRequest();
+	httpreq.open("POST", start, true);
+	httpreq.setRequestHeader("Content-Type", "application/json");
+	httpreq.setRequestHeader("Authorization", "Bearer " + at);
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify(toot));
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			$("#textarea").val("");
+		}
+	};
+}
+function loadVis(acct_id) {
+	var vist = localStorage.getItem("vis");
+	if (!vist) {
+		return "public";
+	} else {
+		if (vist == "memory") {
+			var memory = localStorage.getItem("vis-memory-" + acct_id);
+			if (!memory) {
+				memory = "public";
+			}
+			return memory;
+		} else if (vist == "server" || vist == "useapi") {
+			var multi = localStorage.getItem("multi");
+			var obj = JSON.parse(multi);
+			var memory = obj[acct_id]["vis"];
+			if (!memory) {
+				memory = "public";
+			}
+			return memory;
+		} else {
+			return vist;
+		}
+	}
+}
+function loader(){
+	var acct_id = $("#post-acct-sel").val()
+	console.log(loadVis(acct_id))
+	$("#vis-sel").val(loadVis(acct_id));
+}
+loader()
+$("textarea").height(15); //init
+$("textarea").css("lineHeight", "1rem"); //init
+
+$("textarea").on("input", function(evt) {
+	if (evt.target.scrollHeight > evt.target.offsetHeight) {
+		$(evt.target).height(evt.target.scrollHeight);
+	} else {
+		var lineHeight = Number(
+			$(evt.target)
+				.css("lineHeight")
+				.split("px")[0]
+		);
+		while (true) {
+			$(evt.target).height($(evt.target).height() - lineHeight);
+			if (evt.target.scrollHeight > evt.target.offsetHeight) {
+				$(evt.target).height(evt.target.scrollHeight);
+				break;
+			}
+		}
+	}
+});

app/js/platform/preload.js

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

app/js/post/emoji.js

@@ -23,7 +23,7 @@ function emojiToggle(reaction) {
 		}
 		$("#post-box").css("width", width + "px")
 		$("#suggest").html("");
-		if (!localStorage.getItem("emoji_" + acct_id)) {
+		if (!localStorage.getItem("emojis_" + acct_id)) {
 			var html =
 				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">' + lang.lang_emoji_get + '</button>';
 			$("#emoji-list").html(html);
@@ -69,15 +69,56 @@ function emojiGet(parse, started) {
 		}).then(function (json) {
 			if (parse == "true") {
 				$('#emoji-list').text('Parsing...');
+				var md = {
+					"categorized": {},
+					"uncategorized": []
+				};
+				var if_categorized = false
+				Object.keys(json).forEach(function (key) {
+					var emoji = json[key];
+					if (emoji.visible_in_picker) {
+						var listed = true
+					} else {
+						var listed = false
+					}
+					if (emoji.category) {
+						var cat = emoji.category
+						if (!md["categorized"][cat]) {
+							md["categorized"][cat] = []
+						}
+						md["categorized"][cat].push({
+							"shortcode": emoji.shortcode,
+							"url": emoji.url,
+							"listed": listed
+						})
+						if_categorized = true
+					} else {
+						md["uncategorized"].push({
+							"shortcode": emoji.shortcode,
+							"url": emoji.url,
+							"listed": listed
+						})
+					}
+				});
+				console.log(md)
 				//絵文字をマストドン公式と同順にソート
-				json.sort(function (a, b) {
+				md["uncategorized"].sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
 					if (a.shortcode > b.shortcode) return 1;
 					return 0;
 				});
-				localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
+				Object.keys(md["categorized"]).forEach(function (key) {
+					md["categorized"][key].sort(function (a, b) {
+						if (a.shortcode < b.shortcode) return -1;
+						if (a.shortcode > b.shortcode) return 1;
+						return 0;
+					});
+				});
+				
+				md["if_categorized"] = if_categorized
+				localStorage.setItem("emojis_" + acct_id, JSON.stringify(md));
 			} else {
-				localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
+				localStorage.setItem("emojis_" + acct_id, JSON.stringify(md));
 			}
 			localStorage.setItem("emojiseek", 0);
 			if (!started) {
@@ -103,25 +144,27 @@ function emojiGet(parse, started) {
 				localStorage.setItem("emojiReaction_" + acct_id, "disabled");
 			}
 			var emojis = json.emojis;
-			var md = [];
+			var md = {"uncategorized": []}
 			Object.keys(emojis).forEach(function (key) {
 				var emoji = emojis[key];
-				md.push({
+				md["uncategorized"].push({
 					"shortcode": emoji.name,
-					"url": emoji.url
+					"url": emoji.url,
+					"listed": true
 				})
 			});
+			md["if_categorized"] = false
 			if (parse == "true") {
 				$('#emoji-list').text('Parsing...');
 				//絵文字をマストドン公式と同順にソート
-				md.sort(function (a, b) {
+				md["uncategorized"].sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
 					if (a.shortcode > b.shortcode) return 1;
 					return 0;
 				});
-				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+				localStorage.setItem("emojis_" + acct_id, JSON.stringify(md));
 			} else {
-				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+				localStorage.setItem("emojis_" + acct_id, JSON.stringify(md));
 			}
 			localStorage.setItem("emojiseek", 0);
 			if (!started) {
@@ -153,7 +196,28 @@ function emojiList(target, reaction) {
 		localStorage.getItem("emojiseek", 0)
 	}
 	var html = '';
-	var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
+	var raw = JSON.parse(localStorage.getItem("emojis_" + acct_id));
+	console.log(raw)
+	if (raw.if_categorized) {
+		var obj = [{
+			"divider": true,
+			"cat": lang.lang_emoji_uncat
+		}]
+		var cats = raw["uncategorized"]
+		obj = obj.concat(cats);
+		Object.keys(raw["categorized"]).forEach(function (key) {
+			var cats = raw["categorized"][key];
+			obj = obj.concat([{
+				"divider": true,
+				"cat": key
+			}]);
+			obj = obj.concat(cats);
+		});
+	} else {
+		var obj = raw["uncategorized"]
+	}
+	console.log(obj)
+
 	var num = obj.length;
 	if (num < start) {
 		var start = 0;
@@ -163,24 +227,36 @@ function emojiList(target, reaction) {
 	$("#emoji-sum").text(page);
 	var ct = Math.ceil(start / 126);
 	if (ct === 0) {
-		var ct = 1;
+		if(num > 0){
+			var ct = 1;
+		}
 		$("#emoji-before").addClass("disabled");
 	} else {
 		$("#emoji-before").removeClass("disabled");
 	}
-	$("#emoji-next").removeClass("disabled");
+	if (page != 1) {
+		$("#emoji-next").removeClass("disabled");
+	} else {
+		$("#emoji-next").addClass("disabled");
+	}
 	$("#emoji-count").text(ct);
 	for (i = start; i < start + 126; i++) {
 		var emoji = obj[i];
 		if (emoji) {
 			if (reaction) {
 				html = html + '<a onclick="emojiReaction(\':' + emoji.shortcode +
-					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+					':\')" class="pointer"><img src="' + emoji.url + '" width="20" title="' + emoji.shortcode + '"></a>';
 			} else {
-				html = html + '<a onclick="emojiInsert(\':' + emoji.shortcode +
-					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+				if(emoji.divider){
+					html = html + '<p style="margin-bottom:0">'+ emoji.cat +'</p>'
+				}else{
+					if (emoji.listed) {
+						html = html + '<a onclick="emojiInsert(\':' + emoji.shortcode +
+							':\')" class="pointer"><img src="' + emoji.url + '" width="20" title="' + emoji.shortcode + '"></a>';
+					}
+				}
+				
 			}
-
 		}
 	}
 	$("#emoji-list").html(html);

app/js/post/img.js

@@ -2,36 +2,35 @@
 var obj = $("body");
 var system;
 //ドラッグスタート
-obj.on('dragstart', function (e) {
-	system = "locked"
+obj.on("dragstart", function(e) {
+	system = "locked";
 });
 //何もなくファイルが通過
-obj.on('dragend', function (e) {
+obj.on("dragend", function(e) {
 	system = "";
 });
 //ドラッグファイルが画面上に
-obj.on('dragenter', function (e) {
+obj.on("dragenter", function(e) {
 	if (system != "locked") {
-		$("#drag").css('display', 'flex');
+		$("#drag").css("display", "flex");
 	}
-
 });
-$("body").on('dragover', function (e) {
+$("body").on("dragover", function(e) {
 	e.stopPropagation();
 	e.preventDefault();
 });
 //ドロップした
-$("body").on('drop', function (e) {
+$("body").on("drop", function(e) {
 	if (system != "locked") {
-		$("#drag").css('display', 'none');
+		$("#drag").css("display", "none");
 		e.preventDefault();
 		var files = e.originalEvent.dataTransfer.files;
 		pimg(files);
 	}
 });
 //何もなくファイルが通過
-$("#drag").on('dragleave', function (e) {
-	$("#drag").css('display', 'none');
+$("#drag").on("dragleave", function(e) {
+	$("#drag").css("display", "none");
 });
 
 //複数アップ
@@ -40,9 +39,8 @@ function pimg(files) {
 	for (i = 0; i < files.length; i++) {
 		var dot = files[i].path.match(/\.(.+)$/)[1];
 		if (dot == "bmp" || dot == "BMP") {
-			postMessage(["bmpImage", [files[i].path, i]], "*")
+			postMessage(["bmpImage", [files[i].path, i]], "*");
 			todo(lang.lang_progress);
-
 		} else {
 			handleFileUpload(files[i], obj, i);
 		}
@@ -50,21 +48,21 @@ function pimg(files) {
 }
 //ドラッグ・アンド・ドロップを終了
 function closedrop() {
-	$("#drag").css('display', 'none');
+	$("#drag").css("display", "none");
 }
 //ファイル選択
 function fileselect() {
-	postMessage(["sendSinmpleIpc", "file-select"], "*")
+	postMessage(["sendSinmpleIpc", "file-select"], "*");
 }
 
 //ファイル読み込み
 function handleFileUpload(files, obj, no) {
 	var fr = new FileReader();
-	fr.onload = function (evt) {
+	fr.onload = function(evt) {
 		var b64 = evt.target.result;
-		$('#b64-box').val(b64);
-		var ret = media(b64, files["type"], no)
-	}
+		$("#b64-box").val(b64);
+		var ret = media(b64, files["type"], no);
+	};
 	fr.readAsDataURL(files);
 	$("#mec").append(files["name"] + "/");
 }
@@ -79,7 +77,7 @@ function media(b64, type, no) {
 		r += c[Math.floor(Math.random() * cl)];
 	}
 	if ($("#media").val()) {
-		$("#media").val($("#media").val() + ',' + "tmp_" + r);
+		$("#media").val($("#media").val() + "," + "tmp_" + r);
 	} else {
 		$("#media").val("tmp_" + r);
 	}
@@ -89,14 +87,14 @@ function media(b64, type, no) {
 	todo("Image Upload...");
 	var media = toBlob(b64, type);
 	var fd = new FormData();
-	fd.append('file', media);
+	fd.append("file", media);
 	var acct_id = $("#post-acct-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var httpreq = new XMLHttpRequest();
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
 		var start = "https://" + domain + "/api/drive/files/create";
-		httpreq.open('POST', start, true);
+		httpreq.open("POST", start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
 		httpreq.responseType = "json";
 		if ($("#nsfw").hasClass("nsfw-avail")) {
@@ -104,20 +102,20 @@ function media(b64, type, no) {
 		} else {
 			var nsfw = false;
 		}
-		var previewer = "url"
-		fd.append('i', at);
+		var previewer = "url";
+		fd.append("i", at);
 		//fd.append('isSensitive', nsfw);
 		httpreq.send(fd);
 	} else {
-		var previewer = "preview_url"
+		var previewer = "preview_url";
 		var start = "https://" + domain + "/api/v1/media";
-		httpreq.open('POST', start, true);
+		httpreq.open("POST", start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
 		httpreq.responseType = "json";
-		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		httpreq.setRequestHeader("Authorization", "Bearer " + at);
 		httpreq.send(fd);
 	}
-	httpreq.onreadystatechange = function () {
+	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			if (!json.id) {
@@ -125,17 +123,17 @@ function media(b64, type, no) {
 				$("#imgup").text("");
 				$(".toot-btn-group").prop("disabled", false);
 				$("#post-acct-sel").prop("disabled", false);
-				$('select').formSelect();
+				$("select").formSelect();
 				$("#imgsel").show();
-				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
-				return false
+				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 + '">';
-				$('#preview').append(html);
+				var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" oncontextmenu="deleteImage(\'' + json["id"] + "')\" onclick=\"altImage('" + acct_id + "','" + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';
+				$("#preview").append(html);
 			} else {
-				$('#preview').append(lang.lang_postimg_previewdis);
+				$("#preview").append(lang.lang_postimg_previewdis);
 			}
 			if (!img) {
 				var img = "no-act";
@@ -145,26 +143,30 @@ function media(b64, type, no) {
 				var regExp = new RegExp("tmp_" + r, "g");
 				mediav = mediav.replace(regExp, json["id"]);
 				$("#media").val(mediav);
-
 			}
 			if (img == "url") {
-				$("#textarea").val($("#textarea").val() + " " + json["text_url"])
+				$("#textarea").val($("#textarea").val() + " " + json["text_url"]);
 			}
 			todc();
+			if (localStorage.getItem("nsfw_" + acct_id)) {
+				$("#nsfw").addClass("yellow-text");
+				$("#nsfw").html("visibility");
+				$("#nsfw").addClass("nsfw-avail");
+			}
 			$(".toot-btn-group").prop("disabled", false);
-			$('select').formSelect();
+			$("select").formSelect();
 			$("#mec").text(lang.lang_there);
-			M.toast({ html: lang.lang_postimg_aftupload, displayLength: 1000 })
+			M.toast({ html: lang.lang_postimg_aftupload, displayLength: 1000 });
 			$("#imgup").text("");
 			$("#imgsel").show();
 			localStorage.removeItem("image");
 		}
-	}
+	};
 }
 
 //Base64からBlobへ
 function toBlob(base64, type) {
-	var bin = atob(base64.replace(/^.*,/, ''));
+	var bin = atob(base64.replace(/^.*,/, ""));
 	var buffer = new Uint8Array(bin.length);
 	for (var i = 0; i < bin.length; i++) {
 		buffer[i] = bin.charCodeAt(i);
@@ -182,14 +184,14 @@ function toBlob(base64, type) {
 }
 //画像を貼り付けたら…
 var element = document.querySelector("#textarea");
-element.addEventListener("paste", function (e) {
+element.addEventListener("paste", function(e) {
 	if (!e.clipboardData || !e.clipboardData.items) {
 		return true;
 	}
 	// DataTransferItemList に画像が含まれいない場合は終了する
-	var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'));
+	var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith("image"));
 	if (imageItems.length == 0) {
-		console.warn("it is not image")
+		console.warn("it is not image");
 		return true;
 	}
 
@@ -200,7 +202,7 @@ element.addEventListener("paste", function (e) {
 
 	// FileReaderで読み込む
 	var fr = new FileReader();
-	fr.onload = function (e) {
+	fr.onload = function(e) {
 		// onload内ではe.target.resultにbase64が入っているのであとは煮るなり焼くなり
 		var base64 = e.target.result;
 		var mediav = $("#media").val();
@@ -208,7 +210,7 @@ element.addEventListener("paste", function (e) {
 			var i = mediav.split(",").length;
 		}
 		// DataTransferItem の type に mime tipes があるのでそれを使う
-		media(base64, imageType, i)
+		media(base64, imageType, i);
 	};
 	fr.readAsDataURL(imageFile);
 
@@ -217,13 +219,13 @@ element.addEventListener("paste", function (e) {
 function deleteImage(key) {
 	Swal.fire({
 		title: lang.lang_postimg_delete,
-		type: 'warning',
+		type: "warning",
 		showCancelButton: true,
-		confirmButtonColor: '#3085d6',
-		cancelButtonColor: '#d33',
+		confirmButtonColor: "#3085d6",
+		cancelButtonColor: "#d33",
 		confirmButtonText: lang.lang_yesno,
 		cancelButtonText: lang.lang_no
-	}).then((result) => {
+	}).then(result => {
 		if (result.value) {
 			var media = $("#media").val();
 			var arr = media.split(",");
@@ -234,8 +236,54 @@ function deleteImage(key) {
 				}
 			}
 			$("#media").val(arr.join(","));
-			$('#preview [data-media=' + key + ']').remove();
+			$("#preview [data-media=" + key + "]").remove();
 		}
-	})
+	});
+}
+function altImage(acct_id, id) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/media/" + id;
 
-}
+	Swal.fire({
+		title: lang.lang_postimg_desc,
+		text: lang.lang_postimg_leadContext,
+		input: "text",
+		inputAttributes: {
+			autocapitalize: "off"
+		},
+		showCancelButton: true,
+		confirmButtonText: "Post",
+		showLoaderOnConfirm: true,
+		preConfirm: data => {
+			return fetch(start, {
+				method: "PUT",
+				headers: {
+					"content-type": "application/json",
+					Authorization: "Bearer " + at
+				},
+				body: JSON.stringify({
+					description: data
+				})
+			})
+				.then(function(response) {
+					return response.json();
+				})
+				.catch(function(error) {
+					todo(error);
+					console.error(error);
+				})
+				.then(function(json) {
+					console.log(json)
+					$("[data-media=" + id + "]").attr("title", data);
+				});
+		},
+		allowOutsideClick: () => !Swal.isLoading()
+	}).then(result => {
+		if (result.value) {
+			Swal.fire({
+				title: "Complete",
+			});
+		}
+	});
+}

app/js/post/post.js

@@ -288,9 +288,20 @@ function clear() {
 	if (localStorage.getItem("mainuse") == "main") {
 		$("#post-acct-sel").val(localStorage.getItem("main"));
 	}
+	$("#emoji").addClass("hide")
 	$('select').formSelect();
-	$("#left-side").show();
 	$("#default-emoji").show();
 	$("#unreact").show();
 	$("#addreact").addClass("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)
+	mdCheck()
 }

app/js/post/suggest.js

@@ -57,7 +57,7 @@ input.addEventListener("focus", function () {
 					if (width) {
 						width = width.replace("px", "") * 1 + 200
 					} else {
-						width = 600
+						width = 500
 					}
 					$("#post-box").css("width", width + "px")
 					$("#poll").addClass("hide")
@@ -161,7 +161,7 @@ input.addEventListener("focus", function () {
 							if (width) {
 								width = width.replace("px", "") * 1 + 200
 							} else {
-								width = 600
+								width = 500
 							}
 							$("#post-box").css("width", width + "px")
 							$("#poll").addClass("hide")
@@ -186,7 +186,7 @@ input.addEventListener("focus", function () {
 						if (width) {
 							width = width.replace("px", "") * 1 + 200
 						} else {
-							width = 600
+							width = 500
 						}
 						$("#post-box").css("width", width + "px")
 						$("#suggest").html(accts);

app/js/post/use-txtbox.js

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

app/js/tl/card.js

@@ -6,17 +6,21 @@ function additional(acct_id, tlid) {
 
 	$("#timeline-container .mention").addClass("parsed");
 
-	$("#timeline-container .hashtag").each(function (i, elem) {
+	$("#timeline-container .hashtag, #timeline-container [rel=tag]").each(function (i, elem) {
 		var tags = $(this).attr("href").match(
 			/https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
 		);
-		$(this).attr("href", "#");
-		if (tags) {
-			if (tags[2]) {
-				$(this).attr("onclick", 'tagShow(\'' + tags[2] + '\')');
-			}
-
+		if(tags){
+			var tagThis = tags[2]
+		}else{
+			var tagThis = $(this).attr("data-tag")
 		}
+		
+		if(tagThis){
+			$(this).attr("onclick", 'tagShow(\'' + tagThis + '\')');
+			$(this).attr("href", "#");
+		}
+		
 	});
 
 	//トゥートサムネ
@@ -234,6 +238,7 @@ function cardCheck(tlid) {
 }
 
 function mov(id, tlid, type) {
+	var click = false
 	if (tlid == "notf") {
 		var tlide = "[data-notf=" + acct_id + "]";
 	} else if (tlid == "user") {
@@ -253,12 +258,21 @@ function mov(id, tlid, type) {
 		} else {
 			mouseover = "hide";
 		}
+		click=true
 	} else if (mouseover == "no") {
 		mouseover = "";
 	}
 	if (mouseover == "hide") {
-		$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
-		$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
+		if(click){
+			$(tlide + " [toot-id=" + id + "]").toggleClass("hide-actions")
+		}else{
+			$(tlide + " [toot-id=" + id + "]").removeClass("hide-actions")
+		}
+		
+		//$(tlide + " [toot-id=" + id + "] .area-vis").toggleClass("hide")
+		//$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
+		//$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
+	
 	}
 }
 
@@ -274,8 +288,10 @@ function resetmv(type) {
 		mouseover = "hide";
 	}
 	if (mouseover == "hide") {
-		$(".area-actions").addClass("hide");
-		$(".area-side").addClass("hide");
+		$(".cvo").addClass("hide-actions")
+		//$(".area-vis").addClass("hide");
+		//$(".area-actions").addClass("hide");
+		//$(".area-side").addClass("hide");
 	}
 
 }

app/js/tl/datails.js

@@ -77,6 +77,7 @@ function details(id, acct_id, tlid, mode) {
 		$("#toot-this .rt_ct").text(json.reblogs_count);
 		$("#tootmodal").attr("data-url", url);
 		$("#tootmodal").attr("data-id", json.id);
+		$("#tootmodal").attr("data-acct", acct_id);
 		if (local) {
 			$("#tootmodal").attr("data-user", scn + "@" + domain);
 		} else {
@@ -519,7 +520,7 @@ function detEx(url, acct_id) {
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/search?resolve=true&q=" + url
+	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + url
 	fetch(start, {
 		method: 'GET',
 		headers: {

app/js/tl/misskeyparse.js

@@ -268,19 +268,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						body: toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
 						icon: toot.user.avatarUrl
 					};
-					if (os == "darwin") {
-						var n = new Notification('TheDesk:' + domain, options);
-					} else {
-						var nativeNotfOpt = [
-							'TheDesk:' + domain,
-							toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
-							toot.user.avatarUrl,
-							"toot",
-							acct_id,
-							toot.note.id
-						]
-						postMessage(["nativeNotf", nativeNotfOpt], "*")
-					}
+					var n = new Notification('TheDesk:' + domain, options);
 				}
 				if (localStorage.getItem("hasNotfC_" + acct_id) != "true") {
 					$(".notf-icon_" + acct_id).addClass("red-text");
@@ -917,19 +905,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 					icon: toot.avatar
 				};
 				var domain = localStorage.getItem("domain_" + acct_id);
-				if (os == "darwin") {
-					var n = new Notification('TheDesk:' + domain, options);
-				} else {
-					var nativeNotfOpt = [
-						'TheDesk:' + domain,
-						toot.display_name + "(" + toot.acct + ")" + ftxt,
-						toot.avatar,
-						"userdata",
-						acct_id,
-						toot.id
-					]
-					postMessage(["nativeNotf", nativeNotfOpt], "*")
-				}
+				var n = new Notification('TheDesk:' + domain, options);
 			}
 		}
 		if (toot.name) {

app/js/tl/notification.js

@@ -63,12 +63,7 @@ function notfColumn(acct_id, tlid, sys) {
 							body: ct + lang.lang_notf_new,
 							icon: localStorage.getItem("prof_" + acct_id)
 						};
-						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)]
-							postMessage(["nativeNotf", nativeNotfOpt], "*")
-						}
+						var n = new Notification('TheDesk:' + domain, options);
 
 					}
 					if (localStorage.getItem("filter_" + acct_id) != "undefined") {
@@ -100,10 +95,10 @@ function notfColumn(acct_id, tlid, sys) {
 			todc();
 			//Markers
 			var markers = localStorage.getItem("markers");
-			if (markers == "no") {
-				markers = false;
+			if (markers == "yes") {
+				markers = true;
 			} else {
-				markers = true
+				markers = false
 			}
 			if (markers) {
 				getMarker(tlid, "notf", acct_id)
@@ -178,12 +173,7 @@ function notfCommon(acct_id, tlid, sys) {
 						body: ct + lang.lang_notf_new,
 						icon: localStorage.getItem("prof_" + acct_id)
 					};
-					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)]
-						postMessage(["nativeNotf", nativeNotfOpt], "*")
-					}
+					var n = new Notification('TheDesk:' + domain, options);
 
 				}
 				if (localStorage.getItem("filter_" + acct_id) != "undefined") {
@@ -264,7 +254,21 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 		}
 		websocketNotf[acct_id].onerror = function (error) {
 			console.error('WebSocket Error ' + error);
-			notfWS(misskey, acct_id, tlid, domain, at)
+			errorct++;
+			console.log(errorct)
+			if (errorct < 3) {
+				notfWS(misskey, acct_id, tlid, domain, at)
+			}
+
+		};
+		websocketNotf[acct_id].onclose = function (error) {
+			console.error('WebSocket Close ' + error);
+			errorct++;
+			console.log(errorct)
+			if (errorct < 3) {
+				notfWS(misskey, acct_id, tlid, domain, at)
+			}
+
 		};
 	}
 }
@@ -361,23 +365,23 @@ function notfToggle(acct, tlid) {
 		$("#notf-box_" + tlid).animate({
 			'height': '400px'
 		}, {
-				'duration': 300,
-				'complete': function () {
-					$("#notf-box_" + tlid).css("overflow-y", "scroll")
-					$("#notf-box_" + tlid).removeClass("column-hide")
-				}
-			});
+			'duration': 300,
+			'complete': function () {
+				$("#notf-box_" + tlid).css("overflow-y", "scroll")
+				$("#notf-box_" + tlid).removeClass("column-hide")
+			}
+		});
 	} else {
 		$("#notf-box_" + tlid).css("overflow-y", "hidden")
 		$("#notf-box_" + tlid).animate({
 			'height': '0'
 		}, {
-				'duration': 300,
-				'complete': function () {
-					$("#notf-box_" + tlid).addClass("column-hide")
-					$("#notf-box_" + tlid).css("display", "none")
-				}
-			});
+			'duration': 300,
+			'complete': function () {
+				$("#notf-box_" + tlid).addClass("column-hide")
+				$("#notf-box_" + tlid).css("display", "none")
+			}
+		});
 	}
 	notfCanceler(acct)
 }

app/js/tl/poll.js

@@ -119,20 +119,7 @@ function voteMastodonrefresh(acct_id, id) {
             if (!json) {
                 return false;
             }
-            var poll = "";
-            var choices = json.options;
-            var myvote = lang.lang_parse_voted;
-            var result_hide = "";
-            Object.keys(choices).forEach(function (keyc) {
-                var choice = choices[keyc];
-                if (!json.voted) {
-                    votesel = 'voteSelMastodon(\'' + acct_id + '\',\'' + json.id + '\',' + keyc + ',' + json.multiple + ')';
-                }
-                poll = poll + '<div class="pointer vote vote_' + acct_id + '_' + json.id + '_' + keyc + '" onclick="' + votesel + '">' + escapeHTML(choice.title) + '<span class="vote_' + acct_id + '_' + json.id + '_result ' + result_hide + '">(' + choice.votes_count + ')</span></div>';
-            });
-            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>';
+            var poll = pollParse(json, acct_id)
             $('.vote_' + acct_id + '_' + json.id).html(poll)
         }
     }

app/js/tl/speech.js

@@ -1,4 +1,5 @@
 $voise = null;
+isBouyomi = localStorage.getItem("voice_bouyomi");
 $voiseName = lang.lang_speech;
 $voices = speechSynthesis.getVoices();
 $synthes = new SpeechSynthesisUtterance();
@@ -9,9 +10,12 @@ speechSynthesis.cancel()
 if (!localStorage.getItem("voice_vol")) {
     localStorage.setItem("voice_vol", 1)
 }
-$synthes.rate = localStorage.getItem("voice_speed");
-$synthes.pitch = localStorage.getItem("voice_pitch");
-$synthes.volume = localStorage.getItem("voice_vol");
+voiceRate = localStorage.getItem("voice_speed");
+$synthes.rate = voiceRate
+voicePitch = localStorage.getItem("voice_pitch");
+$synthes.pitch = voicePitch
+voiceVol = localStorage.getItem("voice_vol");
+$synthes.volume = voiceVol
 function say(msgr) {
     msg = voiceParse(msgr);
     var voice = localStorage.getItem("voicebank");
@@ -32,8 +36,21 @@ $repeat = setInterval(function () {
         if (voice) {
             var obj = JSON.parse(voice);
             if (obj[0]) {
-                $synthes.text = obj[0];
-                speechSynthesis.speak($synthes);
+                if (localStorage.getItem("voice_bouyomi")) {
+                    var delim = "<bouyomi>";
+                    var thisVoiceRate = voiceRate * 10 + 70
+                    var thisVoicePitch = voicePitch * 50 + 70
+                    var thisVoiceVol = voiceVol * 100
+                    console.log(thisVoiceRate, thisVoicePitch, thisVoiceVol)
+                    var command = 0x0001;
+                    var type = 0;
+                    var sends = "" + command + delim + thisVoiceRate + delim + thisVoicePitch + delim + thisVoiceVol + delim + type + delim + obj[0];
+                    bouyomiConnect(sends)
+                } else {
+                    $synthes.text = obj[0];
+                    speechSynthesis.speak($synthes);
+                }
+
                 obj.splice(0, 1);
                 var json = JSON.stringify(obj);
                 localStorage.setItem("voicebank", json);
@@ -54,6 +71,11 @@ function voiceToggle(tlid) {
     if (voiceck) {
         localStorage.removeItem("voice_" + tlid);
         speechSynthesis.cancel()
+        if (localStorage.getItem("voice_bouyomi")) {
+            var command = 0x0010;
+            var sends = "" + command;
+            bouyomiConnect(sends)
+        }
         $("#sta-voice-" + tlid).text("Off");
         $("#sta-voice-" + tlid).css("color", 'red');
         parseColumn(tlid);
@@ -78,31 +100,71 @@ function voicePlay() {
     if (speechSynthesis.speaking) {
         speechSynthesis.cancel()
     } else {
-        $synthes.text = $("#voicetxt").val();
-        $synthes.rate = $("#voicespeed").val() / 10;
-        $synthes.pitch = $("#voicepitch").val() / 50;
-        $synthes.volume = $("#voicevol").val() / 100;
-        speechSynthesis.speak($synthes);
+        var text = $("#voicetxt").val();
+        var rate = $("#voicespeed").val();
+        var pitch = $("#voicepitch").val()
+        var vol = $("#voicevol").val()
+        if (localStorage.getItem("voice_bouyomi")) {
+            var delim = "<bouyomi>";
+            rate = rate * 1 + 70
+            pitch = pitch * 1 + 70
+            var command = 0x0001; // コマンドです。0x0001.読み上げ/0x0010.ポーズ/0x0020.再開/0x0030.スキップ
+            /*var speed = 100; // 速度50-200。-1を指定すると本体設定
+            var pitch = 100; // ピッチ50-200。-1を指定すると本体設定
+            var volume = 100; // ボリューム0-100。-1を指定すると本体設定*/
+            var type = 0; // 声質(0.本体設定/1.女性1/2.女性2/3.男性1/4.男性2/5.中性/6.ロボット/7.機械1/8.機械2)
+            var sends = "" + command + delim + rate + delim + pitch + delim + vol + delim + type + delim + text;
+            bouyomiConnect(sends)
+        } else {
+            $synthes.text = text
+            $synthes.rate = rate / 10
+            $synthes.pitch = pitch / 50
+            $synthes.volume = vol / 100;
+            speechSynthesis.speak($synthes);
+        }
     }
 }
 
 function voiceSettings() {
+    var awk = $("[name=bym]:checked").val();
+    if (awk == "yes") {
+        localStorage.setItem("voice_bouyomi", "yes");
+        M.toast({ html: "Bouyomi Chan connection requires WebSocket Plugin", displayLength: 3000 })
+    } else {
+        localStorage.removeItem("voice_bouyomi");
+    }
     localStorage.setItem("voice_speed", $("#voicespeed").val() / 10);
     localStorage.setItem("voice_pitch", $("#voicepitch").val() / 50);
     localStorage.setItem("voice_vol", $("#voicevol").val() / 100);
     M.toast({ html: lang.lang_speech_refresh, displayLength: 3000 })
 }
 function voiceSettingLoad() {
+    var flag = localStorage.getItem("voice_bouyomi");
+    if (flag) {
+        $("#bym_yes").prop("checked", true);
+    } else {
+        $("#bym_no").prop("checked", true);
+    }
     var speed = localStorage.getItem("voice_speed");
     var pitch = localStorage.getItem("voice_pitch");
     var vol = localStorage.getItem("voice_vol");
     if (speed) {
         $("#voicespeed").val(speed * 10);
+        $("#voicespeedVal").text(speed * 10);
     }
     if (pitch) {
         $("#voicepitch").val(pitch * 50);
+        $("#voicepitchVal").text(pitch * 50);
     }
     if (vol) {
         $("#voicevol").val(vol * 100);
+        $("#voicevolVal").text(vol * 100);
     }
+}
+function bouyomiConnect(sends) {
+    var socket = new WebSocket('ws://localhost:50002/');
+    socket.onopen = function () {
+        socket.send(sends);
+    }
+
 }

app/js/tl/src.js

@@ -12,13 +12,13 @@ function searchMenu() {
 
 //検索取得
 function src(mode, offset) {
-	if(!offset){
+	if (!offset) {
 		$("#src-contents").html("");
 		var add = ""
-	}else{
+	} 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") {
@@ -75,12 +75,12 @@ function src(mode, offset) {
 		//アカウント
 		if (json.accounts[0]) {
 			var templete = userparse(json.accounts, '', acct_id);
-			if(!offset){
+			if (!offset) {
 				$("#src-contents").append("<br>Accounts<div id=\"src-accts\">" + templete + '</div><a onclick="src(false,\'more\')" class="pointer">more...</a>');
-			}else{
+			} else {
 				$("#src-accts").append(templete)
 			}
-			
+
 		}
 		jQuery("time.timeago").timeago();
 	});
@@ -205,15 +205,15 @@ function graphDraw(tag, acct_id) {
 	<path d="M0,0 L10,0 20,10 20,50" fill="#3F51B5"></path>
 </svg>
 */
-function trend(){
+function trend() {
 	console.log("get trend")
 	$("#src-contents").html("");
 	var acct_id = $("#src-acct-sel").val();
-	if(acct_id=="tootsearch"){
+	if (acct_id == "tootsearch") {
 		return false;
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "https://" + domain + "/api/v1/trends"
 	console.log(start)
 	fetch(start, {
@@ -222,31 +222,31 @@ function trend(){
 			'content-type': 'application/json',
 			'Authorization': 'Bearer ' + at
 		},
-	}).then(function(response) {
+	}).then(function (response) {
 		return response.json();
-	}).catch(function(error) {
+	}).catch(function (error) {
 		//todo(error);
 		console.error(error);
-	}).then(function(json) {
+	}).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>";
+		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="M-1,51, -1,' + six + ', 0,' + six + ' L10,' + five + ' 20,' + four + ' 30,' + three + ' 40,' + two + ' 50,' + one + ' 60,' + zero + ' 61,' + zero + ' 61,51 -1,51" style="stroke: #0f8c0c;fill: rgba(13,113,19,.25); stroke-width: 1;"></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);
-			});
+			$("#src-contents").append(tags);
+		});
 
 	});
 }

app/js/tl/tl.js

@@ -1,5 +1,6 @@
 //TL取得
 moreloading = false;
+var errorct=0;
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	scrollevent();
 	$("#unread_" + tlid + " .material-icons").removeClass("teal-text")
@@ -153,10 +154,10 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		if (type == "home" || type == "notf") {
 			//Markers
 			var markers = localStorage.getItem("markers");
-			if (markers == "no") {
-				markers = false;
+			if (markers == "yes") {
+				markers = true;
 			} else {
-				markers = true
+				markers = false
 			}
 			if (markers) {
 				getMarker(tlid, type, acct_id)
@@ -230,6 +231,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] })
+			errorct=0
 			$("#notice_icon_" + tlid).removeClass("red-text")
 		}
 		websocket[wsid].onmessage = function (mess) {
@@ -317,8 +319,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				$("#notice_icon_" + tlid).addClass("red-text")
 				todo('WebSocket Error ' + error);
 			} else {
-				var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
-				localStorage.setItem("wserror_" + tlid, errorct);
+				errorct++;
+				console.log(errorct)
 				if (errorct < 3) {
 					reconnector(tlid, type, acct_id, data, "error");
 				}
@@ -331,8 +333,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				$("#notice_icon_" + tlid).addClass("red-text")
 				todo('WebSocket Closed');
 			} else {
-				var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
-				localStorage.setItem("wserror_" + tlid, errorct);
+				errorct++;
+				console.log(errorct)
 				if (errorct < 3) {
 					reconnector(tlid, type, acct_id, data, "error");
 				}
@@ -791,7 +793,6 @@ function strAlive() {
 				var type = obj[key].type;
 				var acct_id = obj[key].domain;
 				var data = obj[key].data;
-				localStorage.removeItem("wserror_" + tlid)
 				reconnector(key, type, acct_id, data, "error");
 			}
 		});
@@ -999,24 +1000,24 @@ function ueload(tlid) {
 			columnReload(tlid, type)
 		}
 		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
-			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type)
 		} else {
-			var mute = [];
+			var mute = []
 		}
-		var templete = parse(json, '', acct_id, tlid, "", mute, type);
+		var templete = parse(json, '', acct_id, tlid, "", mute, type)
 		var len = json.length - 1
-		$("#timeline_" + tlid).prepend(templete);
+		$("#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();
+		additional(acct_id, tlid)
+		jQuery("time.timeago").timeago()
+		todc()
 		ueloadlock = false
 	});
 }
-function asRead() {
+function asRead(callback) {
 	//Markers
 	var markers = localStorage.getItem("markers");
 	if (markers == "no") {
@@ -1027,7 +1028,9 @@ function asRead() {
 	if (markers) {
 		var multi = localStorage.getItem("column")
 		var obj = JSON.parse(multi)
-		for (var i = 0; i < obj.length; i++) {
+		var obl = obj.length
+		ct = 0
+		for (var i = 0; i < obl; i++) {
 			var acct_id = obj[i].domain
 			var type = obj[i].type
 			if (type == "home" || type == "notf") {
@@ -1046,23 +1049,53 @@ function asRead() {
 						}
 					}
 				}
-				var domain = localStorage.getItem("domain_" + acct_id);
-				var at = localStorage.getItem("acct_" + acct_id + "_at");
-				var httpreq = new XMLHttpRequest();
+
+				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.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;
+						var json = httpreq.response
 						console.log(json)
+						ct++
+						if (ct == obl && callback) {
+							postMessage(["asReadComp", ""], "*")
+						}
 					}
 				}
 			}
 		}
 	}
 }
-cbTimer1 = setInterval(asRead, 60000);
+function asReadEnd() {
+	//Markers
+	var markers = localStorage.getItem("markers");
+	if (markers == "no") {
+		markers = false;
+	} else {
+		markers = true
+	}
+	if (markers) {
+		asRead(true)
+		Swal.fire({
+			title: lang.lang_tl_postmarkers_title,
+			html: lang.lang_tl_postmarkers,
+			timer: 3000,
+			onBeforeOpen: () => {
+				Swal.showLoading()
+			},
+			onClose: () => {
+			}
+		}).then((result) => {
+
+		})
+	} else {
+		postMessage(["asReadComp", ""], "*")
+	}
+}

app/js/ui/img.js

@@ -281,4 +281,7 @@ function dlImg() {
 }
 function openFinder(dir) {
 	postMessage(["openFinder", dir], "*")
+}
+function stopVideo(){
+	document.getElementById('video').pause()
 }

app/js/ui/layout.js

@@ -46,6 +46,7 @@ function parseColumn(target, dontclose) {
 		var templete;
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key];
+
 			localStorage.setItem("name_" + key, acct.name);
 			localStorage.setItem("user_" + key, acct.user);
 			localStorage.setItem("user-id_" + key, acct.id);
@@ -61,6 +62,7 @@ function parseColumn(target, dontclose) {
 				localStorage.removeItem("misskey_wss_" + key)
 				connectMisskey(key, false)
 			}
+			localStorage.removeItem("emoji_" + key) //カスタム絵文字カテゴリ分け用旧データ削除
 		});
 	}
 	var acctlist = obj;
@@ -95,6 +97,7 @@ function parseColumn(target, dontclose) {
 		var tlidtar = null
 		if ($("#timeline-container").length) {
 			$("#timeline-container").html("");
+			$(".box, .boxIn").resizable("destroy");
 		}
 	}
 	var basekey = 0;
@@ -155,6 +158,16 @@ function parseColumn(target, dontclose) {
 		} else {
 			localStorage.removeItem("hasNotfC_" + acct.domain);
 		}
+		var width = localStorage.getItem("width");
+		if (width) {
+			var css = " min-width:" + width + "px;"
+		}
+		if(acct.width){
+			var css = " min-width:" + acct.width + "px;max-width:" + acct.width + "px;"
+		}
+		if(!css){
+			var css = ""
+		}
 		if (acct.type == "webview") {
 			if (localStorage.getItem("fixwidth")) {
 				var fixwidth = localStorage.getItem("fixwidth");
@@ -168,10 +181,7 @@ function parseColumn(target, dontclose) {
 			if (!acct.left_fold) {
 				basekey = key;
 			}
-			var width = localStorage.getItem("width");
-			if (width) {
-				var css = " min-width:" + width + "px;"
-			}
+
 			var anime = localStorage.getItem("animation");
 			if (anime == "yes" || !anime) {
 				var animecss = "box-anime";
@@ -180,10 +190,6 @@ function parseColumn(target, dontclose) {
 			}
 			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.data);
 		} else {
-			var width = localStorage.getItem("width");
-			if (width) {
-				var css = " min-width:" + width + "px;"
-			}
 			var anime = localStorage.getItem("animation");
 			if (anime == "yes" || !anime) {
 				var animecss = "box-anime";
@@ -213,10 +219,10 @@ function parseColumn(target, dontclose) {
 				unread = ""
 			}
 			var markers = localStorage.getItem("markers");
-			if (markers == "no") {
-				markers = false;
+			if (markers == "yes") {
+				markers = true;
 			} else {
-				markers = true
+				markers = false
 			}
 			if (!markers) {
 				unread = ""
@@ -242,8 +248,13 @@ function parseColumn(target, dontclose) {
 				var isMisRed = "red-text"
 				var if_misskey_hide = ""
 			}
+			if(acct.height){
+				var addHeight = " min-height:" + acct.height + "px;max-height:" + acct.height + "px;"
+			}else {
+				var addHeight = ""
+			}
 			var html = '<div class="boxIn" id="timeline_box_' + key + '_box" tlid="' + key +
-				'" data-acct="' + acct.domain + '"><div class="notice-box z-depth-2" id="menu_' + key + '" style="' + insert + ' ">' +
+				'" data-acct="' + acct.domain + '" style="' + addHeight + '"><div class="notice-box z-depth-2" id="menu_' + key + '" style="' + insert + ' ">' +
 				'<div class="area-notice"><i class="material-icons waves-effect ' + isMisRed + '" id="notice_icon_' + key + '"' + notf_attr + ' style="font-size:40px; padding-top:25%;" onclick="checkStr(\'' + acct.type + '\', \'' + data + '\', \'' + acct.domain + '\', \'' + key + '\', \'' + delc + '\',\'' + voice + '\',null)" title="' + lang.lang_layout_gotop + '"></i></div>' +
 				'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>' +
 				'<div class="area-a1"><a onclick="notfToggle(' + acct.domain + ',' + key +
@@ -260,9 +271,9 @@ function parseColumn(target, dontclose) {
 				')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_mediafil + '">perm_media</i><span id="sta-media-' +
 				key + '">On</span></a>' + lang.lang_layout_mediafil + '<br><a onclick="cardToggle(' + key +
 				')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_linkanades + '">link</i><span id="sta-card-' +
-				key + '">On</span></a>' + lang.lang_layout_linkana + '<br><a onclick="voiceToggle(' + key +
-				')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_tts + '">hearing</i><span id="sta-voice-' +
-				key + ',\'' + acct.type + '\'">On</span></a>' + lang.lang_layout_tts + 'TL<br><a onclick="columnReload(' + key +
+				key + '">On</span></a>' + lang.lang_layout_linkana + '<br><a onclick="voiceToggle(\'' + key +
+				'\')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_tts + '">hearing</i><span id="sta-voice-' + key + '">' + 
+				'">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>'
 			if (numtarget) {
@@ -293,6 +304,7 @@ function parseColumn(target, dontclose) {
 			mediaCheck(key);
 			catchCheck(key);
 			voiceCheck(key);
+			var css = ""
 		}
 	}
 	var box = localStorage.getItem("box");
@@ -320,6 +332,40 @@ function parseColumn(target, dontclose) {
 			}
 		}
 	}
+	$(".box, .boxIn").resizable({
+		minHeight: 50,
+		minWidth: 50,
+		grid: 50,
+		resize: function (event, ui) {
+			$(this).css("min-width", ui.size.width + "px")
+			$(this).css("max-width", ui.size.width + "px")
+			$(this).css("min-height", ui.size.height + "px")
+			$(this).css("max-height", ui.size.height + "px")
+		},
+		stop: function (event, ui) {
+			var col = localStorage.getItem("column");
+			var o = JSON.parse(col);
+			var width = ui.size.width
+			var height = ui.size.height
+			if ($(this).hasClass("boxIn")) {
+				//縦幅。その縦幅を持つカラムのidは
+				console.log("tate")
+				var key = $(this).attr("tlid")
+				var obj = o[key];
+				obj.height = height;
+				o[key] = obj;
+			} else {
+				//横幅。その縦幅を持つカラムのidは
+				console.log("yoko")
+				var key = $(this).find(".boxIn").attr("tlid")
+				var obj = o[key];
+				obj.width = width;
+				o[key] = obj;
+			}
+			var json = JSON.stringify(o);
+			localStorage.setItem("column", json);
+		}
+	});
 }
 function checkStr(type, data, acct_id, key, delc, voice) {
 	if ($('#notice_icon_' + key).hasClass("red-text") && type != "notf" && type != "mix") {
@@ -500,6 +546,7 @@ function coloradd(key, bg, txt) {
 	if (txt == "def") {
 		$("#menu_" + key).css("background-color", "");
 		$("#menu_" + key).css("color", "");
+		$("#menu_" + key + " .nex").css("color", "");
 	} else {
 		$("#menu_" + key).css('background-color', '#' + bg);
 		if (txt == "black") {

app/js/ui/post-box.js

@@ -55,6 +55,7 @@ function show() {
 	}
 	$('#post-box').fadeIn();
 	$('#textarea').characterCounter();
+	mdCheck()
 }
 
 $(function () {

app/js/ui/settings.js

@@ -14,6 +14,9 @@ var envView = new Vue({
 			if (ls == "ha") {
 				hardwareAcceleration(val)
 			}
+			if (ls == "ua_setting") {
+				useragent(val)
+			}
 			return true
 		}
 	}
@@ -71,7 +74,7 @@ var postView = new Vue({
 //設定ボタン押した。
 function settings() {
 	var cd = $("[name=theme]:checked").val();
-	var ct = $("[for=" + cd + "]").html();
+	var ct = $("[data-ct=" + cd + "]").html();
 	if (cd == "custom" && !$("#custom-sel-sel").val()) {
 		var theme = localStorage.getItem("theme");
 		if (!theme) {
@@ -161,8 +164,37 @@ function load() {
 	$("#c2-file").text(localStorage.getItem("custom2"));
 	$("#c3-file").text(localStorage.getItem("custom3"));
 	$("#c4-file").text(localStorage.getItem("custom4"));
+	var cvol = localStorage.getItem("customVol")
+	if (cvol) {
+		$("#soundvol").val(cvol * 100);
+		$("#soundVolVal").text(cvol * 100)
+	}
 	//$("#log").val(localStorage.getItem("errors"))
 }
+function customVol() {
+	var cvol = $("#soundvol").val()
+	$("#soundVolVal").text(cvol)
+	localStorage.setItem("customVol", cvol / 100)
+	var sound = localStorage.getItem("favSound");
+	if (sound == "default") {
+		var file = "../../source/notif.wav"
+	}else{
+		if (sound == "c1") {
+			var file = localStorage.getItem("custom1");
+		} else if (sound == "c2") {
+			var file = localStorage.getItem("custom2");
+		} else if (sound == "c3") {
+			var file = localStorage.getItem("custom3");
+		} else if (sound == "c4") {
+			var file = localStorage.getItem("custom4");
+		}
+	}
+	request = new XMLHttpRequest();
+	request.open("GET", file, true);
+	request.responseType = "arraybuffer";
+	request.onload = playSound;
+	request.send();
+}
 
 function climute() {
 	//クライアントミュート
@@ -229,12 +261,7 @@ function notftest() {
 		body: lang.lang_setting_notftest + '(' + lang.lang_setting_notftestprof + ')',
 		icon: localStorage.getItem("prof_0")
 	};
-	if (os == "darwin") {
-		var n = new Notification('TheDesk' + lang.lang_setting_notftest, options);
-	} else {
-		var nativeNotfOpt = ['TheDesk' + lang.lang_setting_notftest, lang.lang_setting_notftest + '(' + lang.lang_setting_notftestprof + ')', localStorage.getItem('prof_0'), "", ""]
-		postMessage(["nativeNotf", nativeNotfOpt], "*")
-	}
+	var n = new Notification('TheDesk' + lang.lang_setting_notftest, options);
 
 }
 function oks(no) {
@@ -494,14 +521,38 @@ function customComp() {
 	if (!secondaryC) { secondaryC = "rgb(255,255,255)" }
 	var textC = $("#color-picker2_value").val();
 	if (!textC) { textC = "rgb(255,255,255)" }
-	var accentC = $("#color-picker3_value").val();
-	if (!accentC) { accentC = "rgb(255,255,255)" }
 	var multi = localStorage.getItem("multi");
+	if($("#pickers").hasClass("advanceTheme")){
+		var accentC = $("#color-picker3_value").val();
+		if (!accentC) { accentC = null }
+		var activeC = $("#color-picker4_value").val();
+		if (!activeC) { activeC = null }
+		var modalC = $("#color-picker5_value").val();
+		if (!modalC) { modalC = null }
+		var bottomC = $("#color-picker6_value").val();
+		if (!bottomC) { bottomC = null }
+		var postboxC = $("#color-picker7_value").val();
+		if (!postboxC) { postboxC = null }
+		var subcolorC = $("#color-picker8_value").val();
+		if (!subcolorC) { subcolorC = null }
+		var advanceTheme = {
+			"TheDeskAccent": accentC,
+			"TheDeskActive": activeC,
+			"TheDeskModal": modalC,
+			"TheDeskBottom": bottomC,
+			"TheDeskPostbox": postboxC,
+			"TheDeskSubcolor": subcolorC
+		}
+	}else{
+		var advanceTheme = {}
+	}
+	
 	var my = JSON.parse(multi)[0].name;
 	var id = $("#custom-edit-sel").val();
 	if (id == "add_new") {
 		id = makeCID();
 	}
+	localStorage.setItem("customtheme-id", id)
 	var json = {
 		"name": nameC,
 		"author": my,
@@ -512,29 +563,21 @@ function customComp() {
 			"secondary": secondaryC,
 			"text": textC
 		},
-		"props": {
-			"TheDeskAccent": accentC
-		},
+		"props": advanceTheme,
 		"id": id
 	}
 	$("#custom_json").val(JSON.stringify(json));
-	themes();
+	themes("custom");
+	$("#custom").prop("checked", true);
 	$("#custom_name").val("");
 	$("#custom_desc").val("");
 	$("#dark").prop("checked", true);
 	$("#custom_json").val("");
-	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-	$("#color-picker0_value").val("");
-	$("#color-picker1_value").val("");
-	$("#color-picker2_value").val("");
-	$("#color-picker3_value").val("");
-	pickerDefine(0, "fff");
-	pickerDefine(1, "fff");
-	pickerDefine(2, "fff");
-	pickerDefine(3, "fff");
+	for(var i =0;i <= 8; i++){
+		$("#color-picker" + i + "-wrap").html('<div class="color-picker" id="color-picker' + i + '"></div>')
+		$("#color-picker" + i + "_value").val("");
+		pickerDefine(i, "fff");
+	}
 	postMessage(["themeJsonCreate", JSON.stringify(json)], "*")
 }
 function deleteIt() {
@@ -543,18 +586,11 @@ function deleteIt() {
 	$("#custom_desc").val("");
 	$("#dark").prop("checked", true);
 	$("#custom_json").val("");
-	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-	$("#color-picker0_value").val("");
-	$("#color-picker1_value").val("");
-	$("#color-picker2_value").val("");
-	$("#color-picker3_value").val("");
-	pickerDefine(0, "fff");
-	pickerDefine(1, "fff");
-	pickerDefine(2, "fff");
-	pickerDefine(3, "fff");
+	for(var i =0;i <= 8; i++){
+		$("#color-picker" + i + "-wrap").html('<div class="color-picker" id="color-picker' + i + '"></div>')
+		$("#color-picker" + i + "_value").val("");
+		pickerDefine(i, "fff");
+	}
 	postMessage(["themeJsonDelete", id], "*")
 }
 function ctLoad() {
@@ -586,49 +622,58 @@ function custom() {
 		$("#custom_desc").val("");
 		$("#dark").prop("checked", true);
 		$("#custom_json").val("");
-		$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-		$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-		$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-		$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-		$("#color-picker0_value").val("");
-		$("#color-picker1_value").val("");
-		$("#color-picker2_value").val("");
-		$("#color-picker3_value").val("");
-		pickerDefine(0, "fff");
-		pickerDefine(1, "fff");
-		pickerDefine(2, "fff");
-		pickerDefine(3, "fff");
+		for(var i =0;i <= 8; i++){
+			$("#color-picker" + i + "-wrap").html('<div class="color-picker" id="color-picker' + i + '"></div>')
+			$("#color-picker" + i + "_value").val("");
+			pickerDefine(i, "fff");
+		}
 		$("#delTheme").addClass("disabled")
 	} else {
 		$("#delTheme").removeClass("disabled")
 		postMessage(["themeJsonRequest", id], "*")
 	}
 }
-function customConnect(args) {
+function customConnect(raw) {
+	var args = raw[0]
 	$("#custom_name").val(args.name);
 	$("#custom_desc").val(args.desc);
 	$("#" + args.base).prop("checked", true);
+	//Primary
 	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
 	pickerDefine(0, rgbToHex(args.vars.primary))
 	$("#color-picker0_value").val(args.vars.primary);
+	//Secondary
 	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
 	pickerDefine(1, rgbToHex(args.vars.secondary))
 	$("#color-picker1_value").val(args.vars.secondary);
+	//Text
 	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
 	$("#color-picker2_value").val(args.vars.text);
 	pickerDefine(2, rgbToHex(args.vars.text))
+	//TheDesk Only
+	advancedConncet(args, "TheDeskAccent", "secondary", 3)
+	advancedConncet(args, "TheDeskActive", "primary", 4)
+	advancedConncet(args, "TheDeskModal", "secondary", 5)
+	advancedConncet(args, "TheDeskBottom", "primary", 6)
+	advancedConncet(args, "TheDeskPostbox", "primary", 7)
+	advancedConncet(args, "TheDeskSubcolor", "primary", 8)
+	$("#custom_json").val(raw[1]);
+}
+function advancedConncet(args, tar, sub, i){
 	if (args.props) {
-		if (args.props.TheDeskAccent) {
-			var accent = args.props.TheDeskAccent;
+		if (args.props[tar]) {
+			var color = args.props[tar];
+			$("#pickers").addClass("advanceTheme")
+			$(".advanced").removeClass("hide")
 		} else {
-			var accent = args.vars.secondary;
+			var color = args.vars[sub];
 		}
 	} else {
-		var accent = args.vars.secondary;
+		var color = args.vars[sub];
 	}
-	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-	pickerDefine(3, rgbToHex(accent))
-	$("#custom_json").val(JSON.stringify(args));
+	$("#color-picker"+i+"-wrap").html('<div class="color-picker" id="color-picker'+i+'"></div>')
+	$("#color-picker"+i+"_value").val(color);
+	pickerDefine(i, rgbToHex(color))
 }
 function customImp() {
 	var json = $("#custom_import").val();
@@ -641,12 +686,19 @@ function customImp() {
 		})
 	}
 }
+function advanced(){
+	$(".advanced").toggleClass("hide")
+	$("#pickers").toggleClass("advanceTheme")
+}
 function clearCustomImport() {
 	$("#custom_import").val("");
 }
 function hardwareAcceleration(had) {
 	postMessage(["ha", had], "*")
 }
+function useragent(val){
+	postMessage(["ua", val], "*")
+}
 function customSound(key) {
 	postMessage(["customSound", key], "*")
 }
@@ -665,4 +717,45 @@ window.onload = function () {
 	oksload();
 	ctLoad()
 };
-
+//設定画面で未読マーカーは要らない
+function asReadEnd() {
+	postMessage(["asReadComp", ""], "*")
+}
+function checkupd(){
+	var ver = localStorage.getItem("ver");
+	var start = "https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET'
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (mess) {
+		console.table(mess);
+		if (mess) {
+			var platform = localStorage.getItem("platform");
+			if (platform == "darwin") {
+				var newest = mess.desk_mac;
+			} else {
+				var newest = mess.desk;
+			}
+			if (newest == ver) {
+				Swal.fire({
+					type: 'info',
+					title: lang.lang_setting_noupd,
+					html: ver
+				})
+			} else if (ver.indexOf("beta") != -1 || winstore) {
+				Swal.fire({
+					type: 'info',
+					title: lang.lang_setting_thisisbeta,
+					html: ver
+				})
+			} else {
+				localStorage.removeItem("new-ver-skip")
+				location.href="index.html"
+			}
+		}
+	});
+}

app/js/ui/spotify.js

@@ -134,14 +134,18 @@ function npCore(arg) {
             media(arg.path, "image/png", "new");
         }
     } else if (platform == "darwin") {
-        if (flag && arg.existsArtwork) {
-            media(arg.artworks[0].data, "image/png", "new");
+        if (flag && arg.artwork) {
+            media(arg.artwork, "image/png", "new");
         }
     }
     var regExp = new RegExp("{song}", "g");
     content = content.replace(regExp, arg.name);
     var regExp = new RegExp("{album}", "g");
-    content = content.replace(regExp, arg.album);
+    if(arg.album){
+        if(arg.album.name){
+            content = content.replace(regExp, arg.album.name);
+        }
+    }
     var regExp = new RegExp("{artist}", "g");
     content = content.replace(regExp, arg.artist);
     var regExp = new RegExp("{url}", "g");

app/js/userdata/showOnTL.js

@@ -23,7 +23,7 @@ function udgEx(user, acct_id) {
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) == "misskey") { return false; }
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/search?resolve=true&q=" + user
+	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + user
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -36,11 +36,11 @@ function udgEx(user, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		if (json.accounts) {
+		if (json.accounts[0]) {
 			var id = json.accounts[0].id;
 			udg(id, acct_id);
 		} else {
-			postMessage(["openUrl", url], "*")
+			postMessage(["openUrl", user], "*")
 		}
 	});
 	return true;
@@ -139,8 +139,10 @@ function udg(user, acct_id) {
 		$("#his-since").text(crat(json.created_at));
 		$("#his-openin").attr("data-href", json.url);
 		if (json.fields) {
+			var table =""
 			if (json.fields.length > 0) {
-				note = note + '<table id="his-field">'
+				$("#his-des").css("max-height", "250px");
+				table =  '<table id="his-field">'
 				for (var i = 0; i < json.fields.length; i++) {
 					var fname = json.fields[i].name;
 					var fval = json.fields[i].value;
@@ -151,16 +153,18 @@ function udg(user, acct_id) {
 						var when = "";
 						var color = "inherit"
 					}
-					note = note + '<tr><td class="his-field-title">' + twemoji.parse(escapeHTML(fname)) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + twemoji.parse(fval) + '</td></tr>';
+					table = table + '<tr><td class="his-field-title">' + escapeHTML(fname) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + fval + '</td></tr>';
 				}
-				note = note + '</table>'
+				table = table + '</table>'
 				$("#his-des").html(twemoji.parse(note));
 			} else {
-				$("#his-des").html(twemoji.parse(note));
+				$("#his-des").css("max-height", "400px");
 			}
-		} else {
-			$("#his-des").html(twemoji.parse(note));
+			$("#his-table").html(twemoji.parse(table));
+		}else {
+			$("#his-des").css("max-height", "400px");
 		}
+		$("#his-des").html(twemoji.parse(note));
 		if (json.bot) {
 			$("#his-bot").html(lang.lang_showontl_botacct);
 		}
@@ -305,10 +309,10 @@ function misskeyUdg(user, acct_id) {
 			if (json.isFollowing) {
 				//自分がフォローしている
 				$("#his-data").addClass("following");
-				$("#his-follow-btn").text(lang.lang_status_unfollow);
+				$("#his-follow-btn-text").text(lang.lang_status_unfollow);
 				hisList(user, acct_id);
 			} else {
-				$("#his-follow-btn").text(lang.lang_status_follow);
+				$("#his-follow-btn-text").text(lang.lang_status_follow);
 			}
 			if (json.isFollowed) {
 				//フォローされてる
@@ -317,9 +321,9 @@ function misskeyUdg(user, acct_id) {
 			$("#his-block-btn").hide();
 			if (json.isMuted) {
 				$("#his-data").addClass("muting");
-				$("#his-mute-btn").text(lang.lang_status_unmute);
+				$("#his-mute-btn-text").text(lang.lang_status_unmute);
 			} else {
-				$("#his-mute-btn").text(lang.lang_status_mute);
+				$("#his-mute-btn-text").text(lang.lang_status_mute);
 			}
 			$(".only-my-data").hide();
 			$(".only-his-data").show();
@@ -362,10 +366,10 @@ function relations(user, acct_id) {
 		if (json.following) {
 			//自分がフォローしている
 			$("#his-data").addClass("following");
-			$("#his-follow-btn").text(lang.lang_status_unfollow);
+			$("#his-follow-btn-text").text(lang.lang_status_unfollow);
 			hisList(user, acct_id);
 		} else {
-			$("#his-follow-btn").text(lang.lang_status_follow);
+			$("#his-follow-btn-text").text(lang.lang_status_follow);
 		}
 		if (json.followed_by) {
 			//フォローされてる
@@ -373,35 +377,35 @@ function relations(user, acct_id) {
 		}
 		if (json.blocking) {
 			$("#his-data").addClass("blocking");
-			$("#his-block-btn").text(lang.lang_status_unblock);
+			$("#his-block-btn-text").text(lang.lang_status_unblock);
 		} else {
-			$("#his-block-btn").text(lang.lang_status_block);
+			$("#his-block-btn-text").text(lang.lang_status_block);
 		}
 		if (json.muting) {
 			$("#his-data").addClass("muting");
-			$("#his-mute-btn").text(lang.lang_status_unmute);
+			$("#his-mute-btn-text").text(lang.lang_status_unmute);
 		} else {
-			$("#his-mute-btn").text(lang.lang_status_mute);
+			$("#his-mute-btn-text").text(lang.lang_status_mute);
 		}
 		if (json.muting_notifications) {
 			$("#his-data").addClass("mutingNotf");
-			$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_unmute);
+			$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute);
 		} else {
-			$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
+			$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_mute);
 		}
 		if (json.domain_blocking) {
 			$("#his-data").addClass("blockingDom");
-			$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_unblock);
+			$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock);
 		} else {
-			$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
+			$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_block);
 		}
 		//Endorsed
 		if (json.endorsed) {
 			$("#his-end-btn").addClass("endorsed");
-			$("#his-end-btn").text(lang.lang_status_unendorse)
+			$("#his-end-btn-text").text(lang.lang_status_unendorse)
 		} else {
 			$("#his-end-btn").removeClass("endorsed");
-			$("#his-end-btn").text(lang.lang_status_endorse)
+			$("#his-end-btn-text").text(lang.lang_status_endorse)
 		}
 		//Blocked
 		if (json.blocked_by) {
@@ -452,6 +456,7 @@ function reset() {
 	$("#his-data").removeClass("mutingNotf");
 	$("#his-data").removeClass("blockingDom");
 	$("#his-end-btn").removeClass("endorsed");
+	$("#his-des").css("max-height", "250px");
 	$("#his-bot").html("");
 	$("#his-follow-btn").show();
 	$("#his-block-btn").show();
@@ -459,9 +464,9 @@ function reset() {
 	$("#his-notf-btn").show();
 	$("#his-domain-btn").show();
 	$("#his-emp-btn").show();
-	$("#his-follow-btn").text(lang.lang_status_follow);
-	$("#his-mute-btn").text(lang.lang_status_mute);
-	$("#his-block-btn").text(lang.lang_status_block);
+	$("#his-follow-btn-text").text(lang.lang_status_follow);
+	$("#his-mute-btn-text").text(lang.lang_status_mute);
+	$("#his-block-btn-text").text(lang.lang_status_block);
 	$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
 	$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
 	$("#his-relation").text("");

app/main.js

@@ -1,17 +1,18 @@
 var dirname = __dirname;
-var dir = 'file://' + __dirname;
-var base = dir + '/view/';
+var dir = "file://" + __dirname;
+var base = dir + "/view/";
 // Electronのモジュール
 const electron = require("electron");
 const fs = require("fs");
-const language = require('./main/language.js');
-const css = require('./main/css.js');
-const dl = require('./main/dl.js');
-const img = require('./main/img.js');
-const np = require('./main/np.js');
-const systemFunc = require('./main/system.js');
-const Menu = electron.Menu
-const join = require('path').join;
+const language = require("./main/language.js");
+const css = require("./main/css.js");
+const dl = require("./main/dl.js");
+const img = require("./main/img.js");
+const np = require("./main/np.js");
+const systemFunc = require("./main/system.js");
+const Menu = electron.Menu;
+const join = require("path").join;
+
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
 // ウィンドウを作成するモジュール
@@ -20,56 +21,43 @@ const BrowserWindow = electron.BrowserWindow;
 let mainWindow;
 
 // アプリが多重起動しないようにする
-const gotTheLock = app.requestSingleInstanceLock()
+const gotTheLock = app.requestSingleInstanceLock();
 
 if (!gotTheLock) {
-	app.quit()
+	app.quit();
 } else {
-	app.on('second-instance', () => {
+	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 (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!")
+	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");
 var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+var ua_path = join(app.getPath("userData"), "useragent");
 try {
-	fs.readFileSync(ha_path, 'utf8');
-	app.disableHardwareAcceleration()
-	if(!packaged) console.log("disabled: Hardware Acceleration");
-} catch{
-	if(!packaged) console.log("enabled: Hardware Acceleration");
+	fs.readFileSync(ha_path, "utf8");
+	app.disableHardwareAcceleration();
+	if (!packaged) console.log("disabled: Hardware Acceleration");
+} catch {
+	if (!packaged) console.log("enabled: Hardware Acceleration");
 }
 var window_size;
 try {
-	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'));
+	window_size = JSON.parse(fs.readFileSync(info_path, "utf8"));
 } catch (e) {
 	window_size = {
 		width: 1000,
@@ -78,41 +66,32 @@ try {
 }
 var max_window_size;
 try {
-	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'));
+	max_window_size = JSON.parse(fs.readFileSync(max_info_path, "utf8"));
 } catch (e) {
 	max_window_size = {
 		width: "string",
 		height: "string",
 		x: "string",
 		y: "string"
-
 	}; // デフォルトバリュー
 }
 function isFile(file) {
 	try {
 		fs.statSync(file);
-		return true
+		return true;
 	} catch (err) {
-		if (err.code === 'ENOENT') return false
+		if (err.code === "ENOENT") return false;
 	}
 }
 // 全てのウィンドウが閉じたら終了
-app.on('window-all-closed', function () {
-	if (process.platform != 'darwin') {
-		electron.session.defaultSession.clearCache(() => { })
-		app.quit();
-	}
-});
-// macOSでウィンドウを閉じた後に再度開けるようにする
-app.on('activate', function () {
-	if (mainWindow == null) {
-		createWindow();
-	}
+app.on("window-all-closed", function() {
+	electron.session.defaultSession.clearCache(() => {});
+	app.quit();
 });
 
 function createWindow() {
 	if (isFile(lang_path)) {
-		var lang = fs.readFileSync(lang_path, 'utf8');
+		var lang = fs.readFileSync(lang_path, "utf8");
 	} else {
 		var langs = app.getLocale();
 		console.log(langs);
@@ -127,12 +106,12 @@ function createWindow() {
 		} else {
 			lang = "en";
 		}
-		fs.mkdir(app.getPath("userData"), function (err) {
+		fs.mkdir(app.getPath("userData"), function(err) {
 			fs.writeFileSync(lang_path, lang);
 		});
 	}
-	if(!packaged) console.log("your lang:" + app.getLocale());
-	if(!packaged) 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;
@@ -144,8 +123,13 @@ 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', show: false
-		}
+			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 = {
 			webPreferences: {
@@ -154,8 +138,13 @@ 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, show: false
-		}
+			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 = {
 			webPreferences: {
@@ -164,24 +153,30 @@ 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, show: false
-		}
+			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()
+	mainWindow.once("page-title-updated", () => {
+		mainWindow.show();
 		if (window_size.max) {
 			mainWindow.maximize();
 		}
-	  })
-	electron.session.defaultSession.clearCache(() => { })
+	});
+	if (!packaged) mainWindow.toggleDevTools();
+	electron.session.defaultSession.clearCache(() => {});
 	if (process.argv) {
 		if (process.argv[1]) {
 			var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/);
 			if (m) {
 				var mode = m[1];
 				var code = m[2];
-				var plus = '?mode=' + mode + '&code=' + code;
+				var plus = "?mode=" + mode + "&code=" + code;
 			} else {
 				var plus = "";
 			}
@@ -191,31 +186,65 @@ function createWindow() {
 	} else {
 		var plus = "";
 	}
-	mainWindow.loadURL(base + lang + '/index.html' + plus);
+	var ua;
+	try {
+		ua = fs.readFileSync(ua_path, "utf8");
+	} catch (e) {
+		//default UA Example:
+		// Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36
+		const crypto = require("crypto");
+		const N = 100;
+		var ua = "Mastodon client: "+crypto
+			.randomBytes(N)
+			.toString("base64")
+			.substring(0, N);
+	}
+	mainWindow.loadURL(base + lang + "/index.html" + plus, { userAgent: ua });
 	if (!window_size.x && !window_size.y) {
 		mainWindow.center();
 	}
 	// ウィンドウが閉じられたらアプリも終了
-	mainWindow.on('closed', function () {
+	mainWindow.on("closed", function() {
 		electron.ipcMain.removeAllListeners();
 		mainWindow = null;
 	});
-	mainWindow.on('close', function () {
-		if (
-			max_window_size.width == mainWindow.getBounds().width &&
-			max_window_size.height == mainWindow.getBounds().height &&
-			max_window_size.x == mainWindow.getBounds().x &&
-			max_window_size.y == mainWindow.getBounds().y
-		) {
-			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y, max: true }
+	closeArg = false;
+	mainWindow.on("close", function(e, arg) {
+		writePos(mainWindow);
+		if (!closeArg) {
+			e.preventDefault();
+		}
+		const promise = new Promise(function(resolve) {
+			mainWindow.webContents.send("asReadEnd", "");
+			setTimeout(function() {
+				resolve();
+			}, 3000);
+		});
+		promise.then(function(response) {
+			closeArg = true;
+			mainWindow.close();
+		});
+	});
+	electron.ipcMain.on("sendMarkersComplete", function(e, arg) {
+		closeArg = true;
+		mainWindow.close();
+	});
+	function writePos(mainWindow) {
+		if (max_window_size.width == mainWindow.getBounds().width && max_window_size.height == mainWindow.getBounds().height && max_window_size.x == mainWindow.getBounds().x && max_window_size.y == mainWindow.getBounds().y) {
+			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y, max: true };
 		} else {
-			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y }
+			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y };
 		}
 		fs.writeFileSync(info_path, JSON.stringify(size));
-	});
-	mainWindow.on('maximize', function () {
+	}
+	mainWindow.on("maximize", function() {
+		writePos(mainWindow);
 		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
 	});
+	mainWindow.on("minimize", function() {
+		writePos(mainWindow);
+		mainWindow.webContents.send("asRead", "");
+	});
 
 	var platform = process.platform;
 	var bit = process.arch;
@@ -230,11 +259,36 @@ function createWindow() {
 	np.TheDeskNowPlaying(mainWindow);
 	//その他system
 	systemFunc.system(mainWindow, dir, lang, dirname);
+	setInterval(function() {
+		mouseTrack(mainWindow);
+	}, 1000);
+}
+var x = 0;
+var y = 0;
+var unchanged = 0;
+var locked = false;
+function mouseTrack(mainWindow) {
+	let mousePos = electron.screen.getCursorScreenPoint();
+	let xNow = mousePos.x;
+	let yNow = mousePos.x;
+	if (x != xNow || y != yNow) {
+		unchanged = 0;
+		locked = false;
+	} else {
+		unchanged++;
+		if (unchanged > 60 && !locked) {
+			unchanged = 0;
+			locked = true;
+			mainWindow.webContents.send("asRead", "");
+		}
+	}
+	x = xNow;
+	y = yNow;
 }
 // Electronの初期化完了後に実行
-app.on('ready', createWindow);
-var onError = function (err, response) {
+app.on("ready", createWindow);
+var onError = function(err, response) {
 	console.error(err, response);
 };
 
-app.setAsDefaultProtocolClient('thedesk')
+app.setAsDefaultProtocolClient("thedesk");

app/main/css.js

@@ -23,7 +23,7 @@ function css(mainWindow) {
 	ipc.on('theme-json-create', function (e, arg) {
 		var themecss = join(app.getPath("userData"), JSON5.parse(arg)["id"] +
 			".thedesktheme");
-		fs.writeFileSync(themecss, JSON.stringify(JSON5.parse(arg)));
+		fs.writeFileSync(themecss, JSON5.stringify(JSON5.parse(arg)));
 		if (JSON5.parse(arg)["id"]) {
 			e.sender.webContents.send('theme-json-create-complete', "");
 		} else {
@@ -39,13 +39,14 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-json-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
-		var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
-		e.sender.webContents.send('theme-json-response', json);
+		var raw = fs.readFileSync(themecss, 'utf8')
+		var json = JSON5.parse(raw);
+		e.sender.webContents.send('theme-json-response', [json, raw]);
 	})
 	ipc.on('theme-css-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
 		try {
-			var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
 
 			var primary = json.vars.primary;
 			var secondary = json.vars.secondary;
@@ -67,21 +68,52 @@ function css(mainWindow) {
 				if (json.props.TheDeskAccent) {
 					var emphasized = json.props.TheDeskAccent
 				} else {
-					var emphasized = secondary;
+					var emphasized = secondary
+				}
+				if (json.props.TheDeskActive) {
+					var active = json.props.TheDeskActive
+				} else {
+					var active = primary
+				}
+				if (json.props.TheDeskModal) {
+					var modal = json.props.TheDeskModal
+				} else {
+					var modal = secondary
+				}
+				if (json.props.TheDeskBottom) {
+					var bottom = json.props.TheDeskBottom
+				} else {
+					var bottom = primary
+				}
+				if (json.props.TheDeskPostbox) {
+					var postbox = json.props.TheDeskPostbox
+				} else {
+					var postbox = primary
+				}
+				if (json.props.TheDeskSubcolor) {
+					var subcolor = json.props.TheDeskSubcolor
+				} else {
+					var subcolor = primary
 				}
 			} else {
-				var emphasized = primary;
+				var emphasized = primary
+				var acs = secondary
+				var active = primary
+				var modal = secondary
+				var bottom = primary
+				var postbox = primary
+				var subcolor = primary
 			}
 
 			var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
 				"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
-				secondary + ";--subcolor:" + primary + ";--box:" + primary +
-				";--sidebar:" + primary + ";--shared:" + emphasized + ";" +
-				"--notfbox:" + secondary + ";--emphasized:" + primary + ";--his-data:" +
+				modal + ";--subcolor:" + subcolor + ";--box:" + subcolor +
+				";--sidebar:" + bottom + ";--shared:" + emphasized + ";" +
+				"--notfbox:" + secondary + ";--emphasized:" + active + ";--his-data:" +
 				secondary +
-				";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
+				";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
 				primary +
-				";--accentbtn:" + primary + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
+				";--accentbtn:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
 				"--gray:" + gray + ";"+
 				".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
 			e.sender.webContents.send('theme-css-response', css);
@@ -92,15 +124,19 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-json-list', function (e, arg) {
 		fs.readdir(app.getPath("userData"), function (err, files) {
-			if (err) throw err;
+			if (err || !files) throw err;
 			var fileList = files.filter(function (file) {
-				var tfile = join(app.getPath("userData"), file);
-				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile); //絞り込み
+				if(file.match(/\.thedesktheme$/)){
+					var tfile = join(app.getPath("userData"), file)
+					return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
+				}else{
+					return null
+				}
 			})
 			var themes = [];
 			for (var i = 0; i < fileList.length; i++) {
 				var themecss = join(app.getPath("userData"), fileList[i]);
-				var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+				var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
 				themes.push({
 					name: json.name,
 					id: json.id

app/main/np.js

@@ -15,7 +15,11 @@ function np(mainWindow) {
             if (platform == "darwin") {
                 try {
                     const nowplaying = require("itunes-nowplaying-mac");
-                    const value = await nowplaying.getRawData();
+                    let value = await nowplaying();
+
+                    const artwork = await nowplaying.getThumbnailBuffer(value.databaseID);
+                    const base64 = artwork.toString('base64');
+                    value.artwork = base64
                     e.sender.webContents.send('itunes-np', value);
                 } catch (error) {
                     // エラーを返す

app/main/system.js

@@ -6,41 +6,15 @@ function system(mainWindow, dir, lang, dirname) {
 	const fs = require("fs");
 	var JSON5 = require('json5');
 	var ipc = electron.ipcMain;
+	const clipboard = electron.clipboard;
 	var tmp_img = join(app.getPath("userData"), "tmp.png");
 	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+	var ua_path = join(app.getPath("userData"), "useragent");
 	var lang_path = join(app.getPath("userData"), "language");
 	const BrowserWindow = electron.BrowserWindow;
 	const dialog = electron.dialog;
 	const os = require('os')
 	const language = require("../main/language.js");
-	ipc.on('native-notf', function (e, args) {
-
-		var platform = process.platform;
-		var bit = process.arch;
-		if (platform == "win32") {
-			const notifier = require('node-notifier')
-			var tmp_imge = tmp_img;
-			Jimp.read(args[2], function (err, lenna) {
-				if (!err && lenna) {
-					lenna.write(tmp_img);
-					var tmp_imge = tmp_img;
-				} else {
-					var tmp_imge = "";
-				}
-				notifier.notify({
-					appID: "top.thedesk",
-					message: args[1],
-					title: args[0],
-					icon: tmp_imge,
-					sound: false,
-					wait: true,
-				},
-					function (err, response) {
-						console.log(err, response)
-					});
-			});
-		}
-	});
 	//プラットフォーム
 	ipc.on('getPlatform', function (e, arg) {
 		try {
@@ -119,6 +93,15 @@ function system(mainWindow, dir, lang, dirname) {
 		app.relaunch()
 		app.exit()
 	})
+	ipc.on('ua', function (e, arg) {
+		if (arg == "") {
+			fs.unlink(ua_path, function (err) { });
+		} else {
+			fs.writeFileSync(ua_path, arg);
+		}
+		app.relaunch()
+		app.exit()
+	})
 
 	ipc.on('quit', (e, args) => {
 		app.quit();
@@ -162,14 +145,14 @@ function system(mainWindow, dir, lang, dirname) {
 				preload: join(dirname, "js", "platform", "preload.js")
 			},
 			width: 350,
-			height: 200,
+			height: 140,
 			"transparent": false, // ウィンドウの背景を透過
 			"frame": false, // 枠の無いウィンドウ
 			"resizable": false
 		});
 		nanowindow.loadURL(dir + '/nano.html');
 		nanowindow.setAlwaysOnTop(true);
-
+		//nanowindow.toggleDevTools()
 		nanowindow.setPosition(window_pos[0], window_pos[1]);
 		nanowindow.on('close', function () {
 			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
@@ -237,5 +220,9 @@ function system(mainWindow, dir, lang, dirname) {
 			e.sender.webContents.send('font-list', fonts_sorted);
 		});
 	});
+	//コピー
+	ipc.on('copy', (e, arg) => {
+		clipboard.writeText(arg)
+	});
 }
 exports.system = system;

app/manifest.json

@@ -1,21 +0,0 @@
-{
-  "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
-}

app/nano.html

@@ -1,240 +1,155 @@
 <!DOCTYPE html>
 <html>
-
-<head>
-	<meta charset="utf-8">
-	<link href="./css/themes.css" type="text/css" rel="stylesheet">
-	<link href="./css/tl.css" type="text/css" rel="stylesheet">
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-	<title>TheDesk Nano</title>
-	<style>
-		html {
-			-webkit-app-region: drag !important;
-			cursor: move !important;
-			width: 100vw;
-			height: 100vh;
-			overflow: hidden;
-			font-family: sans-serif;
-		}
-
-		body {
-			background-color: rgba(0, 0, 0, 0.1);
-			font-size: 11px;
-		}
-
-		#timeline_nano {
-			overflow-y: scroll;
-			overflow-x: hidden;
-			-webkit-app-region: no-drag;
-			max-height: 100px;
-		}
-
-		.user {
-			font-size: 12px;
-		}
-
-		select {
-			-webkit-app-region: no-drag;
-		}
-
-		button {
-			-webkit-app-region: no-drag;
-		}
-
-		textarea {
-			-webkit-app-region: no-drag;
-		}
-
-		::-webkit-scrollbar {
-			width: 5px;
-			height: 10px;
-			background: rgba(0, 0, 0, 0.05);
-		}
-
-		::-webkit-scrollbar-track {
-			-webkit-border-radius: 5px;
-			border-radius: 5px;
-		}
-
-		.area-actions {
-			display: none !important;
-		}
-
-		.area-date_via {
-			display: none !important;
-		}
-
-		.area-side {
-			display: none !important;
-		}
-
-		/* Handle */
-		::-webkit-scrollbar-thumb {
-			-webkit-border-radius: 5px;
-			border-radius: 5px;
-			background: rgba(0, 0, 0, 0.8);
-			-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
-		}
-
-		.blacktheme body {
-			color: white;
-			background-color: #212121;
-		}
-
-		.blacktheme button {
-			background-color: black;
-			color: white;
-		}
-
-		.blacktheme textarea,
-		.blacktheme select {
-			color: white;
-		}
-
-		.blacktheme select,
-		.blacktheme option {
-			background-color: black;
-		}
-	</style>
-</head>
-
-<body>
-	<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
-	<script>
-		$.strip_tags = function (str, allowed) {
-			if (!str) {
-				return "";
+	<head>
+		<meta charset="utf-8" />
+		<link href="./css/themes.css" type="text/css" rel="stylesheet" />
+		<link href="./css/tl.css" type="text/css" rel="stylesheet" />
+		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
+		<link href="./node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
+		<title>TheDesk Nano</title>
+		<style>
+			html {
+				-webkit-app-region: drag !important;
+				cursor: move !important;
+				width: 100vw;
+				height: 100vh;
+				overflow: hidden;
+				font-family: sans-serif;
+				color: var(--color) !important;
 			}
-			allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
-				.join('');
-			var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
-				commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
-			return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
-				return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
-			});
-		};
-		function escapeHTML(str) {
-			if (!str) {
-				return "";
-			}
-			return str.replace(/&/g, '&amp;')
-				.replace(/</g, '&lt;')
-				.replace(/>/g, '&gt;')
-				.replace(/"/g, '&quot;')
-				.replace(/'/g, '&#039;');
-		}
-	</script>
-	<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-	<select id="post-acct-sel" style="max-width:150px">
-	</select>
-	<select id="type-sel" style="max-width:60px">
-		<option value="local">Local</option>
-		<option value="home">Home</option>
-	</select><button onclick="tl()">Show</button><button onclick="window.close()">x</button><br>
-	<div id="timeline_nano">
 
-	</div>
-	<br>
-	<textarea id="textarea" style="width:80%; background-color:transparent"></textarea>
-	<button class="btn" onclick="post()">Post</button>
-	<script>
-		if (localStorage.getItem("lang")) {
-			var lang = localStorage.getItem("lang");
-		} else {
-			var lang = "ja";
-		}
-	</script>
-	<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
-	<script type="text/javascript" src="./js/post/post.js"></script>
-	<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
-	<script type="text/javascript" src="./js/tl/parse.js"></script>
-	<script type="text/javascript" src="./js/ui/theme.js"></script>
-	<script type="text/javascript" src="./js/tl/date.js"></script>
-	<script type="text/javascript" src="./js/common/time.js"></script>
-	<script type="text/javascript" src="./js/platform/nano.js"></script>
-	<script type="text/javascript" src="./js/platform/end.js"></script>
-	<script>
-		var multi = localStorage.getItem("multi");
-		if (!multi) {
-			var obj = [{
-				at: localStorage.getItem(localStorage.getItem("domain_" + acct_id) + "_at"),
-				name: localStorage.getItem("name_" + acct_id),
-				domain: localStorage.getItem("domain_" + acct_id),
-				user: localStorage.getItem("user_" + acct_id),
-				prof: localStorage.getItem("prof_" + acct_id)
-			}];
-			var json = JSON.stringify(obj);
-			localStorage.setItem("multi", json);
-		} else {
-			var obj = JSON.parse(multi);
-		}
-		var templete;
-		var last = localStorage.getItem("last-use");
-		var sel;
-		Object.keys(obj).forEach(function (key) {
-			var acct = obj[key];
-			var list = key * 1 + 1;
-			if (key == last) {
-				sel = "selected";
-			} else {
-				sel = "";
+			body {
+				background-color: rgba(0, 0, 0, 0.1);
+				font-size: 11px;
 			}
-			templete = '<option value="' + key + '" ' + sel + '>' + acct.user + '@' + acct.domain +
-				'</option>';
-			$("#post-acct-sel").append(templete);
-		});
-		function mov() {
-			return false;
-		}
-		function resetmv() {
-			return false;
-		}
-		function post() {
-			var acct_id = $("#post-acct-sel").val();
-			var domain = localStorage.getItem("domain_" + acct_id);
-			var at = localStorage.getItem("acct_" + acct_id + "_at");
-			var start = "https://" + domain + "/api/v1/statuses";
-			var str = $("#textarea").val();
-			var toot = {
-				status: str
+
+			#timeline_nano {
+				overflow-y: scroll;
+				overflow-x: hidden;
+				-webkit-app-region: no-drag;
+				max-height: 100px;
 			}
-			var vis = loadVis(acct_id)
-			toot.visibility = vis;
-			var httpreq = new XMLHttpRequest();
-			httpreq.open('POST', start, true);
-			httpreq.setRequestHeader('Content-Type', 'application/json');
-			httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-			httpreq.responseType = "json";
-			httpreq.send(JSON.stringify(toot));
-			httpreq.onreadystatechange = function () {
-				if (httpreq.readyState === 4) {
-					$("#textarea").val("");
+
+			.user {
+				font-size: 12px;
+			}
+
+			select {
+				-webkit-app-region: no-drag;
+			}
+
+			button {
+				-webkit-app-region: no-drag;
+			}
+
+			textarea {
+				-webkit-app-region: no-drag;
+				color: var(--color) !important;
+			}
+
+			::-webkit-scrollbar {
+				width: 5px;
+				height: 10px;
+				background: rgba(0, 0, 0, 0.05);
+			}
+
+			::-webkit-scrollbar-track {
+				-webkit-border-radius: 5px;
+				border-radius: 5px;
+			}
+
+			.area-date_via {
+				display: none !important;
+			}
+
+			.area-side {
+				display: none !important;
+			}
+
+			/* Handle */
+			::-webkit-scrollbar-thumb {
+				-webkit-border-radius: 5px;
+				border-radius: 5px;
+				background: rgba(0, 0, 0, 0.8);
+				-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+			}
+			.hide, .pin, .rep-btn, .tickers{
+				display: none;
+			}
+			.fas {
+				font-size: 1rem !important;
+			}
+			.cvo {
+				grid-template-rows: auto 1rem 1fr auto 2rem;
+			}
+		</style>
+	</head>
+
+	<body>
+		<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
+		<script>
+			$.strip_tags = function(str, allowed) {
+				if (!str) {
+					return "";
 				}
-			}
-		}
-		function loadVis(acct_id) {
-			var vist = localStorage.getItem("vis");
-			console.log(vist);
-			if (!vist) {
-				return "public";
-			} else {
-				if (vist == "memory") {
-					var memory = localStorage.getItem("vis-memory-" + acct_id);
-					if (!memory) {
-						memory = "public";
-					}
-					return memory;
-				} else if (vist == "server") {
-					var multi = localStorage.getItem("multi");
-					var obj = JSON.parse(multi);
-					var memory = obj[acct_id]["vis"];
-					if (!memory) {
-						memory = "public";
-					}
-					return memory;
-				} else {
-					return vist;
+				allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join("");
+				var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
+					commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
+				return str.replace(commentsAndPhpTags, "").replace(tags, function($0, $1) {
+					return allowed.indexOf("<" + $1.toLowerCase() + ">") > -1 ? $0 : "";
+				});
+			};
+			function escapeHTML(str) {
+				if (!str) {
+					return "";
 				}
+				return str
+					.replace(/&/g, "&amp;")
+					.replace(/</g, "&lt;")
+					.replace(/>/g, "&gt;")
+					.replace(/"/g, "&quot;")
+					.replace(/'/g, "&#039;");
 			}
-		}
-	</script>
+		</script>
+		<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
+		<div id="menu" class="hide">
+			TL and posting account<br>
+			<select id="post-acct-sel" style="max-width:150px"> </select><br>
+			TL type<br>
+			<select id="type-sel" style="max-width:60px" onchange="loader()">
+				<option value="local">Local</option>
+				<option value="home">Home</option> </select
+			><button onclick="tl()">Show</button><br>
+			Visibility<br>
+			<select id="vis-sel" style="max-width:60px">
+					<option value="public">Public</option>
+					<option value="unlisted">Unlisted</option>
+					<option value="private">Private</option>
+			</select>
+		</div>
+		<button onclick="set()" id="setting">Setting</button>
+		<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post someyhing new"></textarea>
+		<button class="btn" onclick="post()">Post</button>
+		<button onclick="window.close()">x</button><br />
+		<div id="timeline_nano">Click "settings" to show TL</div>
+		<br />
+		<script>
+			if (localStorage.getItem("lang")) {
+				var lang = localStorage.getItem("lang");
+			} else {
+				var lang = "ja";
+			}
+		</script>
+		<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
+		<script type="text/javascript" src="view/en/main.js"></script>
+		<script type="text/javascript" src="./js/post/status.js"></script>
+		<script type="text/javascript" src="./js/post/post.js"></script>
+		<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
+		<script type="text/javascript" src="./js/tl/parse.js"></script>
+		<script type="text/javascript" src="./js/ui/theme.js"></script>
+		<script type="text/javascript" src="./js/tl/date.js"></script>
+		<script type="text/javascript" src="./js/common/time.js"></script>
+		<script type="text/javascript" src="./js/platform/nano.js"></script>
+		<script type="text/javascript" src="./js/platform/end.js"></script>
+	</body>
+</html>

app/node_modules/.bin/electron

@@ -1,15 +0,0 @@
-#!/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

app/node_modules/.bin/electron-builder

@@ -1,15 +0,0 @@
-#!/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

app/node_modules/.bin/electron-builder.cmd

@@ -1,7 +0,0 @@
-@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" %*
-)

app/node_modules/.bin/electron-download

@@ -1,15 +0,0 @@
-#!/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

app/node_modules/.bin/electron-download.cmd

@@ -1,7 +0,0 @@
-@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" %*
-)

app/node_modules/.bin/electron.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\electron\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\electron\cli.js" %*
-)

app/node_modules/.bin/esparse

@@ -1,15 +0,0 @@
-#!/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

app/node_modules/.bin/esparse.cmd

@@ -1,7 +0,0 @@
-@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" %*
-)

app/node_modules/.bin/esvalidate

@@ -1,15 +0,0 @@
-#!/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

app/node_modules/.bin/esvalidate.cmd

@@ -1,7 +0,0 @@
-@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" %*
-)

app/node_modules/.bin/extract-zip

@@ -1,15 +0,0 @@
-#!/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

app/node_modules/.bin/extract-zip.cmd

@@ -1,7 +0,0 @@
-@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" %*
-)

app/node_modules/.bin/install-app-deps

@@ -1,15 +0,0 @@
-#!/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

app/node_modules/.bin/install-app-deps.cmd

@@ -1,7 +0,0 @@
-@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" %*
-)

app/node_modules/.bin/is-ci

@@ -1,15 +0,0 @@
-#!/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

app/node_modules/.bin/is-ci.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\is-ci\bin.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\is-ci\bin.js" %*
-)

app/node_modules/.bin/js-yaml

@@ -1,15 +0,0 @@
-#!/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/../js-yaml/bin/js-yaml.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../js-yaml/bin/js-yaml.js" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/js-yaml.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\js-yaml\bin\js-yaml.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\js-yaml\bin\js-yaml.js" %*
-)

app/node_modules/.bin/json5

@@ -1,15 +0,0 @@
-#!/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/../json5/lib/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../json5/lib/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/json5.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\json5\lib\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\json5\lib\cli.js" %*
-)

app/node_modules/.bin/mime

@@ -1,15 +0,0 @@
-#!/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/../mime/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../mime/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/mime.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\mime\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\mime\cli.js" %*
-)

app/node_modules/.bin/mkdirp

@@ -1,15 +0,0 @@
-#!/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/../mkdirp/bin/cmd.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../mkdirp/bin/cmd.js" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/mkdirp.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\mkdirp\bin\cmd.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\mkdirp\bin\cmd.js" %*
-)

app/node_modules/.bin/nugget

@@ -1,15 +0,0 @@
-#!/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/../nugget/bin.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../nugget/bin.js" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/nugget.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\nugget\bin.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\nugget\bin.js" %*
-)

app/node_modules/.bin/pixelmatch

@@ -1,15 +0,0 @@
-#!/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/../pixelmatch/bin/pixelmatch" "$@"
-  ret=$?
-else 
-  node  "$basedir/../pixelmatch/bin/pixelmatch" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/pixelmatch.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\pixelmatch\bin\pixelmatch" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\pixelmatch\bin\pixelmatch" %*
-)

app/node_modules/.bin/pretty-bytes

@@ -1,15 +0,0 @@
-#!/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/../pretty-bytes/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../pretty-bytes/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/pretty-bytes.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\pretty-bytes\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\pretty-bytes\cli.js" %*
-)

app/node_modules/.bin/rc

@@ -1,15 +0,0 @@
-#!/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/../rc/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../rc/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/rc.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\rc\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\rc\cli.js" %*
-)

app/node_modules/.bin/semver

@@ -1,15 +0,0 @@
-#!/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/../semver/bin/semver" "$@"
-  ret=$?
-else 
-  node  "$basedir/../semver/bin/semver" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/semver.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\semver\bin\semver" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\semver\bin\semver" %*
-)

app/node_modules/.bin/sshpk-conv

@@ -1,15 +0,0 @@
-#!/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/../sshpk/bin/sshpk-conv" "$@"
-  ret=$?
-else 
-  node  "$basedir/../sshpk/bin/sshpk-conv" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/sshpk-conv.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\sshpk\bin\sshpk-conv" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\sshpk\bin\sshpk-conv" %*
-)

app/node_modules/.bin/sshpk-sign

@@ -1,15 +0,0 @@
-#!/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/../sshpk/bin/sshpk-sign" "$@"
-  ret=$?
-else 
-  node  "$basedir/../sshpk/bin/sshpk-sign" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/sshpk-sign.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\sshpk\bin\sshpk-sign" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\sshpk\bin\sshpk-sign" %*
-)

app/node_modules/.bin/sshpk-verify

@@ -1,15 +0,0 @@
-#!/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/../sshpk/bin/sshpk-verify" "$@"
-  ret=$?
-else 
-  node  "$basedir/../sshpk/bin/sshpk-verify" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/sshpk-verify.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\sshpk\bin\sshpk-verify" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\sshpk\bin\sshpk-verify" %*
-)

app/node_modules/.bin/strip-indent

@@ -1,15 +0,0 @@
-#!/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/../strip-indent/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../strip-indent/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/strip-indent.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\strip-indent\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\strip-indent\cli.js" %*
-)

app/node_modules/.bin/uuid

@@ -1,15 +0,0 @@
-#!/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/../uuid/bin/uuid" "$@"
-  ret=$?
-else 
-  node  "$basedir/../uuid/bin/uuid" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/uuid.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\uuid\bin\uuid" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\uuid\bin\uuid" %*
-)

app/node_modules/.bin/which

@@ -1,15 +0,0 @@
-#!/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/../which/bin/which" "$@"
-  ret=$?
-else 
-  node  "$basedir/../which/bin/which" "$@"
-  ret=$?
-fi
-exit $ret

app/node_modules/.bin/which.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\which\bin\which" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\which\bin\which" %*
-)

app/node_modules/7zip-bin/7x.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-sz_program=${SZA_PATH:-7za}
-sz_type=${SZA_ARCHIVE_TYPE:-xz}
-
-case $1 in
-  -d) "$sz_program" e -si -so -t${sz_type} ;;
-   *) "$sz_program" a f -si -so -t${sz_type} -mx${SZA_COMPRESSION_LEVEL:-9} ;;
-esac 2> /dev/null

app/node_modules/7zip-bin/LICENSE.txt

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Vladimir Krivosheev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-

app/node_modules/7zip-bin/README.md

@@ -1 +0,0 @@
-7-Zip precompiled binaries.