push

Update jimp requirement from ^0.6.4 to ^0.7.0 in /app

.gitignore

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

.travis.yml

@@ -11,6 +11,7 @@ before_deploy:
   - cd app
   - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
   - npm install
+  - npm run construct
   - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi

README.md

@@ -41,6 +41,7 @@ The default sounds of notifications is provided [Creative Commons BY](https://cr
 
 * 日本語(Japanese)
 * English
+* de, cs, bg(from Crowdin)
 
 ### Translation
 
@@ -84,6 +85,7 @@ git clone https://github.com/cutls/TheDesk
 cd TheDesk/app
 npm install
 npm install --only=dev
+npm run construct
 ```
 
 ### electron-builder(Recommended)

README_ja.md

@@ -40,6 +40,7 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
 
 * 日本語
 * English(英語)
+* ドイツ語, チェコ語, ブルガリア語(from Crowdin)
 
 ### 翻訳
   
@@ -72,7 +73,7 @@ Linuxビルダー
 
 * [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
 
-iTunes NowPlayingにアルバムアートワークを付けてくれた人
+コーダー
 
 * [kPherox](https://pl.kpherox.dev/kPherox)
 
@@ -84,6 +85,7 @@ git clone https://github.com/cutls/TheDesk
 cd TheDesk/app
 npm install
 npm install --only=dev
+npm run construct
 ```
 
 ### electron-builder(推奨)

app/about.html

@@ -15,6 +15,8 @@
             font-family: 'Open Sans';
             -webkit-app-region: drag;
             cursor: move;
+            padding: 5px;
+            padding-top: 15px;
         }
 
         a,
@@ -27,7 +29,7 @@
             display: grid;
             grid-template-columns: 1fr 1fr;
             grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5';
+            grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5''name6 data6';
             text-align: left;
             margin: 5px;
         }
@@ -71,6 +73,14 @@
         .area-data5 {
             grid-area: data5;
         }
+
+        .area-name6 {
+            grid-area: name6;
+        }
+
+        .area-data6 {
+            grid-area: data6;
+        }
     </style>
 </head>
 
@@ -85,12 +95,14 @@
         <div class="area-data1" id="now"></div>
         <div class="area-name2">Internal version</div>
         <div class="area-data2" id="ver"></div>
-        <div class="area-name3">Chromium</div>
-        <div class="area-data3" id="chrome"></div>
-        <div class="area-name4">Electron</div>
-        <div class="area-data4" id="electron"></div>
-        <div class="area-name5">Node.js</div>
-        <div class="area-data5" id="node"></div>
+        <div class="area-name3">Commit(7chars)</div>
+        <div class="area-data3" id="hash"></div>
+        <div class="area-name4">Chromium</div>
+        <div class="area-data4" id="chrome"></div>
+        <div class="area-name5">Electron</div>
+        <div class="area-data5" id="electron"></div>
+        <div class="area-name6">Node.js</div>
+        <div class="area-data6" id="node"></div>
     </div>
     <div class="cp">Copyright &copy; TheDesk 2018<br>
         Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
@@ -114,6 +126,7 @@
             var ver = m[1];
             $("#ver").text(ver);
         }
+        $("#hash").html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>');
         $(document).on('click', 'a', e => {
             var url = $(e.target).attr('href');
             postMessage(["openUrl", url], "*")

app/css/master.css

@@ -220,6 +220,17 @@ blockquote:before,
   right: 0;
   top: 0;
 }
+#start {
+  display: none;
+  position: fixed;
+  width: 100vw;
+  height: calc(100vh - 40px);
+  background-color: var(--bg);
+  color: var(--color);
+  z-index: 99999;
+  justify-content: center;
+  align-items: center;
+}
 #drag {
   display: none;
   position: fixed;
@@ -332,13 +343,16 @@ blockquote:before,
   padding: 5px;
   border: thin solid gray;
   border-radius: 5px;
+  overflow: hidden;
 }
 #menu-wrapper {
   margin-left: -5px;
   display: flex;
+  height: calc(100% - 3.5rem);
+  overflow: hidden;
 }
 #left-menu {
-  width: 170px;
+  width: 230px;
 }
 #left-menu div {
   padding-left: 5px;
@@ -358,8 +372,7 @@ blockquote:before,
   background-color: var(--emphasized);
 }
 #right-menu {
-  width: 380px;
-  max-height: 375px;
+  width: 100%;
   overflow-y: scroll;
   overflow-x: hidden;
   padding: 5px;

app/css/post.css

@@ -7,15 +7,18 @@
   background-color: var(--postbox);
   border: thin solid gray;
   z-index: 501;
-  min-width: 300px;
   max-width: 100%;
   padding: 5px;
   border-radius: 5px;
+  overflow: hidden;
 }
 textarea {
   min-height: 100px !important;
   font-family: inherit;
 }
+#post-box .ui-resizable-s, #post-box .ui-resizable-se{
+  display: none !important;
+}
 
 .cancel {
   font-size: 0.5rem;
@@ -108,21 +111,16 @@ textarea {
 }
 #left-side {
   float: left;
-  width: 300px;
+  overflow-x: hidden;
+  height: calc(100% - 32px);
 }
 #right-side {
   display: none;
   float: left;
   width: 300px;
   padding: 5px;
-}
-#poll {
-}
-.poll-provider {
-  position: absolute;
-  height: calc(100% - 90px);
-  overflow-y: scroll;
-  top: 90px;
+  overflow-x: hidden;
+  height: calc(100% - 32px);
 }
 #posttgl,#toot-post-btn {
   background-color: var(--accentbtn);

app/css/tl.css

@@ -24,6 +24,10 @@
   z-index: 500;
   box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2);
 }
+#demobottom {
+  width: 500px;
+  display: flex;
+}
 #bottom.reverse {
   padding-left: 0;
   padding-right: 40px;
@@ -41,16 +45,20 @@
 #bottom .trendtag {
   height: 40px;
 }
-#bottom #group {
+#bottom #group, #demogroup {
   margin-right: 40px;
 }
 #bottom .leftside {
   display: flex;
 }
+#tips {
+  display: flex;
+  align-items: center;
+}
 #bottom #tips img {
   vertical-align: -3px;
 }
-#bottom a {
+#bottom a, #demogroup a {
   color: var(--color);
 }
 #bottom i {
@@ -62,9 +70,9 @@
 .exc-chb {
   padding-left: 24px !important;
 }
-#bottom .btnsgroup {
+.btnsgroup {
   border: 1px solid;
-  padding: 1px;
+  padding-top: 1px;
   padding-left: 5px;
   padding-right: 5px;
   margin-right: 15px;
@@ -276,6 +284,18 @@ iframe,
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.acct-note p {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.area-toot.acct-note p:not(:first-child) {
+  display: none;
+}
+.area-toot.acct-note p:first-child:after {
+  content: "...";
+  color: var(--gray);
+}
 
 .area-actions {
   padding: 0;
@@ -300,11 +320,13 @@ iframe,
   margin: 2px;
   grid-area: side;
 }
-
+.quote-inline {
+  display: none;
+}
 .quote-renote {
   display: grid;
-  grid-template-columns: 43px 2fr 1fr;
-  grid-template-areas: "ricon ruser" "ricon rtext";
+  grid-template-columns: 43px 2fr 25px;
+  grid-template-areas: "ricon ruser rdet" "ricon rtext rdet";
   border: 1px solid;
   margin-top: 3px;
   padding: 1px;
@@ -312,9 +334,13 @@ iframe,
 }
 .renote-icon {
   grid-area: ricon;
+  padding: 5px;
+}
+.renote-details {
+  grid-area: rdet;
 }
 .renote-icon img {
-  width: 43px;
+  width: 100%;
 }
 .renote-user {
   grid-area: ruser;
@@ -382,6 +408,7 @@ iframe,
   white-space: nowrap;
   text-overflow: ellipsis;
   height: calc(0.8em + 8px);
+  user-select: none;
 }
 .cbadge-hover {
   color: var(--color);
@@ -419,7 +446,7 @@ p:not(:last-child) {
   z-index: 500;
   padding: 5px;
   display: grid;
-  grid-template-columns: 40px 48px 1fr 24px;
+  grid-template-columns: 40px 1fr 1fr 24px;
   grid-template-rows: 30px 30px;
   grid-template-areas: "notice notice_name notice_name a2" "notice a1 sta a3" "notf-box notf-box notf-box notf-box";
 }
@@ -444,7 +471,6 @@ p:not(:last-child) {
 }
 
 .area-a1 {
-  text-align: center;
   grid-area: a1;
 }
 .area-sta {
@@ -514,11 +540,6 @@ p:not(:last-child) {
     0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.3),
     0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset;
 }
-#src-contents {
-  min-height: 100px;
-  max-height: 190px;
-  overflow-y: scroll;
-}
 .type-b {
   display: none;
 }
@@ -631,6 +652,7 @@ audio {
 .vis-data {
   font-size: 1rem !important;
   margin: 5px;
+  user-select: none;
 }
 @keyframes jump {
   0% {
@@ -684,3 +706,9 @@ audio {
   animation-duration: 0.1s;
   animation-name: fadeInDown;
 }
+.urbadge {
+  line-height: normal;
+  height: 2rem;
+  font-size: 1rem;
+  background-color: #009688;
+}

app/index.html

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

app/js/common/time.js

@@ -37,7 +37,6 @@
     }
   };
   var $t = $.timeago;
-
   $.extend($.timeago, {
     settings: {
       refreshMillis: 60000,
@@ -47,22 +46,22 @@
       cutoff: 0,
       autoDispose: true,
       strings: {
-        prefixAgo: null,
-        prefixFromNow: "今から",
-        suffixAgo: "",
-        suffixFromNow: "",
-        inPast: '',
-        seconds: "%d秒前",
-        minute: "1分前",
-        minutes: "%d分前",
-        hour: "1時間前",
-        hours: "%d時間前",
-        day: "昨日",
-        days: "%d日前",
-        month: "昨月",
-        months: "%dヶ月前",
-        year: "去年",
-        years: "%d年前",
+        prefixAgo: lang.lang_time_prefixAgo,
+        prefixFromNow: lang.lang_time_prefixFromNow,
+        suffixAgo: lang.lang_time_suffixAgo,
+        suffixFromNow: lang.lang_time_suffixFromNow,
+        inPast: lang.lang_time_inPast,
+        seconds: lang.lang_time_seconds,
+        minute: lang.lang_time_minute,
+        minutes: lang.lang_time_minutes,
+        hour: lang.lang_time_hour,
+        hours: lang.lang_time_hours,
+        day: lang.lang_time_day,
+        days: lang.lang_time_days,
+        month: lang.lang_time_month,
+        months: lang.lang_time_months,
+        year: lang.lang_time_year,
+        years: lang.lang_time_years,
         wordSeparator: " ",
         numbers: []
       }

app/js/common/version.js

@@ -1,5 +1,6 @@
 //バージョンチェッカー
 function verck(ver) {
+	localStorage.setItem("ver", ver);
 	console.log("%c Welcome😊", "color: red;font-size:200%;")
 	var date = new Date();
 	var show = false
@@ -15,11 +16,12 @@ function verck(ver) {
 			}
 		}
 		//ちょっと削除とリンク解析の都合上アレ(e)
-		localStorage.setItem("ver", ver);
 		show = true
 		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
 		$(document).ready(function () {
-			$('#releasenote').modal('open');
+			if (localStorage.getItem("winstore")) {
+				$('#releasenote').modal('open');
+			}
 			verp = ver.replace('(', '');
 			verp = verp.replace('.', '-');
 			verp = verp.replace('.', '-');
@@ -59,7 +61,7 @@ function verck(ver) {
 	var platform = localStorage.getItem("platform");
 	console.log("Your platform:" + platform)
 	if (!localStorage.getItem("winstore")) {
-		storeDialog(platform, ver)
+		$("#start").css('display', 'flex');
 	}
 	if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
 		var winstore = true;
@@ -310,3 +312,9 @@ function storeDialog(platform, ver) {
 		});
 	})
 }
+function closeStart() {
+	$("#start").css('display', 'none');
+	var platform = localStorage.getItem("platform");
+	var ver = localStorage.getItem("ver");
+	storeDialog(platform, ver)
+}

app/js/lang/json5Tojson.js

@@ -0,0 +1,3 @@
+const JSON5 = require('json5')
+const fs = require("fs")
+fs.writeFileSync("main.json", JSON.stringify(JSON5.parse(fs.readFileSync("lang." + process.argv[2] + ".js", 'utf8').replace("var lang = ", ""))))

app/js/lang/lang.bg.js

@@ -16,6 +16,22 @@ var lang={
     "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, изберете „Не“)",
@@ -60,6 +76,8 @@ var lang={
     "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
     "lang_status_unendorse": "Not feature on profile",
     "lang_status_endorse": "Feature on profile",
+    "lang_status_followers": "Followers",
+    "lang_status_active": "Last status",
     "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",
@@ -103,6 +121,7 @@ var lang={
     "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": "Стъпка наляво",

app/js/lang/lang.cs.js

@@ -16,6 +16,22 @@ var lang={
     "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')",
@@ -60,6 +76,8 @@ var lang={
     "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",
@@ -109,6 +127,7 @@ var lang={
     "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",

app/js/lang/lang.de.js

@@ -16,6 +16,22 @@ var lang={
     "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')",
@@ -60,6 +76,8 @@ var lang={
     "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",
@@ -109,6 +127,7 @@ var lang={
     "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",

app/js/lang/lang.en.js

@@ -18,6 +18,23 @@ var lang = {
     "lang_back": "Back",
     "lang_set": "Set",
     "lang_langadd": "Translate TheDesk to other languages or proofread TheDesk on <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk needs your help.",
+    //common/time.js
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": null,
+    "lang_time_suffixAgo": null,
+    "lang_time_suffixFromNow": null,
+    "lang_time_inPast": null,
+    "lang_time_seconds": "%d s",
+    "lang_time_minute": "1 m",
+    "lang_time_minutes": "%d m",
+    "lang_time_hour": "1 h",
+    "lang_time_hours": "%d h",
+    "lang_time_day": "1 d",
+    "lang_time_days": "%d d",
+    "lang_time_month": "1 month",
+    "lang_time_months": "%d months",
+    "lang_time_year": "y",
+    "lang_time_years": "%d y",
     //common/version.js
     "lang_version_usever": "No update is found({{ver}})",
     "lang_version_skipver": "Update was ignored.",
@@ -72,6 +89,8 @@ var lang = {
     "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
     "lang_status_unendorse": "Not feature on profile",
     "lang_status_endorse": "Feature on profile",
+    "lang_status_followers": "Followers",
+    "lang_status_active": "Last status",
     //post/suggest.js
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     //post/use-txtbox.js
@@ -132,8 +151,9 @@ var lang = {
     "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
-    "lang_layout_deleteColumn":"Delete this column",
-    "lang_layout_deleteColumnDesc":"Delete this column",
+    "lang_layout_deleteColumn": "Delete this column",
+    "lang_layout_deleteColumnDesc": "Delete this column",
+    "lang_layout_unread": "Unread",
     //ui/sort.js
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
@@ -202,7 +222,7 @@ var lang = {
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",
-    "lang_parse_notffilter":"Show this user's notifications",
+    "lang_parse_notffilter": "Show this user's notifications",
     //misskey
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/js/lang/lang.ja.js

@@ -18,6 +18,23 @@ var lang = {
     "lang_back": "戻る",
     "lang_set": "設定",
     "lang_langadd": "<a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>から翻訳に参加できます。英語の校正(緊急)や他言語に翻訳していただける方を募集しております。",
+    //common/time.js
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": "今から",
+    "lang_time_suffixAgo": "",
+    "lang_time_suffixFromNow": "",
+    "lang_time_inPast": '',
+    "lang_time_seconds": "%d秒前",
+    "lang_time_minute": "1分前",
+    "lang_time_minutes": "%d分前",
+    "lang_time_hour": "1時間前",
+    "lang_time_hours": "%d時間前",
+    "lang_time_day": "昨日",
+    "lang_time_days": "%d日前",
+    "lang_time_month": "昨月",
+    "lang_time_months": "%dヶ月前",
+    "lang_time_year": "去年",
+    "lang_time_years": "%d年前",
     //common/version.js
     "lang_version_usever": "お使いのバージョン{{ver}}は最新です。",
     "lang_version_skipver": "アップデートはスキップされました。",
@@ -72,6 +89,8 @@ var lang = {
     "lang_status_unemphas": "を強調解除します。リロードしてください。",
     "lang_status_unendorse": "紹介解除",
     "lang_status_endorse": "プロフで紹介する",
+    "lang_status_followers": "フォロワー",
+    "lang_status_active": "最新トゥート",
     //post/suggest.js
     "lang_suggest_nodata": "サジェストのために絵文字リストを取得してください。",
     //post/use-txtbox.js
@@ -134,6 +153,7 @@ var lang = {
     "lang_layout_leftUnfold": "右へ出す",
     "lang_layout_deleteColumn": "カラム削除",
     "lang_layout_deleteColumnDesc": "カラムを削除しますか？",
+    "lang_layout_unread": "未読",
     //ui/sort.js
     "lang_sort_gothis": "このカラムへ",
     "lang_sort_remthis": "このカラムを削除",

app/js/login/instance.js

@@ -9,16 +9,11 @@ var idata = {
 	"kirishima.cloud_public": "パブリックタイムライン",
 	"minohdon.jp": "instance",
 	"minohdon.jp_name": "箕面どん",
-	"minohdon.jp_letters": "500",
-	"minohdon.jp_bbcode": "disabled",
-	"minohdon.jp_markdown": "disabled",
-	"minohdon.jp_glitch": "disabled",
+	"fedibird.com":"instance",
+	"fedibird.com_name":"Fedibird",
+	"fedibird.com_quote":"enabled",
 	"mastodos.com": "instance",
 	"mastodos.com_name": "マストどす",
-	"mastodos.com_letters": "500",
-	"mastodos.com_bbcode": "disabled",
-	"mastodos.com_markdown": "disabled",
-	"mastodos.com_glitch": "disabled",
 	"dev.kirishima.cloud": "hidden",
 	"dev.kirishima.cloud_name": "アスタルテ(Dev)",
 	"dev.kirishima.cloud_letters": "6229",
@@ -27,15 +22,8 @@ var idata = {
 	"dev.kirishima.cloud_glitch": "enabled",
 	"mstdn.y-zu.org": "instance",
 	"mstdn.y-zu.org_name": "Yづドン(Y-zuDon)",
-	"mstdn.y-zu.org_letters": "500",
-	"mstdn.y-zu.org_bbcode": "disabled",
-	"mstdn.y-zu.org_markdown": "enabled",
-	"mstdn.y-zu.org_glitch": "disabled",
 	"imastodon.net": "instance",
 	"imastodon.net_name": "im@stodon",
-	"imastodon.net_letters": "500",
-	"imastodon.net_bbcode": "disabled",
-	"imastodon.net_markdown": "disabled",
 	"imastodon.net_home": "オフィス",
 	"imastodon.net_local": "楽屋",
 	"imastodon.net_notification": "ホワイトボード",
@@ -44,12 +32,6 @@ var idata = {
 	"imastodon.net_fav": "の頭にティンときたようです",
 	"imastodon.net_bt": ":「わかるわ」",
 	"imastodon.net_follow": "名刺をいただきました",
-	"imastodon.net_glitch": "disabled",
-	"mstdn.osaka": "instance",
-	"mstdn.osaka_name": "大阪丼",
-	"mstdn.osaka_letters": "500",
-	"mstdn.osaka_bbcode": "disabled",
-	"mstdn.osaka_markdown": "disabled",
 	"mstdn.osaka_home": "ウチ",
 	"mstdn.osaka_local": "近所",
 	"mstdn.osaka_notification": "あめちゃん",
@@ -58,12 +40,9 @@ var idata = {
 	"mstdn.osaka_fav": "がええやん言いました",
 	"mstdn.osaka_bt": "がしばいた",
 	"mstdn.osaka_follow": "ツルまれました",
-	"mstdn.osaka_glitch": "disabled",
 	"mstdn.kemono-friends.info": "instance",
 	"mstdn.kemono-friends.info_name": "ますとどんちほー",
 	"mstdn.kemono-friends.info_letters": "1024",
-	"mstdn.kemono-friends.info_bbcode": "disabled",
-	"mstdn.kemono-friends.info_markdown": "disabled",
 	"mstdn.kemono-friends.info_home": "なわばり",
 	"mstdn.kemono-friends.info_local": "ますとどんちほー",
 	"mstdn.kemono-friends.info_notification": "ねえねえ!",
@@ -71,19 +50,13 @@ var idata = {
 	"mstdn.kemono-friends.info_post": "がおー！",
 	"mstdn.kemono-friends.info_fav": ":「すごーい」",
 	"mstdn.kemono-friends.info_bt": ":「たーのしー」",
-	"mstdn.kemono-friends.info_glitch": "disabled",
 	"itabashi.0j0.jp": "instance",
 	"itabashi.0j0.jp_name": "板橋丼",
 	"itabashi.0j0.jp_letters": "1024",
-	"itabashi.0j0.jp_bbcode": "disabled",
-	"itabashi.0j0.jp_markdown": "disabled",
-	"itabashi.0j0.jp_glitch": "disabled",
+	"itabashi.0j0.jp_quote":"enabled",
 	"dtp-mstdn.jp": "instance",
-	"dtp-mstdn.jp_name": "DTP鯖",
-	"dtp-mstdn.jp_letters": "500",
-	"dtp-mstdn.jp_bbcode": "disabled",
-	"dtp-mstdn.jp_markdown": "disabled",
-	"dtp-mstdn.jp_glitch": "disabled",
+	"dtp-mstdn.jp_name": "dtp-mstdn.jp",
+	"dtp-mstdn.jp_quote":"enabled",
 	"misskey.io": "misskey",
 	"misskey.io_name": "misskey.io",
 	"misskey.io_letters": "1000",
@@ -93,7 +66,7 @@ var idata = {
 	"misskey.io_post": "Post",
 	"misskey.io_fav": " reacted your post.",
 	"misskey.io_bt": " reposted your post.",
-	"misskey.dev": "misskey.dev",
+	"misskey.dev": "misskey",
 	"misskey.dev_name": "misskey.dev",
 	"misskey.dev_letters": "1024",
 	"misskey.dev_bbcode": "disabled",
@@ -105,10 +78,11 @@ var idata = {
 	"precure.ml": "instance",
 	"precure.ml_name": "キュアスタ！",
 	"precure.ml_letters": "1024",
-	"precure.ml_bbcode": "disabled",
-	"precure.ml_markdown": "disabled",
 	"precure.ml_post": "キュア！",
-	"precure.ml_glitch": "disabled"
+	"odakyu.app_quote":"enabled",
+	"nitiasa.com_quote":"enabled",
+	"biwakodon.com_quote":"enabled",
+	"comm.cx_quote":"enabled"
 };
 
 localStorage.setItem("instance", JSON.stringify(idata));

app/js/login/login.js

@@ -3,6 +3,7 @@
 //アスタルテ判定初期化
 
 localStorage.removeItem("kirishima")
+localStorage.removeItem("quoters")
 localStorage.removeItem("imas")
 localStorage.removeItem("image");
 localStorage.removeItem("stable")
@@ -314,7 +315,6 @@ function ckdb(acct_id) {
 	localStorage.removeItem("followlocale_" + acct_id);
 	if (domain == "kirishima.cloud") {
 		localStorage.setItem("kirishima", "true");
-		$("#ranking-btn").show();
 	} else if (domain == "imastodon.net") {
 		localStorage.setItem("imas", "true");
 		$(".imasonly").show();
@@ -322,8 +322,13 @@ function ckdb(acct_id) {
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var bbcode = domain + "_bbcode";
 	var letters = domain + "_letters";
+	var quoteMarker = domain + "_quote";
 	if (localStorage.getItem("instance")) {
 		var json = JSON.parse(localStorage.getItem("instance"));
+		if (json[quoteMarker] == "enabled") {
+			localStorage.setItem("quoters", "true");
+			localStorage.setItem("quote_" + acct_id, "true");
+		}
 		if (json[bbcode]) {
 			if (json[bbcode] == "enabled") {
 				localStorage.setItem("bb_" + acct_id, "true");
@@ -489,6 +494,7 @@ function multiSelector(parseC) {
 		});
 		$("#src-acct-sel").append('<option value="tootsearch">Tootsearch</option>');
 		$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
+		$("#dir-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option>');
 	}
 	$('select').formSelect();
 	if(!parseC){
@@ -514,13 +520,12 @@ function ticker() {
 			'content-type': 'application/json'
 		},
 	}).then(function (response) {
+
 		return response.json();
 	}).catch(function (error) {
 		console.error(error);
 	}).then(function (json) {
-		if (json.error) {
-			return;
-		}
+		console.log(json)
 		if (json) {
 			localStorage.setItem("ticker", JSON.stringify(json));
 		}

app/js/login/manager.js

@@ -286,10 +286,6 @@ function support() {
 			templete = '<a onclick="login(\'' + key +
 				'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
 			$("#support").append(templete);
-		} else if (instance == "misskey") {
-			templete = '<a onclick="misskeyLogin(\'' + key +
-				'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
-			$("#support").append(templete);
 		}
 	});
 }

app/js/platform/end.js

@@ -141,8 +141,11 @@ onmessage = function (e) {
 	} else if (e.data[0] == "parseColumn") {
 		parseColumn(e.data[1])
 	} else if (e.data[0] == "exportSettingsCore") {
-		exportSettingsCore()
-	} else if (e.data[0] == "fontList") {
+		var exp = exportSettingsCore()
+		postMessage(["exportSettingsCoreComplete", [e.data[1], exp]], "*")
+	} else if (e.data[0] == "importSettingsCore") {
+		importSettingsCore(e.data[1])
+	}else if (e.data[0] == "fontList") {
 		fontList(e.data[1])
 	} else if (e.data[0] == "customSoundSave") {
 		customSoundSave(e.data[1][0], e.data[1][1])
@@ -171,3 +174,13 @@ onmessage = function (e) {
 		})
 	}
 }
+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,3 +1,9 @@
+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/preload.js

@@ -30,6 +30,8 @@ onmessage = function (e) {
         ipc.send('lang', e.data[1]);
     } else if (e.data[0] == "exportSettings") {
         ipc.send('exportSettings', e.data[1]);
+    }  else if (e.data[0] == "exportSettingsCoreComplete") {
+        ipc.send('export', e.data[1]);
     } else if (e.data[0] == "importSettings") {
         ipc.send('importSettings', e.data[1]);
     } else if (e.data[0] == "customSound") {
@@ -49,6 +51,8 @@ onmessage = function (e) {
         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") {
@@ -60,7 +64,7 @@ ipc.send("getPlatform", "")
 ipc.on('platform', function (event, args) {
     localStorage.setItem("platform", args[0])
     localStorage.setItem("bit", args[1])
-    localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4]]))
+    localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4], args[5]]))
 })
 
 ipc.on('reload', function (event, arg) {
@@ -111,12 +115,11 @@ ipc.on('general-dl-message', function (event, arg) {
 ipc.on('langres', function (event, arg) {
     location.href = "../" + arg + "/setting.html"
 });
-ipc.on('exportSettingsFile', function (event, savedFiles) {
-    var exp = exportSettingsCore()
-    ipc.send('export', [savedFiles, JSON.stringify(exp)]);
-    postMessage(["alert", "Done"], "*")
-    //cards
-    //lang
+ipc.on('exportSettingsFile', function (event, arg) {
+    postMessage(["exportSettingsCore", arg], "*")
+});
+ipc.on('exportAllComplete', function (event, arg) {
+    postMessage(["alert", "Complete"], "*")
 });
 ipc.on('config', function (event, arg) {
     postMessage(["importSettingsCore", arg], "*")

app/js/post/emoji.js

@@ -13,6 +13,15 @@ function emojiToggle(reaction) {
 	if ($("#emoji").hasClass("hide")) {
 		$("#emoji").removeClass("hide")
 		$("#right-side").show()
+		$("#right-side").css("width", "300px")
+		$("#left-side").css("width", "calc(100% - 300px)")
+		var width = localStorage.getItem("postbox-width");
+		if (width) {
+			width = width.replace("px", "") * 1 + 300
+		} else {
+			width = 600
+		}
+		$("#post-box").css("width", width + "px")
 		$("#suggest").html("");
 		if (!localStorage.getItem("emoji_" + acct_id)) {
 			var html =
@@ -23,9 +32,18 @@ function emojiToggle(reaction) {
 		}
 	} else {
 		$("#poll").addClass("hide")
+		$("#right-side").hide()
+		$("#right-side").css("width", "300px")
 		$("#emoji").addClass("hide")
 		$("#suggest").html("");
-		$("#right-side").hide()
+		$("#left-side").css("width", "100%")
+		var width = localStorage.getItem("postbox-width");
+		if (width) {
+			width = width.replace("px", "") * 1
+		} else {
+			width = 300
+		}
+		$("#post-box").css("width", width + "px")
 	}
 
 

app/js/post/post.js

@@ -79,6 +79,10 @@ function post(mode, postvis) {
 	if (media) {
 		toot.media_ids = media.split(",");
 	}
+	var quote = $("#quote").val();
+	if (quote) {
+		toot.quote_id = quote;
+	}
 	if ($("#nsfw").hasClass("nsfw-avail")) {
 		var nsfw = "true";
 		toot.sensitive = nsfw;
@@ -110,7 +114,7 @@ function post(mode, postvis) {
 	} else {
 		var scheduled = "";
 	}
-	if ($("#poll-sel").val() == "mastodon-poll") {
+	if (!$("#poll").hasClass("hide")) {
 		var options = [];
 		$(".mastodon-choice").map(function () {
 			var choice = $(this).val();
@@ -243,6 +247,7 @@ function clear() {
 	}
 	$("#textarea").attr("placeholder", lang.lang_toot);
 	$("#reply").val("");
+	$("#quote").val("");
 	$("#media").val("");
 	var cwt = localStorage.getItem("cw-text");
 	if (cwt) {
@@ -274,6 +279,8 @@ function clear() {
 	$("#days_poll").val(0);
 	$("#hours_poll").val(0);
 	$("#mins_poll").val(6);
+	$("#poll").addClass("hide")
+	$("#pollsta").text(lang.lang_no)
 	$(".mastodon-choice").map(function () {
 		$(this).val("");
 	});

app/js/post/suggest.js

@@ -18,6 +18,15 @@ input.addEventListener("focus", function () {
 			$("#suggest").html("");
 			if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 				$("#right-side").hide()
+				$("#right-side").css("width", "300px")
+				$("#left-side").css("width", "100%")
+				var width = localStorage.getItem("postbox-width");
+				if (width) {
+					width = width.replace("px", "") * 1
+				} else {
+					width = 300
+				}
+				$("#post-box").css("width", width + "px")
 			}
 			return;
 		}
@@ -42,11 +51,29 @@ input.addEventListener("focus", function () {
 				}
 				if (ehtml != "") {
 					$("#right-side").show()
+					$("#right-side").css("width", "200px")
+					$("#left-side").css("width", "calc(100% - 200px)")
+					var width = localStorage.getItem("postbox-width");
+					if (width) {
+						width = width.replace("px", "") * 1 + 200
+					} else {
+						width = 600
+					}
+					$("#post-box").css("width", width + "px")
 					$("#poll").addClass("hide")
 					$("#emoji").addClass("hide")
 				} else {
 					if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 						$("#right-side").hide()
+						$("#right-side").css("width", "300px")
+						$("#left-side").css("width", "100%")
+						var width = localStorage.getItem("postbox-width");
+						if (width) {
+							width = width.replace("px", "") * 1
+						} else {
+							width = 300
+						}
+						$("#post-box").css("width", width + "px")
 					}
 				}
 				$("#suggest").html(ehtml);
@@ -62,6 +89,15 @@ input.addEventListener("focus", function () {
 				$("#suggest").html("");
 				if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 					$("#right-side").hide()
+					$("#right-side").css("width", "300px")
+					$("#left-side").css("width", "100%")
+					var width = localStorage.getItem("postbox-width");
+					if (width) {
+						width = width.replace("px", "") * 1
+					} else {
+						width = 300
+					}
+					$("#post-box").css("width", width + "px")
 				}
 				return;
 			}
@@ -119,6 +155,15 @@ input.addEventListener("focus", function () {
 							});
 							$("#suggest").html(ins);
 							$("#right-side").show()
+							$("#right-side").css("width", "200px")
+							$("#left-side").css("width", "calc(100% - 200px)")
+							var width = localStorage.getItem("postbox-width");
+							if (width) {
+								width = width.replace("px", "") * 1 + 200
+							} else {
+								width = 600
+							}
+							$("#post-box").css("width", width + "px")
 							$("#poll").addClass("hide")
 							$("#emoji").addClass("hide")
 						}
@@ -127,17 +172,38 @@ input.addEventListener("focus", function () {
 						Object.keys(json.accounts).forEach(function (key3) {
 							var acct = json.accounts[key3];
 							if (acct.acct != q) {
-								accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
-									'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
+								//Instance Actorって…
+								if (acct.username.indexOf(".") < 0) {
+									accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
+										'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
+								}
 							}
 						});
 						$("#right-side").show()
+						$("#right-side").css("width", "200px")
+						$("#left-side").css("width", "calc(100% - 200px)")
+						var width = localStorage.getItem("postbox-width");
+						if (width) {
+							width = width.replace("px", "") * 1 + 200
+						} else {
+							width = 600
+						}
+						$("#post-box").css("width", width + "px")
 						$("#suggest").html(accts);
 						$("#poll").addClass("hide")
 						$("#emoji").addClass("hide")
 					} else {
 						if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 							$("#right-side").hide()
+							$("#right-side").css("width", "300px")
+							$("#left-side").css("width", "100%")
+							var width = localStorage.getItem("postbox-width");
+							if (width) {
+								width = width.replace("px", "") * 1
+							} else {
+								width = 300
+							}
+							$("#post-box").css("width", width + "px")
 						}
 					}
 				});
@@ -172,6 +238,13 @@ function tagInsert(code, del) {
 	$("#textarea").focus();
 	if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
 		$("#right-side").hide()
+		$("#right-side").css("width", "300px")
+		$("#left-side").css("width", "50%")
+		var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
+		if (!width) {
+			width = 300
+		}
+		$("#post-box").css("width", width + "px")
 	}
 	$("#suggest").html("");
 }

app/js/post/use-txtbox.js

@@ -57,6 +57,21 @@ function qt(id, acct_id, at, url) {
 		html = html.replace(/<\/p>/, "\n");
 		html = $.strip_tags(html);
 		$("#textarea").val("\n" + "@" + at + " " + html + "\n" + url);
+	} else if (qt == "apiQuote") {
+		clear();
+		localStorage.setItem("nohide", true);
+		show();
+		$("#quote").val(id);
+		$("#post-acct-sel").val(acct_id);
+		$("#post-acct-sel").prop("disabled", true);
+		$('select').formSelect();
+		$("#textarea").attr("placeholder", lang.lang_usetxtbox_reply);
+		$("#textarea").focus();
+		var profimg = localStorage.getItem("prof_" + acct_id);
+		if (!profimg) {
+			profimg = "../../img/missing.svg";
+		}
+		$("#acct-sel-prof").attr("src", profimg);
 	}
 	$("#post-acct-sel").val(acct_id);
 	$('select').formSelect();

app/js/tl/datails.js

@@ -422,6 +422,7 @@ function faved(id, acct_id) {
 			$("#toot-fav .no-data").hide();
 		}
 		$("#toot-fav").html(templete);
+		jQuery("time.timeago").timeago();
 	});
 }
 
@@ -445,6 +446,7 @@ function rted(id, acct_id) {
 	}).then(function (json) {
 		var templete = userparse(json, '', acct_id);
 		$("#toot-rt").html(templete);
+		jQuery("time.timeago").timeago();
 	});
 }
 //URL等のコピー

app/js/tl/directory.js

@@ -0,0 +1,69 @@
+//ディレクトリ
+//ディレクトリトグル
+function dirMenu() {
+    $("#dir-contents").html("");
+    directory();
+    $("#left-menu div").removeClass("active");
+    $("#dirMenu").addClass("active");
+    $(".menu-content").addClass("hide");
+    $("#dir-box").removeClass("hide");
+}
+function dirselCk() {
+    var acct = $("#dir-acct-sel").val();
+    if (acct == "noauth") {
+        $("#dirNoAuth").removeClass("hide");
+    } else {
+        $("#dirNoAuth").addClass("hide");
+        directory();
+    }
+}
+function directory(isMore) {
+    var order = $("[name=sort]:checked").val()
+    if (!order) {
+        order = "active"
+    }
+    var local_only = $("#local_only:checked").val()
+    if (local_only) {
+        local_only = "true"
+    } else {
+        local_only = "false"
+    }
+    var acct_id = $("#dir-acct-sel").val();
+    if (acct_id == "noauth") {
+        var domain = $("#dirNoAuth-url").val();
+        var at = "";
+    } else {
+        var domain = localStorage.getItem("domain_" + acct_id);
+        var at = localStorage.getItem("acct_" + acct_id + "_at");
+    }
+    if (isMore) {
+        var addOffset = $("#dir-contents .cvo").length
+    } else {
+        var addOffset = 0
+        $("#dir-contents").html("");
+    }
+    var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset
+    console.log(start)
+    fetch(start, {
+        method: 'GET',
+        headers: {
+            'content-type': 'application/json',
+            'Authorization': 'Bearer ' + at
+        },
+    }).then(function (response) {
+        return response.json();
+    }).catch(function (error) {
+        //todo(error);
+        console.error(error);
+    }).then(function (json) {
+        if (json) {
+            $("#moreDir").removeClass("disabled")
+            var html = userparse(json, null, acct_id, "dir", null)
+            $("#dir-contents").append(html)
+            jQuery("time.timeago").timeago();
+        } else {
+            $("#moreDir").addClass("disabled")
+        }
+
+    });
+}

app/js/tl/list.js

@@ -135,6 +135,7 @@ function listUser(id, acct_id) {
 				templete = lang.lang_list_nouser;
 			}
 			$("#lists-user").html(templete);
+			jQuery("time.timeago").timeago();
 		} else {
 			$("#lists-user").html(lang.lang_list_nouser);
 		}

app/js/tl/notification.js

@@ -66,7 +66,7 @@ function notfColumn(acct_id, tlid, sys) {
 						if (os == "darwin") {
 							var n = new Notification('TheDesk:' + domain, options);
 						} else {
-							var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
+							var nativeNotfOpt = ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
 							postMessage(["nativeNotf", nativeNotfOpt], "*")
 						}
 
@@ -98,6 +98,16 @@ function notfColumn(acct_id, tlid, sys) {
 			}
 			$("#notf-box").addClass("fetched");
 			todc();
+			//Markers
+			var markers = localStorage.getItem("markers");
+			if (markers == "no") {
+				markers = false;
+			} else {
+				markers = true
+			}
+			if (markers) {
+				getMarker(tlid, "notf", acct_id)
+			}
 		}
 	}
 	if (!misskey) {
@@ -171,7 +181,7 @@ function notfCommon(acct_id, tlid, sys) {
 					if (os == "darwin") {
 						var n = new Notification('TheDesk:' + domain, options);
 					} else {
-						var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
+						var nativeNotfOpt = ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
 						postMessage(["nativeNotf", nativeNotfOpt], "*")
 					}
 
@@ -234,16 +244,19 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 			if (type == "notification") {
 				var templete = "";
 				localStorage.setItem("lastnotf_" + acct_id, obj.id);
-				if (obj.type != "follow") {
-					templete = parse([obj], 'notf', acct_id, 'notf', popup);
-				} else {
-					templete = userparse([obj], 'notf', acct_id, 'notf', popup);
+				if (!$("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+					//markers show中はダメ
+					if (obj.type != "follow") {
+						templete = parse([obj], 'notf', acct_id, 'notf', popup);
+					} else {
+						templete = userparse([obj], 'notf', acct_id, 'notf', popup);
+					}
+					if (!$("div[data-notfIndv=" + acct_id + "_" + obj.id + "]").length) {
+						$("div[data-notf=" + acct_id + "]").prepend(templete);
+						$("div[data-const=notf_" + acct_id + "]").prepend(templete);
+					}
+					jQuery("time.timeago").timeago();
 				}
-				if (!$("div[data-notfIndv=" + acct_id + "_" + obj.id + "]").length) {
-					$("div[data-notf=" + acct_id + "]").prepend(templete);
-					$("div[data-const=notf_" + acct_id + "]").prepend(templete);
-				}
-				jQuery("time.timeago").timeago();
 			} else if (type == "delete") {
 				$("[toot-id=" + obj + "]").hide();
 				$("[toot-id=" + obj + "]").remove();

app/js/tl/poll.js

@@ -2,11 +2,31 @@
 function pollToggle() {
     if ($("#poll").hasClass("hide")) {
         $("#right-side").show()
+        $("#right-side").css("width", "300px")
+        $("#left-side").css("width", "calc(100% - 300px)")
+        var width = localStorage.getItem("postbox-width");
+        if (width) {
+            width = width.replace("px", "") * 1 + 300
+        } else {
+            width = 600
+        }
+        $("#post-box").css("width", width + "px")
         $("#poll").removeClass("hide")
+        $("#pollsta").text(lang.lang_yesno)
     } else {
         $("#right-side").hide()
+        $("#left-side").css("width", "100%")
+        $("#right-side").css("width", "300px")
+        var width = localStorage.getItem("postbox-width");
+        if (width) {
+            width = width.replace("px", "") * 1
+        } else {
+            width = 300
+        }
+        $("#post-box").css("width", width + "px")
         $("#emoji").addClass("hide")
         $("#poll").addClass("hide")
+        $("#pollsta").text(lang.lang_no)
     }
 }
 function pollProviderCk() {

app/js/tl/src.js

@@ -11,8 +11,14 @@ function searchMenu() {
 }
 
 //検索取得
-function src(mode) {
-	$("#src-contents").html("");
+function src(mode, offset) {
+	if(!offset){
+		$("#src-contents").html("");
+		var add = ""
+	}else{
+		var add = "&type=accounts&offset=" + $("#src-accts .cvo").length
+	}
+	
 	var q = $("#src").val();
 	var acct_id = $("#src-acct-sel").val();
 	if (acct_id == "tootsearch") {
@@ -28,7 +34,7 @@ function src(mode) {
 		var user = $('#his-data').attr("user-id");
 	}
 	if (!mode) {
-		var start = "https://" + domain + "/api/v2/search?q=" + q
+		var start = "https://" + domain + "/api/v2/search?q=" + q + add
 	} else {
 		var start = "https://" + domain + "/api/v1/search?q=" + q
 	}
@@ -69,7 +75,12 @@ function src(mode) {
 		//アカウント
 		if (json.accounts[0]) {
 			var templete = userparse(json.accounts, '', acct_id);
-			$("#src-contents").append("<br>Accounts<br>" + templete);
+			if(!offset){
+				$("#src-contents").append("<br>Accounts<div id=\"src-accts\">" + templete + '</div><a onclick="src(false,\'more\')" class="pointer">more...</a>');
+			}else{
+				$("#src-accts").append(templete)
+			}
+			
 		}
 		jQuery("time.timeago").timeago();
 	});

app/js/tl/tag.js

@@ -128,3 +128,26 @@ function autoToot(tag) {
     }
     favTag();
 }
+//タグをフィーチャー
+function tagFeature(name, acct_id){
+    var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/featured_tags"
+	fetch(start, {
+		method: 'POST',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+        },
+        body: JSON.stringify({
+            name: name
+        })
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		return false;
+	}).then(function (json) {
+        console.log(json)
+		M.toast({ html: "Complete: " + escapeHTML(name), displayLength: 3000 })
+	});
+}

app/js/tl/tl.js

@@ -2,6 +2,7 @@
 moreloading = false;
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	scrollevent();
+	$("#unread_" + tlid + " .material-icons").removeClass("teal-text")
 	localStorage.removeItem("morelock");
 	localStorage.removeItem("pool");
 	var domain = localStorage.getItem("domain_" + acct_id);
@@ -149,6 +150,18 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		jQuery("time.timeago").timeago();
 		todc();
 		reload(type, '', acct_id, tlid, data, mute, delc, voice);
+		if (type == "home" || type == "notf") {
+			//Markers
+			var markers = localStorage.getItem("markers");
+			if (markers == "no") {
+				markers = false;
+			} else {
+				markers = true
+			}
+			if (markers) {
+				getMarker(tlid, type, acct_id)
+			}
+		}
 		$(window).scrollTop(0);
 	});
 }
@@ -217,7 +230,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		websocket[wsid] = new WebSocket(start);
 		websocket[wsid].onopen = function (mess) {
 			console.table({ "tlid": tlid, "type": "Connect Streaming API" + type, "domain": domain, "message": [mess] })
-			$("#notice_icon_" + tlid).removeClass("red-text");
+			$("#notice_icon_" + tlid).removeClass("red-text")
 		}
 		websocket[wsid].onmessage = function (mess) {
 			console.log([tlid + ":Receive Streaming API:", JSON.parse(mess.data)]);
@@ -256,37 +269,40 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 						$("#timeline_" + tlid + " [toot-id=" + JSON.parse(mess.data).payload + "]").addClass("emphasized");
 						$("#timeline_" + tlid + " [toot-id=" + JSON.parse(mess.data).payload + "]").addClass("by_delcatch");
 					} else {
-						$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
-						$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
+						$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide()
+						$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove()
 					}
 
 				} else if (typeA == "update" || typeA == "conversation") {
-					localStorage.removeItem("delete");
-					var obj = JSON.parse(JSON.parse(mess.data).payload);
-					if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
-						if (voice) {
-							say(obj.content)
-						}
-						var templete = parse([obj], type, acct_id, tlid, "", mute, type);
-						if ($("timeline_box_" + tlid + "_box .tl-box").scrollTop() === 0) {
-							$("#timeline_" + tlid).prepend(templete);
-						} else {
-							var pool = localStorage.getItem("pool_" + tlid);
-							if (pool) {
-								pool = templete + pool;
-							} else {
-								pool = templete
+					localStorage.removeItem("delete")
+					if (!$("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+						//markers show中はダメ
+						var obj = JSON.parse(JSON.parse(mess.data).payload);
+						if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
+							if (voice) {
+								say(obj.content)
 							}
-							localStorage.setItem("pool_" + tlid, pool);
+							var templete = parse([obj], type, acct_id, tlid, "", mute, type);
+							if ($("timeline_box_" + tlid + "_box .tl-box").scrollTop() === 0) {
+								$("#timeline_" + tlid).prepend(templete);
+							} else {
+								var pool = localStorage.getItem("pool_" + tlid);
+								if (pool) {
+									pool = templete + pool;
+								} else {
+									pool = templete
+								}
+								localStorage.setItem("pool_" + tlid, pool);
+							}
+							scrollck();
+							additional(acct_id, tlid);
+							jQuery("time.timeago").timeago();
+						} else {
+							todo("二重取得発生中");
 						}
-						scrollck();
-						additional(acct_id, tlid);
-						jQuery("time.timeago").timeago();
-					} else {
-						todo("二重取得発生中");
-					}
 
-					todc();
+						todc();
+					}
 				} else if (typeA == "filters_changed") {
 					filterUpdate(acct_id);
 				}
@@ -298,7 +314,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			console.error("Error closing");
 			console.error(error);
 			if (mode == "error") {
-				$("#notice_icon_" + tlid).addClass("red-text");
+				$("#notice_icon_" + tlid).addClass("red-text")
 				todo('WebSocket Error ' + error);
 			} else {
 				var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
@@ -312,7 +328,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		websocket[wsid].onclose = function () {
 			console.warn("Closing " + tlid);
 			if (mode == "error") {
-				$("#notice_icon_" + tlid).addClass("red-text");
+				$("#notice_icon_" + tlid).addClass("red-text")
 				todo('WebSocket Closed');
 			} else {
 				var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
@@ -824,8 +840,9 @@ function reconnector(tlid, type, acct_id, data, mode) {
 	M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
 
 }
-function columnReload(tlid, type){
+function columnReload(tlid, type) {
 	$("#notice_icon_" + tlid).addClass("red-text");
+	$("#unread_" + tlid + " .material-icons").removeClass("teal-text")
 	if (type == "mix" || type == "integrated" || type == "plus") {
 		if (localStorage.getItem("voice_" + tlid)) {
 			var voice = true;
@@ -843,6 +860,7 @@ function columnReload(tlid, type){
 		websocketLocal[wssl].close();
 		parseColumn(tlid)
 	} else if (type == "notf") {
+		$("#notice_icon_" + tlid).removeClass("red-text");
 		notfColumn(acct_id, tlid, "")
 	} else {
 		var wss = localStorage.getItem("wss_" + tlid);
@@ -861,3 +879,190 @@ function columnReload(tlid, type){
 	}
 }
 strAliveInt()
+//Markers
+function getMarker(tlid, type, acct_id) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	if (type == "home") {
+		var add = "home"
+	} else if (type == "notf") {
+		var add = "notifications"
+	}
+	var start = "https://" + domain + "/api/v1/markers?timeline=" + add
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		$("#unread_" + tlid).attr("title", lang.lang_layout_unread + ":" + lang.lang_nothing)
+		$("#unread_" + tlid).attr("data-id", "")
+		return false;
+	}).then(function (json) {
+		if (json) {
+			if (json[add]) {
+				json = json[add]
+				$("#unread_" + tlid).attr("title", lang.lang_layout_unread + ":" + json.updated_at + ' v' + json.version)
+				$("#unread_" + tlid).attr("data-id", json.last_read_id)
+			} else {
+				$("#unread_" + tlid).attr("title", lang.lang_layout_unread + ":" + lang.lang_nothing)
+				$("#unread_" + tlid).attr("data-id", "")
+			}
+		} else {
+			$("#unread_" + tlid).attr("title", lang.lang_layout_unread + ":" + lang.lang_nothing)
+			$("#unread_" + tlid).attr("data-id", "")
+		}
+	});
+}
+function showUnread(tlid, type, acct_id) {
+	if ($("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+		goTop(tlid)
+		return
+	}
+	$("#unread_" + tlid + " .material-icons").addClass("teal-text")
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var id = $("#unread_" + tlid).attr("data-id")
+	if (type == "home") {
+		var add = "timelines/home?min_id=" + id
+	} else if (type == "notf") {
+		var add = "notifications?min_id=" + id
+	}
+	var start = "https://" + domain + "/api/v1/" + add
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (!json || !json.length) {
+			columnReload(tlid, type)
+		}
+		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+		} else {
+			var mute = [];
+		}
+		var templete = parse(json, type, acct_id, tlid, "", mute, type);
+		var len = json.length - 1
+		$("#timeline_" + tlid).html(templete);
+		if ($("#timeline_" + tlid + " .cvo:eq(" + len + ")").length) {
+			var to = $("#timeline_" + tlid + " .cvo:eq(" + len + ")").offset().top
+			$("#timeline_box_" + tlid + "_box .tl-box").scrollTop(to)
+		}
+		additional(acct_id, tlid);
+		jQuery("time.timeago").timeago();
+		todc();
+	});
+}
+var ueloadlock = false
+function ueload(tlid) {
+	if (ueloadlock) {
+		return false
+	}
+	ueloadlock = true
+	var multi = localStorage.getItem("column")
+	var obj = JSON.parse(multi)
+	var acct_id = obj[tlid * 1].domain
+	var type = obj[tlid * 1].type
+	var domain = localStorage.getItem("domain_" + acct_id)
+	var at = localStorage.getItem("acct_" + acct_id + "_at")
+	var id = $("#timeline_" + tlid + " .cvo:eq(0)").attr("unique-id")
+	if (type == "home") {
+		var add = "timelines/home?min_id=" + id
+	} else if (type == "notf") {
+		var add = "notifications?min_id=" + id
+	}
+	var start = "https://" + domain + "/api/v1/" + add
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (json) {
+		if (!json) {
+			columnReload(tlid, type)
+		}
+		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
+			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+		} else {
+			var mute = [];
+		}
+		var templete = parse(json, '', acct_id, tlid, "", mute, type);
+		var len = json.length - 1
+		$("#timeline_" + tlid).prepend(templete);
+		if ($("#timeline_" + tlid + " .cvo:eq(" + len + ")").length) {
+			var to = $("#timeline_" + tlid + " .cvo:eq(" + len + ")").offset().top
+			$("#timeline_box_" + tlid + "_box .tl-box").scrollTop(to)
+		}
+		additional(acct_id, tlid);
+		jQuery("time.timeago").timeago();
+		todc();
+		ueloadlock = false
+	});
+}
+function asRead() {
+	//Markers
+	var markers = localStorage.getItem("markers");
+	if (markers == "no") {
+		markers = false;
+	} else {
+		markers = true
+	}
+	if (markers) {
+		var multi = localStorage.getItem("column")
+		var obj = JSON.parse(multi)
+		for (var i = 0; i < obj.length; i++) {
+			var acct_id = obj[i].domain
+			var type = obj[i].type
+			if (type == "home" || type == "notf") {
+				if (type == "home") {
+					var id = $("#timeline_" + i + " .cvo:eq(0)").attr("unique-id")
+					var poster = {
+						home: {
+							last_read_id: id
+						}
+					}
+				} else {
+					var id = $("#timeline_" + i + " .cvo:eq(0)").attr("data-notf")
+					var poster = {
+						notifications: {
+							last_read_id: id
+						}
+					}
+				}
+				var domain = localStorage.getItem("domain_" + acct_id);
+				var at = localStorage.getItem("acct_" + acct_id + "_at");
+				var httpreq = new XMLHttpRequest();
+				var start = "https://" + domain + "/api/v1/markers"
+				httpreq.open('POST', start, true);
+				httpreq.setRequestHeader('Content-Type', 'application/json');
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+				httpreq.responseType = "json";
+				httpreq.send(JSON.stringify(poster));
+				httpreq.onreadystatechange = function () {
+					if (httpreq.readyState === 4) {
+						var json = httpreq.response;
+						console.log(json)
+					}
+				}
+			}
+		}
+	}
+}
+cbTimer1 = setInterval(asRead, 60000);

app/js/ui/layout.js

@@ -190,6 +190,7 @@ function parseColumn(target, dontclose) {
 			} else {
 				var animecss = "";
 			}
+			var unread = '<a id="unread_' + key + '" onclick="showUnread(' + key + ',\'' + acct.type + '\',\'' + acct.domain + '\')" class="setting nex" title="' + lang.lang_layout_unread + '"><i class="material-icons waves-effect nex">more</i></a>'
 			if (acct.type == "notf") {
 				var exclude = lang.lang_excluded + ':<br><label><input type="checkbox" class="filled-in" id="exc-reply-' + key + '" ' + excludeCk(key, "mention") + ' /><span><i class="fas fa-share exc-icons"></i></span></label> ' +
 					'<label><input type="checkbox" class="filled-in" id="exc-fav-' + key + '"  ' + excludeCk(key, "favourite") + ' /><span><i class="fas fa-star exc-icons"></i></span></label> ' +
@@ -201,12 +202,24 @@ function parseColumn(target, dontclose) {
 					exclude = exclude + '<button class="btn red waves-effect" style="width:60px; padding:0;" onclick="resetNotfFilter(' + key + ')">Clear all</button>'
 				}
 				exclude = exclude + "<br>";
+
 			} else if (acct.type == "home") {
 				var exclude = '<a onclick="ebtToggle(' + key +
 					')" class="setting nex"><i class="fas fa-retweet waves-effect nex" title="' + lang.lang_layout_excludingbt + '" style="font-size:24px"></i><span id="sta-bt-' +
 					key + '">Off</span></a>' + lang.lang_layout_excludingbt + '<br>';
+
 			} else {
 				var exclude = "";
+				unread = ""
+			}
+			var markers = localStorage.getItem("markers");
+			if (markers == "no") {
+				markers = false;
+			} else {
+				markers = true
+			}
+			if (!markers) {
+				unread = ""
 			}
 			if (!acct.left_fold) {
 				basekey = key;
@@ -235,7 +248,7 @@ function parseColumn(target, dontclose) {
 				'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>' +
 				'<div class="area-a1"><a onclick="notfToggle(' + acct.domain + ',' + key +
 				')" class="setting nex ' + if_notf + '" title="' + unique_notf + '"' + icnsert + '><i class="material-icons waves-effect nex notf-icon_' +
-				acct.domain + '">notifications</i></div><div class="area-sta"><span class="new badge teal notf-reply_' + acct.domain + ' hide" data-badge-caption="Reply">0</span><span class="new badge yellow black-text notf-fav_' + acct.domain + ' hide" data-badge-caption="Fav">0</span><span class="new badge blue notf-bt_' + acct.domain + ' hide" data-badge-caption="BT">0</span><span class="new badge orange notf-follow_' + acct.domain + ' hide" data-badge-caption="Follow">0</span></a></div>' +
+				acct.domain + '">notifications</i></a>' + unread + '</div><div class="area-sta"><span class="new badge teal notf-reply_' + acct.domain + ' hide" data-badge-caption="Reply">0</span><span class="new badge yellow black-text notf-fav_' + acct.domain + ' hide" data-badge-caption="Fav">0</span><span class="new badge blue notf-bt_' + acct.domain + ' hide" data-badge-caption="BT">0</span><span class="new badge orange notf-follow_' + acct.domain + ' hide" data-badge-caption="Follow">0</span></div>' +
 				'<div class="area-a2"><a onclick="removeColumn(' + key +
 				')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_layout_delthis + '"' + icnsert + '>cancel</i></a></div>' +
 				'<div class="area-a3"><a onclick="setToggle(' + key +
@@ -250,7 +263,7 @@ function parseColumn(target, dontclose) {
 				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 +
-				')" class="setting nex ' + if_notf + ' ' + if_misskey_hide + '"><i class="material-icons waves-effect nex ' + if_notf + '" title="' + lang.lang_layout_reconnect + '">refresh</i></a><span class="' + if_notf + '">' + lang.lang_layout_reconnect + '</span><br>' + lang.lang_layout_headercolor + '<br><div id="picker_' + key + '" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+				',\'' + acct.type + '\')" 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) {
 				$('timeline_box_' + key + '_box').html(html)
@@ -430,23 +443,23 @@ function setToggle(tlid) {
 		$("#util-box_" + tlid).animate({
 			'height': '200px'
 		}, {
-				'duration': 300,
-				'complete': function () {
-					$("#util-box_" + tlid).css("overflow-y", "scroll")
-					$("#util-box_" + tlid).removeClass("column-hide")
-				}
-			});
+			'duration': 300,
+			'complete': function () {
+				$("#util-box_" + tlid).css("overflow-y", "scroll")
+				$("#util-box_" + tlid).removeClass("column-hide")
+			}
+		});
 	} else {
 		$("#util-box_" + tlid).css("overflow-y", "hidden")
 		$("#util-box_" + tlid).animate({
 			'height': '0'
 		}, {
-				'duration': 300,
-				'complete': function () {
-					$("#util-box_" + tlid).addClass("column-hide")
-					$("#util-box_" + tlid).css("display", "none")
-				}
-			});
+			'duration': 300,
+			'complete': function () {
+				$("#util-box_" + tlid).addClass("column-hide")
+				$("#util-box_" + tlid).css("display", "none")
+			}
+		});
 	}
 }
 function colorpicker(key) {

app/js/ui/menu.js

@@ -17,6 +17,16 @@ function menu() {
     }
     $('#menu').css("left", left + "px")
     $('#menu').css("top", top + "px")
+    var height = localStorage.getItem("menu-height");
+    var width = localStorage.getItem("menu-width");
+    if(height){
+      $('#menu').css("height", height + "px")
+    }else{
+      $('#menu').css("height", "460px")
+    }
+    if(width){
+      $('#menu').css("width", width + "px")
+    }
     $('#menu').fadeIn();
     $("#menu-bar").html("TheDesk " + localStorage.getItem("ver"));
     $(".menu-content").addClass("hide");
@@ -49,6 +59,14 @@ $(function () {
       localStorage.setItem("menu-top", top);
     }
   });
+  $("#menu").resizable({
+    minHeight: 150,
+    minWidth: 200,
+    stop: function (event, ui) {
+      localStorage.setItem("menu-height", ui.size.height);
+      localStorage.setItem("menu-width", ui.size.width);
+    }
+  });
 });
 function help() {
   postMessage(["openUrl", "https://docs.thedesk.top"], "*")

app/js/ui/post-box.js

@@ -2,6 +2,15 @@
 //✕隠す
 function hide() {
 	$("#right-side").hide()
+	$("#right-side").css("width", "300px")
+	$("#left-side").css("width", "100%")
+	var width = localStorage.getItem("postbox-width");
+	if(width){
+		width = width.replace("px", "") * 1
+	} else {
+		width = 300
+	}
+	$("#post-box").css("width", width)
 	$('#post-box').fadeOut()
 	$("#post-box").removeClass("appear")
 	$("#emoji").addClass("hide")
@@ -38,6 +47,12 @@ function show() {
 	}
 	$('#post-box').css("left", left + "px")
 	$('#post-box').css("top", top + "px")
+	var width = localStorage.getItem("postbox-width");
+	if (width) {
+		$('#post-box').css("width", width + "px")
+	} else {
+		$('#post-box').css("width", "300px")
+	}
 	$('#post-box').fadeIn();
 	$('#textarea').characterCounter();
 }
@@ -62,6 +77,14 @@ $(function () {
 			localStorage.setItem("postbox-top", top);
 		}
 	});
+	$("#post-box").resizable({
+		minHeight: 150,
+		minWidth: 100,
+		stop: function (event, ui) {
+			$("#textarea").blur()
+			localStorage.setItem("postbox-width", ui.size.width);
+		}
+	});
 });
 
 //コード受信

app/js/ui/scroll.js

@@ -9,13 +9,17 @@ scrollevent();
 function scrollck() {
 	$(".tl-box").each(function (i, elem) {
 		var tlid = $(this).attr('tlid');
-		//一番上ならためていた新しいトゥートを表示
+		//一番上ならためていた新しいトゥートを表示ないしtealなら未読管理モード
 		if ($(this).scrollTop() === 0) {
-			var pool = localStorage.getItem("pool_" + tlid);
-			if (pool) {
-				$("#timeline_" + tlid).prepend(pool);
-				jQuery("time.timeago").timeago();
-				localStorage.removeItem("pool_" + tlid);
+			if (!$("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+				var pool = localStorage.getItem("pool_" + tlid);
+				if (pool) {
+					$("#timeline_" + tlid).prepend(pool);
+					jQuery("time.timeago").timeago();
+					localStorage.removeItem("pool_" + tlid);
+				}
+			} else {
+				ueload(tlid)
 			}
 			//自動リフレッシュ
 			if ($("#timeline_" + tlid + " .cvo").length > 30) {
@@ -35,6 +39,15 @@ function scrollck() {
 }
 
 function goTop(id) {
+	if ($("#unread_" + id + " .material-icons").hasClass("teal-text")) {
+		$("#unread_" + id + " .material-icons").removeClass("teal-text")
+		var multi = localStorage.getItem("column")
+		var obj = JSON.parse(multi)
+		var acct_id = obj[id * 1].domain
+		var type = obj[id * 1].type
+		console.log(id, type)
+		columnReload(id, type)
+	}
 	if ($("#timeline_box_" + id + "_box .tl-box").scrollTop() > 500) {
 		$("#timeline_box_" + id + "_box .tl-box").scrollTop(500)
 	}

app/js/ui/settings.js

@@ -45,7 +45,7 @@ var tlView = new Vue({
 });
 var postView = new Vue({
 	el: '#postView',
-	data: { config: postConstruction, kirishima: localStorage.getItem('kirishima') },
+	data: { config: postConstruction, kirishima: localStorage.getItem('kirishima'), quoters: localStorage.getItem('quoters') },
 	methods: {
 		complete: function (i, val) {
 			var ls = postView.config[i];
@@ -121,7 +121,7 @@ function load() {
 		} else {
 			ls = tlView.config[i].data
 			for (var j = 0; j < ls.length; j++) {
-				if(localStorage.getItem(tlView.config[i].data[j].storage)){
+				if (localStorage.getItem(tlView.config[i].data[j].storage)) {
 					tlView.config[i].data[j].setValue = localStorage.getItem(tlView.config[i].data[j].storage)
 				}
 			}
@@ -323,6 +323,11 @@ function exportSettingsCore() {
 	var tagarr = localStorage.getItem("tag");
 	var favtag = JSON.parse(tagarr);
 	exp.favoriteTags = favtag;
+	exp.revisons = 2.1
+	exp.meta = {}
+	exp.meta.date = new Date()
+	exp.meta.thedesk = localStorage.getItem("ver")
+	exp.meta.platform = localStorage.getItem("platform")
 	return exp;
 }
 function importSettings() {
@@ -340,8 +345,7 @@ function importSettings() {
 		}
 	})
 }
-function importSettingsCore(arg) {
-	var obj = JSON.parse(arg);
+function importSettingsCore(obj) {
 	if (obj) {
 		localStorage.clear();
 		localStorage.setItem("multi", JSON.stringify(obj.accts));
@@ -356,7 +360,7 @@ function importSettingsCore(arg) {
 		}
 		localStorage.setItem("column", JSON.stringify(obj.columns));
 		if (obj.config) {
-			//Version 2
+			//Version 2~
 			var max = envView.config.length;
 			for (var i = 0; i < max; i++) {
 				var ls = envView.config[i].storage;

app/js/ui/tips.js

@@ -25,7 +25,7 @@ function tips(mode) {
 	clearInterval(spotStart);
 	if (mode == "ver") {
 		tipsToggle()
-		$("#tips-text").html('<img src="../../img/desk.png" width="20" onclick="todo(\'!TheDesk! It\\\'s a nice client!\')"><span style="font-size:20px">TheDesk</span> ' + localStorage.getItem("ver") + '[<i class="material-icons" style="font-size:1.2rem;top: 3px;position: relative;">supervisor_account</i><span id="persons">1+</span>]')
+		$("#tips-text").html('<img src="../../img/desk.png" width="20" onclick="todo(\'TheDesk is a nice client!: TheDesk ' + localStorage.getItem("ver") + ' git: '+ gitHash +'\')">TheDesk ' + localStorage.getItem("ver") + ' {'+ gitHash.slice(0, 7) +'} [<i class="material-icons" style="font-size:1.2rem;top: 3px;position: relative;">supervisor_account</i><span id="persons">1+</span>]')
 		localStorage.setItem("tips", "ver")
 	} else if (mode == "clock") {
 		tipsToggle()

app/js/userdata/his-data.js

@@ -162,7 +162,7 @@ function flw(user, more, acct_id) {
 		} else {
 			$("#his-follow-list-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();
 
 	});
 }
@@ -228,7 +228,7 @@ function fer(user, more, acct_id) {
 		} else {
 			$("#his-follower-list-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();
 	});
 }
 
@@ -390,7 +390,7 @@ function showBlo(more, acct_id) {
 		} else {
 			$("#his-blocking-list-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();
 	});
 }
 
@@ -453,7 +453,7 @@ function showReq(more, acct_id) {
 		} else {
 			$("#his-request-list-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();
 	});
 }
 
@@ -550,15 +550,19 @@ function showFrl(more, acct_id) {
 		} else {
 			$("#his-follow-recom-contents").html(templete);
 		}
-
+		jQuery("time.timeago").timeago();
 	});
 }
 //Keybase
-function udAdd(start) {
-	fetch(start, {
+function udAdd(acct_id, id, start) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var proof = "https://" + domain + "/api/v1/accounts/" + id + "/identity_proofs"
+	fetch(proof, {
 		method: 'GET',
 		headers: {
-			'Accept': 'application/json'
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
 		},
 		//body: JSON.stringify({})
 	}).then(function (response) {
@@ -567,16 +571,10 @@ function udAdd(start) {
 		todo(error);
 		console.error(error);
 	}).then(function (json) {
-		var fields = json.attachment;
+		var fields = json;
 		for (var i = 0; i < fields.length; i++) {
-			if (fields[i].type == "IdentityProof") {
-				if (fields[i].signatureAlgorithm == "keybase") {
-					var html = '<a href="https://keybase.io/' + fields[i].name + '" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].signatureAlgorithm)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].signatureAlgorithm) + ':' + escapeHTML(fields[i].name) + '</a>';
-				} else {
-					var html = '<span class="cbadge teal" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].signatureAlgorithm)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].signatureAlgorithm) + ':' + escapeHTML(fields[i].name) + '</span>';
-				}
-				$("#his-proof-prof").append(html)
-			}
+			var html = '<a href="' + fields[i].proof_url + '" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].provider)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].provider) + ':' + escapeHTML(fields[i].provider_username) + '</a>';
+			$("#his-proof-prof").append(html)
 		}
 	});
 	fetch("https://notestock.osa-p.net/api/v1/isstock.json?id=" + start.replace("@", "users/"), {

app/js/userdata/showOnTL.js

@@ -205,7 +205,7 @@ function udg(user, acct_id) {
 		}
 		todc();
 		//外部データ取得(死かもしれないので)
-		udAdd(json.url);
+		udAdd(acct_id, user, json.url);
 	});
 }
 function misskeyUdg(user, acct_id) {

app/main.js

@@ -18,6 +18,23 @@ const app = electron.app;
 const BrowserWindow = electron.BrowserWindow;
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow;
+
+// アプリが多重起動しないようにする
+const gotTheLock = app.requestSingleInstanceLock()
+
+if (!gotTheLock) {
+	app.quit()
+} else {
+	app.on('second-instance', () => {
+		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
+		// Someone tried to run a second instance, we should focus our window.
+		if (mainWindow) {
+		if (mainWindow.isMinimized()) mainWindow.restore()
+		mainWindow.focus()
+		}
+	})
+}
+
 if (process.argv.indexOf("--dev") === -1) {
 	var packaged = true;
 } else {
@@ -202,7 +219,7 @@ function createWindow() {
 
 	var platform = process.platform;
 	var bit = process.arch;
-	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir)));
+	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname)));
 	//CSS
 	css.css(mainWindow);
 	//アップデータとダウンロード

app/main/dl.js

@@ -26,11 +26,9 @@ function dl(mainWindow, lang_path, base, dirname) {
 				"transparent": false, // ウィンドウの背景を透過
 				"frame": false, // 枠の無いウィンドウ
 				"resizable": false
-			});
-			//updatewin.openDevTools()
+			})
 			var lang = fs.readFileSync(lang_path, 'utf8');
 			updatewin.loadURL(base + lang + '/update.html');
-
 			return "true"
 		} else {
 			return false;

app/main/language.js

@@ -1,11 +1,12 @@
 // Create the Application's main menu
-function templete(lang, mainWindow, packaged, dir) {
+function templete(lang, mainWindow, packaged, dir, dirname) {
     if(lang !="ja" && lang != "en"){
         lang = "en"
     }
     const electron = require("electron");
     const app = electron.app;
     const BrowserWindow = electron.BrowserWindow;
+    const join = require('path').join;
     const dict = {
         "application": {
             "ja": "アプリケーション",
@@ -101,9 +102,9 @@ function templete(lang, mainWindow, packaged, dir) {
                             webviewTag: false,
                             nodeIntegration: false,
                             contextIsolation: true,
-                            preload: "../js/platform/preload.js"
+                            preload: join(dirname , "js", "platform", "preload.js")
                         },
-                        width: 300, height: 460,
+                        width: 300, height: 500,
                         "transparent": false,    // ウィンドウの背景を透過
                         "frame": false,     // 枠の無いウィンドウ
                         "resizable": false

app/main/system.js

@@ -4,6 +4,7 @@ function system(mainWindow, dir, lang, dirname) {
 	const join = require('path').join;
 	var Jimp = require("jimp");
 	const fs = require("fs");
+	var JSON5 = require('json5');
 	var ipc = electron.ipcMain;
 	var tmp_img = join(app.getPath("userData"), "tmp.png");
 	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
@@ -42,7 +43,12 @@ function system(mainWindow, dir, lang, dirname) {
 	});
 	//プラットフォーム
 	ipc.on('getPlatform', function (e, arg) {
-		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron]);
+		try {
+			var gitHash = fs.readFileSync("git", 'utf8')
+		} catch{
+			var gitHash = null
+		}
+		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash]);
 	})
 	//言語
 	ipc.on('lang', function (e, arg) {
@@ -56,7 +62,7 @@ function system(mainWindow, dir, lang, dirname) {
 		dialog.showSaveDialog(null, {
 			title: 'Export',
 			properties: ['openFile', 'createDirectory'],
-			defaultPath: "export.thedeskconfigv2"
+			defaultPath: "export.thedeskconfig.json5"
 		}, (savedFiles) => {
 			if (!savedFiles) {
 				return false;
@@ -70,13 +76,13 @@ function system(mainWindow, dir, lang, dirname) {
 			title: 'Import',
 			properties: ['openFile'],
 			filters: [
-				{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2'] },
+				{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2', 'json5'] },
 			]
 		}, (fileNames) => {
 			if (!fileNames) {
 				return false;
 			}
-			e.sender.webContents.send('config', fs.readFileSync(arg, 'utf8'));
+			e.sender.webContents.send('config', JSON5.parse(fs.readFileSync(fileNames[0], 'utf8')));
 		})
 	})
 	//保存フォルダのダイアログ
@@ -125,10 +131,12 @@ function system(mainWindow, dir, lang, dirname) {
 		var window = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
-				nodeIntegration: false
+				nodeIntegration: false,
+				contextIsolation: true,
+				preload: join(dirname, "js", "platform", "preload.js")
 			},
 			width: 300,
-			height: 480,
+			height: 500,
 			"transparent": false, // ウィンドウの背景を透過
 			"frame": false, // 枠の無いウィンドウ
 			"resizable": false
@@ -151,7 +159,7 @@ function system(mainWindow, dir, lang, dirname) {
 				webviewTag: false,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(dirname,"js", "platform", "preload.js")
+				preload: join(dirname, "js", "platform", "preload.js")
 			},
 			width: 350,
 			height: 200,
@@ -187,7 +195,8 @@ function system(mainWindow, dir, lang, dirname) {
 
 
 	ipc.on('export', (e, args) => {
-		fs.writeFileSync(args[0], args[1]);
+		fs.writeFileSync(args[0], JSON5.stringify(args[1]));
+		e.sender.webContents.send('exportAllComplete', "");
 	});
 	//フォント
 	function object_array_sort(data, key, order, fn) {

app/manifest.json

@@ -0,0 +1,21 @@
+{
+  "name": "TheDesk",
+  "short_name": "TheDesk",
+  "icons": [
+    {
+      "src": "./img/desk.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": "/",
+  "display": "standalone",
+  "orientation": "portrait-primary",
+  "background_color": "#212121",
+  "theme_color": "#212121",
+  "description": "TheDesk",
+  "dir": "ltr",
+  "lang": "ja-jp",
+  "related_applications": [],
+  "prefer_related_applications": false
+}

app/node_modules/.bin/electron

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/electron-builder

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron-builder/out/cli/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron-builder/out/cli/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

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

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

app/node_modules/.bin/electron-download

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron-download/lib/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron-download/lib/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

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

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

app/node_modules/.bin/electron.cmd

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

app/node_modules/.bin/esparse

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../esprima/bin/esparse.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../esprima/bin/esparse.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/esparse.cmd

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

app/node_modules/.bin/esvalidate

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../esprima/bin/esvalidate.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../esprima/bin/esvalidate.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/esvalidate.cmd

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

app/node_modules/.bin/extract-zip

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../extract-zip/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../extract-zip/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

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

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

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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../electron-builder/out/cli/install-app-deps.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../electron-builder/out/cli/install-app-deps.js" "$@"
+  ret=$?
+fi
+exit $ret

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

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

app/node_modules/.bin/is-ci

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../is-ci/bin.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../is-ci/bin.js" "$@"
+  ret=$?
+fi
+exit $ret

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

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../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

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../json5/lib/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../json5/lib/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/json5.cmd

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../mime/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../mime/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/mime.cmd

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../mkdirp/bin/cmd.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../mkdirp/bin/cmd.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/mkdirp.cmd

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../nugget/bin.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../nugget/bin.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/nugget.cmd

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../pixelmatch/bin/pixelmatch" "$@"
+  ret=$?
+else 
+  node  "$basedir/../pixelmatch/bin/pixelmatch" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/pixelmatch.cmd

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../pretty-bytes/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../pretty-bytes/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

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

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../rc/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../rc/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/rc.cmd

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../semver/bin/semver" "$@"
+  ret=$?
+else 
+  node  "$basedir/../semver/bin/semver" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/semver.cmd

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../sshpk/bin/sshpk-conv" "$@"
+  ret=$?
+else 
+  node  "$basedir/../sshpk/bin/sshpk-conv" "$@"
+  ret=$?
+fi
+exit $ret

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

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../sshpk/bin/sshpk-sign" "$@"
+  ret=$?
+else 
+  node  "$basedir/../sshpk/bin/sshpk-sign" "$@"
+  ret=$?
+fi
+exit $ret

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

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../sshpk/bin/sshpk-verify" "$@"
+  ret=$?
+else 
+  node  "$basedir/../sshpk/bin/sshpk-verify" "$@"
+  ret=$?
+fi
+exit $ret

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

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../strip-indent/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../strip-indent/cli.js" "$@"
+  ret=$?
+fi
+exit $ret

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

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../uuid/bin/uuid" "$@"
+  ret=$?
+else 
+  node  "$basedir/../uuid/bin/uuid" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/uuid.cmd

@@ -0,0 +1,7 @@
+@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

@@ -0,0 +1,15 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../which/bin/which" "$@"
+  ret=$?
+else 
+  node  "$basedir/../which/bin/which" "$@"
+  ret=$?
+fi
+exit $ret

app/node_modules/.bin/which.cmd

@@ -0,0 +1,7 @@
+@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

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

@@ -0,0 +1,22 @@
+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

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

app/node_modules/7zip-bin/index.d.ts

@@ -0,0 +1,2 @@
+export const path7za: string
+export const path7x: string

app/node_modules/7zip-bin/index.js

@@ -0,0 +1,22 @@
+"use strict"
+
+const path = require("path")
+
+function getPath() {
+  if (process.env.USE_SYSTEM_7ZA === "true") {
+    return "7za"
+  }
+
+  if (process.platform === "darwin") {
+    return path.join(__dirname, "mac", "7za")
+  }
+  else if (process.platform === "win32") {
+    return path.join(__dirname, "win", process.arch, "7za.exe")
+  }
+  else {
+    return path.join(__dirname, "linux", process.arch, "7za")
+  }
+}
+
+exports.path7za = getPath()
+exports.path7x = path.join(__dirname, "7x.sh")