TheDesk 21.0.5 (Mayu)

Bump sweetalert2 from 9.15.2 to 9.17.0 in /app

.github/FUNDING.yml

@@ -5,4 +5,4 @@ patreon: cutls
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-custom: https://www.pixiv.net/fanbox/creator/28105985
+custom: https://cutls.fanbox.cc

.gitignore

@@ -23,3 +23,4 @@ app/view/es-AR
 app/git
 *.code-workspace
 releasenote.md
+app/yarn-error.log

README.md

@@ -28,7 +28,6 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
 * [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
 * [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
 * [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
-* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
 
 The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
 
@@ -47,19 +46,6 @@ The default sounds of notifications is provided [Creative Commons BY](https://cr
 
 Crowdin project is available! Visit: https://translate.thedesk.top
 
-## Requirement and development
-
-* Electron 4.2 or above(install yourself)
-* electron-dl(in package.json)
-* Jimp(in package.json)
-* font-manager(in package.json)
-  * Python 2.x(install yourself)
-  * VisualC++(Windows)(install yourself)
-* itunes-nowplaying-mac(for macOS)(in package.json)
-* node-notifier(in package.json)
-* sumchecker(in package.json)
-* Ability to read unformated files!(install yourself)
-
 ### Run on developer mode
 
 `npm run dev` on `app` folder.
@@ -159,6 +145,17 @@ Linux
 macOS  
 `electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  
 
+### PWA support
+
+TheDesk is a wed-based app, so you can run it on a browser. Of course, the main stream is as Electron. Some features won't work as well as Electron.
+
+You can run `npm run build:pwa` to build as PWA, including `manifest.json` and the ServiceWorker.
+
+**You have to rename `node_modules` to `dependencies` to run as a web application. (restricted by Netlify)**
+
+Check the app on Chrome or Firefox: [Here](https://app.thedesk.top) (it follows the `master` branch, so not stable.)  
+[![Netlify Status](https://api.netlify.com/api/v1/badges/6916503b-2882-43f7-9681-ab814e6d28f9/deploy-status)](https://app.netlify.com/sites/thedesk/deploys)
+
 ## Pleroma support
 
 Did you find a bug with Pleroma accounts?  
@@ -168,4 +165,3 @@ Please write issues to improve TheDesk affinity with Pleroma.
 ## Vulnerabilities when `npm i`???
 
 No, if your npm says materialize-css has vulnerabilities(CVE-2019-11002/3/4), look at [here](https://github.com/Dogfalo/materialize/issues/6286) under discussion.
-

README_ja.md

@@ -46,19 +46,6 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
   
 Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.top  
 
-## 環境
-
-* Electron 4.2以上(自分で入れて)
-* electron-dl(in package.json)
-* Jimp(in package.json)
-* font-manager(in package.json)
-  * Python 2.x(自分で入れて)
-  * VisualC++(Windows)(自分で入れて)
-* itunes-nowplaying-mac(macOS向け)(in package.json)
-* node-notifier(in package.json)
-* sumchecker(in package.json)
-* Ability to read unformated files!(自分で入れて)
-
 ### デベロッパーモード
 
 `npm run dev`を`app`フォルダ内で実行
@@ -158,6 +145,17 @@ Linux
 macOS  
 `electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  
 
+### PWAとして実行
+
+TheDeskはウェブ技術を使用して作られているので、ブラウザで動かすこともできます。もちろん、Electron向けに設計されているので一部機能は動きません。
+
+`npm run build:pwa`でビルドできます。PWAに必要な`manifest.json`やサービスワーカーなども要員されています。
+
+**`node_modules`を`dependencies`にリネームしないと動きません。(Netlifyの制限です)**
+
+ChromeまたはFirefoxでチェック: [こちら](https://app.thedesk.top) (`master`ブランチに追従しています。不安定です。)  
+[![Netlify Status](https://api.netlify.com/api/v1/badges/6916503b-2882-43f7-9681-ab814e6d28f9/deploy-status)](https://app.netlify.com/sites/thedesk/deploys)
+
 ## Pleromaのサポート
 
 Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  

app/about.html

@@ -1,135 +1,139 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="ja">
+	<head>
+		<title>TheDesk</title>
+		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
+		<link href="./css/font-awesome.css" rel="stylesheet" type="text/css" />
+		<link href="./css/themes.css" type="text/css" rel="stylesheet" />
+		<link href="./css/master.css" type="text/css" rel="stylesheet" />
+		<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet" />
+		<meta charset="utf-8" />
+		<style>
+			body {
+				font-family: 'Open Sans';
+				-webkit-app-region: drag;
+				cursor: move;
+				padding: 5px;
+				padding-top: 15px;
+			}
 
-<head>
+			a,
-    <title>TheDesk</title>
+			button {
-    <meta content="width=device-width,initial-scale=1.0" name="viewport">
+				-webkit-app-region: no-drag;
-    <link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
+			}
-    <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
-    <link href="./css/themes.css" type="text/css" rel="stylesheet">
-    <link href="./css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
-    <meta charset="utf-8">
-    <style>
-        body {
-            font-family: 'Open Sans';
-            -webkit-app-region: drag;
-            cursor: move;
-            padding: 5px;
-            padding-top: 15px;
-        }
 
-        a,
+			.container {
-        button {
+				width: 100%;
-            -webkit-app-region: no-drag;
+				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' 'name6 data6';
+				text-align: left;
+				margin: 5px;
+			}
 
-        .container {
+			.area-name1 {
-            width: 100%;
+				grid-area: name1;
-            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''name6 data6';
-            text-align: left;
-            margin: 5px;
-        }
 
-        .area-name1 {
+			.area-data1 {
-            grid-area: name1;
+				grid-area: data1;
-        }
+			}
 
-        .area-data1 {
+			.area-name2 {
-            grid-area: data1;
+				grid-area: name2;
-        }
+			}
 
-        .area-name2 {
+			.area-data2 {
-            grid-area: name2;
+				grid-area: data2;
-        }
+			}
 
-        .area-data2 {
+			.area-name3 {
-            grid-area: data2;
+				grid-area: name3;
-        }
+			}
 
-        .area-name3 {
+			.area-data3 {
-            grid-area: name3;
+				grid-area: data3;
-        }
+			}
 
-        .area-data3 {
+			.area-name4 {
-            grid-area: data3;
+				grid-area: name4;
-        }
+			}
 
-        .area-name4 {
+			.area-data4 {
-            grid-area: name4;
+				grid-area: data4;
-        }
+			}
 
-        .area-data4 {
+			.area-name5 {
-            grid-area: data4;
+				grid-area: name5;
-        }
+			}
 
-        .area-name5 {
+			.area-data5 {
-            grid-area: name5;
+				grid-area: data5;
-        }
+			}
 
-        .area-data5 {
+			.area-name6 {
-            grid-area: data5;
+				grid-area: name6;
-        }
+			}
 
-        .area-name6 {
+			.area-data6 {
-            grid-area: name6;
+				grid-area: data6;
-        }
+			}
+		</style>
+	</head>
 
-        .area-data6 {
+	<body class="center" style="overflow: hidden;">
-            grid-area: data6;
+		<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
-        }
+		<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-    </style>
+		<script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
-</head>
+		<img src="./img/desk.svg" style="max-width: 62%;" />
-
+		<h5>TheDesk</h5>
-<body class="center " style="overflow:hidden">
+		<div class="container">
-    <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
+			<div class="area-name1">Display version</div>
-    <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
+			<div class="area-data1" id="now"></div>
-    <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
+			<div class="area-name2">Internal version</div>
-    <img src="./img/desk.svg" style="max-width:62%;">
+			<div class="area-data2" id="ver"></div>
-    <h5>TheDesk</h5>
+			<div class="area-name3">Commit(7chars)</div>
-    <div class="container">
+			<div class="area-data3" id="hash"></div>
-        <div class="area-name1">Display version</div>
+			<div class="area-name4">Chromium</div>
-        <div class="area-data1" id="now"></div>
+			<div class="area-data4" id="chrome"></div>
-        <div class="area-name2">Internal version</div>
+			<div class="area-name5">Electron</div>
-        <div class="area-data2" id="ver"></div>
+			<div class="area-data5" id="electron"></div>
-        <div class="area-name3">Commit(7chars)</div>
+			<div class="area-name6">Node.js</div>
-        <div class="area-data3" id="hash"></div>
+			<div class="area-data6" id="node"></div>
-        <div class="area-name4">Chromium</div>
+		</div>
-        <div class="area-data4" id="chrome"></div>
+		<div class="cp">
-        <div class="area-name5">Electron</div>
+			Copyright &copy; TheDesk 2018<br />
-        <div class="area-data5" id="electron"></div>
+			Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br />
-        <div class="area-name6">Node.js</div>
+			Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a
-        <div class="area-data6" id="node"></div>
+				href="https://pl.kpherox.dev/kPherox"
-    </div>
+				target="_blank"
-    <div class="cp">Copyright &copy; TheDesk 2018<br>
+				>kPherox</a
-        Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
+			>
-        Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a
+			and all users
-            href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pl.kpherox.dev/kPherox"
+			<img draggable="false" style="width: 0.8rem; top: 1px; margin-left: 1px; position: relative;" alt="❤️" title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png" />
-            target="_blank">kPherox</a> and all users
+			<br /><a href="https://thedesk.top" target="_blank">Web site</a>
-        <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️"
+		</div>
-            title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
+		<button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
-        <br><a href="https://thedesk.top" target="_blank">Web site</a></div>
+		<script type="text/javascript" src="./js/ui/theme.js"></script>
-    <button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i
+		<script>
-            class="material-icons left">close</i>Close</button>
+			var about = JSON.parse(localStorage.getItem('about'))
-    <script type="text/javascript" src="./js/ui/theme.js"></script>
+			$('#now').text(localStorage.getItem('ver'))
-    <script>
+			$('#node').text(about[0])
-        var about = JSON.parse(localStorage.getItem("about"));
+			$('#chrome').text(about[1])
-        $("#now").text(localStorage.getItem("ver"));
+			$('#electron').text(about[2])
-        $("#node").text(about[0]);
+			if (location.search) {
-        $("#chrome").text(about[1]);
+				var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/)
-        $("#electron").text(about[2]);
+				var ver = m[1]
-        if (location.search) {
+				$('#ver').text(ver)
-            var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/);
+			}
-            var ver = m[1];
+			$('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
-            $("#ver").text(ver);
+			$(document).on('click', 'a', (e) => {
-        }
+				var url = $(e.target).attr('href')
-        $("#hash").html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>');
+				postMessage(['openUrl', url], '*')
-        $(document).on('click', 'a', e => {
+				return false
-            var url = $(e.target).attr('href');
+			})
-            postMessage(["openUrl", url], "*")
+		</script>
-            return false;
+	</body>
-        });
+</html>
-    </script>

app/css/acct.css

@@ -0,0 +1,82 @@
+.acct {
+	display: flex;
+	justify-content: space-around;
+}
+
+.card {
+	width: 400px;
+	background-color: #494949;
+	margin: 10px;
+}
+
+body,
+html {
+	overflow-y: scroll;
+}
+
+#acct-list {
+	display: flex;
+	flex-wrap: wrap;
+	color: white;
+	align-items: flex-start;
+}
+
+.lts {
+	font-size: 150%;
+}
+
+.colorsel {
+	display: flex;
+}
+
+.card .colorsel div:not(.exc) {
+	width: 20px;
+	height: 20px;
+}
+
+.card .colorsel div.exc {
+	width: 40px;
+	height: 20px;
+}
+
+.first {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.first .hide-first {
+	display: none;
+}
+.hide-second {
+	display: none;
+}
+.first .hide-second {
+	display: inline;
+}
+
+#compt {
+	margin-top: 20px;
+	margin-bottom: 50px;
+	border: 1px solid;
+	border: 1px solid;
+	padding: 5px;
+}
+
+#compt li {
+	list-style-type: disc;
+	margin-left: 20px;
+}
+
+#domain-list {
+    width: 500px;
+    max-width: 100%;
+}
+
+i.left {
+    margin-right: 5px;
+}
+
+#domain-list .title {
+   font-size: 1.3rem;
+}

app/css/master.css

@@ -1,515 +1,608 @@
 /*共通CSS*/
 html,
 body {
-  /*transform: translate3d(0,0,0);*/
+	/*transform: translate3d(0,0,0);*/
-  overflow: hidden;
+	overflow: hidden;
-  user-select: none;
+	user-select: none;
-  cursor: default;
+	cursor: default;
-  font-size: 13px;
+	height: 100vh;
-  height: 100vh;
+	color: var(--color);
-  color: var(--color);
 }
-.btn {
+html {
-  margin: 5px;
+	font-size: 13px;
-  text-transform: none;
+}
+.titlebar,
+.menubar-menu-container,
+.action-menu-item {
+	background-color: var(--notfbox) !important;
+	filter: brightness(110%) !important;
+	color: var(--color) !important;
+}
+.action-menu-item:hover {
+	filter: brightness(80%) !important;
+}
+.btn, .btn-flat {
+	font-size: 1.1rem;
+	margin: 0.4rem;
+	text-transform: none;
+	height: 2.76rem;
+	line-height: 2.76rem;
 }
 .markdown {
-  display: none;
+	display: none;
 }
-help {
+.accessMark {
-  display: none;
+	font-size: 12px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	background-color: var(--emphasized);
+	padding-left: 5px;
+	padding-right: 5px;
+}
+.accessibility .scr {
+	display: none !important;
 }
 .show-help {
-  display: inline;
+	display: inline;
 }
 option {
-  display: none;
+	display: none;
 }
 #mainView {
-  padding: 10px;
+	padding: 10px;
-  overflow: scroll;
+	overflow: scroll;
-  height: auto;
+	height: auto;
 }
 #message {
-  display: none;
+	display: none;
-  position: fixed;
+	position: fixed;
-  bottom: 0;
+	bottom: 0;
-  left: 0;
+	left: 0;
-  background-color: black;
+	background-color: black;
-  color: white;
+	color: white;
-  z-index: 9999;
+	z-index: 9999;
 }
 #imagemodal,
 #videomodal {
-  display: none;
+	display: none;
-  max-width: 100vw;
+	max-width: 100vw;
-  max-height: 100vh;
+	max-height: 100vh;
-  position: fixed;
+	position: fixed;
-  z-index: 9;
+	z-index: 9;
-  top: 0 !important;
+	top: 0 !important;
 }
 #videomodal,
 #tootmodal {
-  background-color: var(--modal);
+	background-color: var(--modal);
 }
 #imagemodal .modal-content {
-  overflow: hidden;
+	overflow: hidden;
-  padding: 0;
+	padding: 0;
 }
 #imagemodal .modal-footer {
-  overflow-x: scroll;
+	overflow-x: hidden;
-  overflow-y: hidden;
+	overflow-y: hidden;
 }
 
 #imagewrap {
-  width: 100%;
+	width: 100%;
-  height: 100%;
+	height: 100%;
 }
 .pointer {
-  cursor: pointer;
+	cursor: pointer;
 }
 .badge {
-  min-width: 0 !important;
+	min-width: 0 !important;
-  margin-left: 5px !important;
+	margin-left: 0.4rem !important;
 }
 .unvisible {
-  opacity: 0;
+	opacity: 0;
 }
 .bbcode-pulse-loadings,
 .bbcode-pulse-loading,
 .fa-pulse {
-  display: inline-block;
+	display: inline-block;
-  animation-duration: 3s;
+	animation-duration: 3s;
-  animation-fill-mode: both;
+	animation-fill-mode: both;
-  animation-iteration-count: infinite;
+	animation-iteration-count: infinite;
-  animation-name: pulse;
+	animation-name: pulse;
 }
 @keyframes pulse {
-  from,
+	from,
-  50%,
+	50%,
-  to {
+	to {
-    opacity: 1;
+		opacity: 1;
-  }
+	}
-  25%,
+	25%,
-  75% {
+	75% {
-    opacity: 0;
+		opacity: 0;
-  }
+	}
 }
 @keyframes shake {
-  from,
+	from,
-  to {
+	to {
-    -webkit-transform: translate3d(0, 0, 0);
+		-webkit-transform: translate3d(0, 0, 0);
-    transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
-  }
+	}
 
-  10%,
+	10%,
-  30%,
+	30%,
-  50%,
+	50%,
-  70%,
+	70%,
-  90% {
+	90% {
-    -webkit-transform: translate3d(-10px, 0, 0);
+		-webkit-transform: translate3d(-10px, 0, 0);
-    transform: translate3d(-10px, 0, 0);
+		transform: translate3d(-10px, 0, 0);
-  }
+	}
 
-  20%,
+	20%,
-  40%,
+	40%,
-  60%,
+	60%,
-  80% {
+	80% {
-    -webkit-transform: translate3d(10px, 0, 0);
+		-webkit-transform: translate3d(10px, 0, 0);
-    transform: translate3d(10px, 0, 0);
+		transform: translate3d(10px, 0, 0);
-  }
+	}
 }
 
 .shake {
-  display: inline-block;
+	display: inline-block;
-  animation-duration: 1s;
+	animation-duration: 1s;
-  animation-fill-mode: both;
+	animation-fill-mode: both;
-  animation-iteration-count: infinite;
+	animation-iteration-count: infinite;
-  animation-name: shake;
+	animation-name: shake;
 }
 code:before,
 .pre:before {
-  content: "Code";
+	content: 'Code';
-  font-size: 1.8rem;
+	font-size: 1.8rem;
-  line-height: 1em;
+	line-height: 1em;
-  font-family: monospace, monospace;
+	font-family: monospace, monospace;
-  color: #999;
+	color: #999;
-  position: absolute;
+	position: absolute;
-  right: 0;
+	right: 0;
-  top: 0;
+	top: 0;
 }
 code,
 pre {
-  color: white;
+	color: white;
-  display: block;
+	display: block;
-  border-left: 5px solid;
+	border-left: 5px solid;
-  border-color: #079903;
+	border-color: #079903;
-  padding-left: 10px;
+	padding-left: 0.75rem;
-  margin-top: 5px;
+	margin-top: 0.75rem;
-  margin-bottom: 5px;
+	margin-bottom: 0.75rem;
-  margin-left: 5px;
+	margin-left: 0.75rem;
-  background-color: #000;
+	background-color: #000;
-  padding: 1em 1em 1em;
+	padding: 1em 1em 1em;
-  position: relative;
+	position: relative;
-  border-top-left-radius: 10px;
+	border-top-left-radius: 0.75rem;
-  border-bottom-right-radius: 10px;
+	border-bottom-right-radius: 0.75rem;
-  border-bottom-left-radius: 10px;
+	border-bottom-left-radius: 0.75rem;
+	white-space: normal;
 }
 blockquote,
 .quote p {
-  margin: 0;
+	margin: 0;
 }
 blockquote,
 .quote {
-  color: black;
+	color: black;
-  background-color: #ddd;
+	background-color: #ddd;
-  padding: 1em 1em 1em;
+	padding: 1em 1em 1em;
-  position: relative;
+	position: relative;
-  border-top-left-radius: 10px;
+	border-top-left-radius: 0.75rem;
-  border-bottom-right-radius: 10px;
+	border-bottom-right-radius: 0.75rem;
-  border-bottom-left-radius: 10px;
+	border-bottom-left-radius: 0.5rem;
 }
 blockquote:before,
 .quote:before {
-  content: "Quote";
+	content: 'Quote';
-  font-size: 1.8rem;
+	font-size: 1.8rem;
-  line-height: 1em;
+	line-height: 1em;
-  font-family: Open Sans, cursive;
+	font-family: Open Sans, cursive;
-  color: #999;
+	color: #999;
-  position: absolute;
+	position: absolute;
-  right: 0;
+	right: 0;
-  top: 0;
+	top: 0;
 }
 .pixiv-post {
-  color: black;
+	color: black;
-  background-color: #fff;
+	background-color: #fff;
-  padding: 1em 1em 1em;
+	padding: 1em 1em 1em;
-  position: relative;
+	position: relative;
-  border-top-left-radius: 10px;
+	border-top-left-radius: 0.75rem;
-  border-bottom-right-radius: 10px;
+	border-bottom-right-radius: 0.75rem;
-  border-bottom-left-radius: 10px;
+	border-bottom-left-radius: 0.75rem;
-  border-left: 5px solid #0096fa;
+	border-left: 5px solid #0096fa;
 }
 .pixiv-post :before {
-  content: "From Pixiv";
+	content: 'From Pixiv';
-  font-size: 1.8rem;
+	font-size: 1.8rem;
-  line-height: 1em;
+	line-height: 1em;
-  font-family: Open Sans;
+	font-family: Open Sans;
-  color: #999;
+	color: #999;
-  position: absolute;
+	position: absolute;
-  right: 0;
+	right: 0;
-  top: 0;
+	top: 0;
 }
 #start {
-  display: none;
+	display: none;
-  position: fixed;
+	position: fixed;
-  width: 100vw;
+	width: 100vw;
-  height: calc(100vh - 40px);
+	height: calc(100vh - 3rem);
-  background-color: var(--bg);
+	background-color: var(--bg);
-  color: var(--color);
+	color: var(--color);
-  z-index: 99999;
+	z-index: 99999;
-  justify-content: center;
+	justify-content: center;
-  align-items: center;
+	align-items: center;
 }
 #drag {
-  display: none;
+	display: none;
-  position: fixed;
+	position: fixed;
-  width: 100vw;
+	width: 100vw;
-  height: 100vh;
+	height: 100vh;
-  background-color: var(--bg);
+	background-color: var(--bg);
-  color: var(--color);
+	color: var(--color);
-  z-index: 99999;
+	z-index: 99999;
-  justify-content: center;
+	justify-content: center;
-  align-items: center;
+	align-items: center;
 }
 #drag-content {
-  font-size: 2rem;
+	font-size: 2rem;
 }
 #pip {
-  z-index: 504;
+	z-index: 504;
-  width: 418px;
+	width: 418px;
-  background-color: var(--subcolor);
+	background-color: var(--subcolor);
-  position: absolute;
+	position: absolute;
 }
 .pip-bottom {
-  bottom: 10px;
+	bottom: 10px;
 }
 .pip-left {
-  left: 10px;
+	left: 10px;
 }
 .pip-top {
-  top: 10px;
+	top: 10px;
 }
 .pip-right {
-  right: 10px;
+	right: 10px;
 }
 #pip-content .material-icons {
-  display: none;
+	display: none;
 }
 .big-text {
-  font-size: 1.2rem;
+	font-size: 1.2rem;
 }
 #releasenote {
-  background-color: var(--modal);
+	background-color: var(--modal);
 }
 #releasenote li {
-  list-style-type: disc;
+	list-style-type: disc;
 }
 @media only screen and (min-width: 993px) {
-  #toast-container {
+	#toast-container {
-    top: auto;
+		top: auto;
-    right: auto;
+		right: auto;
-    bottom: 5%;
+		bottom: 5%;
-    left: 4%;
+		left: 4%;
-    max-width: 86%;
+		max-width: 86%;
-  }
+	}
 }
 .show {
-  animation: show 0.2s linear 0s;
+	animation: show 0.2s linear 0s;
 }
 @keyframes show {
-  from {
+	from {
-    opacity: 0;
+		opacity: 0;
-  }
+	}
-  to {
+	to {
-    opacity: 1;
+		opacity: 1;
-  }
+	}
 }
 .hide-anime {
-  animation: hide 0.2s linear 0s;
+	animation: hide 0.2s linear 0s;
-  display: none;
+	display: none;
 }
 @keyframes hide {
-  from {
+	from {
-    opacity: 1;
+		opacity: 1;
-  }
+	}
-  to {
+	to {
-    opacity: 0;
+		opacity: 0;
-  }
+	}
 }
 .collapsible-header,
 .tabs {
-  background-color: var(--subcolor);
+	background-color: var(--subcolor);
 }
 .collapsible-header:focus {
-  background-color: var(--subcolor) !important;
+	background-color: var(--subcolor) !important;
 }
 .modal-footer {
-  background-color: var(--modalfooter) !important;
+	background-color: var(--modalfooter) !important;
 }
 .font {
-  font-size: 1.5rem;
+	font-size: 1.5rem;
-  margin-bottom: 5px;
+	margin-bottom: 0.4rem;
 }
 .font:hover {
-  background-color: #999;
+	background-color: #999;
 }
 .release-do {
-  border: solid 2px;
+	border: solid 2px;
-  border-color: var(--color);
+	border-color: var(--color);
-  padding: 5px;
+	padding: 5px;
 }
 #pickers {
-  display: flex;
+	display: flex;
-  flex-wrap: wrap;
+	flex-wrap: wrap;
 }
 #menu {
-  position: fixed;
+	position: fixed;
-  z-index: 9999;
+	z-index: 9999;
-  background-color: var(--postbox);
+	background-color: var(--postbox);
-  width: 540px;
+	width: 540px;
-  top: calc(50% - 150px);
+	top: calc(50% - 150px);
-  left: calc(50% - 250px);
+	left: calc(50% - 250px);
-  padding: 5px;
+	padding: 0.4rem;
-  border: thin solid gray;
+	border: thin solid gray;
-  border-radius: 5px;
+	border-radius: 0.4rem;
-  overflow: hidden;
+	overflow: hidden;
 }
 #menu-wrapper {
-  margin-left: -5px;
+	margin-left: -5px;
-  display: flex;
+	display: flex;
-  height: calc(100% - 3.5rem);
+	height: calc(100% - 3.5rem);
-  overflow: hidden;
+	overflow: hidden;
 }
 #left-menu {
-  width: 230px;
+	width: 17.7rem;
 }
-#left-menu div {
+#left-menu a {
-  padding-left: 5px;
+	padding-left: 0.4rem;
-  width: 100%;
+	width: 100%;
-  height: 50px;
+	height: 3rem;
-  display: flex;
+	display: flex;
-  align-items: center;
+	align-items: center;
-  cursor: pointer;
+	cursor: pointer;
+	color: var(--color);
 }
-#left-menu div:hover {
+#left-menu a:hover {
-  background-color: var(--beforehover);
+	background-color: var(--beforehover);
 }
 #left-menu span {
-  margin-left: 5px;
+	margin-left: 0.4rem;
 }
-#left-menu div.active {
+#left-menu a.active {
-  background-color: var(--emphasized);
+	background-color: var(--emphasized);
 }
 #right-menu {
-  width: 100%;
+	width: 100%;
-  overflow-y: scroll;
+	overflow-y: scroll;
-  overflow-x: hidden;
+	overflow-x: hidden;
-  padding: 5px;
+	padding: 0.4rem;
 }
 #tltype {
-  display: flex;
+	display: flex;
-  flex-wrap: wrap;
+	flex-wrap: wrap;
 }
 #tltype .type {
-  display: flex;
+	display: flex;
-  flex-wrap: wrap;
+	flex-wrap: wrap;
-  align-items: center;
+	align-items: center;
-  width: 170px;
+	width: 13rem;
-  height: 40px;
+	height: 3.1rem;
-  cursor: pointer;
+	cursor: pointer;
+	color: var(--color);
 }
 #tltype .type span {
-  width: calc(100% - 30px);
+	width: calc(100% - 2.3rem);
 }
 #tltype .type:hover {
-  background-color: var(--beforehover);
+	background-color: var(--beforehover);
 }
 #tltype .active {
-  background-color: var(--emphasized);
+	background-color: var(--emphasized);
 }
 #tltype i {
-  font-size: 30px;
+	font-size: 2.3rem;
 }
 #tltype i.sub-icon {
-  font-size: 20px;
+	font-size: 1.53rem;
-  position: absolute;
+	position: absolute;
-  color: var(--beforehover);
+	color: var(--beforehover);
-  left: 10px;
+	left: 0.9rem;
-  bottom: 5px;
+	bottom: 0.4rem;
-  background-color: #fff;
+	background-color: #fff;
 }
 .drag-bar {
-  cursor: move;
+	cursor: move;
-  text-align: center;
+	text-align: center;
-  width: calc(100% + 10px);
+	width: calc(100% + 0.8rem);
-  border-radius: 5px;
+	border-radius: 5px;
-  background-color: var(--box);
+	background-color: var(--box);
-  filter: brightness(80%);
+	filter: brightness(80%);
-  margin-left: -5px;
+	margin-left: -0.4rem;
-  margin-right: -5px;
+	margin-right: -0.4rem;
-  margin-top: -5px;
+	margin-top: -0.4rem;
-  font-size: 16px;
+	font-size: 1.3rem;
-  padding: 4px;
+	padding: 0.3rem;
 }
 #something-wrong {
-  flex-direction: column;
+	flex-direction: column;
-  width: 100%;
+	width: 100%;
-  height: 100%;
+	height: 100%;
-  position: absolute;
+	position: absolute;
-  display: flex;
+	display: flex;
-  justify-content: center;
+	justify-content: center;
-  align-items: center;
+	align-items: center;
 }
 #support-btm {
-  position: fixed;
+	position: fixed;
-  bottom: -300px;
+	bottom: -300px;
-  width: 100vw;
+	width: 100vw;
-  background-color: var(--box);
+	background-color: var(--box);
-  z-index: 9999;
+	z-index: 9999;
-  padding: 10px;
+	padding: 0.8rem;
-  display: grid;
+	display: grid;
-  grid-template-columns: 3fr 1fr 1fr;
+	grid-template-columns: 3fr 1fr 1fr;
-  grid-template-rows: 1fr 36px;
+	grid-template-rows: 1fr 2.7rem;
-  grid-template-areas: "note middle right" "note close close";
+	grid-template-areas: 'note middle right' 'note close close';
 }
 #support-btm-en,
 #support-btm-ja {
-  grid-area: note;
+	grid-area: note;
 }
 #support-btm-middle {
-  grid-area: middle;
+	grid-area: middle;
 }
 #support-btm-right {
-  grid-area: right;
+	grid-area: right;
 }
 #support-btm-close {
-  grid-area: close;
+	grid-area: close;
 }
 .select-wrapper .dropdown-content {
-  width: 250px !important;
+	width: 19.2rem !important;
 }
 input,
 textarea {
-  color: var(--color);
+	color: var(--color);
-  font-size: 1rem !important;
+	font-size: 1rem !important;
-  font-family: inherit;
+	font-family: inherit;
 }
 .swal2-popup {
-  background-color: var(--notfbox) !important;
+	background-color: var(--notfbox) !important;
 }
 .swal2-title,
 .swal2-content {
-  color: var(--color) !important;
+	color: var(--color) !important;
 }
 #src-contents svg {
-  margin-right: 5px;
+	margin-right: 0.4rem;
 }
 .contributor {
-  cursor: pointer;
+	cursor: pointer;
 }
 .contributor img {
-  width: 1rem;
+	width: 1rem;
+}
+.tagComp {
+	display: grid;
+	grid-template-columns: 4.6rem 6.15rem 1fr;
+	grid-template-rows: 1fr 1fr;
+	grid-template-areas: 'svg toot user' 'svg toot tag' 'svg toots tag';
+	border-top: dotted 0.5px var(--gray);
+	padding: 0.4rem;
+}
+.tagCompSvg {
+	grid-area: svg;
+}
+.tagCompToot {
+	grid-area: toot;
+	text-align: center;
+}
+.tagCompToots {
+	grid-area: toots;
+	text-align: center;
+}
+.tagCompUser {
+	grid-area: user;
+}
+.tagCompTag {
+	grid-area: tag;
+	padding-top: 0.4rem;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+#sabakanMark {
+	background-color: var(--emphasized);
+}
+#pageSrc {
+	position: absolute;
+	top: 0;
+	left: calc(50vw - 11.53rem);
+	width: 23rem;
+	max-width: 100%;
+	background-color: var(--box);
+	z-index: 501;
+	padding: 0.4rem;
+}
+#pageSrcInput {
+	width: 12.3rem;
+}
+.voice {
+	clip: rect(1px, 1px, 1px, 1px);
+	position: absolute !important;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+
+@media (max-width: 500px) {
+	#pageSrc {
+		left: 0;
+	}
 }
 
 /*スクロールバー*/
 ::-webkit-scrollbar {
-  width: 5px;
+	width: 5px;
-  height: 10px;
+	height: 10px;
-  background: rgba(0, 0, 0, 0.05);
+	background: rgba(0, 0, 0, 0.05);
 }
 ::-webkit-scrollbar-track {
-  -webkit-border-radius: 5px;
+	-webkit-border-radius: 5px;
-  border-radius: 5px;
+	border-radius: 5px;
 }
 /* Handle */
 ::-webkit-scrollbar-thumb {
-  -webkit-border-radius: 5px;
+	-webkit-border-radius: 5px;
-  border-radius: 5px;
+	border-radius: 5px;
-  background: #607d8b;
+	background: #607d8b;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+	-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
 }
 /* Web Fonts */
 @font-face {
-  font-family: "Open Sans";
+	font-family: 'Open Sans';
-  font-style: normal;
+	font-style: normal;
-  font-weight: 300;
+	font-weight: 300;
-  src: local("Open Sans Light"), local("OpenSans-Light"),
+	src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.ttf') format('truetype');
-    url(https://fonts.gstatic.com/s/opensans/v17/mem5YaGs126MiZpBA-UN_r8OUuhp.woff2)
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-      format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
-    U+FEFF, U+FFFD;
 }
 @font-face {
-  font-family: "Material Icons";
+	font-family: 'Material Icons';
-  font-style: normal;
+	font-style: normal;
-  font-weight: 400;
+	font-weight: 400;
-  src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2)
+	src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
-    format("woff2");
 }
 .material-icons {
-  font-family: "Material Icons";
+	font-family: 'Material Icons';
-  font-weight: normal;
+	font-weight: normal;
-  font-style: normal;
+	font-style: normal;
-  font-size: 24px;
+	font-size: 1.84rem;
-  line-height: 1;
+	line-height: 1;
-  letter-spacing: normal;
+	letter-spacing: normal;
-  text-transform: none;
+	text-transform: none;
-  display: inline-block;
+	display: inline-block;
-  white-space: nowrap;
+	white-space: nowrap;
-  word-wrap: normal;
+	word-wrap: normal;
-  direction: ltr;
+	direction: ltr;
-  -webkit-font-feature-settings: "liga";
+	-webkit-font-feature-settings: 'liga';
-  -webkit-font-smoothing: antialiased;
+	-webkit-font-smoothing: antialiased;
+}
+.pwaView .pwa,
+.pwaView .mac,
+.pwaView .win {
+	display: none;
+}
+.win32 .mac,
+.linux .mac {
+	display: none;
+}
+.linux .win,
+.darwin .win {
+	display: none;
 }

app/css/post.css

@@ -1,144 +1,148 @@
 /*トゥートボックス向けCSS*/
 #post-box {
-  display: none;
+	display: none;
-  position: fixed;
+	position: fixed;
-  left: calc(50vw - 150px);
+	left: calc(50vw - 150px);
-  top: 50vh;
+	top: 50vh;
-  background-color: var(--postbox);
+	background-color: var(--postbox);
-  border: thin solid gray;
+	border: thin solid gray;
-  z-index: 501;
+	z-index: 501;
-  max-width: 100%;
+	max-width: 100%;
-  padding: 5px;
+	padding: 0.4rem;
-  border-radius: 5px;
+	border-radius: 0.4rem;
-  overflow: hidden;
+	overflow: hidden;
 }
 textarea {
-  min-height: 100px !important;
+	min-height: 7.7rem !important;
-  font-family: inherit;
+	font-family: inherit;
 }
-#post-box .ui-resizable-s, #post-box .ui-resizable-se{
+#post-box .ui-resizable-s,
-  display: none !important;
+#post-box .ui-resizable-se {
+	display: none !important;
 }
 
 .cancel {
-  font-size: 0.5rem;
+	font-size: 0.5rem;
-  color: gray;
+	color: gray;
-  cursor: pointer;
+	cursor: pointer;
-  position: absolute;
+	position: absolute;
-  right: 2px;
+	right: 2px;
-  top: 4px;
+	top: 4px;
 }
 .more-show {
-  display: none;
+	display: none;
 }
 #drag {
-  width: 100%;
+	width: 100%;
-  height: 100px;
+	height: 100px;
 }
 #post-btn {
-  display: none;
+	display: none;
 }
 #vis {
-  text-transform: capitalize;
+	text-transform: capitalize;
 }
 #cw-text {
-  display: none;
+	display: none;
 }
 #sch-box {
-  display: none;
+	display: none;
 }
 #sch-box input {
-  width: auto;
+	width: auto;
 }
 .picker__close,
 .picker__today,
 .picker__clear {
-  color: #26a69a !important;
+	color: #26a69a !important;
 }
 .cw {
-  display: none;
+	display: none;
 }
 .sensitive {
-  filter: blur(50px);
+	filter: blur(50px);
 }
 #emoji {
 }
 #suggest {
-  max-height: 300px;
+	max-height: 23rem;
-  overflow-y: scroll;
+	overflow-y: scroll;
 }
 #emoji-list {
-  width: 100%;
+	width: 100%;
-  height: 200px;
+	height: 15.4rem;
-  overflow-y: scroll;
+	overflow-y: scroll;
 }
 #preview-field {
-  display: none;
+	display: none;
 }
 .preview-img {
-  width: 50px;
+	width: 4rem;
-  max-height: 100px;
+	max-height: 7.6rem;
 }
 .pi-wrap {
-  display: inline-block;
+	display: inline-block;
-  width: 50px;
+	width: 3.8rem;
-  max-height: 100px;
+	max-height: 7.7rem;
 }
 #default-emoji a {
-  color: var(--color);
+	color: var(--color);
-  margin-right: 2px;
+	margin-right: 0.15rem;
 }
 .character-counter {
-  position: relative;
+	position: relative;
-  top: -25px;
+	top: -1.9rem;
 }
 .trendtag {
-  overflow-y: scroll;
+	overflow-y: scroll;
-  max-height: 100px;
+	max-height: 7.7rem;
 }
 #toot-btn-field {
-  display: flex;
+	display: flex;
 }
 #toot-post-btn {
-  width: calc(100% - 10px);
+	width: calc(100% - 0.7rem);
-  padding: 0;
+	padding: 0;
-  margin-top: 10px;
+	margin-top: 0.7rem;
+	height: 2.7rem;
 }
 #toot-sec-btn {
-  width: 30px;
+	width: 2.3rem;
-  padding: 0;
+	padding: 0;
-  margin-top: 10px;
+	margin-top: 0.7rem;
 }
 #left-side {
-  float: left;
+	float: left;
-  overflow-x: hidden;
+	overflow-x: hidden;
-  height: calc(100% - 32px);
+	height: calc(100% - 2.5rem);
 }
 #right-side {
-  display: none;
+	display: none;
-  float: left;
+	float: left;
-  width: 300px;
+	width: 23rem;
-  padding: 5px;
+	padding: 0.4rem;
-  overflow-x: hidden;
+	overflow-x: hidden;
-  height: calc(100% - 32px);
+	height: calc(100% - 2.5rem);
 }
-#posttgl,#toot-post-btn {
+#posttgl,
-  background-color: var(--accentbtn);
+#toot-post-btn {
+	background-color: var(--accentbtn);
+	color: var(--color);
 }
 /*mini*/
 .mini-post .mize {
-  display: none !important;
+	display: none !important;
 }
 .mini-post #textarea {
-  padding: 0;
+	padding: 0;
 }
 .mini-post #post-box {
-  width: 200px;
+	width: 15.4rem;
-  min-width: 100px;
+	min-width: 7.7rem;
 }
 .mini-post #toot-field {
-  padding: 0;
+	padding: 0;
 }
 .mini-post #toot-btn-field {
-  padding: 0;
+	padding: 0;
 }

app/css/sort.css

@@ -3,29 +3,29 @@
   cursor: move;
   user-select: none;
   background-color: var(--modalfooter);
-  margin: 5px;
+  margin: 0.4rem;
-  border-radius: 5px;
+  border-radius: 0.4rem;
   color: var(--color);
   padding: 3px;
   display: grid;
-  grid-template-columns: 43px 1fr 60px;
+  grid-template-columns: 3.3rem 1fr 4.6rem;
   grid-template-areas: "sorticon sorttitle sorttitle" "sorticon sortacct sortaction";
 }
 .sorticon {
   grid-area: sorticon;
 }
 .sorticon i {
-  font-size: 43px;
+  font-size: 3.3rem;
 }
 .sorttitle {
-  margin-left: 5px;
+  margin-left: 0.4rem;
   grid-area: sorttitle;
 }
 .sortacct {
-  margin-left: 5px;
+  margin-left: 0.4rem;
   grid-area: sortacct;
 }
 .sortaction {
-  margin-left: 5px;
+  margin-left: 0.4rem;
   grid-area: sortaction;
 }

app/css/themes.css

@@ -142,3 +142,51 @@
 .bluetheme #imagemodal {
   background: url("../img/pixel.white.svg");
 }
+.polartheme {
+  --bg: #2e3440;
+  --drag: rgba(0, 0, 0, 0.8);
+  --color: white;
+  --beforehover: #8d94a0;
+  --modal: #3b4252;
+  --subcolor: #434c5e;
+  --box: #4c566a;
+  --sidebar: #3b4252;
+  --shared: #2d3b58;
+  --notfbox: #2a3857;
+  --emphasized: #2f4b86;
+  --his-data: rgba(0, 0, 0, 0.8);
+  --active: #2a3857;
+  --postbox: #434c5e;
+  --modalfooter: #485166;
+  --accentbtn: #2f4b86;
+  --selected: #464f61;
+  --selectedWithShare: #3e527e;
+  --gray: #cccccc;
+}
+.polartheme #imagemodal {
+  background: url("../img/pixel.svg");
+}
+.snowtheme {
+  --bg: #eceff4;
+  --drag: rgba(255, 255, 255, 0.8);
+  --color: #36425a;
+  --beforehover: #344058;
+  --modal: #e5e9f0;
+  --subcolor: #d8dee9;
+  --box: #c0c8d6;
+  --sidebar: #eeeeee;
+  --shared: #c3d4e6;
+  --notfbox: #d8dee9;
+  --emphasized: #88c0d0;
+  --his-data: rgba(255, 255, 255, 0.9);
+  --active: #8fbcbb;
+  --postbox: #d8dee9;
+  --modalfooter: #b2bed4;
+  --accentbtn: #81a1c1;
+  --selected: #b4bdd0;
+  --selectedWithShare: #a3afbb;
+  --gray: #5c6c8c;
+}
+.snowtheme #imagemodal {
+  background: url("../img/pixel.white.svg");
+}

app/css/tl.css

@@ -1,7 +1,7 @@
 /*TL CSS(ただしBBCode pulse:master.css/spin:font-awesome*/
 #main {
 	width: 100vw;
-	height: calc(100vh - 40px);
+	height: calc(100% - 3rem);
 }
 #timeline-container {
 	overflow-x: scroll;
@@ -11,18 +11,19 @@
 }
 #bottom {
 	position: absolute;
+	overflow: hidden;
 	bottom: 0;
 	width: 100vw;
-	height: 40px;
+	height: 3rem;
-	padding: 3px;
+	padding: 0.23rem;
 	padding-right: 0;
-	padding-left: 40px;
+	padding-left: 3rem;
 	background-color: var(--sidebar);
 	display: flex;
 	justify-content: space-between;
 	flex-wrap: wrap;
 	z-index: 500;
-	box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2);
+	box-shadow: 0.77rem 0 0.77rem, 0.77rem rgba(0, 0, 0, 0.2);
 }
 #demobottom {
 	width: 500px;
@@ -30,24 +31,24 @@
 }
 #bottom.reverse {
 	padding-left: 0;
-	padding-right: 40px;
+	padding-right: 3rem;
 }
 .reverse {
 	flex-direction: row-reverse;
 }
 #bottom #dambox {
-	width: 300px;
+	width: 23rem;
-	margin-right: 10px;
+	margin-right: 0.76rem;
 }
 #bottom.reverse #dambox {
 	margin-right: 0;
 }
 #bottom .trendtag {
-	height: 40px;
+	height: 3rem;
 }
 #bottom #group,
 #demogroup {
-	margin-right: 40px;
+	margin-right: 3rem;
 }
 #bottom .leftside {
 	display: flex;
@@ -57,33 +58,41 @@
 	align-items: center;
 }
 #bottom #tips img {
-	vertical-align: -3px;
+	vertical-align: -0.23rem;
 }
 #bottom a,
 #demogroup a {
 	color: var(--color);
 }
 #bottom i {
-	font-size: 30px;
+	font-size: 2.3rem;
 }
 .exc-icons {
-	font-size: 20px;
+	font-size: 1.53rem;
 }
 .exc-chb {
-	padding-left: 24px !important;
+	padding-left: 1.84rem !important;
 }
 .btnsgroup {
 	border: 1px solid;
 	padding-top: 1px;
-	padding-left: 5px;
+	padding-left: 0.4rem;
-	padding-right: 5px;
+	padding-right: 0.4rem;
-	margin-right: 15px;
+	margin-right: 1.15rem;
-	border-radius: 5px;
+	border-radius: 0.4rem;
+	height: 2.7rem;
+}
+.bgReport {
+	height: 2.61rem;
+	padding-top: 0.45rem;
+	text-decoration: underline;
+	padding-left: 0.4rem;
+	padding-right: 0.4rem;
 }
 #spot-box {
 	display: grid;
-	grid-template-columns: 40px 30px 2.5fr 1fr 60px;
+	grid-template-columns: 3rem 2.3rem 2.5fr 1fr 4.6rem;
-	grid-template-rows: 22px 20px;
+	grid-template-rows: 1.7rem 1.5rem;
 	grid-template-areas: 'cover name name artist refresh' 'cover progress progress progress time';
 }
 #spot-refresh {
@@ -97,14 +106,14 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
-	line-height: 25px;
+	line-height: 1.92rem;
 }
 #spot-artist {
 	grid-area: artist;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
-	line-height: 25px;
+	line-height: 1.92rem;
 }
 #spot-img {
 	width: 90%;
@@ -118,7 +127,7 @@
 }
 .btnsgroup .grouptitle {
 	font-family: Open Sans;
-	font-size: 15px;
+	font-size: 1.1rem;
 }
 @media screen and (max-width: 890px) {
 	.btnsgroup .grouptitle {
@@ -132,7 +141,7 @@
 iframe,
 .cvo video {
 	max-width: 100%;
-	max-height: 300px;
+	max-height: 23rem;
 }
 @media screen and (max-width: 600px) {
 	.mobile #timeline-container {
@@ -148,12 +157,12 @@ iframe,
 }
 .box {
 	overflow: hidden;
-	min-width: 300px;
+	min-width: 23rem;
 	flex: 1;
 	border-top: none;
 	display: flex;
 	flex-direction: column;
-	margin-bottom: -10px;
+	margin-bottom: -0.75rem;
 }
 .img_FTL {
 	display: none;
@@ -207,16 +216,19 @@ iframe,
 }
 .emoji,
 .emoji-img {
-	width: 15px;
+	width: 1.153rem;
 }
 .area-toot .emoji,
 .area-toot .emoji-img {
-	width: 20px;
+	width: 1.538rem;
 	vertical-align: middle;
 	margin: -1px 0;
 }
 .bigemoji {
-	width: 60px !important;
+	width: 7.7rem !important;
+	height: auto !important;
+	position: relative;
+	z-index: 9999;
 }
 .faicon_FTL {
 	display: none;
@@ -242,13 +254,13 @@ iframe,
 }
 .cvo {
 	user-select: text;
-	padding-left: 5px;
+	padding-left: 0.4rem;
 	border-bottom: 0.5px solid;
-	padding-right: 2px;
+	padding-right: 0.15rem;
 	word-break: break-word;
 	width: 100%;
 	display: grid;
-	grid-template-columns: 43px 2fr 1fr;
+	grid-template-columns: 3.3rem 2fr 1fr;
 	grid-template-rows: auto 1.6rem 1fr auto 2.5rem;
 	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space toot toot' 'space additional additional' 'vis actions side';
 }
@@ -274,21 +286,21 @@ iframe,
 }
 
 .area-notice {
-	margin: 2px;
+	margin: 0.15rem;
 	grid-area: notice;
 }
 
 .area-icon {
-	width: 40px;
+	width: 3rem;
-	margin: 2px;
+	margin: 0.15rem;
 	grid-area: icon;
 }
 
 .area-display_name {
 	user-select: text;
 	height: 1.5em;
-	margin: 2px;
+	margin: 0.15rem;
-	margin-left: 5px;
+	margin-left: 0.4rem;
 	overflow: hidden;
 	grid-area: display_name;
 	white-space: nowrap;
@@ -299,7 +311,7 @@ iframe,
 	flex-wrap: nowrap;
 }
 .flex-name {
-	max-width: calc(100% - 60px);
+	max-width: calc(100% - 4.6rem);
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
@@ -307,9 +319,9 @@ iframe,
 .area-toot {
 	cursor: text;
 	user-select: auto;
-	margin-top: 5px;
+	margin-top: 0.4rem;
-	margin-bottom: 5px;
+	margin-bottom: 0.4rem;
-	margin-left: 5px;
+	margin-left: 0.4rem;
 	grid-area: toot;
 }
 
@@ -342,7 +354,7 @@ iframe,
 .area-actions {
 	padding: 0;
 	margin: 0;
-	top: -5px;
+	top: -0.4rem;
 	position: relative;
 	display: flex;
 	justify-content: space-around;
@@ -350,34 +362,59 @@ iframe,
 	grid-area: actions;
 }
 .area-vis {
-	margin: 2px;
+	margin: 0.4rem;
 	grid-area: vis;
 	text-align: center;
 }
 .area-side {
 	display: flex;
-	top: -5px;
+	top: -0.4rem;
 	position: relative;
 	justify-content: flex-end;
-	margin: 2px;
+	margin: 0.15rem;
 	grid-area: side;
 }
 
+.cusr {
+	user-select: text;
+	padding-left: 0.4rem;
+	border-bottom: 0.5px solid;
+	padding-right: 0.15rem;
+	word-break: break-word;
+	width: 100%;
+	display: grid;
+	grid-template-columns: 3.3rem 2fr 1fr;
+	grid-template-rows: auto 1.6rem 2fr auto;
+	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions';
+}
+
+.area-status {
+	grid-area: status;
+	display: flex;
+	flex-wrap: wrap;
+	margin-bottom: 0.75rem;
+}
+
+.cusr .cbadge {
+	margin-top: 0.46rem;
+	margin-left: 0.46rem;
+}
+
 .quote-inline {
 	display: none;
 }
 .quote-renote {
 	display: grid;
-	grid-template-columns: 43px 2fr 25px;
+	grid-template-columns: 3.3rem 2fr 1.92rem;
 	grid-template-areas: 'ricon ruser rdet' 'ricon rtext rdet';
 	border: 1px solid;
-	margin-top: 3px;
+	margin-top: 0.23rem;
 	padding: 1px;
-	border-radius: 3px;
+	border-radius: 0.23rem;
 }
 .renote-icon {
 	grid-area: ricon;
-	padding: 5px;
+	padding: 0.4rem;
 }
 .renote-details {
 	grid-area: rdet;
@@ -396,17 +433,17 @@ iframe,
 	color: var(--color);
 }
 .area-side i {
-	margin-left: 10px;
+	margin-left: 0.75rem;
 }
 .viabadge {
-	margin-top: 10px;
+	margin-top: 0.75rem;
 }
 .action i {
 	font-size: 1.2rem;
-	margin-right: 2px;
+	margin-right: 0.15rem;
 }
 .action .fa-quote-right {
-	margin-top: 2px;
+	margin-top: 0.15rem;
 }
 .actct {
 	color: var(--beforehover);
@@ -425,24 +462,24 @@ iframe,
 	position: fixed;
 	background-color: var(--box);
 	z-index: 9999;
-	border-radius: 5px;
+	border-radius: 0.4rem;
-	padding: 5px;
+	padding: 0.4rem;
 }
 .contextMenu.bottom:before {
 	content: '';
 	position: absolute;
 	top: 100%;
-	right: 27px;
+	right: 2rem;
-	border: 15px solid transparent;
+	border: 1.2rem solid transparent;
-	border-top: 15px solid var(--box);
+	border-top: 1.2rem solid var(--box);
 }
 .contextMenu.top:before {
 	content: '';
 	position: absolute;
-	top: -30px;
+	top: -2.3rem;
-	right: 27px;
+	right: 2rem;
-	border: 15px solid transparent;
+	border: 1.5rem solid transparent;
-	border-bottom: 15px solid var(--box);
+	border-bottom: 1.5rem solid var(--box);
 }
 .contextMenu .btn-flat {
 	text-transform: none !important;
@@ -465,26 +502,26 @@ iframe,
 }
 .toot img:not(.emoji-img) {
 	max-width: 100%;
-	max-height: 300px;
+	max-height: 23rem;
 }
 .cbadge {
 	display: inline-block;
-	min-width: 10px;
+	min-width: 0.76rem;
-	max-width: 100px;
+	max-width: 7.7rem;
-	padding: 3px 7px;
+	padding: 0.23rem 0.5rem;
 	font-size: 0.8em;
-	margin-right: 5px;
+	margin-right: 0.4rem;
 	line-height: 1;
 	color: #fff;
 	text-align: center;
 	white-space: nowrap;
 	vertical-align: middle;
 	background-color: #777;
-	border-radius: 10px;
+	border-radius: 0.75rem;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-	height: calc(0.8em + 8px);
+	height: calc(0.8em + 0.6rem);
 	user-select: none;
 }
 .cbadge-hover {
@@ -498,10 +535,10 @@ iframe,
 p {
 	margin: 0;
 	margin-bottom: 0px;
-	line-height: 20px;
+	line-height: 1.53rem;
 }
 p:not(:last-child) {
-	margin-bottom: 10px;
+	margin-bottom: 0.76rem;
 }
 .shared {
 	background-color: var(--shared);
@@ -517,14 +554,14 @@ p:not(:last-child) {
 	background-color: var(--notfbox);
 	filter: brightness(110%);
 	position: relative;
-	margin-right: 10px;
+	margin-right: 0.7rem;
 	width: 100%;
-	min-height: 60px;
+	min-height: 4.6rem;
 	z-index: 500;
-	padding: 5px;
+	padding: 0.4rem;
 	display: grid;
-	grid-template-columns: 40px 1fr 1fr 24px;
+	grid-template-columns: 3rem 5rem 1fr 1.8rem;
-	grid-template-rows: 30px 30px;
+	grid-template-rows: 2.3rem 2.3rem;
 	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }
 .emp {
@@ -568,8 +605,8 @@ p:not(:last-child) {
 }
 #tools {
 	position: fixed;
-	top: 10px;
+	top: 0.76rem;
-	right: 10px;
+	right: 0.76rem;
 	float: right;
 }
 .setting {
@@ -582,14 +619,14 @@ p:not(:last-child) {
 }
 .notf-box {
 	position: fixed;
-	right: 70px;
+	right: 5.4rem;
 	background-color: var(--box);
 	border: thin solid gray;
 	z-index: 501;
-	width: 400px;
+	width: 30rem;
-	padding: 5px;
+	padding: 0.4rem;
-	min-height: 100px;
+	min-height: 7.7rem;
-	max-height: 500px;
+	max-height: 38.4rem;
 }
 .column-hide {
 	display: none;
@@ -597,17 +634,21 @@ p:not(:last-child) {
 	height: 0;
 }
 .prof-img {
-	border-radius: 3px;
+	border-radius: 0.23rem;
+	width: 3rem;
+}
+.prof-img-sml {
+	width: 1.5rem;
 }
 .notf-icon {
 	position: relative;
-	top: -20px;
+	top: -1.53rem;
-	width: 20px;
+	width: 1.5rem;
-	left: 20px;
+	left: 1.5rem;
 }
 .notf-indv-box {
 	width: 100%;
-	max-height: 400px;
+	max-height: 30.7rem;
 	overflow-y: scroll;
 	overflow-x: hidden;
 	border: thin solid gray;
@@ -640,47 +681,72 @@ p:not(:last-child) {
 .vote {
 	width: 100%;
 	border: 1px solid;
-	margin-top: 3px;
+	margin-top: 0.23rem;
 	padding: 1px;
-	border-radius: 3px;
+	border-radius: 0.23rem;
+	overflow: hidden;
+	position: relative;
 }
 .fa-2x > .emoji-img {
-	width: 36px !important;
+	width: 2.3rem !important;
-	height: 36px !important;
+	height: 2.3rem !important;
 }
 .fa-3x > .emoji-img {
-	width: 54px !important;
+	width: 4.15rem !important;
-	height: 54px !important;
+	height: 4.15rem !important;
 }
 .fa-4x > .emoji-img {
-	width: 72px !important;
+	width: 4.6rem !important;
-	height: 72px !important;
+	height: 4.6rem !important;
 }
 .fa-5x > .emoji-img {
-	width: 90px !important;
+	width: 6.9rem !important;
-	height: 90px !important;
+	height: 6.9rem !important;
 }
 #lists-user {
 	overflow-y: scroll;
 	overflow-x: hidden;
-	max-height: 200px;
+	max-height: 15.4rem;
 }
 .votebtn {
 	border: 1px solid;
 	color: var(--bg);
 	background-color: var(--beforehover);
 	cursor: pointer;
-	width: 50px;
+	width: 3.8rem;
-	padding: 2px;
+	height: 1.7rem;
 	display: inline-block;
 	text-align: center;
-	margin-top: 5px;
+	margin-top: 0.38rem;
-	border-radius: 10px;
+	border-radius: 0.75rem;
 	transition-duration: 0.5s;
 }
 .votebtn:hover {
 	background-color: var(--color);
 }
+.leadPoll {
+	position: absolute;
+	background-color: var(--box);
+	height: 1.5rem;
+	border-radius: 0.23rem;
+}
+.lpAnime {
+	animation-duration: 1s;
+	animation-name: fadeInLeft;
+}
+.onPoll {
+	position: relative;
+}
+.maxVoter {
+	background-color: var(--emphasized);
+	filter: brightness(120%);
+}
+.ownMark img {
+	width: 1.2rem !important;
+	position: relative;
+	top: -1px;
+	margin-left: 0.38rem !important;
+}
 .jump {
 	display: inline-block;
 	animation: jump 0.75s linear infinite;
@@ -704,6 +770,9 @@ p:not(:last-child) {
 	width: 100%;
 	height: 100%;
 }
+.fav_ct, .rt_ct, .rep_ct {
+	font-size: 1.1rem;
+}
 .shared.selectedToot {
 	background-color: var(--selectedWithShare);
 }
@@ -717,17 +786,18 @@ audio {
 	white-space: normal;
 }
 .cw_btn {
-	margin: 3px;
+	margin: 0.23rem;
 	background-color: var(--emphasized);
 	color: var(--color);
-	padding-left: 3px;
+	padding-left: 0.23rem;
-	padding-right: 3px;
+	padding-right: 0.23rem;
-	border-radius: 3px;
+	border-radius: 0.23rem;
 	border: 1px solid var(--color);
+	user-select: none;
 }
 .vis-data {
 	font-size: 1rem !important;
-	margin: 5px;
+	margin: 0.4rem;
 	user-select: none;
 }
 @keyframes jump {
@@ -800,3 +870,31 @@ audio {
 .box .ui-resizable-se {
 	display: none !important;
 }
+.announcement {
+	padding: 0.38rem;
+	border-bottom: 1px solid;
+}
+.announReaction {
+	width: 2.7rem;
+	height: 1.7rem;
+	font-size: 1.1rem;
+	margin: 0.23rem;
+	cursor: pointer;
+	border: solid 1px;
+	padding-left: 0.15rem;
+	background-color: var(--notfbox);
+	border-radius: 0.15rem;
+}
+.announReaction img {
+	position: relative;
+	top: 0.23rem;
+}
+.announReaction.reactioned {
+	background-color: var(--emphasized);
+}
+.announReaction.add {
+	width: 1.46rem;
+}
+.reactionsPack {
+	display: flex;
+}

app/css/userdata.css

@@ -1,7 +1,7 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
 #his-data {
   background-repeat: no-repeat;
-  background-image: url("../../loading.svg");
+  background-image: url("../img/loading.svg");
   overflow-y: hidden;
 }
 #his-data .btn .material-icons{
@@ -16,31 +16,27 @@
 }
 #his-prof {
   float: left;
-  width: 100px;
+  width: 7.7rem;
-  margin-right: 5px;
+  margin-right: 0.4rem;
 }
 .his-float {
   overflow-y: scroll;
-  padding: 5px;
+  padding: 0.4rem;
 }
 #his-float-data {
   height: 100%;
   overflow-y: hidden;
 }
 #his-leftside {
-  width: 500px;
+  width: 38.4rem;
 }
 #his-float-timeline {
-  max-width: 775px;
+  max-width: 59.6rem;
   height: 100%;
   overflow-y: hidden;
 }
 #his-basic-prof {
-  min-height: 130px;
+  min-height: 10rem;
-}
-#his-matching-list {
-  overflow-y: scroll;
-  overflow-x: hidden;
 }
 #his-field {
   vertical-align: baseline;
@@ -55,14 +51,14 @@
   padding: 0;
   background-color: #757575;
   text-align: center;
-  padding: 5px;
+  padding: 0.4rem;
   margin-bottom: 1px;
   width: 30%;
 }
 .his-field-content {
   height: 1.5rem;
   padding: 0;
-  padding-left: 5px;
+  padding-left: 0.4rem;
 }
 .his-var-content a span.ellipsis:after {
   content: "...";
@@ -76,13 +72,13 @@
   display: inline !important;
 }
 #his-data-show {
-  margin: 20px;
+  margin: 1.5rem;
-  margin-left: 50px;
+  margin-left: 3.8rem;
-  margin-right: 50px;
+  margin-right: 3.8rem;
   background-color: var(--his-data);
-  height: calc(100% - 20px);
+  height: calc(100% - 1.5rem);
   margin-bottom: 0;
-  padding: 5px;
+  padding: 0.4rem;
 }
 #his-data-wrap {
   display: flex;
@@ -90,39 +86,39 @@
 .his-var-content {
   overflow-y: scroll;
   overflow-x: hidden;
-  height: calc(100% - 45px);
+  height: calc(100% - 3.4rem);
 }
 #my-data-nav .btn {
-  width: 140px;
+  width: 10.7rem;
 }
 .active-back {
   background-color: var(--active);
 }
 #his-name .emojione,
 #his-name .emoji-img {
-  width: 20px;
+  width: 1.538rem;
 }
 #his-plus-action .btn {
-  padding-right: 5px;
+  padding-right: 0.4rem;
-  padding-left: 5px;
+  padding-left: 0.4rem;
 }
 .tabs {
   display: flex;
 }
 .tabs .tab a {
-  padding: 8px 12px;
+  padding: 0.6rem 0.9rem;
 }
 #his-des {
-  max-height: 250px;
+  max-height: 17.7rem;
   overflow-y: scroll;
 }
 #his-sign-action {
   border: 1px solid;
-  border-radius: 5px;
+  border-radius: 0.4rem;
   display: flex;
   align-items: center;
-  padding-left: 10px;
+  padding-left: 0.75rem;
-  padding-right: 10px;
+  padding-right: 0.75rem;
   flex-wrap: wrap;
 }
 #his-sign-action .btn {
@@ -133,7 +129,7 @@
   cursor: pointer;
 }
 #his-table{
-  max-height: 150px;
+  max-height: 11.538rem;
   overflow-y: scroll;
 }
 #his-float-blocked {

app/img/desk-animation.svg

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="TheDesk">
+        <g id="back">
+            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
+                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:rgba(255,255,255,0);">
+                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
+                </rect>
+            </g>
+            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:rgba(255,255,255,0);">
+                <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
+            </rect>
+            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
+                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:rgba(255,255,255,0);">
+                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
+                </rect>
+            </g>
+        </g>
+        <g transform="matrix(1,0,0,0.998821,0,4.65666)" id="gray">
+            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
+        </g>
+        <g transform="matrix(0.999978,-5.55112e-17,-2.20005e-08,0.996112,-1237.17,972.039)" id="orange">
+            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);" r="3117.62">
+                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,-583.55" to="-60,1915.71,-583.55" dur="0.5s" repeatCount="1" fill="freeze" />
+            </rect>
+        </g>
+        <g transform="matrix(0.999978,5.55112e-17,-5.55112e-17,0.999978,-1236.96,-1164.58)" id="blue">
+            <rect x="1915.5" y="1775.41" width="450" height="3105.58" style="fill:rgb(54,76,159);" r="3117.62">
+                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,4881" to="60,1915.71,4881" dur="0.5s" repeatCount="1" fill="freeze" />
+            </rect>
+        </g>
+        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgba(0,0,0,0);">
+            <animate attributeName="fill" begin="0.6s" dur="0.5s" fill="freeze" values="rgba(0,0,0,0);rgba(0,0,0,1)" repeatCount="1" />
+        </path>
+    </g>
+</svg>

app/img/desk.svg

@@ -1,35 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
+    <g id="TheDesk">
-<style type="text/css">
+        <g>
-	.st0{display:none;}
+            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
-	.st1{fill:#FFFFFF;}
+                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:white;"/>
-	.st2{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
+            </g>
-	.st3{fill:#F0842E;}
+            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:white;"/>
-	.st4{fill:#364C9F;}
+            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
-	.st5{fill:#FFFFFF;stroke:#040000;stroke-miterlimit:10;}
+                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:white;"/>
-	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#040000;}
+            </g>
-	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
+        </g>
-</style>
+        <g transform="matrix(1,0,0,0.998821,0,4.65666)">
-<g id="レイヤー_1" class="st0">
+            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
-</g>
+        </g>
-<g id="レイヤー_2">
+        <g transform="matrix(0.5,-0.866,0.862652,0.498067,224.046,2340.41)">
-	<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);"/>
-	<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
+        </g>
-	
+        <g transform="matrix(0.5,0.866,-0.866,0.5,3757.17,-299.625)">
-		<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
+            <rect x="1915.5" y="1555.41" width="450" height="3105.58" style="fill:rgb(54,76,159);"/>
-	
+        </g>
-		<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
+        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgb(4,0,0);"/>
-	<path class="st5" d="M714.5,2953.5"/>
+        <rect x="0" y="0" width="4096" height="4096" style="fill:none;"/>
-	<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
+    </g>
-		c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
-		c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
-		c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
-		c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
-		c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
-		c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
-	<rect class="st7" width="4096" height="4096"/>
-	<path class="st1" d="M-58,1122"/>
-</g>
 </svg>

app/img/desk_full.svg

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!--
+	TheDesk icon, Cutls P.
+	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+-->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
 <style type="text/css">

app/img/picture.svg

@@ -0,0 +1,2 @@
+
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>

app/img/thinking.svg

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ThinkingDesk: Cutls P's icon, Cutls P.
+	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+-->
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">

app/index.html

@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+    <head>
+        <meta http-equiv=”refresh” content=”0;URL=’./view/ja'” />
+        <script>location.href = './view/ja';</script>
+    </head>
+</html>

app/js/common/about.js

@@ -1,3 +1,4 @@
+//@ts-check
 //このソフトについて
 function about() {
 	postMessage(["sendSinmpleIpc", "about"], "*")

app/js/common/keyshortcut.js

@@ -1,191 +1,204 @@
 selectedColumn = 0
 selectedToot = 0
-$(function ($) {
+$(function($) {
 	//キーボードショートカット
-	$(window).keydown(function (e) {
+	$(window).keydown(function(e) {
-		var hasFocus = $('input').is(':focus');
+		var hasFocus = $('input').is(':focus')
-		var hasFocus2 = $('textarea').is(':focus');
+		var hasFocus2 = $('textarea').is(':focus')
-		if (document.getElementById("webview")) {
+		if (document.getElementById('webview')) {
-			if ($("#webviewsel:checked").val()) {
+			if ($('#webviewsel:checked').val()) {
-				var wv = false;
+				var wv = false
 			} else {
-				var wv = true;
+				var wv = true
 			}
 		} else {
-			var wv = true;
+			var wv = true
 		}
 		//Enter
 		if (e.keyCode === 13) {
-			if($("#src").is(':focus')){
+			if ($('#src').is(':focus')) {
 				src()
-				return false;
+				return false
 			}
-			if($("#list-add").is(':focus')){
+			if ($('#list-add').is(':focus')) {
 				makeNewList()
-				return false;
+				return false
 			}
 		}
 		//Ctrl+Shift+Enter:Lgen
-		if (event.metaKey || event.ctrlKey && wv) {
+		if (event.metaKey || (event.ctrlKey && wv)) {
 			if (event.shiftKey) {
 				if (e.keyCode === 13) {
-					post('local');
+					post('local')
-					return false;
+					return false
 				}
 			}
 		}
 		//Ctrl+Enter:投稿
-		if (event.metaKey || event.ctrlKey && wv) {
+		if (event.metaKey || (event.ctrlKey && wv)) {
 			if (e.keyCode === 13) {
-				post();
+				post()
-				return false;
+				return false
 			}
 		}
 		//Alt+Enter:セカンダリー
-		if (event.metaKey || event.altKey && wv) {
+		if (event.metaKey || (event.altKey && wv)) {
 			if (e.keyCode === 13) {
-				sec();
+				sec()
-				return false;
+				return false
 			}
 		}
 		//Esc:消す
 		if (e.keyCode === 27 && wv) {
-			hide();
+			hide()
-			return false;
+			return false
 		}
 		//F5リロード
 		if (e.keyCode === 116 && wv) {
-			location.href = "index.html";
+			location.href = 'index.html'
-			return false;
+			return false
 		}
 		//Ctrl+Sift+C:全消し
-		if (((event.metaKey || event.ctrlKey) && event.shiftKey) && wv) {
+		if ((event.metaKey || event.ctrlKey) && event.shiftKey && wv) {
 			if (e.keyCode === 67) {
-				clear();
+				clear()
-				return false;
+				return false
 			}
 		}
 		//Ctrl+Sift+N:NowPlaying
-		if (((event.metaKey || event.ctrlKey) && event.shiftKey) && wv) {
+		if ((event.metaKey || event.ctrlKey) && event.shiftKey && wv) {
 			if (e.keyCode === 78) {
-				show();
+				show()
 				nowplaying()
-				return false;
+				return false
 			}
 		}
 		//input/textareaにフォーカスなし時
-		if ((!hasFocus && !hasFocus2) && wv) {
+		if (!hasFocus && !hasFocus2 && wv) {
 			if (!wv) {
-				return true;
+				return true
 			}
 			//Ctrl+V:いつもの
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 86) {
-					show();
+					show()
+				}
+			}
+			//Ctrl+F:検索
+			if (event.metaKey || event.ctrlKey) {
+				if (e.keyCode === 70) {
+					srcBox()
 				}
 			}
 			//X:開閉
 			if (e.keyCode === 88) {
-				if (!$("#post-box").hasClass("appear")) {
+				if (!$('#post-box').hasClass('appear')) {
-					show();
+					show()
-					$('textarea').focus();
+					$('textarea').focus()
 				} else {
-					hide();
+					hide()
 				}
-				return false;
+				return false
 			}
 			//N:新トゥート
 			if (e.keyCode === 78) {
-				if (!$("#post-box").hasClass("appear")) {
+				if (!$('#post-box').hasClass('appear')) {
-					show();
+					show()
 				}
-				$('textarea').focus();
+				$('textarea').focus()
-				return false;
+				return false
 			}
 			//Ctrl+E:全ての通知未読を既読にする
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 69) {
-					allNotfRead();
+					allNotfRead()
-					return false;
+					return false
+				}
+			}
+			//Ctrl+K:メニュー開閉
+			if (event.metaKey || event.ctrlKey) {
+				if (e.keyCode === 75) {
+					menu()
+					return false
 				}
 			}
 			//Ctrl+Space:読み込み
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 32) {
-					parseColumn();
+					parseColumn()
-					return false;
+					return false
 				}
 			}
 			//Ctrl+Sift+S:設定
 			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 83) {
-					location.href = "setting.html";
+					location.href = 'setting.html'
-					return false;
+					return false
 				}
 			}
 			//Ctrl+Sift+M:アカマネ
 			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 77) {
-					location.href = "acct.html";
+					location.href = 'acct.html'
-					return false;
+					return false
 				}
 			}
 			//Ctrl+Sift+P:プロフ
 			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 80) {
 					profShow()
-					return false;
+					return false
 				}
 			}
 			//数字:TL
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode >= 49 && e.keyCode <= 57) {
-					var kz = e.keyCode - 49;
+					var kz = e.keyCode - 49
-					goColumn(kz);
+					goColumn(kz)
-					return false;
+					return false
 				}
 			}
 			//矢印:選択
-			if (e.code == "ArrowLeft") {
+			if (e.code == 'ArrowLeft') {
 				//left
-				if ($("#imagemodal").hasClass("open")) {
+				if ($('#imagemodal').hasClass('open')) {
-					imgCont('prev');
+					imgCont('prev')
-					return false;
+					return false
 				}
 				if (selectedColumn > 0) {
 					selectedColumn--
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
-			} else if (e.code == "ArrowUp") {
+			} else if (e.code == 'ArrowUp') {
 				//up
-				if ($("#imagemodal").hasClass("open")) {
+				if ($('#imagemodal').hasClass('open')) {
-					return false;
+					return false
 				}
 				if (selectedToot > 0) {
 					selectedToot--
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
-			} else if (e.code == "ArrowRight") {
+			} else if (e.code == 'ArrowRight') {
 				//right
-				if ($("#imagemodal").hasClass("open")) {
+				if ($('#imagemodal').hasClass('open')) {
-					imgCont('next');
+					imgCont('next')
-					return false;
+					return false
 				}
-				if (selectedColumn < $(".tl-box").length - 1) {
+				if (selectedColumn < $('.tl-box').length - 1) {
 					selectedColumn++
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
-			} else if (e.code == "ArrowDown") {
+			} else if (e.code == 'ArrowDown') {
 				//down
-				if ($("#imagemodal").hasClass("open")) {
+				if ($('#imagemodal').hasClass('open')) {
-					return false;
+					return false
 				}
 				selectedToot++
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
 			}
 			//Ctrl+U:0,0選択
 			if (event.ctrlKey || event.metaKey) {
@@ -193,29 +206,29 @@ $(function ($) {
 					selectedToot = 0
 					selectedColumn = 0
 					tootSelector(0, 0)
-					return false;
+					return false
 				}
 			}
 			//選択時
 			if (e.keyCode == 70) {
-				var id = $(".selectedToot").attr('unique-id')
+				var id = $('.selectedToot').attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
 				fav(id, acct_id, false)
-				return false;
+				return false
 			}
 			if (e.keyCode == 66) {
-				var id = $(".selectedToot").attr('unique-id')
+				var id = $('.selectedToot').attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
 				rt(id, acct_id, false)
-				return false;
+				return false
 			}
 			if (e.keyCode == 82) {
-				var id = $(".selectedToot").attr('unique-id')
+				var id = $('.selectedToot').attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
-				var ats_cm = $('.selectedToot .rep-btn').attr("data-men")
+				var ats_cm = $('.selectedToot .rep-btn').attr('data-men')
-				var mode = $('.selectedToot .rep-btn').attr("data-visen")
+				var mode = $('.selectedToot .rep-btn').attr('data-visen')
 				re(id, ats_cm, acct_id, mode)
-				return false;
+				return false
 			}
 		}
 		//textareaフォーカス時
@@ -224,23 +237,27 @@ $(function ($) {
 				//C+S+(No):ワンクリ
 				if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 					if (e.keyCode >= 49 && e.keyCode <= 51) {
-						var no = e.keyCode - 48;
+						var no = e.keyCode - 48
-						if (localStorage.getItem("oks-" + no)) { $("#textarea").val($("#textarea").val() + localStorage.getItem("oks-" + no)) }
+						if (localStorage.getItem('oks-' + no)) {
-						return false;
+							$('#textarea').val($('#textarea').val() + localStorage.getItem('oks-' + no))
+						}
+						return false
 					}
 				}
 			}
 		}
-	});
+	})
 	//クリアボタン
-	$("#clear").click(function () {
+	$('#clear').click(function() {
-		clear();
+		clear()
-	});
+	})
-});
+})
 //選択する
 function tootSelector(column, toot) {
-	$('.cvo').removeClass("selectedToot")
+	$('.cvo').removeClass('selectedToot')
-	$('#timeline_' + column + ' .cvo').eq(toot).addClass("selectedToot")
+	$('#timeline_' + column + ' .cvo')
+		.eq(toot)
+		.addClass('selectedToot')
 	var scr = $('.tl-box[tlid=' + column + ']').scrollTop()
 	var elem = $('.selectedToot').offset().top
 	var top = elem - $('.tl-box').height() + scr
@@ -255,4 +272,4 @@ function tootSelector(column, toot) {
 			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
 		}
 	}
-}
+}

app/js/common/version.js

@@ -1,346 +1,408 @@
 //バージョンチェッカー
 function verck(ver, jp) {
-	console.log("%c Welcome😊", "color: red;font-size:200%;");
+	console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
-	var date = new Date();
+	$('body').addClass(localStorage.getItem('platform'))
-	var show = false;
+	var date = new Date()
-	if (localStorage.getItem("ver") != ver && localStorage.getItem("winstore")) {
+	var showVer = false
-		//ちょっと削除とリンク解析の都合上アレ(s)
+	//Spotify
-		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
+	if (localStorage.getItem('spotify')) {
-		if (!localStorage.getItem("usamin_18_6_5_flag")) {
+		localStorage.removeItem('spotify')
-			localStorage.setItem("usamin_18_6_5_flag", true);
+		localStorage.removeItem('spotify-refresh')
-			var multi = localStorage.getItem("column");
+		var spDc = 'Spotify NowPlaying sysytem was changed, please re-login to Spotify'
-			var obj = JSON.parse(multi);
+		if(lang.language == 'ja') {
-			for (var i = 0; i < obj.length; i++) {
+			spDc = 'Spotify NowPlayingの機能が変更されたため、もう一度ログインしてください'
-				localStorage.removeItem("card_" + i);
-			}
 		}
-		//ちょっと削除とリンク解析の都合上アレ(e)
+		Swal.fire({
-		show = true;
+			type: 'info',
-		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
+			title: spDc,
-		$(document).ready(function() {
+		})
-			if (localStorage.getItem("winstore")) {
-				$("#releasenote").modal("open");
-			}
-			verp = ver.replace("(", "");
-			verp = verp.replace(".", "-");
-			verp = verp.replace(".", "-");
-			verp = verp.replace("[", "-");
-			verp = verp.replace("]", "");
-			verp = verp.replace(")", "");
-			verp = verp.replace(" ", "_");
-			console.log("%c " + verp, "color: red;font-size:200%;");
-			if (lang.language == "ja") {
-				$("#release-" + verp).show();
-			} else {
-				$("#release-en").show();
-			}
-		});
 	}
-	localStorage.setItem("ver", ver);
+	//Spotify(e)
-	if (!show) {
+	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
-		console.log(show);
+		showVer = true
-		if (date.getMonth() + 1 >= localStorage.getItem("showSupportMe") || !localStorage.getItem("showSupportMe")) {
+		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-			if (date.getMonth() == 11) {
+		$(document).ready(function() {
-				var nextmonth = 1;
+			if (localStorage.getItem('winstore') && !pwa) {
+				$('#releasenote').modal('open')
+			}
+			verp = ver.replace('(', '')
+			verp = verp.replace('.', '-')
+			verp = verp.replace('.', '-')
+			verp = verp.replace('[', '-')
+			verp = verp.replace(']', '')
+			verp = verp.replace(')', '')
+			verp = verp.replace(' ', '_')
+			console.log('%c ' + verp, 'color: red;font-size:200%;')
+			if (lang.language == 'ja') {
+				$('#release-' + verp).show()
 			} else {
-				var nextmonth = date.getMonth() + 2;
+				$('#release-en').show()
 			}
-			if (lang.language != "ja") {
+		})
-				$("#support-btm-ja").addClass("hide");
+	}
-				$("#support-btm-en").removeClass("hide");
+	localStorage.setItem('ver', ver)
+	if (!showVer) {
+		console.log(showVer)
+		if (
+			date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
+			!localStorage.getItem('showSupportMe')
+		) {
+			if (date.getMonth() == 11) {
+				var yrs = date.getFullYear() + 1
+				var nextmonth = yrs * 100 + 1
+			} else {
+				var yrs = date.getFullYear() 
+				var nextmonth = yrs * 100 + date.getMonth() + 2
 			}
-			localStorage.setItem("showSupportMe", nextmonth);
+			if (lang.language != 'ja') {
-			$("#support-btm").removeClass("hide");
+				$('#support-btm-ja').addClass('hide')
-			$("#support-btm").animate(
+				$('#support-btm-en').removeClass('hide')
+			}
+			localStorage.setItem('showSupportMe', nextmonth)
+			$('#support-btm').removeClass('hide')
+			$('#support-btm').animate(
 				{
-					bottom: "0"
+					bottom: '0'
 				},
 				{
 					duration: 300
 				}
-			);
+			)
 		}
 	}
-	var platform = localStorage.getItem("platform");
+	var platform = localStorage.getItem('platform')
-	console.log("Your platform:" + platform);
+	console.log('Your platform:' + platform)
-	if (!localStorage.getItem("winstore")) {
+	if (!localStorage.getItem('winstore') && !pwa) {
-		$("#start").css("display", "flex");
+		$('#start').css('display', 'flex')
 	}
-	if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
+	if (
-		var winstore = true;
+		localStorage.getItem('winstore') == 'brewcask' ||
+		localStorage.getItem('winstore') == 'snapcraft' ||
+		localStorage.getItem('winstore') == 'winstore'
+	) {
+		var winstore = true
 	} else {
-		var winstore = false;
+		var winstore = false
 	}
-	var l = 5;
+	var l = 5
 	// 生成する文字列に含める文字セット
-	var c = "abcdefghijklmnopqrstuvwxyz0123456789";
+	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
-	var cl = c.length;
+	var cl = c.length
-	var r = "";
+	var r = ''
 	for (var i = 0; i < l; i++) {
-		r += c[Math.floor(Math.random() * cl)];
+		r += c[Math.floor(Math.random() * cl)]
 	}
-	var start = "https://thedesk.top/ver.json";
+	var start = 'https://thedesk.top/ver.json'
 	fetch(start, {
-		method: "GET"
+		method: 'GET'
 	})
 		.then(function(response) {
 			if (!response.ok) {
 				response.text().then(function(text) {
-					setLog(response.url, response.status, text);
+					setLog(response.url, response.status, text)
-				});
+				})
 			}
-			return response.json();
+			return response.json()
 		})
 		.catch(function(error) {
-			todo(error);setLog(start, "JSON", error);
+			todo(error)
-			setLog(start, "JSON", error);
+			setLog(start, 'JSON', error)
-			console.error(error);
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(mess) {
-			console.table(mess);
+			console.table(mess)
 			if (mess) {
 				//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
-				if (jp && mess.jp_ua && !localStorage.getItem("askjp_jp_ua")) {
+				if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
-					localStorage.setItem("askjp_jp_ua", true);
+					localStorage.setItem('askjp_jp_ua', true)
-					$("#askjp_jp_ua").removeClass("hide");
+					$('#askjp_jp_ua').removeClass('hide')
 				}
-				var platform = localStorage.getItem("platform");
+				var platform = localStorage.getItem('platform')
-				if (platform == "darwin") {
+				if (platform == 'darwin') {
-					var newest = mess.desk_mac;
+					var newest = mess.desk_mac
 				} else {
-					var newest = mess.desk;
+					var newest = mess.desk
 				}
 				if (newest == ver) {
-					todo(lang.lang_version_usever.replace("{{ver}}", mess.desk));
+					todo(lang.lang_version_usever.replace('{{ver}}', mess.desk))
 					//betaかWinstoreならアプデチェックしない
-				} else if (ver.indexOf("beta") != -1 || winstore) {
+				} else if (ver.indexOf('beta') != -1 || winstore) {
 				} else {
-					localStorage.removeItem("instance");
+					localStorage.removeItem('instance')
-					if (localStorage.getItem("new-ver-skip")) {
+					if (localStorage.getItem('new-ver-skip')) {
-						if (localStorage.getItem("next-ver") != newest) {
+						if (localStorage.getItem('next-ver') != newest) {
-							postMessage(["sendSinmpleIpc", "update"], "*");
+							postMessage(['sendSinmpleIpc', 'update'], '*')
 						} else {
-							console.warn(lang.lang_version_skipver);
+							console.warn(lang.lang_version_skipver)
-							todo(lang.lang_version_skipver);
+							todo(lang.lang_version_skipver)
 						}
 					} else {
-						postMessage(["sendSinmpleIpc", "update"], "*");
+						postMessage(['sendSinmpleIpc', 'update'], '*')
 					}
 				}
 			}
-		});
+		})
-	if (!localStorage.getItem("last-notice-id")) {
+	if (!localStorage.getItem('last-notice-id')) {
-		localStorage.setItem("last-notice-id", 0);
+		localStorage.setItem('last-notice-id', 0)
 	}
-	var start = "https://thedesk.top/notice?since_id=" + localStorage.getItem("last-notice-id");
+	var start = 'https://thedesk.top/notice/index.php?since_id=' + localStorage.getItem('last-notice-id')
 	fetch(start, {
-		method: "GET"
+		method: 'GET',
+		cors: true
 	})
 		.then(function(response) {
 			if (!response.ok) {
 				response.text().then(function(text) {
-					setLog(response.url, response.status, text);
+					setLog(response.url, response.status, text)
-				});
+				})
 			}
-			return response.json();
+			return response.json()
 		})
 		.catch(function(error) {
-			todo(error);setLog(start, "JSON", error);
+			todo(error)
-			console.error(error);
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(mess) {
 			if (mess.length < 1) {
-				return false;
+				return false
 			} else {
-				var last = localStorage.getItem("last-notice-id");
+				var last = localStorage.getItem('last-notice-id')
-				localStorage.setItem("last-notice-id", mess[0].ID);
+				localStorage.setItem('last-notice-id', mess[0].ID)
 				for (i = 0; i < mess.length; i++) {
-					var obj = mess[i];
+					var obj = mess[i]
 					if (obj.ID * 1 <= last) {
-						break;
+						break
 					} else {
-						if (obj.type == "textv2") {
+						if (obj.type == 'textv2') {
 							if (~obj.languages.indexOf(lang.language)) {
-								var show = true;
+								var showVer = true
-								if (obj.toot != "") {
+								if (obj.toot != '') {
-									var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + "','main')\">Show</button>";
+									var toot =
+										'<button class="btn-flat toast-action" onclick="detEx(\'' +
+										obj.toot +
+										"','main')\">Show</button>"
 								} else {
-									var toot = "";
+									var toot = ''
 								}
-								if (obj.ver != "") {
+								if (obj.ver != '') {
 									if (obj.ver == ver) {
-										show = true;
+										showVer = true
 									} else {
-										show = false;
+										showVer = false
 									}
 								}
-								if (obj.domain != "") {
+								if (obj.domain != '') {
-									var multi = localStorage.getItem("multi");
+									var multi = localStorage.getItem('multi')
 									if (multi) {
-										show = false;
+										showVer = false
-										var accts = JSON.parse(multi);
+										var accts = JSON.parse(multi)
 										Object.keys(accts).forEach(function(key) {
-											var acct = accts[key];
+											var acct = accts[key]
 											if (acct.domain == obj.domain) {
-												show = true;
+												showVer = true
 											}
-										});
+										})
 									}
 								}
-								if (show) {
+								if (showVer) {
-									M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 });
+									M.toast({
+										html:
+											escapeHTML(obj.text) +
+											toot +
+											'<span class="sml grey-text">(スライドして消去)</span>',
+										displayLength: 86400
+									})
 								}
 							}
 						}
 					}
 				}
 			}
-		});
+		})
 }
-var infostreaming = false;
+var infostreaming = false
 function infowebsocket() {
-	infows = new WebSocket("wss://thedesk.top/ws/");
+	infows = new WebSocket('wss://thedesk.top/ws/')
 	infows.onopen = function(mess) {
-		console.log([tlid, ":Connect Streaming Info:", mess]);
+		console.log([tlid, ':Connect Streaming Info:', mess])
-		infostreaming = true;
+		infostreaming = true
-	};
+	}
 	infows.onmessage = function(mess) {
-		console.log([tlid, ":Receive Streaming:", JSON.parse(mess.data)]);
+		console.log([tlid, ':Receive Streaming:', JSON.parse(mess.data)])
-		var obj = JSON.parse(mess.data);
+		var obj = JSON.parse(mess.data)
-		if (obj.type != "counter") {
+		if (obj.type != 'counter') {
-			if (obj.type == "textv2") {
+			if (obj.type == 'textv2') {
 				if (~obj.languages.indexOf(lang.language)) {
-					localStorage.setItem("last-notice-id", obj.id);
+					localStorage.setItem('last-notice-id', obj.id)
-					var show = true;
+					var showVer = true
-					if (obj.toot != "") {
+					if (obj.toot != '') {
-						var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + "','main')\">Show</button>";
+						var toot =
+							'<button class="btn-flat toast-action" onclick="detEx(\'' +
+							obj.toot +
+							"','main')\">Show</button>"
 					} else {
-						var toot = "";
+						var toot = ''
 					}
-					if (obj.ver != "") {
+					if (obj.ver != '') {
 						if (obj.ver == ver) {
-							show = true;
+							showVer = true
 						} else {
-							show = false;
+							showVer = false
 						}
 					}
-					if (obj.domain != "") {
+					if (obj.domain != '') {
-						var multi = localStorage.getItem("multi");
+						var multi = localStorage.getItem('multi')
 						if (multi) {
-							show = false;
+							showVer = false
-							var accts = JSON.parse(multi);
+							var accts = JSON.parse(multi)
 							Object.keys(accts).forEach(function(key) {
-								var acct = accts[key];
+								var acct = accts[key]
 								if (acct.domain == obj.domain) {
-									show = true;
+									showVer = true
 								}
-							});
+							})
 						}
 					}
-					if (show) {
+					if (showVer) {
-						console.log(obj.text);
+						console.log(obj.text)
-						console.log(escapeHTML(obj.text));
+						console.log(escapeHTML(obj.text))
-						M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 });
+						M.toast({
+							html:
+								escapeHTML(obj.text) +
+								toot +
+								'<span class="sml grey-text">(スライドして消去)</span>',
+							displayLength: 86400
+						})
 					}
 				}
 			}
 		} else {
-			$("#persons").text(obj.text);
+			$('#persons').text(obj.text)
 		}
-	};
+	}
 	infows.onerror = function(error) {
-		infostreaming = false;
+		infostreaming = false
-		console.error("Error closing:info");
+		console.error('Error closing:info')
-		console.error(error);
+		console.error(error)
-		return false;
+		return false
-	};
+	}
 	infows.onclose = function() {
-		infostreaming = false;
+		infostreaming = false
-		console.error("Closing:info");
+		console.error('Closing:info')
-	};
+	}
 }
 setInterval(function() {
 	if (!infostreaming) {
-		console.log("try to connect to base-streaming");
+		console.log('try to connect to base-streaming')
-		infowebsocket();
+		infowebsocket()
 	}
-}, 10000);
+}, 10000)
 function openRN() {
-	$("#releasenote").modal("open");
+	$('#releasenote').modal('open')
-	if (lang.language == "ja") {
+	if (lang.language == 'ja') {
-		verp = ver.replace("(", "");
+		verp = ver.replace('(', '')
-		verp = verp.replace(".", "-");
+		verp = verp.replace('.', '-')
-		verp = verp.replace(".", "-");
+		verp = verp.replace('.', '-')
-		verp = verp.replace("[", "-");
+		verp = verp.replace('[', '-')
-		verp = verp.replace("]", "");
+		verp = verp.replace(']', '')
-		verp = verp.replace(")", "");
+		verp = verp.replace(')', '')
-		verp = verp.replace(" ", "_");
+		verp = verp.replace(' ', '_')
-		$("#release-" + verp).show();
+		$('#release-' + verp).show()
 	} else {
-		$("#release-en").show();
+		$('#release-en').show()
 	}
 }
 function closeSupport() {
-	$("#support-btm").animate(
+	$('#support-btm').animate(
 		{
-			bottom: "-300px"
+			bottom: '-300px'
 		},
 		{
 			duration: 300,
 			complete: function() {
-				$("#support-btm").addClass("hide");
+				$('#support-btm').addClass('hide')
 			}
 		}
-	);
+	)
 }
 function storeDialog(platform, ver) {
-	if (platform == "win32") {
+	if($('body').hasClass('accessibility')) return false
-		var mes = lang.lang_version_platform;
+	if (platform == 'win32') {
-	} else if (platform == "linux") {
+		var mes = lang.lang_version_platform
-		var mes = lang.lang_version_platform_linux;
+	} else if (platform == 'linux') {
-	} else if (platform == "darwin") {
+		var mes = lang.lang_version_platform_linux
-		var mes = lang.lang_version_platform_mac;
+	} else if (platform == 'darwin') {
+		var mes = lang.lang_version_platform_mac
+	} else {
+		var mes = false
 	}
-	Swal.fire({
+	if (mes) {
-		title: "Select your platform",
+		Swal.fire({
-		text: mes,
+			title: 'Select your platform',
-		type: "info",
+			text: mes,
-		showCancelButton: true,
+			type: 'info',
-		confirmButtonColor: "#3085d6",
+			showCancelButton: true,
-		cancelButtonColor: "#3085d6",
+			confirmButtonColor: '#3085d6',
-		confirmButtonText: lang.lang_no,
+			cancelButtonColor: '#3085d6',
-		cancelButtonText: lang.lang_yesno
+			confirmButtonText: lang.lang_no,
-	}).then(result => {
+			cancelButtonText: lang.lang_yesno
-		//逆にしてる
+		}).then(result => {
-		if (!result.value) {
+			//逆にしてる
-			localStorage.setItem("winstore", "winstore");
+			if (!result.value) {
-		} else {
+				localStorage.setItem('winstore', 'winstore')
-			localStorage.setItem("winstore", "localinstall");
-		}
-		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");
-			verp = ver.replace("(", "");
-			verp = verp.replace(".", "-");
-			verp = verp.replace(".", "-");
-			verp = verp.replace("[", "-");
-			verp = verp.replace("]", "");
-			verp = verp.replace(")", "");
-			verp = verp.replace(" ", "_");
-			console.log("%c " + verp, "color: red;font-size:200%;");
-			if (lang.language == "ja") {
-				$("#release-" + verp).show();
 			} else {
-				$("#release-en").show();
+				localStorage.setItem('winstore', 'localinstall')
 			}
-		});
+			localStorage.setItem('ver', ver)
-	});
+			showVer = true
+			if(pwa) return false
+			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
+			$(document).ready(function() {
+				$('#releasenote').modal('open')
+				verp = ver.replace('(', '')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('[', '-')
+				verp = verp.replace(']', '')
+				verp = verp.replace(')', '')
+				verp = verp.replace(' ', '_')
+				console.log('%c ' + verp, 'color: red;font-size:200%;')
+				if (lang.language == 'ja') {
+					$('#release-' + verp).show()
+				} else {
+					$('#release-en').show()
+				}
+			})
+		})
+	} else {
+		localStorage.setItem('ver', ver)
+			showVer = true
+			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
+			$(document).ready(function() {
+				if(pwa) return false
+				$('#releasenote').modal('open')
+				verp = ver.replace('(', '')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('[', '-')
+				verp = verp.replace(']', '')
+				verp = verp.replace(')', '')
+				verp = verp.replace(' ', '_')
+				console.log('%c ' + verp, 'color: red;font-size:200%;')
+				if (lang.language == 'ja') {
+					$('#release-' + verp).show()
+				} else {
+					$('#release-en').show()
+				}
+			})
+	}
+	
 }
 function closeStart() {
-	$("#start").css("display", "none");
+	$('#start').css('display', 'none')
-	var platform = localStorage.getItem("platform");
+	var platform = localStorage.getItem('platform')
-	var ver = localStorage.getItem("ver");
+	var ver = localStorage.getItem('ver')
-	storeDialog(platform, ver);
+	storeDialog(platform, ver)
 }

app/js/emoji/default-emoji.js

@@ -1,84 +1,105 @@
-var defaultemojiList = ["activity", "flag", "food", "nature", "object", "people", "place", "symbol"];
+var defaultemojiList = ['activity', 'flag', 'food', 'nature', 'object', 'people', 'place', 'symbol']
 var defaultemoji = {
-    activity: activity,
+	activity: activity,
-    flag: flag,
+	flag: flag,
-    food: food,
+	food: food,
-    nature: nature,
+	nature: nature,
-    object: object,
+	object: object,
-    people: people,
+	people: people,
-    place: place,
+	place: place,
-    symbol: symbol
+	symbol: symbol
-};
+}
-if (lang == "ja") {
+if (lang == 'ja') {
-    var defaultemojiname = {
+	var defaultemojiname = {
-        activity: "活動",
+		activity: '活動',
-        flag: "国旗",
+		flag: '国旗',
-        food: "食べ物",
+		food: '食べ物',
-        nature: "自然",
+		nature: '自然',
-        object: "もの",
+		object: 'もの',
-        people: "ひと",
+		people: 'ひと',
-        place: "場所",
+		place: '場所',
-        symbol: "記号"
+		symbol: '記号'
-    };
+	}
 } else {
-    var defaultemojiname = {
+	var defaultemojiname = {
-        activity: "Activities",
+		activity: 'Activities',
-        flag: "Flags",
+		flag: 'Flags',
-        food: "Foods",
+		food: 'Foods',
-        nature: "Nature",
+		nature: 'Nature',
-        object: "Tools",
+		object: 'Tools',
-        people: "People",
+		people: 'People',
-        place: "Places",
+		place: 'Places',
-        symbol: "Symbols"
+		symbol: 'Symbols'
-    };
+	}
 }
 
 function defaultEmoji(target) {
-    var json = defaultemoji[target];
+    var announcement = false
-    var emojis = "";
+    if ($('#media').val() == 'announcement') {
-    Object.keys(json).forEach(function (key) {
+        announcement = true
-        var emoji = json[key];
+    }
-        emojis = emojis + '<a onclick="defEmoji(\'' + emoji["shortcode"] + '\')" class="pointer"><span style="width: 20px; height: 20px; display: inline-block; background-image: url(\'../../img/sheet.png\'); background-size: 4900%; background-position: ' + emoji["css"] + ';"></span></a>';
+	var json = defaultemoji[target]
-    });
+	var emojis = ''
-    $("#emoji-list").html(emojis);
+	Object.keys(json).forEach(function(key) {
-    $("#now-emoji").text(lang.lang_defaultemojis_text.replace("{{cat}}", defaultemojiname[target]));
+        var emoji = json[key]
-    $(".emoji-control").addClass("hide");
+        if (announcement) {
+            var def = `<a onclick="emojiReactionDef('${emoji['shortcode']}')" class="pointer">`
+        } else {
+            var def = `<a onclick="defEmoji('${emoji['shortcode']}')" class="pointer">`
+        }
+		emojis =
+			emojis +
+			`${def}
+            <span style="
+                width: 20px; height: 20px; display: inline-block; background-image: url('../../img/sheet.png'); background-size: 4900%;
+                 background-position:${emoji['css']};"></span>
+            </a>`
+	})
+	$('#emoji-list').html(emojis)
+	$('#now-emoji').text(lang.lang_defaultemojis_text.replace('{{cat}}', defaultemojiname[target]))
+	$('.emoji-control').addClass('hide')
 }
 function customEmoji() {
-    $("#emoji-suggest").val("");
+	$('#emoji-suggest').val('')
-    $(".emoji-control").removeClass("hide");
+	$('.emoji-control').removeClass('hide')
-    emojiList('home')
+	emojiList('home')
 }
 function defEmoji(target) {
-    var selin = $("#textarea").prop('selectionStart');
+	var selin = $('#textarea').prop('selectionStart')
-    if (!selin) {
+	if (!selin) {
-        selin = 0;
+		selin = 0
-    }
+	}
-    var emojiraw = newpack.filter(function (item, index) {
+	var emojiraw = newpack.filter(function(item, index) {
-        if (item.short_name == target) return true;
+		if (item.short_name == target) return true
-    });
+	})
-    var hex = emojiraw[0].unified.split("-");
+	var hex = emojiraw[0].unified.split('-')
-    if (hex.length === 2) {
+	if (hex.length === 2) {
-        emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1]);
+		emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1])
-    } else {
+	} else {
-        emoji = twemoji.convert.fromCodePoint(hex[0]);
+		emoji = twemoji.convert.fromCodePoint(hex[0])
-    }
+	}
-    var now = $("#textarea").val();
+	var now = $('#textarea').val()
-    var before = now.substr(0, selin);
+	var before = now.substr(0, selin)
-    var after = now.substr(selin, now.length);
+	var after = now.substr(selin, now.length)
-    newt = before + emoji + after;
+	newt = before + emoji + after
-    $("#textarea").val(newt);
+	$('#textarea').val(newt)
-    $("#textarea").focus();
+	$('#textarea').focus()
 }
 function faicon() {
-    var json = faicons;
+	var json = faicons
-    var emojis = "";
+	var emojis = ''
-    Object.keys(json).forEach(function (key) {
+	Object.keys(json).forEach(function(key) {
-        var emoji = json[key];
+		var emoji = json[key]
-        var eje = emoji.replace(/fa-/g, "");
+		var eje = emoji.replace(/fa-/g, '')
-        emojis = emojis + '<a onclick="emojiInsert(\'[faicon]' + eje + '[/faicon]\')" class="pointer white-text" style="font-size:24px"><i class="fa ' + emoji + '"></i></a>';
+		emojis =
-    });
+			emojis +
-    $("#emoji-list").html(emojis);
+			'<a onclick="emojiInsert(\'[faicon]' +
-    $("#now-emoji").text("faicon");
+			eje +
-    $(".emoji-control").addClass("hide");
+			'[/faicon]\')" class="pointer white-text" style="font-size:24px"><i class="fa ' +
-}
+			emoji +
+			'"></i></a>'
+	})
+	$('#emoji-list').html(emojis)
+	$('#now-emoji').text('faicon')
+	$('.emoji-control').addClass('hide')
+}

app/js/login/login.js

@@ -47,6 +47,9 @@ function ck() {
 			multiSelector(false)
 			verck(ver, jp)
 			$('.stw').show()
+			if (localStorage.getItem('tips')) {
+				tips(localStorage.getItem('tips'))
+			}
 			$('#something-wrong img').attr('src', '../../img/thinking.svg')
 		}
 	}
@@ -587,9 +590,10 @@ function enc(ver) {
 }
 //インスタンスティッカー
 function ticker() {
-	var start = 'https://toot.app/toot/'
+	var start = 'https://s.0px.io/json'
 	fetch(start, {
 		method: 'GET',
+		cors: true,
 		headers: {
 			'content-type': 'application/json'
 		}
@@ -607,7 +611,8 @@ function ticker() {
 		})
 		.then(function(json) {
 			if (json) {
-				localStorage.setItem('ticker', JSON.stringify(json))
+				localStorage.removeItem('ticker')
+				localStorage.setItem('sticker', JSON.stringify(json))
 			}
 		})
 }

app/js/login/manager.js

@@ -33,7 +33,9 @@ function load() {
 	}
 
 	console.table(obj)
+	var domains = []
 	var templete
+	$('#acct-list').html('')
 	Object.keys(obj).forEach(function(key) {
 		var acct = obj[key]
 		var list = key * 1 + 1
@@ -47,6 +49,7 @@ function load() {
 		} else {
 			var name = acct.user
 		}
+		domains.push(acct.domain)
 		templete = `
 		<div id="acct_${key}" class="card" ${style}>
 			<div class="card-content ">
@@ -54,15 +57,12 @@ function load() {
 				<span class="card-title">${name}</span>${escapeHTML(acct.user)}@${acct.domain}
 			</div>
 			<div class="card-action">
-				<a class="waves-effect disTar pointer white-text" onclick="data('${acct.domain}')">
+				<button class="btn-flat waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
-					<i class="material-icons">info</i>${lang.lang_manager_info}
+					<i class="material-icons left">refresh</i>${lang.lang_manager_refresh}
-				</a>
+				</button>
-				<a class="waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
+				<button class="btn-flat waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
-					<i class="material-icons">refresh</i>${lang.lang_manager_refresh}
+					<i class="material-icons left">delete</i>${lang.lang_manager_delete}
-				</a>
+				</button><br />${lang.lang_manager_color}
-				<a class="waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
-					<i class="material-icons">delete</i>${lang.lang_manager_delete}"
-				</a><br />${lang.lang_manager_color}
 				<div id="colorsel_${key}" class="colorsel"></div>
 			</div>
 		</div>
@@ -70,6 +70,30 @@ function load() {
 		$('#acct-list').append(templete)
 		colorpicker(key)
 	})
+	domains = _.uniq(domains)
+	$('#domain-list').html('')
+	Object.keys(domains).forEach(function(key2) {
+		var domain = domains[key2]
+		if (localStorage.getItem('letters_' + key2)) {
+			var maxChars = localStorage.getItem('letters_' + key2)
+		} else {
+			var maxChars = 500
+		}
+		var templete = `
+	<li class="collection-item transparent">
+		<div>
+			<p class="title">${domain}</p>
+			${lang.lang_manager_maxChars}　<input style="width: 100px" value="${maxChars}" id="maxChars${key2}">
+			<button class="btn-flat waves-effect" onclick="maxChars('${domain}', '${key2}')">
+				<i class="material-icons">send</i>
+			</button>
+			<button class="btn-flat waves-effect secondary-content" onclick="data('${domain}', '${key2}')">
+				<i class="material-icons left">info</i>${lang.lang_manager_info}
+			</button>
+		</div></li>
+		`
+		$('#domain-list').append(templete)
+	})
 	multisel()
 	var acctN = localStorage.getItem('acct')
 	if (!acctN) {
@@ -82,9 +106,35 @@ function load() {
 //最初に読む
 load()
 support()
-
+function maxChars(domain, uid) {
+	var value = $('#maxChars' + uid).val()
+	if(value*1 < 1 || !Number.isInteger(value*1)) {
+		Swal.fire({
+			type: 'error',
+			title: 'Error'
+		})
+		return false
+	}
+	var multi = localStorage.getItem('multi')
+	if (!multi) {
+		var obj = []
+	} else {
+		var obj = JSON.parse(multi)
+	}
+	if (obj[0]) {
+		if (!obj[0].at) {
+			obj = []
+			localStorage.removeItem('multi')
+		}
+	}
+	Object.keys(obj).forEach(function(key) {
+		if(obj[key].domain == domain) localStorage.setItem('letters_' + key, value)
+	})
+	console.log('#maxChars' + uid, value)
+	load()
+}
 //instances.social/instances API
-function data(domain) {
+async function data(domain, acct_id) {
 	$('#ins-upd').text('Loading...')
 	$('#ins-add').text('Loading...')
 	$('#ins-connect').text('Loading...')
@@ -96,7 +146,7 @@ function data(domain) {
 	$('#ins-name').text('Loading...')
 	$('#ins-prof').attr('src', '../../img/loading.svg')
 	var start = 'https://instances.social/api/1.0/instances/show?name=' + domain
-	fetch(start, {
+	let promise = await fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
@@ -104,74 +154,42 @@ function data(domain) {
 				'Bearer tC8F6xWGWBUwGScyNevYlx62iO6fdQ4oIK0ad68Oo7ZKB8GQdGpjW9TKxBnIh8grAhvd5rw3iyP9JPamoDpeLQdz62EToPJUW99hDx8rfuJfGdjQuimZPTbIOx0woA5M'
 		}
 	})
-		.then(function(response) {
+	var json = await promise.json()
-			if (!response.ok) {
+	$('#ins-name').text(json.name)
-				response.text().then(function(text) {
+	$('#ins-upd').text(date(json.checked_at, 'full'))
-					setLog(response.url, response.status, text)
+	$('#ins-add').text(date(json.added_at, 'full'))
-				})
+	$('#ins-connect').text(json.connections)
-			}
+	$('#ins-toot').text(json.statuses)
-			return response.json()
+	$('#ins-sys').text(date(json.updated_at, 'full'))
-		})
+	$('#ins-per').text(json.uptime * 100)
-		.catch(function(error) {
+	$('#ins-user').text(json.users)
-			todo(error)
+	$('#ins-ver').text(json.version)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			if (!json.error) {
-				$('#ins-name').text(json.name)
-				$('#ins-upd').text(date(json.checked_at, 'full'))
-				$('#ins-add').text(date(json.added_at, 'full'))
-				$('#ins-connect').text(json.connections)
-				$('#ins-toot').text(json.statuses)
-				$('#ins-sys').text(date(json.updated_at, 'full'))
-				$('#ins-per').text(json.uptime * 100)
-				$('#ins-user').text(json.users)
-				$('#ins-ver').text(json.version)
-			} else {
-				console.error(json.error)
-			}
-		})
 	var start = 'https://' + domain + '/api/v1/instance'
-	fetch(start, {
+	let promise2 = await fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json'
 		}
 	})
-		.then(function(response) {
+	var json = await promise2.json()
-			if (!response.ok) {
+	$('#ins-title').text(json.title)
-				response.text().then(function(text) {
+	$('#ins-desc').html(json.description)
-					setLog(response.url, response.status, text)
+	$('#ins-email').text(json.email)
-				})
+	$('#ins-toot').text(json.stats.status_count)
-			}
+	$('#ins-user').text(json.stats.user_count)
-			return response.json()
+	$('#ins-ver').text(json.version)
-		})
+	$('#ins-prof').attr('src', json.thumbnail)
-		.catch(function(error) {
+	$('#ins-admin').text(
-			todo(error)
+		escapeHTML(json.contact_account.display_name) + '(' + json.contact_account.acct + ')'
-			setLog(start, 'JSON', error)
+	)
-			console.error(error)
+	$('#ins-admin').attr(
-		})
+		'href',
-		.then(function(json) {
+		'index.html?mode=user&code=' + json.contact_account.username + '@' + domain
-			if (!json.error) {
+	)
-				$('#ins-title').text(json.title)
+	if (json['max_toot_chars']) {
-				$('#ins-desc').html(json.description)
+		localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
-				$('#ins-email').text(json.email)
+		load()
-				$('#ins-toot').text(json.stats.status_count)
+	}
-				$('#ins-user').text(json.stats.user_count)
-				$('#ins-ver').text(json.version)
-				$('#ins-prof').attr('src', json.thumbnail)
-				$('#ins-admin').text(
-					escapeHTML(json.contact_account.display_name) + '(' + json.contact_account.acct + ')'
-				)
-				$('#ins-admin').attr(
-					'href',
-					'index.html?mode=user&code=' + json.contact_account.username + '@' + domain
-				)
-			} else {
-				console.error(json.error)
-			}
-		})
 }
 
 //アカウントデータ　消す
@@ -234,11 +252,31 @@ function multiDel(target) {
 					var newdom = oldcol.domain
 				}
 				var type = oldcol.type
+				var data = null
+				if(oldcol.data) {
+					data = oldcol.data
+				}
+				var background = null
+				if(oldcol.background) {
+					background = oldcol.background
+				}
+				var text = null
+				if(oldcol.text) {
+					text = oldcol.text
+				}
+				var left_fold = false
+				if(oldcol.left_fold) {
+					left_fold = true
+				}
 				//消した垢のコラムじゃないときコピー
 				if (target != oldcol.domain) {
 					var add = {
 						domain: newdom,
-						type: type
+						type: type,
+						data: data,
+						background: background,
+						text: text,
+						left_fold: left_fold
 					}
 					newcols.push(add)
 				}
@@ -488,7 +526,7 @@ function misskeyLogin(url) {
 	if (!url) {
 		var url = $('#misskey-url').val()
 	}
-	var start = 'http://' + url + '/api/app/create'
+	var start = 'https://' + url + '/api/app/create'
 	var httpreq = new XMLHttpRequest()
 	httpreq.open('POST', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')

app/js/platform/end.js

@@ -46,10 +46,17 @@ $(document).on('click', 'a', e => {
 					udgEx(url, 'main')
 					return false
 				} else {
-					postMessage(['openUrl', url], '*')
+					if(pwa) {
+						return true
+					} else {
+						postMessage(['openUrl', url], '*')
+					}
 				}
 			}
 		} else {
+			if(pwa) {
+				return true
+			}
 			//hrefがhttp/httpsならブラウザで
 			if (urls) {
 				if (urls[0]) {
@@ -133,19 +140,20 @@ function nano() {
 	postMessage(['nano', null], '*')
 }
 onmessage = function(e) {
+	console.log(e)
 	if (e.data[0] == 'details') {
 		details(e.data[1][0], e.data[1][1])
 	} else if (e.data[0] == 'udg') {
 		udg(e.data[1][0], e.data[1][1])
 	} else if (e.data[0] == 'media') {
-		media(e.data[1][0], e.data[1][1], e.data[1][2])
+		media(e.data[1][0], e.data[1][1], e.data[1][2], e.data[1][3])
 	} else if (e.data[0] == 'post') {
 		post('pass')
 	} else if (e.data[0] == 'toastSaved') {
-		var show = `${lang.lang_img_DLDone}${
+		var showTxt = `${lang.lang_img_DLDone}${
 			e.data[1][0]
-		}<button class="btn-flat toast-action" onclick="openFinder(${e.data[1][1]}')">Show</button>`
+		}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
-		M.toast({ html: show, displayLength: 5000 })
+		M.toast({ html: showTxt, displayLength: 5000 })
 	} else if (e.data[0] == 'parseColumn') {
 		parseColumn(e.data[1])
 	} else if (e.data[0] == 'exportSettingsCore') {
@@ -179,6 +187,10 @@ onmessage = function(e) {
 		asRead()
 	} else if (e.data[0] == 'asReadEnd') {
 		asReadEnd()
+	} else if (e.data[0] == 'accessibility') {
+		console.log('atrue')
+		$('body').addClass('accessibility')
+		$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
 	} else if (e.data[0] == 'logData') {
 		$('#logs').val(e.data[1])
 		var obj = document.getElementById('logs')
@@ -190,3 +202,23 @@ onmessage = function(e) {
 		})
 	}
 }
+/* PWA */
+if(pwa) {
+	function postMessage(e) {
+		if (e[0] == 'openUrl') {
+			urls = e[1].match(/https?:\/\/(.+)/)
+			if (urls) {
+				Swal.fire({
+					title: 'Open URL',
+					icon: 'info',
+					html:
+					  `If you are OK, click: <a href="${urls[0]}" target="_blank" class="btn waves-effect">Here</a>`,
+					showCloseButton: false,
+					showCancelButton: true,
+					focusConfirm: false,
+					confirmButtonText: 'Close'
+				  })
+			}
+		}
+	}
+}

app/js/platform/first.js

@@ -1,4 +1,3 @@
-document.title = 'TheDesk'
 $.strip_tags = function(str, allowed) {
 	if (!str) {
 		return ''
@@ -161,8 +160,8 @@ $.mb_substr = function(str, begin, end) {
 	var splitter = new GraphemeSplitter()
 	var arr = splitter.splitGraphemes(str)
 	var newarr = []
-	for(var i = 0; i < arr.length; i++){
+	for (var i = 0; i < arr.length; i++) {
-		if(i >= begin && i <= end){
+		if (i >= begin && i <= end) {
 			newarr.push(arr[i])
 		}
 	}
@@ -205,9 +204,81 @@ function escapeCsv(str) {
 		return str
 	}
 	var result
-	result = str.replace(/\"/g, '""')
+	result = str.toString().replace(/\"/g, '""')
 	if (result.indexOf(',') >= 0) {
 		result = '"' + result + '"'
 	}
 	return result
 }
+function evalAttr(json, attr, lenCk) {
+	if (json[attr]) {
+		if (lenCk) {
+			if (json[attr][0]) {
+				return true
+			} else {
+				return false
+			}
+		} else {
+			return true
+		}
+	} else {
+		return false
+	}
+}
+function statusModel(now) {
+	if (!now) {
+		var now = new Date().toString()
+	}
+	return {
+		id: '',
+		created_at: now,
+		in_reply_to_id: null,
+		in_reply_to_account_id: null,
+		sensitive: false,
+		spoiler_text: '',
+		visibility: 'public',
+		language: 'en',
+		uri: '',
+		url: '',
+		replies_count: 0,
+		reblogs_count: 0,
+		favourites_count: 0,
+		favourited: false,
+		reblogged: false,
+		muted: false,
+		bookmarked: false,
+		pinned: false,
+		content: '<p><i>No status here</i></p>',
+		reblog: null,
+		application: {
+			name: null,
+			website: null
+		},
+		account: {
+			id: '',
+			username: '',
+			acct: '',
+			display_name: '',
+			locked: false,
+			bot: false,
+			created_at: now,
+			note: '',
+			url: '',
+			avatar: '',
+			avatar_static: '',
+			header: '',
+			header_static: '',
+			followers_count: 0,
+			following_count: 0,
+			statuses_count: 0,
+			last_status_at: now,
+			emojis: [],
+			fields: []
+		},
+		media_attachments: [],
+		mentions: [],
+		tags: [],
+		card: null,
+		poll: null
+	}
+}

app/js/platform/preload.js

@@ -1,6 +1,28 @@
 var electron = require('electron')
 const shell = electron.shell
 var ipc = electron.ipcRenderer
+//title bar
+const customTitlebar = require('custom-electron-titlebar')
+window.addEventListener('DOMContentLoaded', () => {
+	document.title = 'TheDesk'
+	ipc.send('acsCheck', '')
+	ipc.send('frameCheck', '')
+	ipc.on('frame', function(event, args) {
+		const file = location.href.substr(-10)
+		if (
+			file == 'index.html' ||
+			file == '/acct.html' ||
+			file == 'tting.html'
+		) {
+			new customTitlebar.Titlebar({
+				backgroundColor: customTitlebar.Color.fromHex('#000'),
+				titleHorizontalAlignment: 'right',
+				icon: '../../img/desk.png'
+			})
+		}
+		})
+})
+
 onmessage = function(e) {
 	if (e.data[0] == 'openUrl') {
 		urls = e.data[1].match(/https?:\/\/(.+)/)
@@ -13,6 +35,10 @@ onmessage = function(e) {
 		ipc.send('dialogStore', e.data[1])
 	} else if (e.data[0] == 'bmpImage') {
 		ipc.send('bmp-image', e.data[1])
+	} else if (e.data[0] == 'resizeImage') {
+		ipc.send('resize-image', e.data[1])
+	} else if (e.data[0] == 'stampImage') {
+		ipc.send('stamp-image', e.data[1])
 	} else if (e.data[0] == 'dialogCW') {
 		ipc.send('dialogCW', e.data[1])
 	} else if (e.data[0] == 'nativeNotf') {
@@ -23,7 +49,7 @@ onmessage = function(e) {
 	} else if (e.data[0] == 'generalDL') {
 		ipc.send('general-dl', e.data[1])
 	} else if (e.data[0] == 'openFinder') {
-		ipc.send('open-finder', e.data[1])
+		ipc.send('openFinder', e.data[1])
 	} else if (e.data[0] == 'columnDel') {
 		ipc.send('column-del', e.data[1])
 	} else if (e.data[0] == 'lang') {
@@ -44,6 +70,8 @@ onmessage = function(e) {
 		ipc.send('theme-json-request', e.data[1])
 	} else if (e.data[0] == 'ha') {
 		ipc.send('ha', e.data[1])
+	} else if (e.data[0] == 'frameSet') {
+		ipc.send('frameSet', e.data[1])
 	} else if (e.data[0] == 'ua') {
 		ipc.send('ua', e.data[1])
 	} else if (e.data[0] == 'aboutData') {
@@ -112,14 +140,38 @@ ipc.on('theme-css-response', function(event, arg) {
 })
 //img.js
 ipc.on('bmp-img-comp', function(event, b64) {
-	postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+	if (b64[2]) {
+		var stamped = true
+	} else {
+		var stamped = false
+	}
+	postMessage(['media', [b64[0], 'image/png', b64[1], stamped]], '*')
+})
+ipc.on('resizeJudgement', function(event, b64) {
+	var resize = localStorage.getItem('uploadCrop') * 1
+	if (resize > 0) {
+		var element = new Image()
+		var width
+		element.onload = function() {
+			var width = element.naturalWidth
+			var height = element.naturalHeight
+			if (width > resize || height > resize) {
+				ipc.send('resize-image', [b64[0], resize])
+			} else {
+				postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+			}
+		}
+		element.src = 'data:image/png;base64,' + b64[0]
+	} else {
+		postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+	}
 })
 //ui,img.js
 ipc.on('general-dl-prog', function(event, arg) {
 	console.log('Progress: ' + arg)
 })
 ipc.on('general-dl-message', function(event, arg) {
-	var argC = arg.replace(/\\/g, '\\\\') + '\\\\.'
+	var argC = arg.replace(/\\/g, '\\\\')
 	console.log('saved')
 	postMessage(['toastSaved', [arg, argC]], '*')
 })
@@ -180,12 +232,16 @@ ipc.on('prog', function(event, arg) {
 ipc.on('mess', function(event, arg) {
 	postMessage(['updateMess', arg], '*')
 })
+//misc
 ipc.on('asRead', function(event, arg) {
 	postMessage(['asRead', ''], '*')
 })
 ipc.on('asReadEnd', function(event, arg) {
 	postMessage(['asReadEnd', ''], '*')
 })
+ipc.on('accessibility', function(event, arg) {
+	postMessage(['accessibility', 'true'], '*')
+})
 var webviewDom = document.getElementById('webview')
 if (webviewDom) {
 	webviewDom.addEventListener('new-window', function(e) {

app/js/post/bb-md.js

@@ -50,7 +50,12 @@ function mdCheck() {
 	if (idata[domain + '_letters']) {
 		$('#textarea').attr('data-length', idata[domain + '_letters'])
 	} else {
-		$('#textarea').attr('data-length', 500)
+		var maxletters = localStorage.getItem('letters_' + acct_id)
+		if (maxletters > 0) {
+			$('#textarea').attr('data-length', maxletters)
+		} else {
+			$('#textarea').attr('data-length', 500)
+		}
 	}
 	if (idata[domain + '_glitch'] === 'true') {
 		$('#local-button').removeClass('hide')

app/js/post/emoji.js

@@ -193,7 +193,15 @@ function emojiGet(parse, started) {
 function emojiList(target, reaction) {
 	$('#now-emoji').text(lang.lang_emoji_custom)
 	var acct_id = $('#post-acct-sel').val()
-	if (reaction && localStorage.getItem('emojiReaction_' + acct_id) != 'true') {
+	if(reaction && $('#media').val() == 'misskey') {
+		var misskeyReact = true
+	} else {
+		var misskeyReact = false
+	}
+	if (
+		misskeyReact &&
+		localStorage.getItem('emojiReaction_' + acct_id) != 'true'
+	) {
 		console.error('Disabled')
 		clear()
 		hide()
@@ -263,9 +271,20 @@ function emojiList(target, reaction) {
 		var emoji = obj[i]
 		if (emoji) {
 			if (reaction) {
-				html =
+				if (emoji.divider) {
-					html +
+					html = html + '<p style="margin-bottom:0">' + emoji.cat + '</p>'
-					`<a onclick="emojiReaction(':${emoji.shortcode}:')" class="pointer"><img src="${emoji.url}" width="20" title="${emoji.shortcode}"></a>`
+				} else {
+					if (emoji.listed) {
+						if(misskeyReact) {
+							var shortcode = `:${emoji.shortcode}:`
+						} else {
+							var shortcode = emoji.shortcode
+						}
+						html =
+							html +
+							`<a onclick="emojiReaction('${shortcode}')" class="pointer"><img src="${emoji.url}" width="20" title="${emoji.shortcode}"></a>`
+					}
+				}
 			} else {
 				if (emoji.divider) {
 					html = html + '<p style="margin-bottom:0">' + emoji.cat + '</p>'

app/js/post/img.js

@@ -60,6 +60,24 @@ function handleFileUpload(files, obj, no) {
 	var fr = new FileReader()
 	fr.onload = function(evt) {
 		var b64 = evt.target.result
+		var resize = localStorage.getItem('uploadCrop') * 1
+		if (resize > 0) {
+			var element = new Image()
+			var width
+			element.onload = function() {
+				var width = element.naturalWidth
+				var height = element.naturalHeight
+				if (width > resize || height > resize) {
+					postMessage(['resizeImage', [b64, resize]], '*')
+					return false
+				} else {
+					$('#b64-box').val(b64)
+					var ret = media(b64, files['type'], no)
+				}
+			}
+			element.src = b64
+			return false
+		}
 		$('#b64-box').val(b64)
 		var ret = media(b64, files['type'], no)
 	}
@@ -68,7 +86,14 @@ function handleFileUpload(files, obj, no) {
 }
 
 //ファイルアップロード
-function media(b64, type, no) {
+async function media(b64, type, no, stamped) {
+	var acct_id = $('#post-acct-sel').val()
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var user = localStorage.getItem('user_' + acct_id)
+	if ($('#stamp').hasClass('stamp-avail') && !stamped) {
+		postMessage(['stampImage', [b64, user + '@' + domain]], '*')
+		return false
+	}
 	var l = 4
 	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
 	var cl = c.length
@@ -88,8 +113,6 @@ function media(b64, type, no) {
 	var media = toBlob(b64, type)
 	var fd = new FormData()
 	fd.append('file', media)
-	var acct_id = $('#post-acct-sel').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	var httpreq = new XMLHttpRequest()
 	if (localStorage.getItem('mode_' + domain) == 'misskey') {
@@ -104,22 +127,60 @@ function media(b64, type, no) {
 		}
 		var previewer = 'url'
 		fd.append('i', at)
-		//fd.append('isSensitive', nsfw);
 		httpreq.send(fd)
 	} else {
 		var previewer = 'preview_url'
-		var start = 'https://' + domain + '/api/v1/media'
+		//v2/media
-		httpreq.open('POST', start, true)
+		try {
-		httpreq.upload.addEventListener('progress', progshow, false)
+			var id = await v2MediaUpload(domain, at, fd)
-		httpreq.responseType = 'json'
+			if(!id) {
-		httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+				var start = 'https://' + domain + '/api/v1/media'
-		httpreq.send(fd)
+				httpreq.open('POST', start, true)
+				httpreq.upload.addEventListener('progress', progshow, false)
+				httpreq.responseType = 'json'
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+				httpreq.send(fd)
+			} else {
+				var mediav = $('#media').val()
+				var regExp = new RegExp('tmp_' + r, 'g')
+				mediav = mediav.replace(regExp, id)
+				$('#media').val(mediav)
+				var html = `<img src="../../img/picture.svg" class="preview-img pointer unknown" data-media="${id}" oncontextmenu="deleteImage('${id}')" onclick="altImage('${acct_id}','${id}')" title="${lang.lang_postimg_delete}">`
+				$('#preview').append(html)
+				todc()
+				if (localStorage.getItem('nsfw_' + acct_id)) {
+					$('#nsfw').addClass('yellow-text')
+					$('#nsfw').html('visibility')
+					$('#nsfw').addClass('nsfw-avail')
+				}
+				$('.toot-btn-group').prop('disabled', false)
+				$('select').formSelect()
+				$('#mec').text(lang.lang_there)
+				M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
+				$('#imgup').text('')
+				$('#imgsel').show()
+				localStorage.removeItem('image')
+			} 
+		} catch {
+			var start = 'https://' + domain + '/api/v1/media'
+			httpreq.open('POST', start, true)
+			httpreq.upload.addEventListener('progress', progshow, false)
+			httpreq.responseType = 'json'
+			httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+			httpreq.send(fd)
+		}
 	}
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
 				setLog(start, this.status, json)
+				$('.toot-btn-group').prop('disabled', false)
+				$('select').formSelect()
+				$('#mec').text(lang.lang_there)
+				M.toast({ html: this.status + ':' +json, displayLength: 2000 })
+				$('#imgup').text('')
+				$('#imgsel').show()
 			}
 			if (!json.id) {
 				todc()
@@ -131,13 +192,13 @@ function media(b64, type, no) {
 				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
 				return false
 			}
+			$('#imgup').text('')
+			$('.toot-btn-group').prop('disabled', false)
+			$('select').formSelect()
+			$('#imgsel').show()
 			var img = localStorage.getItem('img')
 			if (json.type.indexOf('image') != -1) {
-				var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${
+				var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${json['id']}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${json['id']}')" title="${lang.lang_postimg_delete}">`
-					json['id']
-				}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${
-					json['id']
-				}')" title="${lang.lang_postimg_delete}">`
 				$('#preview').append(html)
 			} else {
 				$('#preview').append(lang.lang_postimg_previewdis)
@@ -151,22 +212,9 @@ function media(b64, type, no) {
 				mediav = mediav.replace(regExp, json['id'])
 				$('#media').val(mediav)
 			}
-			if (img == 'url') {
+			if (img == 'url' && json['text_url']) {
 				$('#textarea').val($('#textarea').val() + ' ' + json['text_url'])
 			}
-			todc()
-			if (localStorage.getItem('nsfw_' + acct_id)) {
-				$('#nsfw').addClass('yellow-text')
-				$('#nsfw').html('visibility')
-				$('#nsfw').addClass('nsfw-avail')
-			}
-			$('.toot-btn-group').prop('disabled', false)
-			$('select').formSelect()
-			$('#mec').text(lang.lang_there)
-			M.toast({ html: lang.lang_postimg_aftupload, displayLength: 1000 })
-			$('#imgup').text('')
-			$('#imgsel').show()
-			localStorage.removeItem('image')
 		}
 	}
 }
@@ -251,52 +299,129 @@ function altImage(acct_id, id) {
 	var domain = localStorage.getItem('domain_' + acct_id)
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	var start = 'https://' + domain + '/api/v1/media/' + id
-
+	if($('[data-media=' + id + ']').hasClass('unknown')) {
+		fetch(start, {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/json',
+				Authorization: 'Bearer ' + at
+			}
+		})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			console.log(json)
+			$('[data-media=' + id + ']').removeClass('unknown')
+			if(json.preview_url) {
+				$('[data-media=' + id + ']').attr('src', json.preview_url)
+			}
+		})
+	} else {
+		Swal.fire({
+			title: lang.lang_postimg_desc,
+			text: lang.lang_postimg_leadContext,
+			input: 'text',
+			inputAttributes: {
+				autocapitalize: 'off'
+			},
+			showCancelButton: true,
+			confirmButtonText: 'Post',
+			showLoaderOnConfirm: true,
+			preConfirm: data => {
+				return fetch(start, {
+					method: 'PUT',
+					headers: {
+						'content-type': 'application/json',
+						Authorization: 'Bearer ' + at
+					},
+					body: JSON.stringify({
+						description: data
+					})
+				})
+					.then(function(response) {
+						if (!response.ok) {
+							response.text().then(function(text) {
+								setLog(response.url, response.status, text)
+							})
+						}
+						return response.json()
+					})
+					.catch(function(error) {
+						todo(error)
+						setLog(start, 'JSON', error)
+						console.error(error)
+					})
+					.then(function(json) {
+						console.log(json)
+						$('[data-media=' + id + ']').attr('title', data)
+					})
+			},
+			allowOutsideClick: () => !Swal.isLoading()
+		}).then(result => {
+			if (result.value) {
+				Swal.fire({
+					title: 'Complete'
+				})
+			}
+		})
+	}
+	
+}
+function stamp() {
+	if ($('#stamp').hasClass('stamp-avail')) {
+		$('#stamp').html('Off')
+		$('#stamp').removeClass('stamp-avail')
+	} else {
+		$('#stamp').html('On')
+		$('#stamp').addClass('stamp-avail')
+	}
+}
+//v2/media対応
+async function v2MediaUpload(domain, at, fd) {
+	var start = 'https://' + domain + '/api/v2/media'
+	let promise = await fetch(start, {
+		method: 'POST',
+		headers: {
+			Authorization:
+				'Bearer ' + at
+		},
+		body: fd
+	})
+	var json = await promise.json()
+	if(json.id) {
+		return json.id
+	} else {
+		return false
+	}
+}
+function alertProcessUnfinished() {
 	Swal.fire({
-		title: lang.lang_postimg_desc,
+		title: lang.lang_post_unfinishedMedia,
-		text: lang.lang_postimg_leadContext,
+		type: 'error',
-		input: 'text',
-		inputAttributes: {
-			autocapitalize: 'off'
-		},
 		showCancelButton: true,
-		confirmButtonText: 'Post',
+		confirmButtonText: lang.lang_post_retry,
-		showLoaderOnConfirm: true,
+		cancelButtonText: lang.lang_no
-		preConfirm: data => {
-			return fetch(start, {
-				method: 'PUT',
-				headers: {
-					'content-type': 'application/json',
-					Authorization: 'Bearer ' + at
-				},
-				body: JSON.stringify({
-					description: data
-				})
-			})
-				.then(function(response) {
-					if (!response.ok) {
-						response.text().then(function(text) {
-							setLog(response.url, response.status, text)
-						})
-					}
-					return response.json()
-				})
-				.catch(function(error) {
-					todo(error)
-					setLog(start, 'JSON', error)
-					console.error(error)
-				})
-				.then(function(json) {
-					console.log(json)
-					$('[data-media=' + id + ']').attr('title', data)
-				})
-		},
-		allowOutsideClick: () => !Swal.isLoading()
 	}).then(result => {
 		if (result.value) {
-			Swal.fire({
+			post()
-				title: 'Complete'
-			})
 		}
 	})
 }
+function syncDetail() {
+	Swal.fire({
+		title: lang.lang_post_syncDetail,
+		text: lang.lang_post_syncDetailText,
+		type: 'info'
+	})
+}

app/js/post/misskeystatus.js

@@ -116,6 +116,7 @@ function reactiontoggle(id, acct_id, tlid) {
 //reactioncustom
 function reactioncustom(acct_id, id) {
 	$('#reply').val(id)
+	$('#media').val('misskey')
 	$('#unreact').hide()
 	$('#addreact').removeClass('hide')
 	$('#post-acct-sel').val(acct_id)
@@ -186,9 +187,14 @@ function reactRefreshCore(json) {
 	}
 }
 function emojiReaction(emoji) {
+	var media = $('#media').val()
 	var acct_id = $('#post-acct-sel').val()
 	var id = $('#reply').val()
-	reaction(emoji, id, acct_id, null)
+	if(media == 'announcement') {
+		announReaction(id, acct_id, 0, false, emoji)
+	} else {
+		reaction(emoji, id, acct_id, null)
+	}
 	clear()
 	hide()
 }

app/js/post/post.js

@@ -17,6 +17,13 @@ function post(mode, postvis) {
 	var acct_id = $('#post-acct-sel').val()
 	localStorage.setItem('last-use', acct_id)
 	var domain = localStorage.getItem('domain_' + acct_id)
+	if ($('#ideKey').val() != '') {
+		var ideKey = $('#ideKey').val()
+	} else {
+		var user = localStorage.getItem('user_' + acct_id)
+		var ideKey = Math.floor(Date.now() / 1000) + '/TheDesk/' + user + '@' + domain
+		$('#ideKey').val(ideKey)
+	}
 	if (!localStorage.getItem('cw_sentence')) {
 		var cw_sent = 500
 	} else {
@@ -115,6 +122,10 @@ function post(mode, postvis) {
 		console.log('This toot will be posted at:' + scheduled)
 		schedule()
 		toot.scheduled_at = scheduled
+		if($('#sch-box').hasClass('expire')) {
+			toot.scheduled_at = null
+			toot.expires_at = scheduled
+		}
 	} else {
 		var scheduled = ''
 	}
@@ -152,25 +163,56 @@ function post(mode, postvis) {
 	httpreq.open('POST', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.setRequestHeader('Idempotency-Key', ideKey)
 	httpreq.responseType = 'json'
 	httpreq.send(JSON.stringify(toot))
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
-				setLog(start, this.status, json)
+				if(media && this.status == 422) {
+					$('#ideKey').val('')
+					$('.toot-btn-group').prop('disabled', false)
+					alertProcessUnfinished()
+				} else {
+					setLog(start, this.status, json)
+					var box = localStorage.getItem('box')
+					if (box == 'yes' || !box) {
+						$('#textarea').blur()
+						hide()
+					}
+					$('.toot-btn-group').prop('disabled', false)
+					todc()
+					clear()
+				}
+			} else {
+				$('#ideKey').val('')
+				var box = localStorage.getItem('box')
+				if (box == 'yes' || !box) {
+					$('#textarea').blur()
+					hide()
+				}
+				$('.toot-btn-group').prop('disabled', false)
+				todc()
+				clear()
 			}
-			var box = localStorage.getItem('box')
-			if (box == 'yes' || !box) {
-				$('#textarea').blur()
-				hide()
-			}
-			$('.toot-btn-group').prop('disabled', false)
-			todc()
-			clear()
 		}
 	}
 }
+function expPostMode() {
+	$('#sch-box').toggleClass('expire')
+	if($('#sch-box').hasClass('expire')) {
+		Swal.fire({
+			type: 'info',
+			title: 'Expiring toot On'
+		})
+	} else {
+		Swal.fire({
+			type: 'info',
+			title: 'Expireing toot Off'
+		})
+	}
+}
 function misskeyPost() {
 	var str = $('#textarea').val()
 	var acct_id = $('#post-acct-sel').val()
@@ -255,6 +297,7 @@ function misskeyPost() {
 //クリア(Shift+C)
 function clear() {
 	$('#textarea').val('')
+	$('#ideKey').val('')
 	if (localStorage.getItem('stable')) {
 		$('#textarea').val('#' + localStorage.getItem('stable') + ' ')
 	}
@@ -284,6 +327,8 @@ function clear() {
 	$('#nsfw').removeClass('yellow-text')
 	$('#nsfw').html('visibility_off')
 	$('#nsfw').removeClass('nsfw-avail')
+	$('#stamp').html('Off')
+	$('#stamp').removeClass('stamp-avail')
 	$('#nsc').text(lang.lang_nothing)
 	$('#drag').css('background-color', '#e0e0e0')
 	$('#preview').html('')

app/js/post/secure.js

@@ -96,9 +96,9 @@ function cw() {
 	}
 }
 //TLでコンテントワーニングを表示トグル
-function cw_show(id) {
+function cw_show(e) {
-	$('.cw_hide_' + id).toggleClass('cw')
+	$(e).parent().parent().find('.cw_hide').toggleClass('cw')
-	$('.cw-long-' + id).toggleClass('hide')
+	$(e).parent().find('.cw_long').toggleClass('hide')
 }
 $(function() {
 	$('#cw-text').on('change', function(event) {

app/js/post/status.js

@@ -1,7 +1,7 @@
 //お気に入り登録やブースト等、フォローやブロック等
 //お気に入り登録
 function fav(id, acct_id, remote) {
-	if ($('#pub_' + id).hasClass('faved')) {
+	if ($(`.cvo[unique-id=${id}]`).hasClass('faved')) {
 		var flag = 'unfavourite'
 	} else {
 		var flag = 'favourite'
@@ -57,7 +57,7 @@ function fav(id, acct_id, remote) {
 
 //ブースト
 function rt(id, acct_id, remote, vis) {
-	if ($('#pub_' + id).hasClass('rted')) {
+	if ($(`.cvo[toot-id=${id}]`).hasClass('rted')) {
 		var flag = 'unreblog'
 	} else {
 		var flag = 'reblog'
@@ -85,7 +85,7 @@ function rt(id, acct_id, remote, vis) {
 				json = json.reblog
 			}
 			console.log(['Success: boost', json])
-			$('[unique-id=' + id + '] .fav_ct').text(json.favourites_count)
+			$('[toot-id=' + id + '] .fav_ct').text(json.favourites_count)
 			if (!json.reblog) {
 				if (flag == 'unreblog') {
 					var rt = json.reblogs_count - 1
@@ -95,16 +95,16 @@ function rt(id, acct_id, remote, vis) {
 				} else {
 					var rt = json.reblogs_count
 				}
-				$('[unique-id=' + id + '] .rt_ct').text(rt)
+				$('[toot-id=' + id + '] .rt_ct').text(rt)
 			} else {
-				$('[unique-id=' + id + '] .rt_ct').text(json.reblogs_count)
+				$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
 			}
 
-			if ($('[unique-id=' + id + ']').hasClass('rted')) {
+			if ($('[toot-id=' + id + ']').hasClass('rted')) {
-				$('[unique-id=' + id + ']').removeClass('rted')
+				$('[toot-id=' + id + ']').removeClass('rted')
 				$('.rt_' + id).removeClass('light-blue-text')
 			} else {
-				$('[unique-id=' + id + ']').addClass('rted')
+				$('[toot-id=' + id + ']').addClass('rted')
 				$('.rt_' + id).addClass('light-blue-text')
 			}
 		}
@@ -117,7 +117,7 @@ function boostWith(vis) {
 }
 //ブックマーク
 function bkm(id, acct_id, tlid) {
-	if ($('#pub_' + id).hasClass('bkmed')) {
+	if ($(`.cvo[unique-id=${id}]`).hasClass('bkmed')) {
 		var flag = 'unbookmark'
 	} else {
 		var flag = 'bookmark'
@@ -141,27 +141,33 @@ function bkm(id, acct_id, tlid) {
 				json = json.reblog
 			}
 			var fav = json.favourites_count
-				$('[toot-id=' + id + '] .fav_ct').text(fav)
+			$('[toot-id=' + id + '] .fav_ct').text(fav)
-				$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
+			$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
-				if (flag == 'unbookmark') {
+			if (flag == 'unbookmark') {
-					$('.bkmStr_' + id).text(lang.lang_parse_bookmark)
+				$('.bkmStr_' + id).text(lang.lang_parse_bookmark)
-					$('.bkm_' + id).removeClass('red-text')
+				$('.bkm_' + id).removeClass('red-text')
-					$('[toot-id=' + id + ']').removeClass('bkmed')
+				$('[toot-id=' + id + ']').removeClass('bkmed')
-				} else {
+			} else {
-					$('.bkmStr_' + id).text(lang.lang_parse_unbookmark)
+				$('.bkmStr_' + id).text(lang.lang_parse_unbookmark)
-					$('.bkm_' + id).addClass('red-text')
+				$('.bkm_' + id).addClass('red-text')
-					$('[toot-id=' + id + ']').addClass('bkmed')
+				$('[toot-id=' + id + ']').addClass('bkmed')
-				}
+			}
-				var tlidTar = $(`.bookmark-timeline[data-acct=${acct_id}]`).attr('tlid')
+			var tlidTar = $(`.bookmark-timeline[data-acct=${acct_id}]`).attr('tlid')
-				columnReload(tlidTar,'bookmark')
+			columnReload(tlidTar, 'bookmark')
 		}
 	}
 }
 
 //フォロー
 async function follow(acct_id, resolve) {
+	if($('#his-data').hasClass('locked')) {
+		locked = true
+	} else {
+		locked = false
+	}
 	if (!acct_id && acct_id != 'selector') {
 		var acct_id = $('#his-data').attr('use-acct')
+
 	} else if (acct_id == 'selector') {
 		var acct_id = $('#user-acct-sel').val()
 	}
@@ -172,6 +178,7 @@ async function follow(acct_id, resolve) {
 		var flag = 'follow'
 		var flagm = 'create'
 	}
+	
 	var id = $('#his-data').attr('user-id')
 	if (resolve == 'selector') {
 		var fullacct = $('#his-acct').attr('fullname')
@@ -205,7 +212,11 @@ async function follow(acct_id, resolve) {
 				$('#his-follow-btn-text').text(lang.lang_status_follow)
 			} else {
 				$('#his-data').addClass('following')
-				$('#his-follow-btn-text').text(lang.lang_status_unfollow)
+				if(locked) {
+					$('#his-follow-btn-text').text(lang.lang_status_requesting)
+				} else {
+					$('#his-follow-btn-text').text(lang.lang_status_unfollow)
+				}
 			}
 		}
 	}
@@ -389,45 +400,92 @@ function redraft(id, acct_id) {
 	}).then(result => {
 		if (result.value) {
 			show()
-			del(id, acct_id)
+			var domain = localStorage.getItem('domain_' + acct_id)
-			$('#post-acct-sel').prop('disabled', true)
+			var at = localStorage.getItem('acct_' + acct_id + '_at')
-			$('#post-acct-sel').val(acct_id)
+			if (localStorage.getItem('mode_' + domain) == 'misskey') {
-			$('select').formSelect()
+				var start = 'https://' + domain + '/api/notes/delete'
-			mdCheck()
+				var httpreq = new XMLHttpRequest()
-			var medias = $('[toot-id=' + id + ']').attr('data-medias')
+				httpreq.open('POST', start, true)
-			var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis')
+				httpreq.setRequestHeader('Content-Type', 'application/json')
-			vis(vismode)
+				httpreq.responseType = 'json'
-			$('#media').val(medias)
+				httpreq.send(JSON.stringify({ i: at, noteId: id }))
-			var ct = medias.split(',').length
+				$('[toot-id=' + id + ']').hide()
-			$('[toot-id=' + id + '] img.toot-img').each(function(i, elem) {
+				$('[toot-id=' + id + ']').remove()
-				if (i < ct) {
+			} else {
-					var url = $(elem).attr('src')
+				var start = 'https://' + domain + '/api/v1/statuses/' + id
-					console.log('Play back image data:' + url)
+				var httpreq = new XMLHttpRequest()
-					$('#preview').append('<img src="' + url + '" style="width:50px; max-height:100px;">')
+				httpreq.open('DELETE', start, true)
+				httpreq.setRequestHeader('Content-Type', 'application/json')
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+				httpreq.responseType = 'json'
+				httpreq.send()
+			}
+			httpreq.onreadystatechange = function() {
+				if (httpreq.readyState === 4) {
+					if (this.status !== 200) {
+						setLog(start, this.status, this.response)
+					}
+					var json = httpreq.response
+					$('#post-acct-sel').prop('disabled', true)
+					$('#post-acct-sel').val(acct_id)
+					$('select').formSelect()
+					mdCheck()
+					var medias = $('[toot-id=' + id + ']').attr('data-medias')
+					var mediack = json.media_attachments[0]
+					//メディアがあれば
+					var media_ids = []
+					if (mediack) {
+						for (var i = 0; i <= 4; i++) {
+							if (json.media_attachments[i]) {
+								media_ids.push(json.media_attachments[i].id)
+								$('#preview').append(
+									'<img src="' +
+										json.media_attachments[i].preview_url +
+										'" style="width:50px; max-height:100px;">'
+								)
+							} else {
+								break
+							}
+						}
+					}
+					var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis')
+					vis(vismode)
+					var medias = media_ids.join(',');
+					$('#media').val(medias)
+					localStorage.setItem('nohide', true)
+					show()
+					if (json.text) {
+						var html = json.text
+					} else {
+						var html = $('[toot-id=' + id + '] .toot').html()
+						html = html.replace(/^<p>(.+)<\/p>$/, '$1')
+						html = html.replace(/<br\s?\/?>/, '\n')
+						html = html.replace(/<p>/, '\n')
+						html = html.replace(/<\/p>/, '\n')
+						html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, '$1')
+						html = $.strip_tags(html)
+					}
+					$('#textarea').val(html)
+					if (json.spoiler_text) {
+						cw()
+						$('#cw-text').val(json.spoiler_text)
+					}
+					if (json.sensitive) {
+						$('#nsfw').addClass('yellow-text')
+						$('#nsfw').html('visibility')
+						$('#nsfw').addClass('nsfw-avail')
+					}
+					if (json.in_reply_to_id) {
+						$('#reply').val(json.in_reply_to_id)
+					}
 				}
-			})
-			var html = $('[toot-id=' + id + '] .toot').html()
-			html = html.replace(/^<p>(.+)<\/p>$/, '$1')
-			html = html.replace(/<br\s?\/?>/, '\n')
-			html = html.replace(/<p>/, '\n')
-			html = html.replace(/<\/p>/, '\n')
-			html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, '$1')
-			html = $.strip_tags(html)
-			localStorage.setItem('nohide', true)
-			show()
-			$('#textarea').val(html)
-			var cwtxt = $('[toot-id=' + id + '] .cw_text').html()
-			if (cwtxt != '') {
-				cwtxt = $.strip_tags(cwtxt)
-				cw()
-				$('#cw-text').val(cwtxt)
 			}
 		}
 	})
 }
 //ピン留め
 function pin(id, acct_id) {
-	if ($('#pub_' + id).hasClass('pined')) {
+	if ($(`.cvo[unique-id=${id}]`).hasClass('pined')) {
 		var flag = 'unpin'
 	} else {
 		var flag = 'pin'
@@ -607,13 +665,17 @@ function staEx(mode) {
 			console.error(error)
 		})
 		.then(function(json) {
-			var id = json.statuses[0].id
+			if (json.statuses) {
-			if (mode == 'rt') {
+				if (json.statuses[0]) {
-				rt(id, acct_id, 'remote')
+					var id = json.statuses[0].id
-			} else if (mode == 'fav') {
+					if (mode == 'rt') {
-				fav(id, acct_id, 'remote')
+						rt(id, acct_id, 'remote')
-			} else if (mode == 'reply') {
+					} else if (mode == 'fav') {
-				reEx(id)
+						fav(id, acct_id, 'remote')
+					} else if (mode == 'reply') {
+						reEx(id)
+					}
+				}
 			}
 		})
 	return
@@ -632,10 +694,10 @@ function toggleAction(elem, height) {
 			cont.removeClass('top')
 			cont.addClass('bottom')
 		}
-		if(elem.parents('.cvo').attr('id') == 'toot-this'){
+		if (elem.parents('.cvo').attr('id') == 'toot-this') {
 			console.log($('#toot-this').offset().top, elem.offset().top)
 			left = $('#toot-this').offset().left + elem.offset().left + 10
-			top = $('#toot-this').offset().top - $('#toot-this').height() -height + 25
+			top = $('#toot-this').offset().top - $('#toot-this').height() - height + 25
 		}
 		cont.css('top', top + 'px')
 		cont.css('right', `calc(100vw - ${left}px)`)

app/js/tl/announParse.js

@@ -0,0 +1,145 @@
+function announParse(obj, acct_id, tlid) {
+	var template = ''
+	var datetype = localStorage.getItem('datetype')
+	var gif = localStorage.getItem('gif')
+	//Ticker
+	var tickerck = localStorage.getItem('ticker_ok')
+	if (tickerck == 'yes') {
+		var ticker = true
+	} else if (!ticker || ticker == 'no') {
+		var ticker = false
+	}
+	if (!datetype) {
+		datetype = 'absolute'
+	}
+	if (!gif) {
+		var gif = 'yes'
+	}
+	Object.keys(obj).forEach(function(key) {
+		var toot = obj[key]
+		var content = toot.content
+		if (toot.emojis) {
+			Object.keys(toot.emojis).forEach(function(key1) {
+				var emoji = toot.emojis[key1]
+				var shortcode = emoji.shortcode
+				if (gif == 'yes') {
+					var emoSource = emoji.url
+				} else {
+					var emoSource = emoji.static_url
+				}
+				var emoji_url = `
+					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+						alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+				`
+				var regExp = new RegExp(':' + shortcode + ':', 'g')
+				content = content.replace(regExp, emoji_url)
+			})
+		}
+		content = twemoji.parse(content)
+		var reactions = ''
+		//既存のリアクション
+		if (toot.reactions) {
+			Object.keys(toot.reactions).forEach(function(key2) {
+				var reaction = toot.reactions[key2]
+				//普通の絵文字 or カスタム絵文字 は文字数判断。ただしスコットランド国旗みたいなやべぇやつに注意
+				var splitter = new GraphemeSplitter()
+				if (splitter.splitGraphemes(reaction.name).length > 1) {
+					//カスタム絵文字
+					var shortcode = reaction.shortcode
+					if (gif == 'yes') {
+						var emoSource = reaction.url
+					} else {
+						var emoSource = reaction.static_url
+					}
+					var emoji_url = `
+					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+                        alt=" :${shortcode}: " title="${shortcode}">`
+				} else {
+					emoji_url = twemoji.parse(reaction.name)
+				}
+				var addClass = ''
+				if (reaction.me) {
+					addClass = 'reactioned'
+				}
+				reactions =
+					reactions +
+                    `<div class="announReaction ${addClass}" onclick="announReaction('${toot.id}', '${acct_id}', '${tlid}', ${reaction.me},'${reaction.name}')">
+                        ${emoji_url} ${reaction.count}
+                    </div>`
+			})
+		}
+		if (toot.ends_at) {
+			var ended = `<div class="announReaction" title="${date(toot.ends_at, 'absolute')}" style="width: auto; cursor: default;">
+            <i class="fas fa-arrow-right"></i>
+            ${date(toot.ends_at, datetype)}
+        </div>`
+		} else {
+			var ended = ''
+		}
+
+		template =
+			template +
+			`<div class="announcement" data-id="${toot.id}">
+            ${content}
+            <div class="reactionsPack">
+                ${reactions}
+                <div class="announReaction add" onclick="announReactionNew('${toot.id}', '${acct_id}', '${tlid}')"><i class="fas fa-plus"></i></div>
+                ${ended}
+            </div>
+        </div>`
+	})
+	return template
+}
+function announReaction(id, acct_id, tlid, del, name) {
+    var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var start = 'https://' + domain + '/api/v1/announcements/' + id + '/reactions/' + encodeURIComponent(name)
+    var httpreq = new XMLHttpRequest()
+    if(del) {
+        var method = 'DELETE'
+    } else {
+        var method = 'PUT'
+    }
+	httpreq.open(method, start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			announ(acct_id, tlid)
+		}
+	}
+}
+function announReactionNew(id, acct_id, tlid) {
+    $('#reply').val(id)
+	$('#media').val('announcement')
+	$('#unreact').hide()
+	$('#addreact').removeClass('hide')
+	$('#post-acct-sel').val(acct_id)
+	$('select').formSelect()
+	localStorage.setItem('nohide', true)
+	show()
+	emojiToggle(true)
+	$('#left-side').hide()
+}
+function emojiReactionDef(target) {
+    var emojiraw = newpack.filter(function(item, index) {
+		if (item.short_name == target) return true
+	})
+	var hex = emojiraw[0].unified.split('-')
+	if (hex.length === 2) {
+		emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1])
+	} else {
+		emoji = twemoji.convert.fromCodePoint(hex[0])
+    }
+	var acct_id = $('#post-acct-sel').val()
+	var id = $('#reply').val()
+	announReaction(id, acct_id, 0, false, emoji)
+	clear()
+	hide()
+}

app/js/tl/card.js

@@ -9,24 +9,21 @@ function additional(acct_id, tlid) {
 	$('#timeline-container .hashtag, #timeline-container [rel=tag]').each(function(i, elem) {
 		var tags = $(this)
 			.attr('href')
-			.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/)
+			.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/tags?\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/)
 		if (tags) {
 			var tagThis = tags[2]
 		} else {
-			var tagThis = $(this).attr('data-tag')
+			var tagThis = $(this).attr('data-regTag')
 		}
 
 		if (tagThis) {
-			$(this).attr('onclick', "tagShow('" + tagThis + "')")
+			$(this).attr('href', "javascript:tagShow('" + tagThis + "')")
-			$(this).attr('href', '#')
+			
 		}
 	})
 
 	//トゥートサムネ
 	$('#timeline_' + tlid + ' .toot a:not(.parsed)').each(function(i, elem) {
-		var domain = localStorage.getItem('domain_' + acct_id)
-		var at = localStorage.getItem('acct_' + acct_id + '_at')
-		var card = localStorage.getItem('card_' + tlid)
 		var text = $(this).attr('href')
 		if (text) {
 			if (text.indexOf('twimg.com') === -1) {
@@ -48,48 +45,6 @@ function additional(acct_id, tlid) {
 		}
 		if (urls) {
 			$(this).remove()
-		} else if (!card) {
-			var id = $(this)
-				.parents('.cvo')
-				.attr('toot-id')
-			if (localStorage.getItem('mode_' + domain) == 'misskey') {
-				var start = 'https://' + domain + '/url?url=' + text
-				fetch(start, {
-					method: 'GET',
-					headers: {
-						'content-type': 'application/json'
-					}
-					//body: JSON.stringify({})
-				})
-					.then(function(response) {
-						if (!response.ok) {
-							response.text().then(function(text) {
-								setLog(response.url, response.status, text)
-							})
-						}
-						return response.json()
-					})
-					.catch(function(error) {
-						todo(error)
-						setLog(start, 'JSON', error)
-						console.error(error)
-					})
-					.then(function(json) {
-						if (json.title) {
-							$('[toot-id=' + id + '] .additional').html(
-								'<span class="gray">URL' +
-									lang.lang_cards_check +
-									':<br>Title:' +
-									escapeHTML(json.title) +
-									'<br>' +
-									escapeHTML(json.description) +
-									'</span>'
-							)
-							$('[toot-id=' + id + '] a:not(.parsed)').addClass('parsed')
-							$('[toot-id=' + id + ']').addClass('parsed')
-						}
-					})
-			}
 		} else {
 			$(this).attr('title', text)
 		}
@@ -139,8 +94,7 @@ function additional(acct_id, tlid) {
 		var id = $(this)
 			.parents('.cvo')
 			.attr('toot-id')
-		$(this).attr('href', '#')
+		$(this).attr('href', `javascript:imgv('${id}','${i}')`)
-		$(this).attr('onclick', "imgv('" + id + "','" + i + "')")
 		$(this).attr('data-type', 'image')
 		$(this).attr('id', id + '-image-' + i)
 		$(this).attr('data-url', ilink)

app/js/tl/directory.js

@@ -3,7 +3,7 @@
 function dirMenu() {
 	$("#dir-contents").html("");
 	directory();
-	$("#left-menu div").removeClass("active");
+	$("#left-menu a").removeClass("active");
 	$("#dirMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#dir-box").removeClass("hide");

app/js/tl/filter.js

@@ -14,6 +14,46 @@ function mediaToggle(tlid) {
 		$('#timeline_' + tlid).addClass('media-filter')
 	}
 }
+/* Remote only */
+function remoteOnly(tlid, type) {
+	var multi = localStorage.getItem('column')
+	var obj = JSON.parse(multi)
+	if (obj[tlid].data) {
+		if (obj[tlid].data.remote) {
+			obj[tlid].data.remote = false
+			var json = JSON.stringify(obj)
+			localStorage.setItem('column', json)
+			$('#sta-remote-' + tlid).text('Off')
+			$('#sta-remote-' + tlid).css('color', '#009688')
+		} else {
+			obj[tlid].data.remote = true
+			var json = JSON.stringify(obj)
+			localStorage.setItem('column', json)
+			$('#sta-remote-' + tlid).text('On')
+			$('#sta-remote-' + tlid).css('color', 'red')
+		}
+	} else {
+		obj[tlid].data = {}
+		obj[tlid].data.remote = true
+		var json = JSON.stringify(obj)
+		localStorage.setItem('column', json)
+		$('#sta-remote-' + tlid).text('On')
+		$('#sta-remote-' + tlid).css('color', 'red')
+	}
+	columnReload(tlid, type)
+}
+function remoteOnlyCk(tlid) {
+	var multi = localStorage.getItem('column')
+	var obj = JSON.parse(multi)
+	if (obj[tlid].data) {
+		if (obj[tlid].data.remote) {
+			$('#sta-remote-' + tlid).text('On')
+			$('#sta-remote-' + tlid).css('color', 'red')
+			return true
+		}
+	}
+	return false
+}
 //各TL上方のBT[BTOnly/BTExc/Off]
 function ebtToggle(tlid) {
 	var ebt = localStorage.getItem('ebt_' + tlid)
@@ -101,7 +141,7 @@ function delreset(tlid) {
 }
 /*ワードフィルター機能*/
 function filterMenu() {
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#filterMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#filter-box').removeClass('hide')
@@ -117,26 +157,26 @@ function filter() {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json) {
 				var filters = ''
-				Object.keys(json).forEach(function(key) {
+				Object.keys(json).forEach(function (key) {
 					var filterword = json[key]
 					var context = filterword.context.join(',')
 					filters =
@@ -180,6 +220,9 @@ function makeNewFilter() {
 	if ($('#conv_filter:checked').val()) {
 		cont.push('thread')
 	}
+	if ($('#prof_filter:checked').val()) {
+		cont.push('profiles')
+	}
 	if (!cont.length) {
 		$('#filtered-words').html('Error:' + lang.lang_filter_errordegree)
 	}
@@ -188,10 +231,7 @@ function makeNewFilter() {
 	if (!who) {
 		who = false
 	}
-	var time =
+	var time = $('#days_filter').val() * 24 * 60 * 60 + $('#hours_filter').val() * 60 * 60 + $('#mins_filter').val() * 60
-		$('#days_filter').val() * 24 * 60 * 60 +
-		$('#hours_filter').val() * 60 * 60 +
-		$('#mins_filter').val() * 60
 	var domain = localStorage.getItem('domain_' + acct_id)
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	if ($('#filter-edit-id').val()) {
@@ -213,10 +253,10 @@ function makeNewFilter() {
 			context: cont,
 			irreversible: exc,
 			whole_word: who,
-			expires_in: time
+			expires_in: time,
 		})
 	)
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -229,6 +269,7 @@ function makeNewFilter() {
 			$('#local_filter').prop('checked', false)
 			$('#notf_filter').prop('checked', false)
 			$('#conv_filter').prop('checked', false)
+			$('#prof_filter').prop('checked', false)
 			$('#except_filter').prop('checked', false)
 			$('#wholeword_filter').prop('checked', false)
 			$('#days_filter').val('0')
@@ -259,29 +300,29 @@ function filterEdit(id, acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json) {
 				var now = new Date()
 				now = now.getTime()
 				var now = Math.floor(now / 1000)
 				$('#filter-add-word').val(json.phrase)
-				Object.keys(json.context).forEach(function(key) {
+				Object.keys(json.context).forEach(function (key) {
 					var context = json.context[key]
 					$('[value=' + context + ']').prop('checked', true)
 				})
@@ -311,7 +352,7 @@ function filterDel(id, acct_id) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -331,23 +372,23 @@ function getFilter(acct_id) {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				Authorization: 'Bearer ' + at,
-			}
+			},
 		})
-			.then(function(response) {
+			.then(function (response) {
 				if (!response.ok) {
-					response.text().then(function(text) {
+					response.text().then(function (text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function(error) {
+			.catch(function (error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(function (json) {
 				localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
 			})
 	} else {
@@ -366,13 +407,13 @@ function getFilterType(json, type) {
 		type = 'notifi'
 	}
 	var mutedfilters = []
-	Object.keys(json).forEach(function(key) {
+	Object.keys(json).forEach(function (key) {
 		var filterword = json[key]
 		var phrases = filterword.phrase
 		var arr = filterword.context
 		if (arr.join(',').indexOf(type) !== -1) {
 			mutedfilters.push(phrases)
-		} else if (type == 'mix'){
+		} else if (type == 'mix') {
 			if (arr.indexOf('home') !== -1 || arr.indexOf('public') !== -1) {
 				mutedfilters.push(phrases)
 			}
@@ -396,23 +437,23 @@ function filterUpdate(acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
 			filterUpdateInternal(json, 'home')
 			filterUpdateInternal(json, 'local')
@@ -428,13 +469,11 @@ function filterUpdateInternal(json, type) {
 		home = home.concat(wordmute)
 	}
 	if (home) {
-		$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function(i, elem) {
+		$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function (i, elem) {
 			var id = $(elem).attr('toot-id')
 			$('[toot-id=' + id + ']').removeClass('hide')
-			var text = $(elem)
+			var text = $(elem).find('.toot').html()
-				.find('.toot')
+			Object.keys(home).forEach(function (key8) {
-				.html()
-			Object.keys(home).forEach(function(key8) {
 				var word = home[key8]
 				var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g')
 				if ($.strip_tags(text).match(regExp)) {

app/js/tl/list.js

@@ -1,5 +1,5 @@
 function listMenu() {
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#listMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#list-box').removeClass('hide')

app/js/tl/misskeyparse.js

@@ -360,22 +360,20 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if ((toot.cw || toot.cw == "") && cw) {
 			var content = escapeHTML(toot.text);
 			var spoil = escapeHTMLtemp(toot.cw);
-			var spoiler = "cw cw_hide_" + toot.id;
+			var spoiler = "cw cw_hide";
 			var api_spoil = "gray";
-			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+			var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
-				'\')" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
 		} else {
 			var ct1 = nl2br(toot.text).split('<br />').length - 2;
 			var ct2 = nl2br(toot.text).split('<br>').length - 2;
 			if (ct1 > ct2) { var ct = ct1; } else { var ct = ct2; }
 			if ((sent < ct && $.mb_strlen($.strip_tagstemp(toot.text)) > 5) || ($.strip_tagstemp(toot.text).length > ltr && $.mb_strlen($.strip_tagstemp(toot.text)) > 5)) {
 				var content = '<span class="gray">' + lang.lang_parse_fulltext + '</span><br>' + escapeHTMLtemp(toot.text)
-				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tagstemp(
+				var spoil = '<span class="cw_long">' + $.mb_substr($.strip_tagstemp(
 					toot.text), 0, 100) +
 					'</span><span class="gray">' + lang.lang_parse_autofold + '</span>';
-				var spoiler = "cw cw_hide_" + toot.id;
+				var spoiler = "cw cw_hide";
-				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+				var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
-					'\')" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
 			} else {
 				var content = escapeHTMLtemp(toot.text);
 				if (toot.cw) {
@@ -520,7 +518,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if (tagck) {
 			Object.keys(toot.tags).forEach(function (key4) {
 				var tag = toot.tags[key4];
-				var tags = '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
+				var tags = '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '" data-regTag="'+tag.toLowerCase()+'">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
 					',\'add\')" class="pointer parsed" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a>　' +
 					'<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag) + '">Pin</a></span> ';
 				content = content.replace("#" + tag, tags);
@@ -880,7 +878,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		}
 		var ftxt = lang.lang_parse_followed;
 		if (popup > 0 || popup == -1) {
-			var notftext = '<span class="cbadge"title="' + date(toot.createdAt,
+			var notftext = '<span class="cbadge" title="' + date(toot.createdAt,
 				'absolute') + '(' + lang.lang_parse_notftime + ')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 					datetype) +
 				'</span>' + ftxt + '<br>';

app/js/tl/notification.js

@@ -69,17 +69,20 @@ function notfColumn(acct_id, tlid, sys) {
 						var n = new Notification('TheDesk:' + domain, options)
 					}
 					var mute = getFilterTypeByAcct(acct_id, 'notif')
-					if (obj.type != 'follow') {
+					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
+					if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') {
 						if (misskey) {
 							templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
 						} else {
 							templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute)
 						}
+					} else if (obj.type == 'follow_request') {
+						templete = templete + userparse([obj.account], 'request', acct_id, tlid, -1)
 					} else {
 						if (misskey) {
 							templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
 						} else {
-							templete = templete + userparse([obj.account], 'notf', acct_id, tlid, -1)
+							templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
 						}
 					}
 				})
@@ -179,7 +182,8 @@ function notfCommon(acct_id, tlid, sys) {
 						var n = new Notification('TheDesk:' + domain, options)
 					}
 					var mute = getFilterTypeByAcct(acct_id, 'notif')
-					if (obj.type != 'follow') {
+					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
+					if (obj.type != 'follow' && obj.type != 'move') {
 						if (misskey) {
 							templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
 						} else {
@@ -189,7 +193,7 @@ function notfCommon(acct_id, tlid, sys) {
 						if (misskey) {
 							templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
 						} else {
-							templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1)
+							templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
 						}
 					}
 				})
@@ -235,10 +239,12 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 				localStorage.setItem('lastnotf_' + acct_id, obj.id)
 				if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
 					//markers show中はダメ
-					if (obj.type != 'follow') {
+					if (obj.type != 'follow' && obj.type != 'follow_request') {
 						templete = parse([obj], 'notf', acct_id, 'notf', popup)
+					} else if (obj.type == 'follow_request') {
+						templete = userparse([obj.account], 'request', acct_id, 'notf', -1)
 					} else {
-						templete = userparse([obj], 'notf', acct_id, 'notf', popup)
+						templete = userparse([obj], obj.type, acct_id, 'notf', popup)
 					}
 					if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
 						$('div[data-notf=' + acct_id + ']').prepend(templete)
@@ -338,7 +344,7 @@ function notfmore(tlid) {
 							if (misskey) {
 								templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
 							} else {
-								templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1)
+								templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
 							}
 						}
 					})
@@ -402,6 +408,11 @@ function notfCanceler(acct) {
 	localStorage.removeItem('notf-follow_' + acct)
 	$('.notf-follow_' + acct).addClass('hide')
 	$('.notf-icon_' + acct).removeClass('red-text')
+	var id = $('#announce_' + acct + ' .announcement').first().attr('data-id')
+	$('.notf-announ_' + acct + '_ct').text("")
+	if(id) {
+		localStorage.setItem('announ_' + acct, id)
+	}
 }
 function allNotfRead() {
 	var multi = localStorage.getItem('multi')

app/js/tl/parse.js

@@ -194,7 +194,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	}
 	var local = []
 	var times = []
-	Object.keys(obj).forEach(function(key) {
+	Object.keys(obj).forEach(function (key) {
 		var domain = localStorage.getItem('domain_' + acct_id)
 		var toot = obj[key]
 		if (type == 'dm') {
@@ -214,11 +214,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}
 		//絵文字があれば
 		if (actemojick) {
-			Object.keys(toot.account.emojis).forEach(function(key5) {
+			Object.keys(toot.account.emojis).forEach(function (key5) {
 				var emoji = toot.account.emojis[key5]
 				var shortcode = emoji.shortcode
+				if (gif == 'yes') {
+					var emoSource = emoji.url
+				} else {
+					var emoSource = emoji.static_url
+				}
 				var emoji_url = `
-					<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
 						alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
 				`
 				var regExp = new RegExp(':' + shortcode + ':', 'g')
@@ -227,13 +232,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}
 		var noticeavatar = ''
 		if (mix == 'notf') {
+			if (!toot.status) {
+				toot.status = statusModel(toot.created_at)
+			}
 			if (gif == 'yes') {
 				noticeavatar = toot.account.avatar
 			} else {
 				noticeavatar = toot.account.avatar_static
 			}
 			noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
-					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}">
+					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}" alt="">
 				</a>`
 			if (toot.type == 'mention') {
 				var what = lang.lang_parse_mentioned
@@ -260,15 +268,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			} else {
 				var notfFilHide = ''
 			}
-			var noticetext = `<i class="fas fa-filter pointer big-text ${notfFilHide}" 
+			var noticetext = `<span onclick="notfFilter('${toot.account.id}','${tlid}');" class=" pointer big-text ${notfFilHide}"><i class="fas fa-filter" 
-					onclick="notfFilter('${toot.account.id}','${tlid}');" title="${lang.lang_parse_notffilter}">
+					 title="${lang.lang_parse_notffilter}">
-				</i>
+				</i><span class="voice">${lang.lang_parse_notffilter}</span></span>
 				<span class="cbadge cbadge-hover" title="${date(toot.created_at, 'absolute')}(${
 				lang.lang_parse_notftime
-			})">
+				})" aria-hidden="true"><i class="far fa-clock"></i>
-					<i class="far fa-clock"></i>
 					${date(toot.created_at, datetype)}
 				</span>
+				<span class="voice">${date(toot.created_at, 'absolute')}(${lang.lang_parse_notftime})</span>
 				<i class="big-text fas ${icon}"></i>
 				<a onclick="udg('${toot.account.id}','${acct_id}')" class="pointer grey-text">
 					${dis_name}(@${toot.account.acct})
@@ -361,12 +369,18 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//絵文字があれば
 			if (actemojick) {
-				Object.keys(toot.account.emojis).forEach(function(key5) {
+				Object.keys(toot.account.emojis).forEach(function (key5) {
 					var emoji = toot.account.emojis[key5]
 					var shortcode = emoji.shortcode
+					if (gif == 'yes') {
+						var emoSource = emoji.url
+					} else {
+						var emoSource = emoji.static_url
+					}
 					var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+					`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					dis_name = dis_name.replace(regExp, emoji_url)
 				})
@@ -379,8 +393,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				} else {
 					noticeavatar = toot.account.avatar_static
 				}
-				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg">
+				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg" aria-hidden="true">
-						<img draggable="false" src="${noticeavatar}" width="20" class="prof-img" 
+						<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" 
 							user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'">
 					</a>`
 				var rebtxt = lang.lang_parse_btedsimple
@@ -412,12 +426,18 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 				//絵文字があれば
 				if (actemojick) {
-					Object.keys(toot.account.emojis).forEach(function(key5) {
+					Object.keys(toot.account.emojis).forEach(function (key5) {
 						var emoji = toot.account.emojis[key5]
 						var shortcode = emoji.shortcode
+						if (gif == 'yes') {
+							var emoSource = emoji.url
+						} else {
+							var emoSource = emoji.static_url
+						}
 						var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+						`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
 					})
@@ -434,7 +454,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					var fullname = toot.account.acct + '@' + domain
 				}
 				if (useremp) {
-					Object.keys(useremp).forEach(function(key10) {
+					Object.keys(useremp).forEach(function (key10) {
 						var user = useremp[key10]
 						if (user == fullname) {
 							boostback = 'emphasized'
@@ -474,7 +494,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var via = escapeHTML(toot.application.name)
 				if (empCli) {
 					//強調チェック
-					Object.keys(empCli).forEach(function(key6) {
+					Object.keys(empCli).forEach(function (key6) {
 						var empCliList = empCli[key6]
 						if (empCliList == via) {
 							boostback = 'emphasized'
@@ -483,7 +503,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 				if (muteCli) {
 					//ミュートチェック
-					Object.keys(muteCli).forEach(function(key7) {
+					Object.keys(muteCli).forEach(function (key7) {
 						var muteCliList = muteCli[key7]
 						if (muteCliList == via) {
 							boostback = 'hide'
@@ -496,9 +516,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			if (toot.spoiler_text && cw) {
 				var spoil = escapeHTML(toot.spoiler_text)
-				var spoiler = 'cw cw_hide_' + toot.id
+				var spoiler = 'cw cw_hide'
 				var api_spoil = 'gray'
-				var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
+				var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}<span class="voice">${lang.lang_parse_cwshow_acc}</span></a><br>`
 			} else {
 				if (content) {
 					var ct1 = content.split('</p>').length + content.split('<br />').length - 2
@@ -518,14 +538,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5)
 				) {
 					var content = `<span class="gray">${lang.lang_parse_fulltext}</span><br>` + content
-					var spoil = `<span class="cw-long-${toot.id}">${$.mb_substr(
+					var spoil = `<span class="cw_long">${$.mb_substr(
 						$.strip_tags(content),
 						0,
 						100
 					)}</span>
 						<span class="gray">${lang.lang_parse_autofold}</span>`
-					var spoiler = 'cw cw_hide_' + toot.id
+					var spoiler = 'cw cw_hide'
-					var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">
+					var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">
 							${lang.lang_parse_more}
 						</a><br>`
 				} else {
@@ -556,7 +576,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 
 			if (urls) {
-				var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer">
+				var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer" aria-hidden="true">
 						${lang.lang_parse_url}
 					</a><br>`
 			} else {
@@ -568,7 +588,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//Poll
 			var poll = ''
 			if (toot.poll) {
-				var poll = pollParse(toot.poll, acct_id)
+				var poll = pollParse(toot.poll, acct_id, false)
 			}
 
 			var mediack = toot.media_attachments[0]
@@ -577,7 +597,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			if (mediack) {
 				hasmedia = 'hasmedia'
 				var cwdt = 100 / toot.media_attachments.length
-				Object.keys(toot.media_attachments).forEach(function(key2) {
+				Object.keys(toot.media_attachments).forEach(function (key2) {
 					var media = toot.media_attachments[key2]
 					var purl = media.preview_url
 					media_ids = media_ids + media.id + ','
@@ -601,7 +621,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							viewer +
 							`<a onclick="imgv('${id}','${key2}','${acct_id}')" id="${id}'-image-${key2}" 
 								data-url="${url}" data-type="video" class="img-parsed">
-									<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true">
+									<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true" alt="attached media">
 							</a></span>`
 					} else {
 						if (media.type == 'unknown') {
@@ -614,7 +634,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 								viewer +
 								'<audio src="' +
 								url +
-								'" class="pointer" style="width:100%;" controls></span>'
+								'" class="pointer" style="width:100%;" controls alt="attached media"></span>'
 						} else {
 							if (media.description) {
 								var desc = media.description
@@ -632,7 +652,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 										id="${id}-image-${key2}" data-url="${url}" data-original="${remote_url}" data-type="${media.type}" 
 										class="img-parsed img-link" style="width:calc(${cwdt}% - 1px); height:${imh};">
 									<img draggable="false" src="${purl}" class="${sense} toot-img pointer" 
-										onerror="this.src=\'../../img/loading.svg\'" title="${desc}">
+										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}" alt="${escapeHTML(desc)}">
 									${nsfwmes}
 								</a>`
 						}
@@ -649,7 +669,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			if (menck) {
 				mentions = ''
 				var to_mention = []
-				Object.keys(toot.mentions).forEach(function(key3) {
+				Object.keys(toot.mentions).forEach(function (key3) {
 					var mention = toot.mentions[key3]
 					//自分は除外
 					//自インスタンスかどうかを確認し、IDの一致
@@ -663,7 +683,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						if (toot.account.acct != mention.acct) {
 							mentions =
 								mentions +
-								`<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer">@${mention.acct}</a> `
+								`<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer" aria-hidden="true">@${mention.acct}</a> `
 							to_mention.push(mention.acct)
 						}
 					}
@@ -684,25 +704,27 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var tags = ''
 			//タグであれば
 			if (tagck) {
-				Object.keys(toot.tags).forEach(function(key4) {
+				Object.keys(toot.tags).forEach(function (key4) {
 					var tag = toot.tags[key4]
 					var featured = `　<a onclick="tagFeature('${tag.name}','${acct_id}')" class="pointer" title="add it to Featured tags">Feature</a>　`
 					tags =
 						tags +
-						`<span class="hide" data-tag="${tag.name}">#${tag.name}:
+						`<span class="hide" data-tag="${tag.name}" data-regTag="${tag.name.toLowerCase()}">#${
+						tag.name
+						}:
 							<a onclick="tl('tag','${tag.name}','${acct_id}','add')" class="pointer"
 							 title="${lang.lang_parse_tagTL.replace(
-									'{{tag}}',
+							'{{tag}}',
-									'#' + tag.name
+							'#' + tag.name
-								)}">TL</a>　<a onclick="brInsert('#${tag.name}')" 
+						)}">TL</a>　<a onclick="brInsert('#${tag.name}')" 
 							 class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag.name)}">Toot</a>　
 						<a onclick="tagPin('${tag.name}')" class="pointer" title="${lang.lang_parse_tagpin.replace(
 							'{{tag}}',
 							'#' + tag.name
 						)}
-						">Pin</a></span> `
+						">Pin</a>${featured}</span> `
 				})
-				tags = '<div style="float:right">' + tags + '</div>'
+				tags = '<div style="float:right" aria-hidden="true">' + tags + '</div>'
 			}
 			//リプ数
 			if (toot.replies_count || toot.replies_count === 0) {
@@ -717,29 +739,29 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var vis = ''
 			var visen = toot.visibility
 			if (visen == 'public') {
-				var vis = `<i class="text-darken-3 material-icons gray sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons gray sml vis-data pointer" 
-						title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						public
-					</i>`
+					</i><span class="voice">${lang.lang_parse_public} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = ''
 			} else if (visen == 'unlisted') {
-				var vis = `<i class="text-darken-3 material-icons blue-text sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons blue-text sml vis-data pointer" 
-						title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						lock_open
-					</i>`
+					</i><span class="voice">${lang.lang_parse_unlisted} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = ''
 			} else if (visen == 'private') {
-				var vis = `<i class="text-darken-3 material-icons orange-text sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons orange-text sml vis-data pointer" 
-						title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						lock
-					</i>`
+					</i><span class="voice">${lang.lang_parse_private} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 
 				var can_rt = 'unvisible'
 			} else if (visen == 'direct') {
-				var vis = `<i class="text-darken-3 material-icons red-text sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons red-text sml vis-data pointer" 
-						title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						mail
-					</i>`
+					</i><span class="voice">${lang.lang_parse_direct} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = 'unvisible'
 			}
 			if (toot.account.acct == localStorage.getItem('user_' + acct_id)) {
@@ -790,7 +812,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//ワードミュート
 			if (wordmuteList) {
-				Object.keys(wordmuteList).forEach(function(key8) {
+				Object.keys(wordmuteList).forEach(function (key8) {
 					var worde = wordmuteList[key8]
 					if (worde) {
 						if (worde.tag) {
@@ -807,7 +829,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//ワード強調
 			if (wordempList) {
-				Object.keys(wordempList).forEach(function(key9) {
+				Object.keys(wordempList).forEach(function (key9) {
 					var wordList = wordempList[key9]
 					if (wordList) {
 						var wordList = wordList.tag
@@ -823,12 +845,18 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//絵文字があれば
 			if (emojick) {
-				Object.keys(toot.emojis).forEach(function(key5) {
+				Object.keys(toot.emojis).forEach(function (key5) {
 					var emoji = toot.emojis[key5]
 					var shortcode = emoji.shortcode
+					if (gif == 'yes') {
+						var emoSource = emoji.url
+					} else {
+						var emoSource = emoji.static_url
+					}
 					var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+					`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					content = content.replace(regExp, emoji_url)
 					spoil = spoil.replace(regExp, emoji_url)
@@ -843,7 +871,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//絵文字があれば(nico)
 			if (nicoemojick) {
-				Object.keys(toot.profile_emojis).forEach(function(keynico) {
+				Object.keys(toot.profile_emojis).forEach(function (keynico) {
 					var emoji = toot.profile_emojis[keynico]
 					var shortcode = emoji.shortcode
 					var emoji_url = `<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" alt=" :${shortcode}: "
@@ -876,7 +904,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var trans = `<div class="">
 						<a onclick="trans('${toot.language}','${lang.language}', $(this))" 
 							class="waves-effect waves-dark btn-flat actct" style="padding:0">
-								<i class="material-icons">g_translate</i>${lang.lang_parse_trans}
+								<i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
 						</a>
 					</div>`
 			} else {
@@ -890,9 +918,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//Ticker
 			var tickerdom = ''
 			if (ticker) {
-				var tickerdata = localStorage.getItem('ticker')
+				var tickerdata = localStorage.getItem('sticker')
 				if (tickerdata) {
-					var tickerdata = JSON.parse(tickerdata)
+					var tickerdataRaw = JSON.parse(tickerdata)
+					var tickerdata = tickerdataRaw.data
 
 					var thisdomain = toot.account.acct.split('@')
 					if (thisdomain.length > 1) {
@@ -901,14 +930,41 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					for (var i = 0; i < tickerdata.length; i++) {
 						var value = tickerdata[i]
 						if (value.domain == thisdomain) {
-							var tickerdom = `<div style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
+							var bgColor = value.bgColor
-								value.bg
+							var fontColor = value.fontColor
-							}, transparent 96%) !important; color:${
+							if (!value.bgColor || !value.fontColor) {
-								value.text
+								if (value.type == 'mastodon') {
-							};width:100%; height:0.9rem; font-size:0.8rem;" class="tickers">
+									if(!value.bgColor) bgColor = tickerdataRaw.default.mastodon.bgColor
+									if(!value.fontColor) fontColor = tickerdataRaw.default.mastodon.fontColor
+								} else if (value.type == 'pleroma') {
+									if(!value.bgColor) bgColor = tickerdataRaw.default.pleroma.bgColor
+									if(!value.fontColor) fontColor = tickerdataRaw.default.pleroma.fontColor
+								} else if (value.type == 'misskey') {
+									if(!value.bgColor) bgColor = tickerdataRaw.default.misskey.bgColor
+									if(!value.fontColor) fontColor = tickerdataRaw.default.misskey.fontColor
+								} else if (value.type == 'misskeylegacy') {
+									if(!value.bgColor) bgColor = tickerdataRaw.default.misskeylegacy.bgColor
+									if(!value.fontColor) fontColor = tickerdataRaw.default.misskeylegacy.fontColor
+								} else if (value.type == 'pixelfed') {
+									if(!value.bgColor) bgColor = tickerdataRaw.default.pixelfed.bgColor
+									if(!value.fontColor) fontColor = tickerdataRaw.default.pixelfed.fontColor
+								}
+							} else {
+								var bgColor = value.bgColor
+								var fontColor = value.fontColor
+							}
+							bgColorCSS = ''
+							for (let j = 0; j < bgColor.length; j++) {
+								const bg = bgColor[j]
+								bgColorCSS = bgColorCSS + bg + ','
+							}
+							bgColorCSS = `linear-gradient(90deg, ${bgColorCSS} transparent)`
+							var tickerdom = `<div aria-hidden="true" style="user-select:none;cursor:default;background:${bgColorCSS} !important; color:${
+								fontColor
+								};width:100%; height:0.9rem; font-size:0.8rem;" class="tickers">
 									<img draggable="false" src="${
-										value.image
+								value.favicon
-									}" style="height:100%;" onerror="this.src=\'../../img/loading.svg\'">
+								}" style="height:100%;" onerror="this.src=\'../../img/loading.svg\'">
 									<span style="position:relative; top:-0.2rem;">${escapeHTML(value.name)}</span>
 								</div>`
 							break
@@ -922,13 +978,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				if (!quoteUser) {
 					quoteUser = toot.quote.account.acct
 				}
-				poll =
+				if (!toot.quote.quote_muted) {
-					poll +
+					poll =
-					`<div class="quote-renote">
+						poll +
+						`<div class="quote-renote">
 						<div class="renote-icon">
 							<a onclick="udg('${toot.quote.account.id}','${acct_id}');" user="${
 						toot.quote.account.acct
-					}" class="udg">
+						}" class="udg">
 								<img draggable="false" src="${toot.quote.account.avatar}">
 							</a>
 						</div>
@@ -940,12 +997,18 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</div>
 						<div class="renote-details">
 							<a onclick="details('${
-								toot.quote.id
+						toot.quote.id
-							}','${acct_id}','${tlid}','normal')" class="waves-effect waves-dark btn-flat details" style="padding:0">
+						}','${acct_id}','${tlid}','normal')" class="waves-effect waves-dark btn-flat details" style="padding:0">
 								<i class="text-darken-3 material-icons">more_vert</i>
 							</a>
 						</div>
 					</div>`
+				} else {
+					poll =
+						poll +
+						`<span class="gray sml">${lang.lang_parse_hidden}</span>`
+				}
+
 			}
 			//menuは何個？
 			var menuct = 2
@@ -979,7 +1042,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				<div class="area-icon grid">
 					<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
 						<img draggable="false" src="${avatar}" width="40" class="prof-img"
-							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'"/>
+							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'" alt="" />
 					</a>
 					${noticeavatar}
 				</div>
@@ -993,7 +1056,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="flex-time">
 						<span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy('${toot.url}');"
 							title="${date(toot.created_at, 'absolute')}(${lang.lang_parse_clickcopyurl})">
-							<i class="far fa-clock"></i>${date(toot.created_at, datetype)}
+							<i class="far fa-clock"></i><span class="voice">posted at </span>${date(toot.created_at, datetype)}
 						</span>
 					</div>
 				</div>
@@ -1028,13 +1091,17 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							class="waves-effect waves-dark btn-flat actct rep-btn"
 							data-men="${to_mention}" data-visen="${visen}" style="padding:0" title="${lang.lang_parse_replyto}">
 								<i class="fas fa-share"></i>
+								<span class="voice">${lang.lang_parse_replyto} </span>
 								<span class="rep_ct">${replyct}</span>
 						</a>
 					</div>
 					<div class="action ${can_rt} ${disp['rt']} ${noauth}">
-						<a onclick="rt('${uniqueid}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
+						<a onclick="rt('${
+				toot.id
+				}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
 							style="padding:0" title="${lang.lang_parse_bt}">
-							<i class="fas fa-retweet ${if_rt} rt_${uniqueid}"></i>
+							<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
+							<span class="voice">${lang.lang_parse_bt} </span>
 							<span class="rt_ct">${toot.reblogs_count}</span>
 						</a>
 					</div>
@@ -1042,6 +1109,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<a onclick="qt('${toot.id}','${acct_id}','${toot.account.acct}','${toot.url}')" 
 							class="waves-effect waves-dark btn-flat actct" style="padding:0" title="${lang.lang_parse_quote}">
 							<i class="text-darken-3 fas fa-quote-right"></i>
+							<span class="voice">${lang.lang_parse_quote} </span>
 						</a>
 					</div>
 					<div class="action ${disp['bkm']} ${noauth} ${bkmClass}">
@@ -1049,6 +1117,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0"
 							title="${lang.lang_parse_bookmark}">
 							<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
+							<span class="voice">${lang.lang_parse_bookmark} </span>
 					</a>
 					</div>
 					<div class="action ${disp['fav']} ${noauth}">
@@ -1057,6 +1126,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							title="${lang.lang_parse_fav}">
 							<i class="fas text-darken-3 fa-star${if_fav} fav_${uniqueid}"></i>
 							<span class="fav_ct">${toot.favourites_count}</span>
+							<span class="voice">${lang.lang_parse_fav} </span>
 						</a>
 					</div>
 				</div>
@@ -1064,14 +1134,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="action ${noauth}">
 						<a onclick="toggleAction($(this), ${menuct * 39 + 6})" 
 							class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0">
-							<i class="text-darken-3 material-icons act-icon">expand_more</i>
+							<i class="text-darken-3 material-icons act-icon" aria-hidden="true">expand_more</i>
+							<span class="voice">Other actions</span>
 						</a>
 					</div>
 					<div class="action ${noauth}">
 						<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
 							class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0"
 							title="${lang.lang_parse_detail}">
-						<i class="text-darken-3 material-icons">menu_open</i></a>
+						<i class="text-darken-3 material-icons" aria-hidden="true">menu_open</i></a>
+						<span class="voice">${lang.lang_parse_detail}</span>
 					</div>
 				</div>
 				<div class="contextMenu hide z-depth-4">
@@ -1080,30 +1152,28 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<a onclick="client('${$.strip_tags(via)}')" class="pointer">${lang.lang_parse_clientop}</a>
 					</div>
 					<div>
-					<button onclick="bkm('${toot.id}','${acct_id}','${tlid}')"
+					<button onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
 						class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0">
 						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
-						<span class="bkmStr_${toot.id}">${bkmStr}</span>
+						<span class="bkmStr_${uniqueid}">${bkmStr}</span>
 					</button>
 					</div>
 					<div class="${if_mine}">
-						<button onclick="del('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+						<button onclick="del('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
 							<i class="fas fa-trash"></i>${lang.lang_parse_del}
 						</button>
 					</div>
 					<div class="${if_mine}">
-						<button onclick="pin('${
+						<button onclick="pin('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
-							toot.id
+							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>
-						}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
+							<span class="pinStr_${uniqueid}">${pinStr}</span>
-							<i class="fas fa-map-pin pin_${toot.id} ${if_pin}"></i>
-							<span class="pinStr_${toot.id}">${pinStr}</span>
 						</button>
 					</div>
 					<div class="${if_mine}">
-						<button onclick="redraft('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+						<button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
-							<i class="material-icons">redo</i>${lang.lang_parse_redraft}
+							<i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
 						</button>
 					</div>
 					${trans}
@@ -1133,9 +1203,13 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	if (locale == 'yes') {
 		var locale = false
 	}
+	var gif = localStorage.getItem('gif')
+	if (!gif) {
+		gif = 'yes'
+	}
 	var templete = ''
 	var datetype = localStorage.getItem('datetype')
-	Object.keys(obj).forEach(function(key) {
+	Object.keys(obj).forEach(function (key) {
 		var toot = obj[key]
 		if (toot) {
 			if (!toot.username) {
@@ -1153,19 +1227,26 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					var locked = ''
 				}
 				if (auth == 'request') {
-					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept">
+					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept" aria-hidden="true">
 							person_add
-						</i>　
+						</i>
-						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject">
+						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject" aria-hidden="true">
 							person_add_disabled
 						</i>`
 				} else {
 					var authhtml = ''
 				}
-				var ftxt = lang.lang_parse_followed
+				if (auth == 'follow') {
-				if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
+					var ftxt = lang.lang_parse_followed
-					ftxt = localStorage.getItem('followlocale_' + acct_id)
+					if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
+						ftxt = localStorage.getItem('followlocale_' + acct_id)
+					}
+				} else if (auth == 'moved') {
+					var ftxt = lang.lang_parse_moved
+				} else if (auth == 'request') {
+					var ftxt = lang.lang_parse_request
 				}
+				console.log(auth, ftxt)
 				if (popup > 0 || popup == -1 || notf) {
 					var notftext = ftxt + '<br>'
 				} else {
@@ -1205,12 +1286,18 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				//絵文字があれば
 				if (actemojick) {
-					Object.keys(toot.emojis).forEach(function(key5) {
+					Object.keys(toot.emojis).forEach(function (key5) {
 						var emoji = toot.emojis[key5]
 						var shortcode = emoji.shortcode
+						if (gif == 'yes') {
+							var emoSource = emoji.url
+						} else {
+							var emoSource = emoji.static_url
+						}
 						var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+						`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
 					})
@@ -1219,7 +1306,11 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					dis_name = twemoji.parse(dis_name)
 				}
 				if (toot.avatar) {
-					var avatar = toot.avatar
+					if (gif == 'yes') {
+						var avatar = toot.avatar
+					} else {
+						var avatar = toot.avatar_static
+					}
 				} else {
 					var avatar = '../../img/missing.svg'
 				}
@@ -1230,13 +1321,13 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				var latest = date(toot.last_status_at, 'relative')
 				if (toot.last_status_at) {
-					var latesthtml = `<div class="cbadge" style="width:100px;">Last:${latest}</div>`
+					var latesthtml = `<div class="cbadge" style="width:100px;">Last <span class="voice">toot</span>: ${latest}</div>`
 				} else {
 					var latesthtml = ''
 				}
 				templete =
 					templete +
-					`<div class="cvo" style="padding-top:5px;" user-id="${toot.id}">
+					`<div class="cusr" style="padding-top:5px;" user-id="${toot.id}">
 					<div class="area-notice">${notftext}</div>
 					<div class="area-icon">
 						${udg}
@@ -1247,6 +1338,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 							class="prof-img"
 							user="${toot.acct}"
 							onerror="this.src='../../img/loading.svg'"
+							alt=""
 						/>
 					</a></div>
 					<div class="area-display_name">
@@ -1256,21 +1348,20 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 								class="sml gray"
 								style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"
 							>
-								@ ${toot.acct}${locked}</span
+								@ ${toot.acct}${locked}</span>
-							>
 						</div>
 					</div>
-					<div class="area-toot acct-note">
+					<div class="area-status">
-						${toot.note.replace(/<br\s?\/?>.+/g, '<span class="gray">...</span>')}
-					</div>
-					<div style="justify-content:space-around;top:5px" class="area-actions">
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_follow}:${toot.following_count}
 						</div>
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_followers}:${toot.followers_count}
 						</div>
-						${latesthtml}${authhtml}
+						${latesthtml}
+					</div>
+					<div class="area-actions" style="justify-content: flex-end;">
+						${authhtml}
 					</div>
 				</div>
 				`
@@ -1306,7 +1397,7 @@ function client(name) {
 					M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
 				} else {
 					var can
-					Object.keys(obj).forEach(function(key) {
+					Object.keys(obj).forEach(function (key) {
 						var cliT = obj[key]
 						if (cliT != name && !can) {
 							can = false
@@ -1342,71 +1433,130 @@ function client(name) {
 	}
 }
 //Poll Parser
-function pollParse(poll, acct_id) {
+function pollParse(poll, acct_id, emojis) {
+	var rand = randomStr(8)
 	var datetype = localStorage.getItem('datetype')
+	var anime = localStorage.getItem('animation')
+	if (anime == 'yes' || !anime) {
+		var lpAnime = 'lpAnime'
+	} else {
+		var lpAnime = ''
+	}
+	var gif = localStorage.getItem('gif')
+	if (!gif) {
+		gif = 'yes'
+	}
 	var choices = poll.options
 	if (poll.own_votes) {
 		var minechoice = poll.own_votes
 	} else {
 		var minechoice = []
 	}
-
+	var refresh = `<a onclick="voteMastodonrefresh('${acct_id}','${poll.id}','${rand}')" class="pointer">
-	if (poll.voted) {
+		${lang.lang_manager_refresh}
+	</a>`
+	if (poll.voted && minechoice.length) {
 		var myvote = lang.lang_parse_voted
+		if (poll.expired) myvote = myvote + '/' + lang.lang_parse_endedvote
+		var result_hide = ''
+	} else if (poll.voted && !minechoice.length) {
+		var myvote = lang.lang_parse_myvote
+		if (poll.expired) myvote = myvote + '/' + lang.lang_parse_endedvote
 		var result_hide = ''
 	} else if (poll.expired) {
 		var myvote = lang.lang_parse_endedvote
 		var result_hide = ''
 	} else {
-		var myvote = `<a onclick="voteMastodon('${acct_id}','${poll.id}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
+		var myvote = `<a onclick="voteMastodon('${acct_id}','${poll.id}','${rand}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
 		if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
 			myvote =
 				myvote +
-				`<a onclick="showResult('${acct_id}','${poll.id}')" class="pointer">
+				`<a onclick="showResult('${acct_id}','${poll.id}','${rand}')" class="pointer">
 				${lang.lang_parse_unvoted}
-				</a>`
+				</a>　`
 		}
 		var result_hide = 'hide'
 	}
 	var ended = date(poll.expires_at, datetype)
 	var pollHtml = ''
-	Object.keys(choices).forEach(function(keyc) {
+	if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
+		var max = _.maxBy(choices, 'votes_count').votes_count
+	} else {
+		var max = 0
+	}
+
+	Object.keys(choices).forEach(function (keyc) {
 		var choice = choices[keyc]
 		var voteit = ''
 		for (var i = 0; i < minechoice.length; i++) {
 			var me = minechoice[i]
 			if (me == keyc) {
-				var voteit = '✅'
+				var voteit =
+					'<span class="ownMark"><img class="emoji" draggable="false" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/2705.png"></span>'
 				break
 			}
 		}
 		if (!poll.voted && !poll.expired) {
 			var votesel =
-				"voteSelMastodon('" + acct_id + "','" + poll.id + "'," + keyc + ',' + poll.multiple + ')'
+				`voteSelMastodon('${acct_id}','${poll.id}',${keyc},${poll.multiple}, this)`
-			var voteclass = 'pointer waves-effect waves-light'
+			var voteclass = 'pointer'
 		} else {
 			var votesel = ''
 			var voteclass = ''
 		}
+		var per = Math.ceil((choice.votes_count / poll.votes_count) * 100)
+		if (!per) per = 0
+		if (max == choice.votes_count) {
+			var addPoll = 'maxVoter'
+		} else {
+			var addPoll = ''
+		}
+		var openData = ''
+		if (choice.votes_count !== null) {
+			openData = `<span style="float: right">${voteit}${choice.votes_count}<span class="sml">(${per}%)</span></span>`
+		} else {
+			openData = `<span style="float: right">${voteit}?<span class="sml">(-%)</span></span>`
+		}
+		var choiceText = escapeHTML(choice.title)
+		if (emojis) {
+			//絵文字があれば
+			Object.keys(emojis).forEach(function (key5) {
+				var emoji = emojis[key5]
+				var shortcode = emoji.shortcode
+				if (gif == 'yes') {
+					var emoSource = emoji.url
+				} else {
+					var emoSource = emoji.static_url
+				}
+				var emoji_url = `
+			<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+				alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+		`
+				var regExp = new RegExp(':' + shortcode + ':', 'g')
+				choiceText = choiceText.replace(regExp, emoji_url)
+			})
+			choiceText = twemoji.parse(choiceText)
+		}
 		pollHtml =
 			pollHtml +
 			`<div class="${voteclass} vote vote_${acct_id}_${poll.id}_${keyc}" onclick="${votesel}">
-				${escapeHTML(choice.title)}
+				<span class="vote_${acct_id}_${poll.id}_result leadPoll ${result_hide} ${addPoll} ${lpAnime}" style="width: ${per}%"></span>
-				<span class="vote_${acct_id}_${poll.id}_result ${result_hide}">
+				<span class="onPoll">${choiceText}</span>
-					(${choice.votes_count})
+				<span class="vote_${acct_id}_${poll.id}_result ${result_hide} onPoll">
+					${openData}
 				</span>
-				${voteit}
 			</div>`
 	})
-	pollHtml = `<div class="vote_${acct_id}_${poll.id}">
+	if (poll.expired) {
+		refresh = ''
+	}
+	pollHtml = `<div class="vote_${acct_id}_${poll.id}" id="vote${rand}">
 			${pollHtml}${myvote}
-			<a onclick="voteMastodonrefresh('${acct_id}','${poll.id}')" class="pointer">
+			${refresh}
-				${lang.lang_manager_refresh}
-			</a>
 			<span class="cbadge cbadge-hover" title="${date(poll.expires_at, 'absolute')}">
 				<i class="far fa-calendar-times"></i>
 				${ended}
-			</span>
+			</span>${poll.voters_count} ${lang.lang_parse_people}
 		</div>`
 	return pollHtml
 }

app/js/tl/poll.js

@@ -49,30 +49,25 @@ function pollCalc() {
 	return days * 86400 + hrs * 3600 + mins * 60
 }
 //Vote
-function voteSelMastodon(acct_id, id, to, mul) {
+function voteSelMastodon(acct_id, id, to, mul, elem) {
-	if ($('.vote_' + acct_id + '_' + id + '_' + to).hasClass('sel')) {
+	if ($(elem).hasClass('sel')) {
-		$('.vote_' + acct_id + '_' + id + '_' + to).css('background-color', 'transparent')
+		$(elem).css('background-color', 'transparent')
-		$('.vote_' + acct_id + '_' + id + '_' + to).removeClass('sel')
+		$(elem).removeClass('sel')
 	} else {
 		if (!mul) {
-			$('.vote_' + acct_id + '_' + id + ' div').each(function(i, elem) {
+			$('.vote_' + acct_id + '_' + id + ' div').css('background-color', 'transparent')
-				if (i == to) {
+			$('.vote_' + acct_id + '_' + id + ' div').removeClass('sel')
-					$(this).css('background-color', 'var(--emphasized)')
+			$(elem).css('background-color', 'var(--emphasized)')
-					$(this).addClass('sel')
+			$(elem).addClass('sel')
-				} else {
-					$(this).css('background-color', 'transparent')
-					$(this).removeClass('sel')
-				}
-			})
 		} else {
-			$('.vote_' + acct_id + '_' + id + '_' + to).css('background-color', 'var(--emphasized)')
+			$(elem).css('background-color', 'var(--emphasized)')
-			$('.vote_' + acct_id + '_' + id + '_' + to).addClass('sel')
+			$(elem).addClass('sel')
 		}
 	}
 }
-function voteMastodon(acct_id, id) {
+function voteMastodon(acct_id, id, target) {
 	var choice = []
-	$('.vote_' + acct_id + '_' + id + ' div').each(function(i, elem) {
+	$(`#vote${target} div`).each(function(i, elem) {
 		if ($(this).hasClass('sel')) {
 			choice.push(i + '')
 		}
@@ -90,13 +85,13 @@ function voteMastodon(acct_id, id) {
 	httpreq.responseType = 'json'
 	httpreq.send(JSON.stringify({ choices: choice }))
 	httpreq.onreadystatechange = function() {
-		voteMastodonrefresh(acct_id, id)
+		voteMastodonrefresh(acct_id, id, target)
 	}
 }
 function showResult(acct_id, id) {
 	$('.vote_' + acct_id + '_' + id + '_result').toggleClass('hide')
 }
-function voteMastodonrefresh(acct_id, id) {
+function voteMastodonrefresh(acct_id, id, target) {
 	var datetype = localStorage.getItem('datetype')
 	if (!datetype) {
 		datetype = 'absolute'
@@ -120,8 +115,8 @@ function voteMastodonrefresh(acct_id, id) {
 			if (!json) {
 				return false
 			}
-			var poll = pollParse(json, acct_id)
+			var poll = pollParse(json, acct_id, json.emojis)
-			$('.vote_' + acct_id + '_' + json.id).html(poll)
+			$(`#vote${target}`).html(poll)
 		}
 	}
 }

app/js/tl/src.js

@@ -3,7 +3,7 @@
 function searchMenu() {
 	$('#src-contents').html('')
 	trend()
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#searchMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#src-box').removeClass('hide')
@@ -36,7 +36,7 @@ function src(mode, offset) {
 		var user = $('#his-data').attr('user-id')
 	}
 	if (!mode) {
-		var start = 'https://' + domain + '/api/v2/search?q=' + q + add
+		var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(q) + add
 	} else {
 		var start = 'https://' + domain + '/api/v1/search?q=' + q
 	}
@@ -116,8 +116,11 @@ function tsAdd(q) {
 	parseColumn('add')
 }
 function tootsearch(tlid, q) {
+	if(!q || q=='undefined') {
+		return false
+	}
 	var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
-	console.log('Toot srrach at ' + start)
+	console.log('Toot search at ' + start)
 	$('#notice_' + tlid).text('tootsearch(' + q + ')')
 	$('#notice_icon_' + tlid).text('search')
 	fetch(start, {
@@ -216,6 +219,9 @@ function moreTs(tlid, q) {
 function graphDraw(tag, acct_id) {
 	var tags = ''
 	var his = tag.history
+	return graphDrawCore(his, tag)
+}
+function graphDrawCore(his, tag) {
 	var max = Math.max.apply(null, [
 		his[0].uses,
 		his[1].uses,
@@ -232,36 +238,34 @@ function graphDraw(tag, acct_id) {
 	var two = 50 - (his[2].uses / max) * 50
 	var one = 50 - (his[1].uses / max) * 50
 	var zero = 50 - (his[0].uses / max) * 50
-	if (max === 0) {
+	return `<div class="tagComp">
-		tags =
+				<div class="tagCompSvg">
-			`<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50"></svg>
+					<svg version="1.1" viewbox="0 0 60 50" width="60" height="50">
-			<span style="font-size:200%">${his[0].uses}</span>
+						<g>
-			toot(s)&nbsp;
+							<path d="M0,${six} L10,${five} 20,${four} 30,${three} 40,${two} 50,${one} 60,${zero} 61,61 0,61" 
-			<a onclick=\"tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer">
+							style="stroke: #0f8c0c;fill: rgba(13,113,19,.25); stroke-width: 1;">
-				#${escapeHTML(tag.name)}
+								</path>
-			</a>&nbsp;` +
+						</g>
-			his[0].accounts +
+					</svg>
-			lang.lang_src_people
+				</div>
-	} else {
+				<div class="tagCompToot">
-		tags =
+					<span style="font-size:200%">${his[0].uses}</span>
-			`<br><br>
+				</div>
-			<svg version="1.1" viewbox="0 0 60 50" width="60" height="50">
+				<div class="tagCompToots">
-				<g>
+					toot
-					<path d="M0,${six} L10,${five} 20,${four} 30,${three} 40,${two} 50,${one} 60,${zero}" 
+				</div>
-						style="stroke: #0f8c0c;fill: rgba(13,113,19,.25); stroke-width: 1;">
+				<div class="tagCompTag">
-					</path>
+					<a onclick="tl('tag','${escapeHTML(
-				</g>
+						tag.name
-			</svg>
+					)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
-			<span style="font-size:200%">${his[0].uses}</span>
+						#${escapeHTML(tag.name)}
-			toot&nbsp;
+					</a>
-			<a onclick="tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer">
+				</div>
-				#${escapeHTML(tag.name)}
+				<div class="tagCompUser">
-			</a>&nbsp;` +
+					${his[0].accounts}
-			his[0].accounts +
+					${lang.lang_src_people}
-			lang.lang_src_people
+				</div>
-	}
+				</div>`
-
-	return tags
 }
 /*
 <svg version="1.1" viewbox="0 0 50 300" width="100%" height="50">
@@ -303,40 +307,54 @@ function trend() {
 			Object.keys(json).forEach(function(keye) {
 				var tag = json[keye]
 				var his = tag.history
-				var max = Math.max.apply(null, [
+				tags = graphDrawCore(his, tag)
-					his[0].uses,
-					his[1].uses,
-					his[2].uses,
-					his[3].uses,
-					his[4].uses,
-					his[5].uses,
-					his[6].uses
-				])
-				var six = 50 - (his[6].uses / max) * 50
-				var five = 50 - (his[5].uses / max) * 50
-				var four = 50 - (his[4].uses / max) * 50
-				var three = 50 - (his[3].uses / max) * 50
-				var two = 50 - (his[2].uses / max) * 50
-				var one = 50 - (his[1].uses / max) * 50
-				var zero = 50 - (his[0].uses / max) * 50
-				tags =
-				`<svg version="1.1" viewbox="0 0 60 50" width="60" height="50">
-					<g>
-						<path d="M0,${six} L10,${five} 20,${four} 30,${three} 40,${two} 50,${one} 60,${zero}" 
-							style="stroke: #0f8c0c;fill: rgba(13,113,19,.25); stroke-width: 1;">
-						</path>
-					</g>
-				</svg>
-				<span style="font-size:200%">${his[0].uses}</span>
-				toot&nbsp;
-				<a onclick="tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer">
-					#${escapeHTML(tag.name)}
-				</a>&nbsp;` +
-				his[0].accounts +
-				lang.lang_src_people +
-					'<br><br>'
 
 				$('#src-contents').append(tags)
 			})
 		})
 }
+function srcBox(mode) {
+	var selectedText = window.getSelection().toString()
+	if (mode == 'open') {
+		$('#pageSrc').removeClass('hide')
+	} else if (mode == 'close') {
+		if(!selectedText) {
+			$('#pageSrc').addClass('hide')
+			$('#pageSrc').removeClass('keep')
+		}
+	} else {
+		$('#pageSrc').toggleClass('hide')
+	}
+	if(!$('#pageSrc').hasClass('keep')) {
+		$('#pageSrcInput').val(selectedText)
+	}
+}
+$('#pageSrcInput').click(function() {
+	$('#pageSrc').addClass('keep')
+})
+$('#pageSrcInput').on('input', function(evt) {
+	if(!$('#pageSrcInput').val()) {
+		$('#pageSrc').removeClass('keep')
+	}
+})
+document.addEventListener('selectionchange', function() {
+	var selectedText = window.getSelection().toString()
+	if (selectedText && !$('input').is(':focus') && !$('textarea').is(':focus')) {
+		srcBox('open')
+	}
+})
+function doSrc(type) {
+	$('#pageSrc').addClass('hide')
+	$('#pageSrc').removeClass('keep')
+	var q = $('#pageSrcInput').val()
+	if(type == 'web') {
+		var start = localStorage.getItem('srcUrl')
+		if(!start) {
+			start = 'https://google.com/search?q={q}'
+		}
+		start = start.replace(/{q}/, q)
+		postMessage(["openUrl", start], "*")
+	} else if(type == 'ts') {
+		tsAdd(q)
+	}
+}

app/js/tl/tag.js

@@ -10,7 +10,8 @@ if (location.search) {
 }
 //よく使うタグ
 function tagShow(tag) {
-	$('[data-tag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
+	console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']')
+	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
 }
 //タグ追加
 function tagPin(tag) {
@@ -69,7 +70,7 @@ function favTag() {
 		tags =
 			tags +
 			`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
-			${nowon}<span class="hide" data-tag="${tag}">　
+			${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 			<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}">
 				TL
 			</a>　
@@ -124,7 +125,7 @@ function trendTag() {
 					tags =
 						tags +
 						`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
-						<span class="hide" data-tag="${tag}">　
+						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 						<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
 						<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">
 							Toot
@@ -197,3 +198,28 @@ function tagFeature(name, acct_id) {
 			M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
 		})
 }
+//タグのフィルタ
+function addTag(id) {
+	var columns = JSON.parse(localStorage.getItem('column'))
+	var column = columns[id]
+	if(!column.data.name) {
+		var name = column.data
+	} else {
+		var name = column.data.name
+	}
+	var col = localStorage.getItem('column')
+	var o = JSON.parse(col)
+	var obj = o[id]
+	obj.data = {
+		'name': name,
+		'all': $(`#all_tm-${id}`).val(),
+		'any': $(`#any_tm-${id}`).val(),
+		'none': $(`#none_tm-${id}`).val(),
+	}
+	o[id] = obj
+	var json = JSON.stringify(o)
+	console.log(json)
+	localStorage.setItem('column',json)
+	columnReload(id, 'tag')
+}
+

app/js/tl/tl.js

@@ -10,10 +10,18 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (tlid == 'add') {
 		console.log('add new column')
 		var newtab = $('.box').length
+		if (type == 'tag') {
+			data = {
+				name: data,
+				any: [],
+				all: [],
+				none: [],
+			}
+		}
 		var add = {
 			domain: acct_id,
 			type: type,
-			data: data
+			data: data,
 		}
 		var multi = localStorage.getItem('column')
 		var obj = JSON.parse(multi)
@@ -35,7 +43,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (type == 'mix' && localStorage.getItem('mode_' + domain) != 'misskey') {
 		//Integratedなら飛ばす
 		$('#notice_' + tlid).text(
-			'Integrated TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			'Integrated TL(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('merge_type')
 		mixtl(acct_id, tlid, 'integrated', delc, voice)
@@ -43,7 +55,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	} else if (type == 'plus') {
 		//Local+なら飛ばす
 		$('#notice_' + tlid).text(
-			'Local+ TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			'Local+ TL(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('people_outline')
 		mixtl(acct_id, tlid, 'plus', delc, voice)
@@ -52,7 +68,12 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//通知なら飛ばす
 		notf(acct_id, tlid, 'direct')
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			cap(type, data, acct_id) +
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('notifications')
 		return
@@ -60,10 +81,31 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//ブックマークなら飛ばす
 		getBookmark(acct_id, tlid)
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			cap(type, data, acct_id) +
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('bookmark')
 		return
+	} else if (type == 'utl') {
+		//UTLなら飛ばす
+		getUtl(acct_id, tlid, data, false)
+		$('#notice_' + tlid).text(
+			cap(type, data, acct_id) +
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
+		)
+		$('#notice_icon_' + tlid).text('person')
+		return
+	} else if (type == 'home') {
+		//ホームならお知らせ「も」取りに行く
+		announ(acct_id, tlid)
 	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
@@ -71,14 +113,19 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (type != 'noauth') {
 		var hdr = {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
 		}
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			cap(type, data, acct_id) +
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 	} else {
 		var hdr = {
-			'content-type': 'application/json'
+			'content-type': 'application/json',
 		}
 		domain = acct_id
 		$('#notice_' + tlid).text('Glance TL(' + domain + ')')
@@ -107,11 +154,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var i = {
 			method: method,
 			headers: hdr,
-			body: JSON.stringify(req)
+			body: JSON.stringify(req),
 		}
 	} else {
 		var misskey = false
-		var url = com(type, data)
+		var url = com(type, data, tlid)
 		if (type == 'tag') {
 			var tag = localStorage.getItem('tag-range')
 			if (tag == 'local') {
@@ -126,26 +173,26 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var method = 'GET'
 		var i = {
 			method: method,
-			headers: hdr
+			headers: hdr,
 		}
 	}
 
 	console.log(['Try to get timeline of ' + tlid, start])
 	fetch(start, i)
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			console.log(['Result of getting timeline of ' + tlid, json])
 			$('#landing_' + tlid).hide()
 			var mute = getFilterTypeByAcct(acct_id, type)
@@ -187,8 +234,13 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 	if (localStorage.getItem('mode_' + domain) == 'misskey') {
 		var misskey = true
 		var key = localStorage.getItem('misskey_wss_' + acct_id)
-		var send = '{"type":"connect","body":{"channel":"' + typePs(type) + '","id":"' + tlid + '"}}'
+		var send =
-		var mskyset = setInterval(function() {
+			'{"type":"connect","body":{"channel":"' +
+			typePs(type) +
+			'","id":"' +
+			tlid +
+			'"}}'
+		var mskyset = setInterval(function () {
 			if (misskeywsstate[key]) {
 				misskeyws[key].send(send)
 				clearInterval(mskyset)
@@ -204,14 +256,25 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		if (type == 'home') {
 			var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
 		} else if (type == 'pub') {
-			var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at
+			var add = ''
+			if(remoteOnlyCk(tlid)){
+				add = '&remote=true'
+			}
+			var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at + add
 		} else if (type == 'pub-media') {
-			var start = wss + '/api/v1/streaming/?stream=public:media&access_token=' + at
+			var add = ''
+			if(remoteOnlyCk(tlid)){
+				add = '&remote=true'
+			}var start =
+				wss + '/api/v1/streaming/?stream=public:media&access_token=' + at + add
 		} else if (type == 'local') {
-			var start = wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
+			var start =
+				wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
 		} else if (type == 'local-media') {
 			var start =
-				wss + '/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' + at
+				wss +
+				'/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' +
+				at
 		} else if (type == 'tag') {
 			if (type == 'tag') {
 				var tag = localStorage.getItem('tag-range')
@@ -219,28 +282,38 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					data = data + '&local=true'
 				}
 			}
-			var start = wss + '/api/v1/streaming/?stream=hashtag&tag=' + data + '&access_token=' + at
+			var start =
+				wss +
+				'/api/v1/streaming/?stream=hashtag&tag=' +
+				data +
+				'&access_token=' +
+				at
 		} else if (type == 'noauth') {
 			var start = 'wss://' + acct_id + '/api/v1/streaming/?stream=public:local'
 		} else if (type == 'list') {
-			var start = wss + '/api/v1/streaming/?stream=list&list=' + data + '&access_token=' + at
+			var start =
+				wss +
+				'/api/v1/streaming/?stream=list&list=' +
+				data +
+				'&access_token=' +
+				at
 		} else if (type == 'dm') {
 			var start = wss + '/api/v1/streaming/?stream=direct&access_token=' + at
 		}
 		var wsid = websocket.length
 		localStorage.setItem('wss_' + tlid, wsid)
 		websocket[wsid] = new WebSocket(start)
-		websocket[wsid].onopen = function(mess) {
+		websocket[wsid].onopen = function (mess) {
 			console.table({
 				tlid: tlid,
 				type: 'Connect Streaming API' + type,
 				domain: domain,
-				message: [mess]
+				message: [mess],
 			})
 			errorct = 0
 			$('#notice_icon_' + tlid).removeClass('red-text')
 		}
-		websocket[wsid].onmessage = function(mess) {
+		websocket[wsid].onmessage = function (mess) {
 			console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)])
 			if (misskey) {
 				if (JSON.parse(mess.data).type == 'note') {
@@ -251,7 +324,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					websocketNotf[acct_id].send(
 						JSON.stringify({
 							type: 'capture',
-							id: obj.id
+							id: obj.id,
 						})
 					)
 					var templete = misskeyParse([obj], type, acct_id, tlid, '', mute)
@@ -270,26 +343,40 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				if (typeA == 'delete') {
 					var obj = JSON.parse(mess.data).payload
 					if (delc == 'true') {
-						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+						$(
-							'emphasized'
+							'#timeline_' +
-						)
+								tlid +
-						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+								' [unique-id=' +
-							'by_delcatch'
+								JSON.parse(mess.data).payload +
-						)
+								']'
+						).addClass('emphasized')
+						$(
+							'#timeline_' +
+								tlid +
+								' [unique-id=' +
+								JSON.parse(mess.data).payload +
+								']'
+						).addClass('by_delcatch')
 					} else {
-						$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
-						$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
 					}
 				} else if (typeA == 'update' || typeA == 'conversation') {
-					if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
+					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 (
+							$('#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) {
+							if (
+								$('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0
+							) {
 								$('#timeline_' + tlid).prepend(templete)
 							} else {
 								var pool = localStorage.getItem('pool_' + tlid)
@@ -311,10 +398,12 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					}
 				} else if (typeA == 'filters_changed') {
 					filterUpdate(acct_id)
+				} else if (~typeA.indexOf('announcement')) {
+					announ(acct_id, tlid)
 				}
 			}
 		}
-		websocket[wsid].onerror = function(error) {
+		websocket[wsid].onerror = function (error) {
 			console.error('Error closing')
 			console.error(error)
 			if (mode == 'error') {
@@ -329,7 +418,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			}
 			return false
 		}
-		websocket[wsid].onclose = function() {
+		websocket[wsid].onclose = function () {
 			console.warn('Closing ' + tlid)
 			if (mode == 'error') {
 				$('#notice_icon_' + tlid).addClass('red-text')
@@ -371,13 +460,17 @@ function moreload(type, tlid) {
 	if (sid && !moreloading) {
 		if (
 			type == 'mix' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) != 'misskey'
 		) {
 			mixmore(tlid, 'integrated')
 			return
 		} else if (
 			type == 'plus' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) != 'misskey'
 		) {
 			mixmore(tlid, 'plus')
 			return
@@ -391,6 +484,10 @@ function moreload(type, tlid) {
 		} else if (type == 'bookmark') {
 			getBookmark(acct_id, tlid, true)
 			return
+		} else if (type == 'utl') {
+			var data = obj[tlid].data
+			getUtl(acct_id, tlid, data, true)
+			return
 		}
 		moreloading = true
 		localStorage.setItem('now', type)
@@ -399,19 +496,19 @@ function moreload(type, tlid) {
 			var at = localStorage.getItem('acct_' + acct_id + '_at')
 			var hdr = {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				Authorization: 'Bearer ' + at,
 			}
 			var domain = localStorage.getItem('domain_' + acct_id)
 		} else {
 			var hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			domain = acct_id
 		}
 		if (localStorage.getItem('mode_' + domain) == 'misskey') {
 			var misskey = true
 			hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			var url = misskeycom(type, data)
 			var start = 'https://' + domain + '/api/notes/' + url
@@ -434,35 +531,42 @@ function moreload(type, tlid) {
 			var i = {
 				method: method,
 				headers: hdr,
-				body: JSON.stringify(req)
+				body: JSON.stringify(req),
 			}
 		} else {
 			var misskey = false
-			var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'max_id=' + sid
+			var start =
+				'https://' +
+				domain +
+				'/api/v1/timelines/' +
+				com(type, data, tlid) +
+				'max_id=' +
+				sid
 			if (type == 'dm') {
-				var start = 'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid
+				var start =
+					'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid
 			}
 			var method = 'GET'
 			var i = {
 				method: method,
-				headers: hdr
+				headers: hdr,
 			}
 		}
 		fetch(start, i)
-			.then(function(response) {
+			.then(function (response) {
 				if (!response.ok) {
-					response.text().then(function(text) {
+					response.text().then(function (text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function(error) {
+			.catch(function (error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(function (json) {
 				var mute = getFilterTypeByAcct(acct_id, type)
 				if (misskey) {
 					var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -503,12 +607,16 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 	if (sid && !moreloading) {
 		if (
 			type == 'mix' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) != 'misskey'
 		) {
 			return
 		} else if (
 			type == 'plus' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) != 'misskey'
 		) {
 			return
 		} else if (type == 'notf') {
@@ -521,19 +629,19 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 			var at = localStorage.getItem('acct_' + acct_id + '_at')
 			var hdr = {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				Authorization: 'Bearer ' + at,
 			}
 			var domain = localStorage.getItem('domain_' + acct_id)
 		} else {
 			var hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			domain = acct_id
 		}
 		if (localStorage.getItem('mode_' + domain) == 'misskey') {
 			var misskey = true
 			hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			var url = misskeycom(type, data)
 			var start = 'https://' + domain + '/api/notes/' + url
@@ -556,36 +664,43 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 			var i = {
 				method: method,
 				headers: hdr,
-				body: JSON.stringify(req)
+				body: JSON.stringify(req),
 			}
 		} else {
 			var misskey = false
-			var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'since_id=' + sid
+			var start =
+				'https://' +
+				domain +
+				'/api/v1/timelines/' +
+				com(type, data, tlid) +
+				'since_id=' +
+				sid
 			if (type == 'dm') {
-				var start = 'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid
+				var start =
+					'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid
 			}
 			var method = 'GET'
 			var i = {
 				method: method,
-				headers: hdr
+				headers: hdr,
 			}
 		}
 
 		fetch(start, i)
-			.then(function(response) {
+			.then(function (response) {
 				if (!response.ok) {
-					response.text().then(function(text) {
+					response.text().then(function (text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function(error) {
+			.catch(function (error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(function (json) {
 				console.log(['Result diff of TL' + tlid, json])
 				if (misskey) {
 					var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -607,7 +722,7 @@ function reloadTL(type, data, acct_id, key, delc, voice) {
 
 //WebSocket切断
 function tlCloser() {
-	Object.keys(websocket).forEach(function(tlid) {
+	Object.keys(websocket).forEach(function (tlid) {
 		if (websocketOld[tlid]) {
 			websocketOld[tlid].close()
 			console.log('%c Close Streaming API: Old' + tlid, 'color:blue')
@@ -619,27 +734,30 @@ function tlCloser() {
 		}
 	})
 	websocket = []
-	Object.keys(wsHome).forEach(function(tlid) {
+	Object.keys(wsHome).forEach(function (tlid) {
 		if (wsHome[tlid]) {
 			wsHome[tlid].close()
 			console.log('%c Close Streaming API:Integrated Home' + tlid, 'color:blue')
 		}
 	})
 	wsHome = []
-	Object.keys(wsLocal).forEach(function(tlid) {
+	Object.keys(wsLocal).forEach(function (tlid) {
 		if (wsLocal[tlid]) {
 			wsLocal[tlid].close()
-			console.log('%c Close Streaming API:Integrated Local' + tlid, 'color:blue')
+			console.log(
+				'%c Close Streaming API:Integrated Local' + tlid,
+				'color:blue'
+			)
 		}
 	})
 	wsLocal = []
-	Object.keys(websocketNotf).forEach(function(tlid) {
+	Object.keys(websocketNotf).forEach(function (tlid) {
 		if (websocketNotf[tlid]) {
 			websocketNotf[tlid].close()
 			console.log('%c Close Streaming API:Notf' + tlid, 'color:blue')
 		}
 	})
-	Object.keys(misskeyws).forEach(function(tlid) {
+	Object.keys(misskeyws).forEach(function (tlid) {
 		if (misskeyws[tlid]) {
 			misskeyws[tlid].close()
 			console.log('%c Close Streaming API:Misskey' + tlid, 'color:blue')
@@ -669,7 +787,11 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == 'local-media') {
 		if (localStorage.getItem('local_' + acct_id) && !locale) {
-			var response = localStorage.getItem('local_' + acct_id) + '(' + lang.lang_tl_media + ')'
+			var response =
+				localStorage.getItem('local_' + acct_id) +
+				'(' +
+				lang.lang_tl_media +
+				')'
 		} else {
 			var response = 'Local TL(Media)'
 		}
@@ -681,12 +803,22 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == 'pub-media') {
 		if (localStorage.getItem('public_' + acct_id) && !locale) {
-			var response = localStorage.getItem('public_' + acct_id) + '(' + lang.lang_tl_media + ')'
+			var response =
+				localStorage.getItem('public_' + acct_id) +
+				'(' +
+				lang.lang_tl_media +
+				')'
 		} else {
 			var response = 'Federated TL(Media)'
 		}
 	} else if (type == 'tag') {
-		var response = '#' + escapeHTML(data)
+		if (data) {
+			if (data.name) {
+				var response = '#' + escapeHTML(data.name)
+			} else {
+				var response = '#' + escapeHTML(data)
+			}
+		}
 	} else if (type == 'list') {
 		var ltitle = localStorage.getItem('list_' + data + '_' + acct_id)
 		var response = 'List(' + ltitle + ')'
@@ -701,7 +833,11 @@ function cap(type, data, acct_id) {
 	} else if (type == 'dm') {
 		var response = 'DM'
 	} else if (type == 'mix') {
-		if (localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) == 'misskey') {
+		if (
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) == 'misskey'
+		) {
 			var response = 'Social TL'
 		} else {
 			var response = 'Integrated'
@@ -714,12 +850,14 @@ function cap(type, data, acct_id) {
 		var response = 'tootsearch(' + escapeHTML(data) + ')'
 	} else if (type == 'bookmark') {
 		var response = 'Bookmarks'
+	} else if (type == 'utl') {
+		var response = 'User TL(' + escapeHTML(data.acct) + ')'
 	}
 	return response
 }
 
 //TLのURL
-function com(type, data) {
+function com(type, data, tlid) {
 	if (type == 'home') {
 		return 'home?'
 	} else if (type == 'local' || type == 'noauth') {
@@ -727,11 +865,33 @@ function com(type, data) {
 	} else if (type == 'local-media') {
 		return 'public?local=true&only_media=true&'
 	} else if (type == 'pub') {
-		return 'public?'
+		var add = ''
+		if(remoteOnlyCk(tlid)){
+			add = 'remote=true&'
+		}
+		return 'public?' + add
 	} else if (type == 'pub-media') {
-		return 'public?only_media=true&'
+		var add = ''
+		if(remoteOnlyCk(tlid)){
+			add = 'remote=true&'
+		}
+		return 'public?only_media=true&' + add
 	} else if (type == 'tag') {
-		return 'tag/' + data + '?'
+		if (data.name) {
+			var name = data.name
+			var all = data.all
+			var any = data.any
+			var none = data.none
+		} else {
+			var name = data
+			var all = ''
+			var any = ''
+			var none = ''
+		}
+		return `tag/${name}?${buildQuery('all', all)}${buildQuery(
+			'any',
+			any
+		)}${buildQuery('none', none)}`.slice(0, -1)
 	} else if (type == 'list') {
 		return 'list/' + data + '?'
 	} else if (type == 'dm') {
@@ -892,37 +1052,50 @@ function getMarker(tlid, type, acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
-			$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
+			$('#unread_' + tlid).attr(
+				'title',
+				lang.lang_layout_unread + ':' + lang.lang_nothing
+			)
 			$('#unread_' + tlid).attr('data-id', '')
 			return false
 		})
-		.then(function(json) {
+		.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
+						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(
+						'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(
+					'title',
+					lang.lang_layout_unread + ':' + lang.lang_nothing
+				)
 				$('#unread_' + tlid).attr('data-id', '')
 			}
 		})
@@ -946,23 +1119,23 @@ function showUnread(tlid, type, acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (!json || !json.length) {
 				columnReload(tlid, type)
 			}
@@ -1002,23 +1175,23 @@ function ueload(tlid) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (!json) {
 				columnReload(tlid, type)
 			}
@@ -1057,15 +1230,15 @@ function asRead(callback) {
 					var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('unique-id')
 					var poster = {
 						home: {
-							last_read_id: id
+							last_read_id: id,
-						}
+						},
 					}
 				} else {
 					var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('data-notf')
 					var poster = {
 						notifications: {
-							last_read_id: id
+							last_read_id: id,
-						}
+						},
 					}
 				}
 
@@ -1078,7 +1251,7 @@ function asRead(callback) {
 				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 				httpreq.responseType = 'json'
 				httpreq.send(JSON.stringify(poster))
-				httpreq.onreadystatechange = function() {
+				httpreq.onreadystatechange = function () {
 					if (httpreq.readyState === 4) {
 						var json = httpreq.response
 						if (this.status !== 200) {
@@ -1112,8 +1285,8 @@ function asReadEnd() {
 			onBeforeOpen: () => {
 				Swal.showLoading()
 			},
-			onClose: () => {}
+			onClose: () => {},
-		}).then(result => {})
+		}).then((result) => {})
 	} else {
 		postMessage(['asReadComp', ''], '*')
 	}
@@ -1139,7 +1312,7 @@ function getBookmark(acct_id, tlid, more) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -1154,7 +1327,11 @@ function getBookmark(acct_id, tlid, more) {
 				}
 			}
 			var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
-			templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
+			templete =
+				templete +
+				'<div class="hide notif-marker" data-maxid="' +
+				max_id +
+				'"></div>'
 			if (more) {
 				$('#timeline_' + tlid).append(templete)
 			} else {
@@ -1167,3 +1344,93 @@ function getBookmark(acct_id, tlid, more) {
 		}
 	}
 }
+function getUtl(acct_id, tlid, data, more) {
+
+	moreloading = true
+	if (more) {
+		var sid = $('#timeline_' + tlid + ' .cvo')
+		.last()
+		.attr('unique-id')
+		var ad = '?max_id=' + sid
+	} else {
+		var ad = ''
+	}
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var start = "https://" + domain + "/api/v1/accounts/" + data.id + "/statuses" + ad
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('GET', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function () {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
+			templete =
+				templete
+			if (more) {
+				$('#timeline_' + tlid).append(templete)
+			} else {
+				$('#timeline_' + tlid).html(templete)
+			}
+			$('#landing_' + tlid).hide()
+			jQuery('time.timeago').timeago()
+			moreloading = false
+			todc()
+		}
+	}
+}
+//Announcement
+function announ(acct_id, tlid) {
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var start = 'https://' + domain + '/api/v1/announcements'
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('GET', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function () {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			if (json.length > 0) {
+				$('.notf-announ_' + acct_id).removeClass('hide')
+				var ct = 0
+				for (var i = 0; i < json.length; i++) {
+					if (localStorage.getItem('announ_' + acct_id) == json[i].id) {
+						break
+					}
+					ct++
+				}
+				if (ct > 0) {
+					$('.notf-announ_' + acct_id + '_ct').text(ct)
+				}
+			} else {
+				$('.notf-announ_' + acct_id).addClass('hide')
+			}
+			var templete = announParse(json, acct_id, tlid)
+			$('#announce_' + tlid).html(templete)
+			jQuery('time.timeago').timeago()
+			todc()
+		}
+	}
+}
+//buildQuery
+function buildQuery(name, data) {
+	if(!data || data == '') return ''
+	var arr = data.split(',')
+	var str = ''
+	for (var i = 0; i < arr.length; i++) {
+		str = str + `${name}[]=${arr[i]}&`
+	}
+	return str
+}

app/js/ui/img.js

@@ -53,7 +53,7 @@ function imgCont(type) {
 	$('#imagemodal').attr('data-image', murl)
 	//表示はリモートを使うか(どちらにしろコピーはオリジナル)
 	var remote_img = localStorage.getItem('remote_img')
-	if (remote_img == 'yes') {
+	if (remote_img == 'yes' && ourl != 'null') {
 		murl = ourl
 	}
 	if (murl) {
@@ -95,13 +95,20 @@ function imageXhr(id, key, murl) {
 		'loadend',
 		function(event) {
 			var total = event.total
-			$('#imgbyte').text(Math.floor(total/1024))
+			$('#imgbyte').text(Math.floor(total / 1024))
 			var now = event.loaded
 			var per = (now / total) * 100
 			$('#imgprog').text(Math.floor(per))
 		},
 		false
 	)
+	xhr.addEventListener(
+		'error',
+		function(event) {
+			$('#imgmodal').attr('src', murl)
+		},
+		false
+	)
 	xhr.onreadystatechange = function() {
 		if (this.readyState == 4 && this.status == 200) {
 			r = new FileReader()
@@ -112,19 +119,22 @@ function imageXhr(id, key, murl) {
 				var width
 				element.onload = function() {
 					var width = element.naturalWidth
+					if(width < 650) {
+						width = 650;
+					}
 					var height = element.naturalHeight
 					var windowH = $(window).height()
 					var windowW = $(window).width()
 					$('#imagemodal').css('bottom', '0')
 					$('#imagemodal img').css('width', 'auto')
 					if (height < windowH) {
-						$('#imagemodal').css('height', height + 60 + 'px')
+						$('#imagemodal').css('height', height + 100 + 'px')
-						$('#imagemodal img').css('height', '100%')
+						$('#imagemodal img').css('height',  height + 'px')
 						if (width > windowW * 0.8) {
 							$('#imagemodal').css('width', '80vw')
-							$('#imagemodal img').css('width', '100%')
+							$('#imagemodal img').css('width', 'auto')
 							var heightS = ((windowW * 0.8) / width) * height
-							$('#imagemodal').css('height', heightS + 60 + 'px')
+							$('#imagemodal').css('height', heightS + 100 + 'px')
 						} else {
 							$('#imagemodal').css('width', width + 'px')
 						}
@@ -266,9 +276,8 @@ function dlImg() {
 	if (remote_img == 'yes') {
 		murl = ourl
 	}
-	if (localStorage.getItem('savefolder')) {
+	var save = localStorage.getItem('savefolder')
-		var save = localStorage.getItem('savefolder')
+	if (!save || save == 'null') {
-	} else {
 		var save = ''
 	}
 	postMessage(['generalDL', [murl, save, false]], '*')

app/js/ui/layout.js

@@ -8,13 +8,13 @@ var websocketNotf = []
 
 //カラム追加ボックストグル
 function addColumnMenu() {
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#addColumnMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#add-box').removeClass('hide')
 	addselCk()
 }
-$('.type').click(function() {
+$('.type').click(function () {
 	$('.type').removeClass('active')
 	$(this).addClass('active')
 	$('#type-sel').val($(this).attr('data-type'))
@@ -44,7 +44,7 @@ function parseColumn(target, dontclose) {
 		var obj = JSON.parse(multi)
 
 		var templete
-		Object.keys(obj).forEach(function(key) {
+		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key]
 
 			localStorage.setItem('name_' + key, acct.name)
@@ -76,8 +76,8 @@ function parseColumn(target, dontclose) {
 		var obj = [
 			{
 				domain: 0,
-				type: 'local'
+				type: 'local',
-			}
+			},
 		]
 		var json = JSON.stringify(obj)
 		localStorage.setItem('column', json)
@@ -122,10 +122,7 @@ function parseColumn(target, dontclose) {
 			var if_notf = ''
 		}
 		if (localStorage.getItem('notification_' + acct.domain)) {
-			var unique_notf = lang.lang_layout_thisacct.replace(
+			var unique_notf = lang.lang_layout_thisacct.replace('{{notf}}', localStorage.getItem('notification_' + acct.domain))
-				'{{notf}}',
-				localStorage.getItem('notification_' + acct.domain)
-			)
 		} else {
 			if (lang.language == 'ja') {
 				var notflocale = '通知'
@@ -191,18 +188,8 @@ function parseColumn(target, dontclose) {
 			} else {
 				var animecss = ''
 			}
-			unstreamingTL(
+			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.data)
-				acct.type,
+		} else if (acct.type == 'bookmark') {
-				key,
-				basekey,
-				insert,
-				icnsert,
-				acct.left_fold,
-				css,
-				animecss,
-				acct.data
-			)
-		}  else if (acct.type == 'bookmark') {
 			if (!acct.left_fold) {
 				basekey = key
 			}
@@ -213,31 +200,34 @@ function parseColumn(target, dontclose) {
 			} else {
 				var animecss = ''
 			}
-			unstreamingTL(
+			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.domain)
-				acct.type,
+		} else if (acct.type == 'utl') {
-				key,
+			if (!acct.left_fold) {
-				basekey,
+				basekey = key
-				insert,
+			}
-				icnsert,
+
-				acct.left_fold,
-				css,
-				animecss,
-				acct.domain
-			)
-		}else {
 			var anime = localStorage.getItem('animation')
 			if (anime == 'yes' || !anime) {
 				var animecss = 'box-anime'
 			} else {
 				var animecss = ''
 			}
-			var unread =
+			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, { acct: acct.domain, data: acct.data })
-				`<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
+		} else {
+			var anime = localStorage.getItem('animation')
+			if (anime == 'yes' || !anime) {
+				var animecss = 'box-anime'
+			} 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>`
+				</a>${lang.lang_layout_unread}<br>`
-				var notfDomain = acct.domain
+			var notfDomain = acct.domain
-				var notfKey = key
+			var notfKey = key
+			var if_tag = ''
+			var if_tag_btn = ''
 			if (acct.type == 'notf') {
 				var exclude =
 					lang.lang_excluded +
@@ -281,20 +271,48 @@ function parseColumn(target, dontclose) {
 						</button>`
 				}
 				exclude = exclude + '<br>'
-				notfDomain = "dummy"
+				notfDomain = 'dummy'
-				notfKey = "dummy"
+				notfKey = 'dummy'
 			} else if (acct.type == 'home') {
-				var exclude =
+				var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex">
-					`<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 if (acct.type == 'tag') {
+				if (acct.data.name) {
+					var name = acct.data.name
+					var all = acct.data.all
+					var any = acct.data.any
+					var none = acct.data.none
+				} else {
+					var name = acct.data
+					var all = ''
+					var any = ''
+					var none = ''
+				}
+				if_tag = `<div class="column-hide notf-indv-box" id="tag-box_${key}" style="padding:5px;">
+					Base: ${name}<br>
+					<div id="tagManager-${key}">
+						all: <input type="text" id="all_tm-${key}"" value="${all}">
+						any: <input type="text" id="any_tm-${key}" value="${any}">
+						none: <input type="text" id="none_tm-${key}"" value="${none}">
+					</div>
+					<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Refresh</button>
+				</div>`
+				if_tag_btn = `<a onclick="setToggleTag('${key}')" class="setting nex" 
+				title="${lang.lang_layout_tagManager}" style="width:30px">
+				<i class="material-icons waves-effect nex">note_add</i>
+				</a>`
+				unread = ''
+				var exclude = ''
+				var if_notf = 'hide'
 			} else {
 				var exclude = ''
 				unread = ''
 			}
+
 			var markers = localStorage.getItem('markers')
 			if (markers == 'yes') {
 				markers = true
@@ -307,18 +325,15 @@ function parseColumn(target, dontclose) {
 			if (!acct.left_fold) {
 				basekey = key
 				if (!numtarget) {
-					var basehtml =
+					var basehtml = `<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
-						`<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
 					$('#timeline-container').append(basehtml)
 				}
-				var left_hold =
+				var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex">
-					`<a onclick="leftFoldSet('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
 					</a>
 					${lang.lang_layout_leftFold}<br>`
 			} else {
-				var left_hold =
+				var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex">
-					`<a onclick="leftFoldRemove('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
 					</a>
 					${lang.lang_layout_leftUnfold}<br>`
@@ -326,9 +341,7 @@ function parseColumn(target, dontclose) {
 			if (key === 0) {
 				left_hold = ''
 			}
-			if (
+			if (localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct.domain)) == 'misskey') {
-				localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct.domain)) == 'misskey'
-			) {
 				var isMisRed = ''
 				exclude = ''
 				var if_misskey_hide = 'hide'
@@ -341,15 +354,26 @@ function parseColumn(target, dontclose) {
 			} else {
 				var addHeight = ''
 			}
-			var html =
+			if (acct.type != 'pub' && acct.type != 'pub-media') {
-				`
+				console.log(acct.type, key)
+				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex">
+					<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
+					<span id="sta-media-${key}">On</span>
+				</a>${lang.lang_layout_mediafil}`
+			} else {
+				var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex">
+					<i class="material-icons waves-effect nex" title="${lang.lang_layout_remoteOnly}">perm_media</i>
+					<span id="sta-remote-${key}">Off</span>
+				</a>${lang.lang_layout_remoteOnly}`
+			}
+			var html = `
 				<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}" data-acct="${acct.domain}" style="${addHeight}">
 					<div class="notice-box z-depth-2" id="menu_${key}" style="${insert}">
 						<div class="area-notice">
 							<i class="material-icons waves-effect ${isMisRed}" id="notice_icon_${key}" ${notf_attr}
 								 style="font-size:40px; padding-top:25%;" 
 								 onclick="checkStr('${acct.type}','${data}','${acct.domain}', '${key}', '${delc}','${voice}',null)"
-							 	 title="${lang.lang_layout_gotop}">
+							 	 title="${lang.lang_layout_gotop}" aria-hidden="true">
 							</i>
 						</div>
 					<div class="area-notice_name">
@@ -358,38 +382,45 @@ function parseColumn(target, dontclose) {
 					<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>
+							<i class="material-icons waves-effect nex notf-icon_${acct.domain}" aria-hidden="true">notifications</i>
+							<span class="voice">${unique_notf}</span>
 						</a>
-						${unread}
+						<span class="cbadge hide notf-announ_${acct.domain}" style="margin-right:0" 
+							onclick="notfToggle('${acct.domain}','${key}')" title="${lang.lang_layout_announ}">
+							<i class="fas fa-bullhorn"></i>
+							<span class="notf-announ_${acct.domain}_ct"></span>
+							<span class="voice">${lang.lang_layout_announ}</span>
+						</span>
+						${if_tag_btn}
 					</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 teal notf-reply_${acct.domain} hide" data-badge-caption="Reply" aria-hidden="true">0</span>
-						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav">0</span>
+						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav" aria-hidden="true">0</span>
-						<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT">0</span>
+						<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT" aria-hidden="true">0</span>
-						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow">0</span>
+						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow" aria-hidden="true">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>
+							<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert} aria-hidden="true">cancel</i>
+							<span class="voice">${lang.lang_layout_delthis}</span>
 						</a>
 					</div>
 					<div class="area-a3">
 						<a onclick="setToggle('${key}')" class="setting nex" title="${lang.lang_layout_setthis}" ${icnsert}>
-							<i class="material-icons waves-effect nex">settings</i>
+							<i class="material-icons waves-effect nex" aria-hidden="true">settings</i>
+							<span class="voice">${lang.lang_layout_setthis}</span>
 						</a>
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box z-depth-4" id="notf-box_${notfKey}">
+					<div id="announce_${notfKey}" style="border: 1px solid"></div>
 					<div id="notifications_${notfKey}" data-notf="${notfDomain}" data-type="notf" class="notf-timeline">
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
+					${unread}
 					${exclude}${left_hold}
-					<a onclick="mediaToggle('${key}')" class="setting nex">
+					${mediaFil}<br>
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
-						<span id="sta-media-${key}">On</span>
-					</a>
-					${lang.lang_layout_mediafil}<br>
 					<a onclick="cardToggle('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_linkanades}">link</i>
 						<span id="sta-card-${key}">On</span>
@@ -412,7 +443,7 @@ function parseColumn(target, dontclose) {
 					${lang.lang_layout_headercolor}
 					<br>
 					<div id="picker_${key}" class="color-picker"></div>
-				</div>
+				</div>${if_tag}
 				<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}">
@@ -481,13 +512,13 @@ function parseColumn(target, dontclose) {
 		minHeight: 50,
 		minWidth: 50,
 		grid: 50,
-		resize: function(event, ui) {
+		resize: function (event, ui) {
 			$(this).css('min-width', ui.size.width + 'px')
 			$(this).css('max-width', ui.size.width + 'px')
 			$(this).css('min-height', ui.size.height + 'px')
 			$(this).css('max-height', ui.size.height + 'px')
 		},
-		stop: function(event, ui) {
+		stop: function (event, ui) {
 			var col = localStorage.getItem('column')
 			var o = JSON.parse(col)
 			var width = ui.size.width
@@ -502,16 +533,14 @@ function parseColumn(target, dontclose) {
 			} else {
 				//横幅。その縦幅を持つカラムのidは
 				console.log('yoko')
-				var key = $(this)
+				var key = $(this).find('.boxIn').attr('tlid')
-					.find('.boxIn')
-					.attr('tlid')
 				var obj = o[key]
 				obj.width = width
 				o[key] = obj
 			}
 			var json = JSON.stringify(o)
 			localStorage.setItem('column', json)
-		}
+		},
 	})
 }
 function checkStr(type, data, acct_id, key, delc, voice) {
@@ -561,7 +590,7 @@ function addColumn() {
 	}
 	var add = {
 		domain: acct,
-		type: type
+		type: type,
 	}
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
@@ -595,9 +624,7 @@ function addselCk() {
 		$('#webview-add').addClass('hide')
 	}
 	if (domain == 'knzk.me' || domain == 'mstdn.y-zu.org') {
-		$('#type-sel').append(
+		$('#type-sel').append('<option value="dm" data-trans="dm" id="direct-add">' + lang.layout_dm + '</option>')
-			'<option value="dm" data-trans="dm" id="direct-add">' + lang.layout_dm + '</option>'
-		)
 	} else {
 		$('#direct-add').remove()
 	}
@@ -614,16 +641,20 @@ function removeColumn(tlid) {
 		confirmButtonColor: '#3085d6',
 		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+		cancelButtonText: lang.lang_no,
-	}).then(result => {
+	}).then((result) => {
 		if (result.value) {
 			var multi = localStorage.getItem('column')
 			var obj = JSON.parse(multi)
+			var data = obj[tlid]
 			obj.splice(tlid, 1)
 			var json = JSON.stringify(obj)
 			localStorage.setItem('column', json)
 			sortLoad()
-			$('#timeline_box_' + tlid + '_parentBox').remove()
+			$('#timeline_box_' + tlid + '_box').remove()
+			if(!data.left_fold) {
+				$('#timeline_box_' + tlid + '_parentBox').remove()
+			}
 		}
 		$('#sort-box').removeClass('hide')
 		$('#sort-box').addClass('show')
@@ -637,35 +668,67 @@ function setToggle(tlid) {
 		$('#util-box_' + tlid).css('display', 'block')
 		$('#util-box_' + tlid).animate(
 			{
-				height: '200px'
+				height: '200px',
 			},
 			{
 				duration: 300,
-				complete: function() {
+				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'
+				height: '0',
 			},
 			{
 				duration: 300,
-				complete: function() {
+				complete: function () {
 					$('#util-box_' + tlid).addClass('column-hide')
 					$('#util-box_' + tlid).css('display', 'none')
-				}
+				},
+			}
+		)
+	}
+}
+//タグトグル
+//設定トグル
+function setToggleTag(tlid) {
+	if ($('#tag-box_' + tlid).hasClass('column-hide')) {
+		$('#tag-box_' + tlid).css('display', 'block')
+		$('#tag-box_' + tlid).animate(
+			{
+				height: '200px',
+			},
+			{
+				duration: 300,
+				complete: function () {
+					$('#tag-box_' + tlid).css('overflow-y', 'scroll')
+					$('#tag-box_' + tlid).removeClass('column-hide')
+				},
+			}
+		)
+	} else {
+		$('#tag-box_' + tlid).css('overflow-y', 'hidden')
+		$('#tag-box_' + tlid).animate(
+			{
+				height: '0',
+			},
+			{
+				duration: 300,
+				complete: function () {
+					$('#tag-box_' + tlid).addClass('column-hide')
+					$('#tag-box_' + tlid).css('display', 'none')
+				},
 			}
 		)
 	}
 }
 function colorpicker(key) {
-	temp =
+	temp = `<div onclick="coloradd('${key}','def','def')" class="pointer">Default</div>
-		`<div onclick="coloradd('${key}','def','def')" class="pointer">Default</div>
 		<div onclick="coloradd('${key}','f44336','white')" class="red white-text pointer">Red</div>
 		<div onclick="coloradd('${key}','e91e63','white')" class="pink white-text pointer">Pink</div>
 		<div onclick="coloradd('${key}','9c27b0','white')" class="purple white-text pointer">Purple</div>
@@ -717,8 +780,7 @@ function coloradd(key, bg, txt) {
 }
 //禁断のTwitter
 function webviewParse(url, key, insert, icnsert, css) {
-	var html =
+	var html = `<div class="box" id="timeline_box_${key}_box" tlid="${key}" style="${css}">
-		`<div class="box" id="timeline_box_${key}_box" tlid="${key}" style="${css}">
 			<div class="notice-box z-depth-2" id="menu_${key}" style="${insert}">
 				<div class="area-notice">
 					<i class="fab fa-twitter waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;"></i>
@@ -753,29 +815,30 @@ function webviewParse(url, key, insert, icnsert, css) {
 function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, animecss, data) {
 	//type名が関数名
 	if (!left_fold) {
-		var basehtml =
+		var basehtml = `<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
-			`<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
 		$('#timeline-container').append(basehtml)
-		var left_hold =
+		var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex">
-			`<a onclick="leftFoldSet('${key}')" class="setting nex">
 				<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
 			</a>
 			${lang.lang_layout_leftFold}
 			</span><br>`
 	} else {
-		var left_hold =
+		var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex">
-			`<a onclick="leftFoldRemove('${key}')" class="setting nex">
 				<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
 			</a>
 			${lang.lang_layout_leftUnfold}
 			</span><br>`
 	}
-	var html =
+	if(type == 'utl') {
-		`<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}">
+		var dataHtml = false
+	} else {
+		var dataHtml = data
+	}
+	var html = `<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}">
 			<div class="notice-box z-depth-2" id="menu_${key}" style="${insert} ">
 				<div class="area-notice">
 					<i class="material-icons waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;" 
-						onclick="${type}('${key}','${data}');" title="${lang.lang_layout_gotop}"></i>
+						onclick="${type}('${key}','${dataHtml}');" title="${lang.lang_layout_gotop}"></i>
 				</div>
 				<div class="area-notice_name">
 					<span id="notice_${key}" class="tl-title"></span>
@@ -811,11 +874,13 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 			</div>
 		</div>`
 	$('#timeline_box_' + basekey + '_parentBox').append(html)
-	if(type == 'tootsearch'){
+	if (type == 'tootsearch') {
 		tootsearch(key, data)
-	}else if(type == 'bookmark'){
+	} else if (type == 'bookmark') {
 		console.log(key, data)
 		bookmark(key, data)
+	} else if (type == 'utl') {
+		utl(key, data.acct, data.data)
 	}
 	cardCheck(key)
 	ebtCheck(key)
@@ -824,7 +889,7 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 	voiceCheck(key)
 	return true
 }
-function bookmark(key, data){
+function bookmark(key, data) {
 	console.log(key, data)
 	if (localStorage.getItem('voice_' + key)) {
 		var voice = true
@@ -833,6 +898,22 @@ function bookmark(key, data){
 	}
 	tl('bookmark', '', data, key, 'false', voice, '')
 }
+function utl(key, acct_id, data) {
+	if(!data) {
+		var multi = localStorage.getItem('column')
+		var obj = JSON.parse(multi)
+		data = obj[key].data
+		acct_id = obj[key].domain
+	}
+	
+	console.log(key, data)
+	if (localStorage.getItem('voice_' + key)) {
+		var voice = true
+	} else {
+		var voice = false
+	}
+	tl('utl', data, acct_id, key, 'false', voice, '')
+}
 function leftFoldSet(key) {
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)

app/js/ui/menu.js

@@ -33,6 +33,7 @@ function menu() {
     $("#add-box").removeClass("hide");
     $("#left-menu div").removeClass("active");
     $("#addColumnMenu").addClass("active");
+    $("#addColumnMenu").click();
   } else {
     $('#menu').fadeOut()
     $("#menu").removeClass("appear")
@@ -69,7 +70,7 @@ $(function () {
   });
 });
 function help() {
-  $("#left-menu div").removeClass("active");
+  $("#left-menu a").removeClass("active");
 	$("#helpMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#help-box").removeClass("hide");

app/js/ui/post-box.js

@@ -58,10 +58,10 @@ function show() {
 	mdCheck()
 }
 
-$(function() {
+$(function () {
 	$('#post-box').draggable({
 		handle: '#post-bar',
-		stop: function() {
+		stop: function () {
 			var left = $('#post-box').offset().left
 			if (left > $('body').width() - $('#post-box').width()) {
 				left = $('body').width() - $('#post-box').width()
@@ -76,15 +76,15 @@ $(function() {
 			}
 			localStorage.setItem('postbox-left', left)
 			localStorage.setItem('postbox-top', top)
-		}
+		},
 	})
 	$('#post-box').resizable({
 		minHeight: 150,
 		minWidth: 100,
-		stop: function(event, ui) {
+		stop: function (event, ui) {
 			$('#textarea').blur()
 			localStorage.setItem('postbox-width', ui.size.width)
-		}
+		},
 	})
 })
 
@@ -101,40 +101,44 @@ if (location.search) {
 		$('.mini-btn').text('expand_less')
 	}
 }
-$('#posttgl').click(function(e) {
+window.onload = initPostbox
-	if (!$('#post-box').hasClass('appear')) {
+function initPostbox() {
-		show()
+	$('#posttgl').click(function (e) {
-	} else {
+		if (!$('#post-box').hasClass('appear')) {
-		hide()
+			show()
-	}
+		} else {
-	$('.cvo').removeClass('selectedToot')
-	selectedColumn = 0
-	selectedToot = 0
-})
-
-$('#timeline-container,#group').click(function(e) {
-	if (localStorage.getItem('box') != 'absolute') {
-		if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
 			hide()
 		}
-	}
+		$('.cvo').removeClass('selectedToot')
-	$('.cvo').removeClass('selectedToot')
+		selectedColumn = 0
-	selectedColumn = 0
+		selectedToot = 0
-	selectedToot = 0
+	})
-	localStorage.removeItem('nohide')
+
-})
+	$('#timeline-container,#group').click(function (e) {
-$('#contextWrap').click(function(e) {
+		if (localStorage.getItem('box') != 'absolute') {
-	$('#contextWrap').addClass('hide')
+			if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
-	$('.contextMenu').addClass('hide')
+				hide()
-	$('.act-icon').text('expand_more')
+			}
-})
+		}
-$('#textarea,#cw-text').focusout(function(e) {
+		$('.cvo').removeClass('selectedToot')
-	localStorage.setItem('nohide', true)
+		selectedColumn = 0
-	var countup = function() {
+		selectedToot = 0
 		localStorage.removeItem('nohide')
-	}
+		srcBox('close')
-	//setTimeout(remove, 100);
+	})
-	$('.cvo').removeClass('selectedToot')
+	$('#contextWrap').click(function (e) {
-	selectedColumn = 0
+		$('#contextWrap').addClass('hide')
-	selectedToot = 0
+		$('.contextMenu').addClass('hide')
-})
+		$('.act-icon').text('expand_more')
+	})
+	$('#textarea,#cw-text').focusout(function (e) {
+		localStorage.setItem('nohide', true)
+		var countup = function () {
+			localStorage.removeItem('nohide')
+		}
+		//setTimeout(remove, 100);
+		$('.cvo').removeClass('selectedToot')
+		selectedColumn = 0
+		selectedToot = 0
+	})
+}

app/js/ui/sort.js

@@ -33,7 +33,7 @@ function sortLoad () {
 			var acctdata = user + "@" + domain;
 		}
 
-		var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, escapeHTML(acct.data), acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
+		var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, acct.data, acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_sort_gothis + '">forward</i></a> <a onclick="removeColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>';
 		$("#sort").append(html);
@@ -111,7 +111,7 @@ function sort() {
 }
 //ソートボタントグル
 function sortMenu() {
-	$("#left-menu div").removeClass("active");
+	$("#left-menu a").removeClass("active");
 	$("#sortMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#sort-box").removeClass("hide");

app/js/ui/spotify.js

@@ -1,189 +1,311 @@
 function spotifyConnect() {
-	var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing";
+	var auth = 'https://spotify.thedesk.top/connect'
-	var platform = localStorage.getItem("platform");
+	$('#spotify-code-show').removeClass('hide')
-	if (platform == "win32") {
+	postMessage(['openUrl', auth], '*')
-		postMessage(["openUrl", auth], "*");
-		postMessage(["sendSinmpleIpc", "quit"], "*");
-	} else {
-		auth = auth + "&state=code";
-		$("#spotify-code-show").removeClass("hide");
-		postMessage(["openUrl", auth], "*");
-	}
 }
 function spotifyAuth() {
-	var code = $("#spotify-code").val();
+	var code = $('#spotify-code').val()
-	localStorage.setItem("spotify", "code");
+	localStorage.setItem('spotify-token', code)
-	localStorage.setItem("spotify-refresh", code);
+	$('#spotify-code-show').addClass('hide')
-	$("#spotify-code-show").addClass("hide");
+	$('#spotify-enable').addClass('disabled')
-	$("#spotify-enable").addClass("disabled");
+	$('#spotify-disable').removeClass('disabled')
-	$("#spotify-disable").removeClass("disabled");
 }
 function spotifyDisconnect() {
-	localStorage.removeItem("spotify");
+	var start = 'https://spotify.thedesk.top/disconnect?code=' + localStorage.getItem('spotify-token')
-	localStorage.removeItem("spotify-refresh");
+	fetch(start, {
-	checkSpotify();
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+		},
+	})
+		.then(function (response) {
+			if (!response.ok) {
+				response.text().then(function (text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function (error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function (json) {
+			if(!json.success) alert('error')
+			localStorage.removeItem('spotify-token')
+			checkSpotify()
+		})
 }
 function checkSpotify() {
-	if (localStorage.getItem("spotify")) {
+	if (localStorage.getItem('spotify-token')) {
-		$("#spotify-enable").addClass("disabled");
+		$('#spotify-enable').addClass('disabled')
-		$("#spotify-disable").removeClass("disabled");
+		$('#spotify-disable').removeClass('disabled')
 	} else {
-		$("#spotify-enable").removeClass("disabled");
+		$('#spotify-enable').removeClass('disabled')
-		$("#spotify-disable").addClass("disabled");
+		$('#spotify-disable').addClass('disabled')
 	}
-	var content = localStorage.getItem("np-temp");
+	var content = localStorage.getItem('np-temp')
-	if (!content || content == "" || content == "null") {
+	if (!content || content == '' || content == 'null') {
-		var content = "#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
+		var content = '#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk'
 	}
-	$("#np-temp").val(content);
+	$('#np-temp').val(content)
-	var flag = localStorage.getItem("artwork");
+	var flag = localStorage.getItem('artwork')
 	if (flag) {
-		$("#awk_yes").prop("checked", true);
+		$('#awk_yes').prop('checked', true)
 	} else {
-		$("#awk_no").prop("checked", true);
+		$('#awk_no').prop('checked', true)
+	}
+	var flag2 = localStorage.getItem('complete-artwork')
+	if (flag2) {
+		$('#amw_yes').prop('checked', true)
+	} else {
+		$('#amw_no').prop('checked', true)
 	}
 }
 function spotifyFlagSave() {
-	var awk = $("[name=awk]:checked").val();
+	var awk = $('[name=awk]:checked').val()
-	if (awk == "yes") {
+	if (awk == 'yes') {
-		localStorage.setItem("artwork", "yes");
+		localStorage.setItem('artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
 	} else {
-		localStorage.removeItem("artwork");
+		localStorage.removeItem('artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
+	}
+}
+function aMusicFlagSave() {
+	var awk = $('[name=amw]:checked').val()
+	if (awk == 'yes') {
+		localStorage.setItem('complete-artwork', 'yes')
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
+	} else {
+		localStorage.removeItem('complete-artwork')
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
 	}
 }
 function nowplaying(mode) {
-	if (mode == "spotify") {
+	if (mode == 'spotify') {
-		var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
+		var start = 'https://spotify.thedesk.top/current-playing?code=' + localStorage.getItem('spotify-token')
-		var at = localStorage.getItem("spotify");
+		var at = localStorage.getItem('spotify-token')
 		if (at) {
 			fetch(start, {
-				method: "GET",
+				method: 'GET',
 				headers: {
-					"content-type": "application/json"
+					'content-type': 'application/json',
-				}
+				},
 			})
-				.then(function(response) {
+				.then(function (response) {
 					if (!response.ok) {
-						response.text().then(function(text) {
+						response.text().then(function (text) {
-							setLog(response.url, response.status, text);
+							setLog(response.url, response.status, text)
-						});
+						})
 					}
-					return response.json();
+					return response.json()
 				})
-				.catch(function(error) {
+				.catch(function (error) {
-					todo(error);
+					todo(error)
-					setLog(start, "JSON", error);
+					setLog(start, 'JSON', error)
-					console.error(error);
+					console.error(error)
 				})
-				.then(function(json) {
+				.then(function (jsonRaw) {
-					console.table(json);
+					var code = jsonRaw.token
+					localStorage.setItem('spotify-token', code)
+					var json = jsonRaw.data
+					console.table(json)
 					if (json.length < 1) {
-						return false;
+						return false
 					}
-					var item = json.item;
+					var item = json.item
-					var img = item.album.images[0].url;
+					var img = item.album.images[0].url
-					var flag = localStorage.getItem("artwork");
+					var flag = localStorage.getItem('artwork')
 					if (flag) {
-						postMessage(["bmpImage", [img, 0]], "*");
+						postMessage(['bmpImage', [img, 0]], '*')
 					}
-					var content = localStorage.getItem("np-temp");
+					var content = localStorage.getItem('np-temp')
-					if (!content || content == "" || content == "null") {
+					if (!content || content == '' || content == 'null') {
-						var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
+						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
 					}
-					var regExp = new RegExp("{song}", "g");
+					var regExp = new RegExp('{song}', 'g')
-					content = content.replace(regExp, item.name);
+					content = content.replace(regExp, item.name)
-					var regExp = new RegExp("{album}", "g");
+					var regExp = new RegExp('{album}', 'g')
-					content = content.replace(regExp, item.album.name);
+					content = content.replace(regExp, item.album.name)
-					var regExp = new RegExp("{artist}", "g");
+					var regExp = new RegExp('{artist}', 'g')
-					content = content.replace(regExp, item.artists[0].name);
+					content = content.replace(regExp, item.artists[0].name)
-					var regExp = new RegExp("{url}", "g");
+					var regExp = new RegExp('{url}', 'g')
-					content = content.replace(regExp, item.external_urls.spotify);
+					content = content.replace(regExp, item.external_urls.spotify)
-					var regExp = new RegExp("{composer}", "g");
+					var regExp = new RegExp('{composer}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{hz}", "g");
+					var regExp = new RegExp('{hz}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{bitRate}", "g");
+					var regExp = new RegExp('{bitRate}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{lyricist}", "g");
+					var regExp = new RegExp('{lyricist}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{bpm}", "g");
+					var regExp = new RegExp('{bpm}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{genre}", "g");
+					var regExp = new RegExp('{genre}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					$("#textarea").val(content);
+					$('#textarea').val(content)
-				});
+				})
 		} else {
 			Swal.fire({
-				type: "info",
+				type: 'info',
-				title: lang.lang_spotify_acct
+				title: lang.lang_spotify_acct,
-			});
+			})
+		}
+	} else if (mode == 'itunes') {
+		postMessage(['itunes', ''], '*')
+	} else if (mode == 'lastFm') {
+		var user = localStorage.getItem('lastFmUser')
+		var start = 'https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=' + user + '&limit=1&api_key=8f113803bfea951b6dde9e56d32458b2&format=json'
+
+		if (user) {
+			fetch(start, {
+				method: 'GET',
+				headers: {
+					'content-type': 'application/json',
+				},
+			})
+				.then(function (response) {
+					if (!response.ok) {
+						response.text().then(function (text) {
+							setLog(response.url, response.status, text)
+						})
+					}
+					return response.json()
+				})
+				.catch(function (error) {
+					todo(error)
+					setLog(start, 'JSON', error)
+					console.error(error)
+				})
+				.then(function (json) {
+					console.table(json)
+					if (!json || !json.recenttracks) {
+						console.error('no data')
+						return false
+					}
+					var item = json.recenttracks.track[0]
+					if (!item['@attr']) return false
+					var img = item.image[3]['#text']
+					var isImg = item.streamable * 1
+					var flag = localStorage.getItem('artwork')
+					if (flag && isImg && img) {
+						postMessage(['bmpImage', [img, 0]], '*')
+					}
+					var content = localStorage.getItem('np-temp')
+					if (!content || content == '' || content == 'null') {
+						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
+					}
+					var regExp = new RegExp('{song}', 'g')
+					content = content.replace(regExp, item.name)
+					var regExp = new RegExp('{album}', 'g')
+					content = content.replace(regExp, item.album['#text'])
+					var regExp = new RegExp('{artist}', 'g')
+					content = content.replace(regExp, item.artist['#text'])
+					var regExp = new RegExp('{url}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{composer}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{hz}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{bitRate}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{lyricist}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{bpm}', 'g')
+					content = content.replace(regExp, '')
+					var regExp = new RegExp('{genre}', 'g')
+					content = content.replace(regExp, '')
+					$('#textarea').val(content)
+				})
+		} else {
+			Swal.fire({
+				type: 'info',
+				title: lang.lang_spotify_acct,
+			})
 		}
-	} else if (mode == "itunes") {
-		postMessage(["itunes", ""], "*");
 	}
 }
-function npCore(arg) {
+async function npCore(arg) {
-	if (arg.cmd) {
+	console.table(arg)
-		console.error(arg);
+	var content = localStorage.getItem('np-temp')
-		return;
+	if (!content || content == '' || content == 'null') {
+		var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
 	}
-	console.table(arg);
+	var flag = localStorage.getItem('artwork')
-	var content = localStorage.getItem("np-temp");
+	var platform = localStorage.getItem('platform')
-	if (!content || content == "" || content == "null") {
+	var aaw = { aaw: '', album: '' }
-		var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
+	if (platform == 'win32') {
-	}
-	var flag = localStorage.getItem("artwork");
-	var platform = localStorage.getItem("platform");
-	if (platform == "win32") {
 		if (flag && arg.path) {
-			media(arg.path, "image/png", "new");
+			media(arg.path, 'image/png', 'new')
 		}
-	} else if (platform == "darwin") {
+	} else if (platform == 'darwin') {
 		if (flag && arg.artwork) {
-			media(arg.artwork, "image/png", "new");
+			media(arg.artwork, 'image/png', 'new')
+		} else if (flag && localStorage.getItem('complete-artwork')) {
+			var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name
+			aaw = await getUnknownAA(q)
+			postMessage(['bmpImage', [aaw.aaw, 0]], '*')
 		}
 	}
-	var regExp = new RegExp("{song}", "g");
+	var regExp = new RegExp('{song}', 'g')
-	content = content.replace(regExp, arg.name);
+	content = content.replace(regExp, arg.name)
-	var regExp = new RegExp("{album}", "g");
+	var regExp = new RegExp('{album}', 'g')
 	if (arg.album) {
 		if (arg.album.name) {
-			content = content.replace(regExp, arg.album.name);
+			content = content.replace(regExp, arg.album.name)
+		} else {
+			if (aaw.album) content = content.replace(regExp, aaw.album)
+			content = content.replace(regExp, '-')
 		}
+	} else {
+		if (aaw.album) content = content.replace(regExp, aaw.album)
+		content = content.replace(regExp, '-')
 	}
-	var regExp = new RegExp("{artist}", "g");
+	var regExp = new RegExp('{artist}', 'g')
-	content = content.replace(regExp, arg.artist);
+	content = content.replace(regExp, arg.artist)
-	var regExp = new RegExp("{url}", "g");
+	var regExp = new RegExp('{url}', 'g')
-	content = content.replace(regExp, "");
+	content = content.replace(regExp, '')
-	var regExp = new RegExp("{composer}", "g");
+	var regExp = new RegExp('{composer}', 'g')
-	content = content.replace(regExp, arg.composer);
+	content = content.replace(regExp, arg.composer)
-	var regExp = new RegExp("{hz}", "g");
+	var regExp = new RegExp('{hz}', 'g')
-	content = content.replace(regExp, arg.sampleRate / 1000 + "kHz");
+	content = content.replace(regExp, arg.sampleRate / 1000 + 'kHz')
-	var regExp = new RegExp("{lyricist}", "g");
+	var regExp = new RegExp('{lyricist}', 'g')
-	content = content.replace(regExp, "");
+	content = content.replace(regExp, '')
-	var regExp = new RegExp("{bpm}", "g");
+	var regExp = new RegExp('{bpm}', 'g')
-	content = content.replace(regExp, "");
+	content = content.replace(regExp, '')
-	var regExp = new RegExp("{bitRate}", "g");
+	var regExp = new RegExp('{bitRate}', 'g')
-	content = content.replace(regExp, arg.bitRate + "kbps");
+	content = content.replace(regExp, arg.bitRate + 'kbps')
-	var regExp = new RegExp("{genre}", "g");
+	var regExp = new RegExp('{genre}', 'g')
-	content = content.replace(regExp, arg.genre);
+	content = content.replace(regExp, arg.genre)
-	$("#textarea").val(content);
+	$('#textarea').val(content)
 }
 function spotifySave() {
-	var temp = $("#np-temp").val();
+	var temp = $('#np-temp').val()
-	localStorage.setItem("np-temp", temp);
+	localStorage.setItem('np-temp', temp)
-	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 });
+	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
 }
 if (location.search) {
-	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
-	var mode = m[1];
+	var mode = m[1]
-	var codex = m[2];
+	var codex = m[2]
-	if (mode == "spotify") {
+	if (mode == 'spotify') {
-		var coder = codex.split(":");
+		var coder = codex.split(':')
-		localStorage.setItem("spotify", coder[0]);
+		localStorage.setItem('spotify', coder[0])
-		localStorage.setItem("spotify-refresh", coder[1]);
+		localStorage.setItem('spotify-refresh', coder[1])
 	} else {
 	}
 }
+async function getUnknownAA(q) {
+	const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song'
+	let promise = await fetch(start, {
+		method: 'GET',
+	})
+	const json = await promise.json()
+	if (!json.resultCount) {
+		return []
+	}
+	const data = json.results[0].artworkUrl100
+	return { aaw: data.replace(/100x100/, '512x512'), album: json.results[0].collectionName }
+}

app/js/ui/theme.js

@@ -1,32 +1,35 @@
 //テーマ適用
 function themes(theme) {
 	if (!theme) {
-		var theme = localStorage.getItem("theme");
+		var theme = localStorage.getItem('theme')
 		if (!theme) {
-			var theme = "black";
+			var theme = 'black'
-			localStorage.setItem("theme", "black");
+			localStorage.setItem('theme', 'black')
 		}
 	}
-	var el = document.getElementsByTagName("html")[0]
+	var el = document.getElementsByTagName('html')[0]
 
-	el.classList.remove('indigotheme');
+	el.classList.remove('indigotheme')
-	el.classList.remove('greentheme');
+	el.classList.remove('greentheme')
-	el.classList.remove('browntheme');
+	el.classList.remove('browntheme')
-	el.classList.remove('blacktheme');
+	el.classList.remove('blacktheme')
-	el.classList.remove('bluetheme');
+	el.classList.remove('bluetheme')
-	el.classList.remove('customtheme');
+	el.classList.remove('polartheme')
-	el.classList.add(theme + "theme");
+	el.classList.remove('snowtheme')
-	var font = localStorage.getItem("font");
+	el.classList.remove('customtheme')
+	el.classList.add(theme + 'theme')
+	var font = localStorage.getItem('font')
 	if (font) {
-		el.style.fontFamily = font;
+		font = font.replace(/"(.+)"/, '$1')
+		el.style.fontFamily = '"' + font + '"'
 	} else {
-		el.style.fontFamily = "";
+		el.style.fontFamily = ''
 	}
-	if (theme == "custom") {
+	if (theme == 'custom') {
-		if (localStorage.getItem("customtheme-id")) {
+		if (localStorage.getItem('customtheme-id')) {
-			postMessage(["themeCSSRequest", localStorage.getItem("customtheme-id")], "*")
+			postMessage(['themeCSSRequest', localStorage.getItem('customtheme-id')], '*')
 		}
 	}
-	el.style.backgroundColor = "var(--bg)";
+	el.style.backgroundColor = 'var(--bg)'
 }
-themes();
+themes()

app/js/ui/tips.js

@@ -30,7 +30,7 @@ function tips(mode) {
 				localStorage.getItem('ver') +
 				' git: ' +
 				gitHash +
-				'\')">TheDesk ' +
+				'\')"> ' +
 				localStorage.getItem('ver') +
 				' {' +
 				gitHash.slice(0, 7) +
@@ -111,7 +111,7 @@ function trendTagonTip() {
 						`<a onclick="tagShow('${tag}')" class="pointer">
 							#${escapeHTML(tag)}
 						</a>
-						<span class="hide" data-tag="${tag}">　
+						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 							<a onclick="tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
 							<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">Toot</a>
 						</span><br>`
@@ -131,12 +131,8 @@ function trendTagonTip() {
 spotint = null
 function spotifytips() {
 	if (spotint) clearInterval(spotint)
-	var start =
+	var start = 'https://spotify.thedesk.top/current-playing?code=' + localStorage.getItem('spotify-token')
-		'https://thedesk.top/now-playing?at=' +
+	var at = localStorage.getItem('spotify-token')
-		localStorage.getItem('spotify') +
-		'&rt=' +
-		localStorage.getItem('spotify-refresh')
-	var at = localStorage.getItem('spotify')
 	if (at) {
 		fetch(start, {
 			method: 'GET',
@@ -157,8 +153,15 @@ function spotifytips() {
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(function(jsonRaw) {
+				var code = jsonRaw.token
+				localStorage.setItem('spotify-token', code)
+				var json = jsonRaw.data
 				var ms = json.progress_ms
+				if(!ms) {
+					tips('ver')
+					return false
+				}
 				var last = 1000 - (ms % 1000)
 				var item = json.item
 				var img = item.album.images[0].url
@@ -218,6 +221,8 @@ function spotifytips() {
 			type: 'info',
 			title: lang.lang_spotify_acct
 		})
+		tips('ver')
+		return false
 	}
 }
 function spotStart() {
@@ -288,6 +293,4 @@ function tipsToggle() {
 	$('#tips').toggleClass('hide')
 	$('#tips-menu').toggleClass('hide')
 }
-if (localStorage.getItem('tips')) {
+
-	tips(localStorage.getItem('tips'))
-}

app/js/userdata/his-data.js

@@ -1,6 +1,6 @@
 //ユーザーデータ表示
 //タイムライン
-function utl(user, more, acct_id) {
+function utlShow(user, more, acct_id) {
 	if (!acct_id) {
 		var acct_id = $("#his-data").attr("use-acct");
 	}
@@ -79,6 +79,26 @@ function utl(user, more, acct_id) {
 			jQuery("time.timeago").timeago();
 		});
 }
+function utlAdd() {
+	var acct_id = $("#his-data").attr("use-acct");
+	var user = $("#his-data").attr("user-id");
+	var add = {
+		domain: acct_id,
+		type: 'utl',
+		data: {
+			id: user,
+			acct: $("#his-acct").attr('fullname')
+		}
+	}
+	var multi = localStorage.getItem('column')
+	var obj = JSON.parse(multi)
+	localStorage.setItem('card_' + obj.length, 'true')
+	obj.push(add)
+	var json = JSON.stringify(obj)
+	localStorage.setItem('column', json)
+	parseColumn('add')
+	hisclose()
+}
 //ピン留めTL
 function pinutl(before, user, acct_id) {
 	if (!acct_id) {
@@ -719,46 +739,3 @@ function udAdd(acct_id, id, start) {
 			}
 		});
 }
-
-//ユーザーマッチングリスト
-function showMat() {
-	$("#his-matching-list-contents").html(lang.lang_hisdata_taketime);
-	var full = $("#his-acct").attr("fullname");
-	var acct_id = $("#his-data").attr("use-acct");
-	full = full.split("@");
-	var start = "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-filtered-api.cgi?" + full[1] + "+" + full[0];
-	fetch(start, {
-		method: "GET",
-		headers: {
-			"content-type": "application/json"
-		}
-		//body: JSON.stringify({})
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text);
-				});
-			}
-			return response.json();
-		})
-		.catch(function(error) {
-			todo(error);
-			setLog(start, "JSON", error);
-			console.error(error);
-		})
-		.then(function(json) {
-			var templete = "";
-			Object.keys(json).forEach(function(key) {
-				var user = json[key];
-				if (user.avatar) {
-					var avatar = user.avatar;
-				} else {
-					var avatar = "../../img/loading.svg";
-				}
-				templete = templete + '<div class="" style="padding-top:5px;">' + '<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' + '<div style="flex-basis:40px;"><a onclick="udgEx(\'' + user.user + "'," + acct_id + ');" user="' + user.user + '" class="udg">' + '<img src="' + avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' + '<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"><big>' + escapeHTML(user.screen_name) + "</big></div>" + '<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' + user.user + "@" + user.host + "</div>" + "</div>" + '<div class="divider"></div>' + "</div>" + "</div>";
-			});
-			$("#his-matching-list").css("height", $("#his-float-data").height() - $("#his-basic-prof").height() - $("#his-des").height() - $("#his-plus-action").height() + "px");
-			$("#his-matching-list-contents").html(templete);
-		});
-}

app/js/userdata/showOnTL.js

@@ -115,7 +115,7 @@ function udg(user, acct_id) {
 				$("#his-data").attr("remote", "false");
 				var fullname = json.acct + "@" + domain;
 			}
-			utl(json.id, "", acct_id);
+			utlShow(json.id, "", acct_id);
 			flw(json.id, "", acct_id);
 			fer(json.id, "", acct_id);
 			var dis_name = escapeHTML(json.display_name);
@@ -239,6 +239,11 @@ function udg(user, acct_id) {
 				$(".only-his-data").show();
 			}
 			todc();
+			if(json.locked) {
+				$('#his-data').addClass('locked')
+			} else {
+				$('#his-data').removeClass('locked')
+			}
 			//外部データ取得(死かもしれないので)
 			udAdd(acct_id, user, json.url);
 		});
@@ -298,7 +303,7 @@ function misskeyUdg(user, acct_id) {
 				$("#his-data").attr("remote", "false");
 				var fullname = json.acct + "@" + domain;
 			}
-			utl(json.id, "", acct_id);
+			utlShow(json.id, "", acct_id);
 			flw(json.id, "", acct_id);
 			fer(json.id, "", acct_id);
 			if (json.name) {
@@ -412,9 +417,14 @@ function relations(user, acct_id) {
 		})
 		.then(function(json) {
 			var json = json[0];
+			if(json.requested) {
+				//フォロリク中
+				$('#his-data').addClass('following')
+				$("#his-follow-btn-text").text(lang.lang_status_requesting)
+			}
 			if (json.following) {
 				//自分がフォローしている
-				$("#his-data").addClass("following");
+				$("#his-data").addClass("following")
 				$("#his-follow-btn-text").text(lang.lang_status_unfollow);
 				hisList(user, acct_id);
 			} else {
@@ -538,6 +548,8 @@ function reset() {
 	$("#his-float-blocked").hide();
 	$("#his-main-acct").show();
 	$("#his-proof-prof").html("");
+	$('#his-data').removeClass('locked')
+	$('#his-data').removeClass('requesting')
 }
 $("#my-data-nav .anc-link").on("click", function() {
 	var target = $(this).attr("go");

app/main.js

@@ -3,6 +3,10 @@ var dir = 'file://' + __dirname
 var base = dir + '/view/'
 // Electronのモジュール
 const electron = require('electron')
+// アプリケーションをコントロールするモジュール
+const app = electron.app
+// Electronの初期化完了後に実行
+app.on('ready', createWindow)
 const fs = require('fs')
 const language = require('./main/language.js')
 const css = require('./main/css.js')
@@ -12,9 +16,6 @@ const np = require('./main/np.js')
 const systemFunc = require('./main/system.js')
 const Menu = electron.Menu
 const join = require('path').join
-
-// アプリケーションをコントロールするモジュール
-const app = electron.app
 // ウィンドウを作成するモジュール
 const BrowserWindow = electron.BrowserWindow
 // メインウィンドウはGCされないようにグローバル宣言
@@ -36,59 +37,11 @@ if (!gotTheLock) {
 	})
 }
 
-if (process.argv.indexOf('--dev') === -1) {
+// 全てのウィンドウが閉じたら終了
-	var packaged = true
+app.on('window-all-closed', function () {
-} else {
+	electron.session.defaultSession.clearCache(() => {})
-	var packaged = false
+	app.quit()
-	console.log(
+})
-		'||\\\\\\ \n' +
-			'||||  \\\\\\\\ \n' +
-			'||||     \\\\\\\\ \n' +
-			'|||| Am I a \\\\\\\\ \n' +
-			'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
-			'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
-			"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
-			'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
-			'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
-			'||||          /////         \n' +
-			'||||       /////\n' +
-			'||||     /////\n' +
-			'||||//////'
-	)
-	console.log('Welcome!')
-}
-var info_path = join(app.getPath('userData'), 'window-size.json')
-var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
-var lang_path = join(app.getPath('userData'), 'language')
-var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
-var ua_path = join(app.getPath('userData'), 'useragent')
-try {
-	fs.readFileSync(ha_path, 'utf8')
-	app.disableHardwareAcceleration()
-	if (!packaged) console.log('disabled: Hardware Acceleration')
-} catch {
-	if (!packaged) console.log('enabled: Hardware Acceleration')
-}
-var window_size
-try {
-	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
-} catch (e) {
-	window_size = {
-		width: 1000,
-		height: 750
-	} // デフォルトバリュー
-}
-var max_window_size
-try {
-	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
-} catch (e) {
-	max_window_size = {
-		width: 'string',
-		height: 'string',
-		x: 'string',
-		y: 'string'
-	} // デフォルトバリュー
-}
 function isFile(file) {
 	try {
 		fs.statSync(file)
@@ -97,12 +50,8 @@ function isFile(file) {
 		if (err.code === 'ENOENT') return false
 	}
 }
-// 全てのウィンドウが閉じたら終了
-app.on('window-all-closed', function() {
-	electron.session.defaultSession.clearCache(() => {})
-	app.quit()
-})
 function createWindow() {
+	var lang_path = join(app.getPath('userData'), 'language')
 	if (isFile(lang_path)) {
 		var lang = fs.readFileSync(lang_path, 'utf8')
 	} else {
@@ -119,64 +68,134 @@ function createWindow() {
 		} else {
 			lang = 'en'
 		}
-		fs.mkdir(app.getPath('userData'), function(err) {
+		fs.mkdir(app.getPath('userData'), function (err) {
 			fs.writeFileSync(lang_path, lang)
 		})
 	}
 	if (!packaged) console.log('your lang:' + app.getLocale())
 	if (!packaged) console.log('launch:' + lang)
+	//Opening
+	const package = fs.readFileSync(__dirname + '/package.json')
+	if(lang == 'ja') {
+		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
+		var show = maxims[Math.floor(Math.random() * maxims.length)]
+	} else if(lang == 'ja-KS') {
+		//ja-KSも作れたらいいね
+		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
+		var show = maxims[Math.floor(Math.random() * maxims.length)]
+	} else{
+		var show = 'TheDesk 2018'
+	}
+	const data = JSON.parse(package)
+	const version = data.version
+	const codename = data.codename
+	var openingWindow = new BrowserWindow({
+		width: 300,
+		height: 400,
+		transparent: false,
+		frame: false,
+		resizable: false,
+	})
+	openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`)
+
+	if (process.argv.indexOf('--dev') === -1) {
+		var packaged = true
+	} else {
+		var packaged = false
+		console.log(
+			'||\\\\\\ \n' +
+				'||||  \\\\\\\\ \n' +
+				'||||     \\\\\\\\ \n' +
+				'|||| Am I a \\\\\\\\ \n' +
+				'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
+				'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
+				"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
+				'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
+				'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
+				'||||          /////         \n' +
+				'||||       /////\n' +
+				'||||     /////\n' +
+				'||||//////'
+		)
+		console.log('If it does not show the window, you might forget `npm run construct`.')
+	}
+
+	var info_path = join(app.getPath('userData'), 'window-size.json')
+	var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
+	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
+	var ua_path = join(app.getPath('userData'), 'useragent')
+	var frame_path = join(app.getPath('userData'), 'frame')
+	try {
+		fs.readFileSync(ha_path, 'utf8')
+		app.disableHardwareAcceleration()
+		if (!packaged) console.log('disabled: Hardware Acceleration')
+	} catch {
+		if (!packaged) console.log('enabled: Hardware Acceleration')
+	}
+	var window_size
+	try {
+		window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
+	} catch (e) {
+		window_size = {
+			width: 1000,
+			height: 750,
+		} // デフォルトバリュー
+	}
+	var max_window_size
+	try {
+		max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
+	} catch (e) {
+		max_window_size = {
+			width: 'string',
+			height: 'string',
+			x: 'string',
+			y: 'string',
+		} // デフォルトバリュー
+	}
+
+	try {
+		var frameRaw = fs.readFileSync(frame_path, 'utf8')
+		if (frameRaw == 'false') {
+			var frame = false
+			var frameTitle = 'hidden'
+		} else {
+			var frame = true
+			var frameTitle = 'default'
+		}
+	} catch {
+		var frame = true
+	}
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
 	var platform = process.platform
 	var bit = process.arch
+	var arg = {
+		webPreferences: {
+			webviewTag: true,
+			nodeIntegration: false,
+			contextIsolation: true,
+			preload: join(__dirname, 'js', 'platform', 'preload.js'),
+		},
+		width: window_size.width,
+		height: window_size.height,
+		x: window_size.x,
+		y: window_size.y,
+		show: false,
+		frame: frame,
+	}
 	if (platform == 'linux') {
-		var arg = {
+		arg.resizable = true
-			webPreferences: {
+		arg.icon = __dirname + '/desk.png'
-				webviewTag: true,
-				nodeIntegration: false,
-				contextIsolation: true,
-				preload: join(__dirname, 'js', 'platform', 'preload.js')
-			},
-			width: window_size.width,
-			height: window_size.height,
-			x: window_size.x,
-			y: window_size.y,
-			icon: __dirname + '/desk.png',
-			show: false
-		}
 	} else if (platform == 'win32') {
-		var arg = {
+		arg.simpleFullscreen = true
-			webPreferences: {
-				webviewTag: true,
-				nodeIntegration: false,
-				contextIsolation: true,
-				preload: join(__dirname, 'js', 'platform', 'preload.js')
-			},
-			width: window_size.width,
-			height: window_size.height,
-			x: window_size.x,
-			y: window_size.y,
-			simpleFullscreen: true,
-			show: false
-		}
 	} else if (platform == 'darwin') {
-		var arg = {
+		arg.simpleFullscreen = true
-			webPreferences: {
+		arg.titleBarStyle = frameTitle
-				webviewTag: true,
-				nodeIntegration: false,
-				contextIsolation: true,
-				preload: join(__dirname, 'js', 'platform', 'preload.js')
-			},
-			width: window_size.width,
-			height: window_size.height,
-			x: window_size.x,
-			y: window_size.y,
-			simpleFullscreen: true,
-			show: false
-		}
 	}
 	mainWindow = new BrowserWindow(arg)
 	mainWindow.once('page-title-updated', () => {
+		openingWindow.close()
 		mainWindow.show()
+		console.log('Accessibility: ' + app.accessibilitySupportEnabled)
 		if (window_size.max) {
 			mainWindow.maximize()
 		}
@@ -207,40 +226,35 @@ function createWindow() {
 		// Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36
 		const crypto = require('crypto')
 		const N = 100
-		var ua =
+		var ua = 'Mastodon client: ' + crypto.randomBytes(N).toString('base64').substring(0, N)
-			'Mastodon client: ' +
-			crypto
-				.randomBytes(N)
-				.toString('base64')
-				.substring(0, N)
 	}
 	mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua })
 	if (!window_size.x && !window_size.y) {
 		mainWindow.center()
 	}
 	// ウィンドウが閉じられたらアプリも終了
-	mainWindow.on('closed', function() {
+	mainWindow.on('closed', function () {
 		electron.ipcMain.removeAllListeners()
 		mainWindow = null
 	})
 	closeArg = false
-	mainWindow.on('close', function(e, arg) {
+	mainWindow.on('close', function (e, arg) {
 		writePos(mainWindow)
 		if (!closeArg) {
 			e.preventDefault()
 		}
-		const promise = new Promise(function(resolve) {
+		const promise = new Promise(function (resolve) {
 			mainWindow.webContents.send('asReadEnd', '')
-			setTimeout(function() {
+			setTimeout(function () {
 				resolve()
 			}, 3000)
 		})
-		promise.then(function(response) {
+		promise.then(function (response) {
 			closeArg = true
 			mainWindow.close()
 		})
 	})
-	electron.ipcMain.on('sendMarkersComplete', function(e, arg) {
+	electron.ipcMain.on('sendMarkersComplete', function (e, arg) {
 		closeArg = true
 		mainWindow.close()
 	})
@@ -256,32 +270,33 @@ function createWindow() {
 				height: mainWindow.getBounds().height,
 				x: mainWindow.getBounds().x,
 				y: mainWindow.getBounds().y,
-				max: true
+				max: true,
 			}
 		} else {
 			var size = {
 				width: mainWindow.getBounds().width,
 				height: mainWindow.getBounds().height,
 				x: mainWindow.getBounds().x,
-				y: mainWindow.getBounds().y
+				y: mainWindow.getBounds().y,
 			}
 		}
 		fs.writeFileSync(info_path, JSON.stringify(size))
 	}
-	mainWindow.on('maximize', function() {
+	mainWindow.on('maximize', function () {
 		writePos(mainWindow)
 		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()))
 	})
-	mainWindow.on('minimize', function() {
+	mainWindow.on('minimize', function () {
 		writePos(mainWindow)
 		mainWindow.webContents.send('asRead', '')
 	})
 
 	var platform = process.platform
 	var bit = process.arch
-	Menu.setApplicationMenu(
+	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame)))
-		Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname))
+	if (!frame) {
-	)
+		mainWindow.setMenu(null)
+	}
 	//CSS
 	css.css(mainWindow)
 	//アップデータとダウンロード
@@ -292,7 +307,7 @@ function createWindow() {
 	np.TheDeskNowPlaying(mainWindow)
 	//その他system
 	systemFunc.system(mainWindow, dir, lang, dirname)
-	setInterval(function() {
+	setInterval(function () {
 		mouseTrack(mainWindow)
 	}, 1000)
 }
@@ -318,10 +333,5 @@ function mouseTrack(mainWindow) {
 	x = xNow
 	y = yNow
 }
-// Electronの初期化完了後に実行
-app.on('ready', createWindow)
-var onError = function(err, response) {
-	console.error(err, response)
-}
 
 app.setAsDefaultProtocolClient('thedesk')

app/main/dl.js

@@ -1,126 +1,137 @@
 function dl(mainWindow, lang_path, base, dirname) {
-	const electron = require("electron");
+	const electron = require('electron')
-	const shell = electron.shell;
+	const shell = electron.shell
-	const fs = require("fs");
+	const fs = require('fs')
-	const { download } = require('electron-dl');
+	const { download } = require('electron-dl')
-	const BrowserWindow = electron.BrowserWindow;
+	const BrowserWindow = electron.BrowserWindow
-	const dialog = electron.dialog;
+	const dialog = electron.dialog
-	var updatewin = null;
+	var updatewin = null
-	var ipc = electron.ipcMain;
+	var ipc = electron.ipcMain
-	const app = electron.app;
+	const app = electron.app
-	const join = require('path').join;
+	const join = require('path').join
-	ipc.on('update', function (e, x, y) {
+	ipc.on('update', function(e, x, y) {
-
+		var platform = process.platform
-		var platform = process.platform;
+		var bit = process.arch
-		var bit = process.arch;
+		if (platform != 'others') {
-		if (platform != "others") {
 			updatewin = new BrowserWindow({
 				webPreferences: {
 					webviewTag: false,
 					nodeIntegration: false,
 					contextIsolation: true,
-					preload: join(dirname,"js", "platform", "preload.js")
+					preload: join(dirname, 'js', 'platform', 'preload.js')
 				},
 				width: 600,
 				height: 400,
-				"transparent": false, // ウィンドウの背景を透過
+				transparent: false, // ウィンドウの背景を透過
-				"frame": false, // 枠の無いウィンドウ
+				frame: false, // 枠の無いウィンドウ
-				"resizable": false
+				resizable: false,
+				show: false
 			})
-			var lang = fs.readFileSync(lang_path, 'utf8');
+			var lang = fs.readFileSync(lang_path, 'utf8')
-			updatewin.loadURL(base + lang + '/update.html');
+			updatewin.loadURL(base + lang + '/update.html')
-			return "true"
+			updatewin.webContents.once('dom-ready', () => {
+				updatewin.show()
+			 })
+			return 'true'
 		} else {
-			return false;
+			return false
 		}
 	})
 	//アプデDL
-	ipc.on('download-btn', (e, args) => {
+	ipc.on('download-btn', async (e, args) => {
 		function dl(url, file, dir, e) {
-
+			e.sender.webContents.send('mess', 'Start...')
-			e.sender.webContents.send('mess', "ダウンロードを開始します。");
 			const opts = {
 				directory: dir,
+				filename: file,
 				openFolderWhenDone: true,
-				onProgress: function (event) {
+				onProgress: function(event) {
-					e.sender.webContents.send('prog', event);
+					e.sender.webContents.send('prog', [event, args[2]])
 				},
 				saveAs: false
-			};
+			}
-			download(updatewin,
+			download(updatewin, url, opts)
-				url, opts)
 				.then(dl => {
-					e.sender.webContents.send('mess', "ダウンロードが完了しました。");
+					e.sender.webContents.send('mess', 'ダウンロードが完了しました。')
-					app.quit();
+					app.quit()
 				})
-				.catch(console.error);
+				.catch(console.error)
 		}
-		var platform = process.platform;
+		var platform = process.platform
-		var bit = process.arch;
+		var bit = process.arch
-		dialog.showSaveDialog(null, {
+		var options = {
 			title: 'Save',
-			defaultPath: app.getPath('home') + "/" + args[1]
+			defaultPath: app.getPath('home') + '/' + args[1]
-		}, (savedFiles) => {
+		}
-			console.log(savedFiles);
+		const file = await dialog.showSaveDialog(null, options)
-			if (!savedFiles) {
+		const savedFiles = file.filePath
-				return false;
+		console.log(savedFiles)
-			}
+		if (!savedFiles) {
-			if (platform == "win32") {
+			return false
-				var m = savedFiles.match(/(.+)\\(.+)$/);
+		}
-			} else {
+		if (platform == 'win32') {
-				var m = savedFiles.match(/(.+)\/(.+)$/);
+			var m = savedFiles.match(/(.+)\\(.+)$/)
-			}
+		} else {
-			//console.log(m);
+			var m = savedFiles.match(/(.+)\/(.+)$/)
-			if (isExistFile(savedFiles)) {
+		}
-				fs.unlinkSync(savedFiles);
+		//console.log(m);
-			}
+		if (isExistFile(savedFiles)) {
-			dl(args[0], args[1], m[1], e);
+			fs.unlinkSync(savedFiles)
-		});
+		}
-	});
+		console.log(m)
+		dl(args[0], m[2], m[1], e)
+	})
 
 	function isExistFile(file) {
 		try {
-			fs.statSync(file);
+			fs.statSync(file)
 			return true
 		} catch (err) {
 			if (err.code === 'ENOENT') return false
 		}
 	}
 
-
 	ipc.on('general-dl', (event, args) => {
-
+		var name = ''
-		var name = "";
+		var platform = process.platform
-		var platform = process.platform;
+		var bit = process.arch
-		var bit = process.arch;
+		const filename = args[0].match(/https:\/\/.+\/(.+\..+)$/)
-		if (args[1] == "") {
+		if (args[1] == '') {
-			if (platform == "win32") {
+			if (platform == 'win32') {
-				var dir = app.getPath('home') + "\\Pictures\\TheDesk";
+				var dir = app.getPath('home') + '\\Pictures\\TheDesk'
-			} else if (platform == "linux" || platform == "darwin") {
+			} else if (platform == 'linux' || platform == 'darwin') {
-				var dir = app.getPath('home') + "/Pictures/TheDesk";
+				var dir = app.getPath('home') + '/Pictures/TheDesk'
 			}
 		} else {
-			var dir = args[1];
+			var dir = args[1]
 		}
 		const opts = {
 			directory: dir,
 			filename: name,
 			openFolderWhenDone: false,
-			onProgress: function (e) {
+			onProgress: function(e) {
-				event.sender.webContents.send('general-dl-prog', e);
+				event.sender.webContents.send('general-dl-prog', e)
 			},
 			saveAs: false
-		};
+		}
-		download(BrowserWindow.getFocusedWindow(),
+		download(BrowserWindow.getFocusedWindow(), args[0], opts)
-			args[0], opts)
 			.then(dl => {
-				event.sender.webContents.send('general-dl-message', dir);
+				if(filename[1]) {
+					if (platform == 'win32') {
+						var name = dir + '\\' + filename[1]
+					} else if (platform == 'linux' || platform == 'darwin') {
+						var name = dir + '/' + filename[1]
+					}
+				} else {
+					var name = dir
+				}
+				event.sender.webContents.send('general-dl-message', name)
 			})
-			.catch(console.error);
+			.catch(console.error)
-	});
+	})
-	ipc.on('open-finder', (e, folder) => {
+	ipc.on('openFinder', (e, folder) => {
-
+		console.log(folder)
 		shell.showItemInFolder(folder)
-	});
+	})
 }
-exports.dl = dl;
+exports.dl = dl

app/main/img.js

@@ -1,43 +1,87 @@
 function img(mainWindow, dir) {
-    const electron = require("electron");
+	const electron = require('electron')
-    const dialog = electron.dialog;
+	const dialog = electron.dialog
-    const fs = require("fs");
+	const fs = require('fs')
-    var Jimp = require("jimp");
+	var Jimp = require('jimp')
-    var ipc = electron.ipcMain;
+	var ipc = electron.ipcMain
-    const BrowserWindow = electron.BrowserWindow;
+	const BrowserWindow = electron.BrowserWindow
-    ipc.on('file-select', (e, args) => {
+	ipc.on('file-select', (e, args) => {
-
+		let fileNames = dialog.showOpenDialogSync(mainWindow, {
-        dialog.showOpenDialog(null, {
+			properties: ['openFile', 'multiSelections'],
-            properties: ['openFile', 'multiSelections'],
+			title: '添付ファイルを選択',
-            title: '添付ファイルを選択',
+			defaultPath: '.',
-            defaultPath: '.',
+			filters: [
-            filters: [
+				{
-                { name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] },
+					name: 'メディアファイル',
-                { name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
+					extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'],
-                { name: '動画', extensions: ['mp4', 'webm'] },
+				},
-                { name: '全てのファイル', extensions: ['*'] }
+				{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
-            ]
+				{ name: '動画', extensions: ['mp4', 'webm'] },
-        }, (fileNames) => {
+				{ name: '全てのファイル', extensions: ['*'] },
-            if (!fileNames) {
+			],
-                return false;
+		})
-            }
+		if (!fileNames) {
-            for (var i = 0; i < fileNames.length; i++) {
+			return false
-                var path = fileNames[i];
+		}
-                var bin = fs.readFileSync(path, 'base64');
+		for (var i = 0; i < fileNames.length; i++) {
-                e.sender.webContents.send('bmp-img-comp', [bin, 'new']);
+			var path = fileNames[i]
-            }
+			var bin = fs.readFileSync(path, 'base64')
-        });
+			e.sender.webContents.send('resizeJudgement', [bin, 'new'])
-    });
+		}
-    ipc.on('bmp-image', (e, args) => {
+	})
-
+	ipc.on('bmp-image', (e, args) => {
-        var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
+		Jimp.read(args[0], function (err, lenna) {
-        Jimp.read(args[0], function (err, lenna) {
+			if (err) throw err
-            if (err) throw err;
+			lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
-            lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
+				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
-                e.sender.webContents.send('bmp-img-comp', [src, args[1]]);
+			})
-            });
+		})
-        });
+	})
-
+	ipc.on('resize-image', (e, args) => {
-    });
+		var ext = args[0].toString().slice(args[0].indexOf('/') + 1, args[0].indexOf(';'))
+		if (ext == 'jpeg') {
+			var use = 'MIME_JPEG'
+		} else {
+			var use = 'MIME_PNG'
+		}
+		var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
+		var decodedFile = new Buffer(b64, 'base64')
+		Jimp.read(decodedFile, function (err, lenna) {
+			if (err) throw err
+			lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function (err, src) {
+				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
+			})
+		})
+	})
+	ipc.on('stamp-image', (e, args) => {
+		var text = args[1]
+		var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
+		var decodedFile = new Buffer(b64, 'base64')
+		console.log(text)
+		Jimp.read(decodedFile, function (err, image) {
+			if (err) throw err
+			Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then((font) => {
+				var evWidth = Jimp.measureText(font, text)
+				var width = image.bitmap.width
+				var height = image.bitmap.height
+				var left = width - evWidth - 10
+				var top = height - 30
+				var color = Jimp.intToRGBA(image.getPixelColor(left, top))
+				console.log(left, top, color)
+				var ave = (color.r + color.g + color.b) / 3
+				if (ave > 128) {
+					image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) {
+						e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
+					})
+				} else {
+					Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then((font) => {
+						image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) {
+							e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
+						})
+					})
+				}
+			})
+		})
+	})
 }
-exports.img = img;
+exports.img = img

app/main/language.js

@@ -1,12 +1,19 @@
 // Create the Application's main menu
-function templete(lang, mainWindow, packaged, dir, dirname) {
+function templete(lang, mainWindow, packaged, dir, dirname, frame) {
+    //フレーム
     if(lang !="ja" && lang != "en"){
         lang = "en"
     }
     const electron = require("electron");
+    const ipc = electron.ipcMain;
     const app = electron.app;
     const BrowserWindow = electron.BrowserWindow;
     const join = require('path').join;
+    ipc.on("frameCheck", function(e, arg) {
+		if(!frame) {
+            e.sender.webContents.send("frame", "");
+        }
+	});
     const dict = {
         "application": {
             "ja": "アプリケーション",

app/main/np.js

@@ -1,36 +1,36 @@
 function np(mainWindow) {
-    const electron = require("electron");
+	const electron = require('electron')
-    const join = require('path').join;
+	const ipc = electron.ipcMain
-    const app = electron.app;
+	ipc.on('itunes', async (e, args) => {
-    const fs = require("fs");
+		console.log('Access')
-    var ipc = electron.ipcMain;
+		if (args[0] == 'set') {
-    ipc.on('itunes', async (e, args) => {
+		} else {
-        //Verified on Windows
+			var platform = process.platform
-        console.log("Access");
+			var bit = process.arch
-        if (args[0] == "set") {
+			if (platform == 'darwin') {
-            
+				try {
-        } else {
+					const nowplaying = require('itunes-nowplaying-mac')
-            var platform = process.platform;
+					let value = await nowplaying()
-            var bit = process.arch;
+					try {
-            if (platform == "darwin") {
+						const artwork = await nowplaying.getThumbnailBuffer(value.databaseID)
-                try {
+						if(artwork) {
-                    const nowplaying = require("itunes-nowplaying-mac");
+							const base64 = artwork.toString('base64')
-                    let value = await nowplaying();
+							value.artwork = base64
-
+							e.sender.webContents.send('itunes-np', value)
-                    const artwork = await nowplaying.getThumbnailBuffer(value.databaseID);
+						}
-                    const base64 = artwork.toString('base64');
+					} catch (error) {
-                    value.artwork = base64
+						console.error(error)
-                    e.sender.webContents.send('itunes-np', value);
+						e.sender.webContents.send('itunes-np', value)
-                } catch (error) {
+					}
-                    // エラーを返す
+					
-                    console.error(error);
+				} catch (error) {
-                    e.sender.webContents.send('itunes-np', error);
+					console.error(error)
-                }
+					e.sender.webContents.send('itunes-np', error)
-            } else {
+				}
-                
+			} else {
-            }
+			}
-        }
+		}
-
+    })
-    });
+    
 }
-exports.TheDeskNowPlaying = np;
+exports.TheDeskNowPlaying = np

app/main/system.js

@@ -1,300 +1,303 @@
 function system(mainWindow, dir, lang, dirname) {
-	const electron = require("electron");
+	const electron = require('electron')
-	const app = electron.app;
+	const app = electron.app
-	const join = require("path").join;
+	const join = require('path').join
-	var Jimp = require("jimp");
+	var Jimp = require('jimp')
-	const fs = require("fs");
+	const fs = require('fs')
-	var JSON5 = require("json5");
+	var JSON5 = require('json5')
-	var ipc = electron.ipcMain;
+	var ipc = electron.ipcMain
-	const clipboard = electron.clipboard;
+	const clipboard = electron.clipboard
-	var tmp_img = join(app.getPath("userData"), "tmp.png");
+	var tmp_img = join(app.getPath('userData'), 'tmp.png')
-	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
-	var ua_path = join(app.getPath("userData"), "useragent");
+	var ua_path = join(app.getPath('userData'), 'useragent')
-	var lang_path = join(app.getPath("userData"), "language");
+	var lang_path = join(app.getPath('userData'), 'language')
-	var log_dir_path = join(app.getPath("userData"), "logs");
+	var log_dir_path = join(app.getPath('userData'), 'logs')
+	var frame_path = join(app.getPath('userData'), 'frame')
 	//ログ
-	var today = new Date();
+	var today = new Date()
 	//今日のやつ
-	var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	var todayStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 	//昨日のやつ
-	today.setDate(today.getDate() - 1);
+	today.setDate(today.getDate() - 1)
-	var yestStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	var yestStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 	//一昨日のやつ
-	today.setDate(today.getDate() - 1);
+	today.setDate(today.getDate() - 1)
-	var yest2Str = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	var yest2Str = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 
-	const BrowserWindow = electron.BrowserWindow;
+	const BrowserWindow = electron.BrowserWindow
-	const dialog = electron.dialog;
+	const dialog = electron.dialog
-	const os = require("os");
+	const os = require('os')
-	const language = require("../main/language.js");
+	const language = require('../main/language.js')
 	//プラットフォーム
-	ipc.on("getPlatform", function(e, arg) {
+	ipc.on('getPlatform', function (e, arg) {
 		try {
-			var gitHash = fs.readFileSync("git", "utf8");
+			var gitHash = fs.readFileSync('git', 'utf8')
 		} catch {
-			var gitHash = null;
+			var gitHash = null
 		}
-		e.sender.webContents.send("platform", [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash]);
+		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash])
-	});
+	})
 	//言語
-	ipc.on("lang", function(e, arg) {
+	ipc.on('lang', function (e, arg) {
-		console.log("set:" + arg);
+		console.log('set:' + arg)
-		fs.writeFileSync(lang_path, arg);
+		fs.writeFileSync(lang_path, arg)
-		e.sender.webContents.send("langres", arg);
+		e.sender.webContents.send('langres', arg)
-	});
+	})
 	//エクスポートのダイアログ
-	ipc.on("exportSettings", function(e, args) {
+	ipc.on('exportSettings', function (e, args) {
-		dialog.showSaveDialog(
+		let savedFiles = dialog.showSaveDialogSync(mainWindow, {
-			null,
+			title: 'Export',
-			{
+			properties: ['openFile', 'createDirectory'],
-				title: "Export",
+			defaultPath: 'export.thedeskconfig.json5',
-				properties: ["openFile", "createDirectory"],
+		})
-				defaultPath: "export.thedeskconfig.json5"
+		if (!savedFiles) {
-			},
+			return false
-			savedFiles => {
+		}
-				if (!savedFiles) {
+		e.sender.webContents.send('exportSettingsFile', savedFiles)
-					return false;
+	})
-				}
-				e.sender.webContents.send("exportSettingsFile", savedFiles);
-			}
-		);
-	});
 	//インポートのダイアログ
-	ipc.on("importSettings", function(e, args) {
+	ipc.on('importSettings', function (e, args) {
-		dialog.showOpenDialog(
+		let fileNames = dialog.showOpenDialogSync(mainWindow, {
-			null,
+			title: 'Import',
-			{
+			properties: ['openFile'],
-				title: "Import",
+			filters: [{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2', 'json5'] }],
-				properties: ["openFile"],
+		})
-				filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
+		console.log('imported from: ', fileNames)
-			},
+		if (!fileNames) {
-			fileNames => {
+			return false
-				if (!fileNames) {
+		}
-					return false;
+		e.sender.webContents.send('config', JSON5.parse(fs.readFileSync(fileNames[0], 'utf8')))
-				}
+	})
-				e.sender.webContents.send("config", JSON5.parse(fs.readFileSync(fileNames[0], "utf8")));
-			}
-		);
-	});
 	//保存フォルダのダイアログ
-	ipc.on("savefolder", function(e, args) {
+	ipc.on('savefolder', function (e, args) {
-		dialog.showOpenDialog(
+		let fileNames = dialog.showOpenDialogSync(
-			null,
+			mainWindow,
 			{
-				title: "Save folder",
+				title: 'Save folder',
-				properties: ["openDirectory"]
+				properties: ['openDirectory'],
-			},
-			fileNames => {
-				e.sender.webContents.send("savefolder", fileNames[0]);
 			}
-		);
+		)
-	});
+		e.sender.webContents.send('savefolder', fileNames[0])
+	})
 	//カスタムサウンドのダイアログ
-	ipc.on("customSound", function(e, arg) {
+	ipc.on('customSound', function (e, arg) {
-		dialog.showOpenDialog(
+		let fileNames = dialog.showOpenDialogSync(
-			null,
+			mainWindow,
 			{
-				title: "Custom sound",
+				title: 'Custom sound',
-				properties: ["openFile"],
+				properties: ['openFile'],
-				filters: [{ name: "Audio", extensions: ["mp3", "aac", "wav", "flac", "m4a"] }, { name: "All", extensions: ["*"] }]
+				filters: [
-			},
+					{ name: 'Audio', extensions: ['mp3', 'aac', 'wav', 'flac', 'm4a'] },
-			fileNames => {
+					{ name: 'All', extensions: ['*'] },
-				e.sender.webContents.send("customSoundRender", [arg, fileNames[0]]);
+				],
 			}
-		);
+		)
-	});
+		e.sender.webContents.send('customSoundRender', [arg, fileNames[0]])
+	})
 
 	//ハードウェアアクセラレーションの無効化
-	ipc.on("ha", function(e, arg) {
+	ipc.on('ha', function (e, arg) {
-		if (arg == "true") {
+		if (arg == 'true') {
-			fs.writeFileSync(ha_path, arg);
+			fs.writeFileSync(ha_path, arg)
 		} else {
-			fs.unlink(ha_path, function(err) {});
+			fs.unlink(ha_path, function (err) {})
 		}
-		app.relaunch();
+		app.relaunch()
-		app.exit();
+		app.exit()
-	});
+	})
-	ipc.on("ua", function(e, arg) {
+	//ユーザーエージェント
-		if (arg == "") {
+	ipc.on('ua', function (e, arg) {
-			fs.unlink(ua_path, function(err) {});
+		if (arg == '') {
+			fs.unlink(ua_path, function (err) {})
 		} else {
-			fs.writeFileSync(ua_path, arg);
+			fs.writeFileSync(ua_path, arg)
 		}
-		app.relaunch();
+		app.relaunch()
-		app.exit();
+		app.exit()
-	});
+	})
-
+	//フレームのありなし
-	ipc.on("quit", (e, args) => {
+	ipc.on('frameSet', function (e, arg) {
-		app.quit();
+		fs.writeFileSync(frame_path, arg)
-	});
+		app.relaunch()
-	ipc.on("about", (e, args) => {
+		app.exit()
-		about();
+	})
-	});
+	//スクリーンリーダー
+	ipc.on('acsCheck', function (e, arg) {
+		if (app.accessibilitySupportEnabled) {
+			mainWindow.webContents.send('accessibility', 'true')
+		}
+	})
+	ipc.on('quit', (e, args) => {
+		app.quit()
+	})
+	ipc.on('about', (e, args) => {
+		about()
+	})
 	function about() {
-		var ver = app.getVersion();
+		var ver = app.getVersion()
 		var window = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(dirname, "js", "platform", "preload.js")
+				preload: join(dirname, 'js', 'platform', 'preload.js'),
 			},
 			width: 300,
 			height: 500,
 			transparent: false, // ウィンドウの背景を透過
 			frame: false, // 枠の無いウィンドウ
-			resizable: false
+			resizable: false,
-		});
+		})
-		window.loadURL(dir + "/about.html?ver=" + ver);
+		window.loadURL(dir + '/about.html?ver=' + ver)
-		return "true";
+		return 'true'
 	}
-	ipc.on("nano", function(e, x, y) {
+	ipc.on('nano', function (e, x, y) {
-		var nano_info_path = join(app.getPath("userData"), "nano-window-position.json");
+		var nano_info_path = join(app.getPath('userData'), 'nano-window-position.json')
-		var window_pos;
+		var window_pos
 		try {
-			window_pos = JSON.parse(fs.readFileSync(nano_info_path, "utf8"));
+			window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'))
 		} catch (e) {
-			window_pos = [0, 0]; // デフォルトバリュー
+			window_pos = [0, 0] // デフォルトバリュー
 		}
 		var nanowindow = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(dirname, "js", "platform", "preload.js")
+				preload: join(dirname, 'js', 'platform', 'preload.js'),
 			},
 			width: 350,
 			height: 140,
 			transparent: false, // ウィンドウの背景を透過
 			frame: false, // 枠の無いウィンドウ
-			resizable: false
+			resizable: false,
-		});
+		})
-		nanowindow.loadURL(dir + "/nano.html");
+		nanowindow.loadURL(dir + '/nano.html')
-		nanowindow.setAlwaysOnTop(true);
+		nanowindow.setAlwaysOnTop(true)
 		//nanowindow.toggleDevTools()
-		nanowindow.setPosition(window_pos[0], window_pos[1]);
+		nanowindow.setPosition(window_pos[0], window_pos[1])
-		nanowindow.on("close", function() {
+		nanowindow.on('close', function () {
-			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
+			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()))
-		});
+		})
-		return true;
+		return true
-	});
+	})
-	var cbTimer1;
+	var cbTimer1
-	ipc.on("startmem", (e, arg) => {
+	ipc.on('startmem', (e, arg) => {
-		event = e.sender;
+		event = e.sender
-		cbTimer1 = setInterval(mems, 1000);
+		cbTimer1 = setInterval(mems, 1000)
-	});
+	})
 	function mems() {
-		var mem = os.totalmem() - os.freemem();
+		var mem = os.totalmem() - os.freemem()
 		if (mainWindow) {
-			event.webContents.send("memory", [mem, os.cpus()[0].model, os.totalmem()]);
+			event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()])
 		}
 	}
-	ipc.on("endmem", (e, arg) => {
+	ipc.on('endmem', (e, arg) => {
 		if (cbTimer1) {
-			clearInterval(cbTimer1);
+			clearInterval(cbTimer1)
 		}
-	});
+	})
 
-	ipc.on("export", (e, args) => {
+	ipc.on('export', (e, args) => {
-		fs.writeFileSync(args[0], JSON5.stringify(args[1]));
+		fs.writeFileSync(args[0], JSON5.stringify(args[1]))
-		e.sender.webContents.send("exportAllComplete", "");
+		e.sender.webContents.send('exportAllComplete', '')
-	});
+	})
 	//フォント
 	function object_array_sort(data, key, order, fn) {
 		//デフォは降順(DESC)
-		var num_a = -1;
+		var num_a = -1
-		var num_b = 1;
+		var num_b = 1
 
-		if (order === "asc") {
+		if (order === 'asc') {
 			//指定があれば昇順(ASC)
-			num_a = 1;
+			num_a = 1
-			num_b = -1;
+			num_b = -1
 		}
 
-		data = data.sort(function(a, b) {
+		data = data.sort(function (a, b) {
-			var x = a[key];
+			var x = a[key]
-			var y = b[key];
+			var y = b[key]
-			if (x > y) return num_a;
+			if (x > y) return num_a
-			if (x < y) return num_b;
+			if (x < y) return num_b
-			return 0;
+			return 0
-		});
+		})
 
 		//重複排除
-		var arrObj = {};
+		var arrObj = {}
 		for (var i = 0; i < data.length; i++) {
-			arrObj[data[i]["family"]] = data[i];
+			arrObj[data[i]['family']] = data[i]
 		}
 
-		data = [];
+		data = []
 		for (var key in arrObj) {
-			data.push(arrObj[key]);
+			data.push(arrObj[key])
 		}
 
-		fn(data); // ソート後の配列を返す
+		fn(data) // ソート後の配列を返す
 	}
-	ipc.on("fonts", (e, arg) => {
+	ipc.on('fonts', (e, arg) => {
-		const fm = require("font-manager");
+		var SystemFonts = require('system-font-families').default
-		var fonts = fm.getAvailableFontsSync();
+		var fm = new SystemFonts()
-		object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
+		const fontList = fm.getFontsSync()
-			e.sender.webContents.send("font-list", fonts_sorted);
+		e.sender.webContents.send('font-list', fontList)
-		});
+	})
-	});
 	//コピー
-	ipc.on("copy", (e, arg) => {
+	ipc.on('copy', (e, arg) => {
-		clipboard.writeText(arg);
+		clipboard.writeText(arg)
-	});
+	})
 	//ログ
-	ipc.on("log", (e, arg) => {
+	ipc.on('log', (e, arg) => {
-		var today = new Date();
+		var today = new Date()
-		var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate();
+		var todayStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate()
-		var log_path = join(log_dir_path, todayStr + ".log");
+		var log_path = join(log_dir_path, todayStr + '.log')
-		fs.appendFile(log_path, "\n" + arg, function(err) {
+		fs.appendFile(log_path, '\n' + arg, function (err) {
 			if (err) {
-				throw err;
+				throw err
 			}
-		});
+		})
-	});
+	})
-	ipc.on("getLogs", (e, arg) => {
+	ipc.on('getLogs', (e, arg) => {
-		var logs=""
+		var logs = ''
-		var todayLog=""
+		var todayLog = ''
-		var yestLog=""
+		var yestLog = ''
-		var yest2Log=""
+		var yest2Log = ''
-		fs.readdir(log_dir_path, function(err, files) {
+		fs.readdir(log_dir_path, function (err, files) {
-			if (err) throw err;
+			if (err) throw err
-			files.filter(function(file) {
+			files.filter(function (file) {
 				if (file == todayStr) {
-					todayLog=fs.readFileSync(join(log_dir_path, file), "utf8")
+					todayLog = fs.readFileSync(join(log_dir_path, file), 'utf8')
 				}
 				if (file == yestStr) {
-					yestLog=logs+fs.readFileSync(join(log_dir_path, file), "utf8")
+					yestLog = logs + fs.readFileSync(join(log_dir_path, file), 'utf8')
 				}
 				if (file == yest2Str) {
-					yest2Log=fs.readFileSync(join(log_dir_path, file), "utf8")
+					yest2Log = fs.readFileSync(join(log_dir_path, file), 'utf8')
 				}
-				logs = todayLog + yestLog + yest2Log;
+				logs = todayLog + yestLog + yest2Log
-			});
+			})
-			logs = yest2Log + yestLog + todayLog;
+			logs = yest2Log + yestLog + todayLog
-			e.sender.webContents.send("logData", logs);
+			e.sender.webContents.send('logData', logs)
-		});
+		})
-	});
+	})
+
 	//起動時ログディレクトリ存在確認と作成、古ログ削除
-	fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, error => {
+	fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, (error) => {
 		if (error) {
-			if (error.code === "ENOENT") {
+			if (error.code === 'ENOENT') {
-				fs.mkdirSync(log_dir_path);
+				fs.mkdirSync(log_dir_path)
 			} else {
-				return;
+				return
 			}
 		} else {
-			fs.readdir(log_dir_path, function(err, files) {
+			fs.readdir(log_dir_path, function (err, files) {
-				if (err) throw err;
+				if (err) throw err
-				files.filter(function(file) {
+				files.filter(function (file) {
 					if (file != todayStr && file != yestStr && file != yest2Str) {
-						fs.unlinkSync(join(log_dir_path, file));
+						fs.unlinkSync(join(log_dir_path, file))
 					}
-				});
+				})
-			});
+			})
 		}
-	});
+	})
 }
-exports.system = system;
+exports.system = system

app/manifest.json

@@ -0,0 +1,52 @@
+{
+  "name": "TheDesk",
+  "short_name": "TheDesk",
+  "theme_color": "#212121",
+  "background_color": "#212121",
+  "display": "standalone",
+  "Scope": "/",
+  "start_url": "/",
+  "icons": [
+    {
+      "src": "img/icons/icon-72x72.png",
+      "sizes": "72x72",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-96x96.png",
+      "sizes": "96x96",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-128x128.png",
+      "sizes": "128x128",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-144x144.png",
+      "sizes": "144x144",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-152x152.png",
+      "sizes": "152x152",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-384x384.png",
+      "sizes": "384x384",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "splash_pages": null
+}

app/maxim.ja.json

@@ -0,0 +1,54 @@
+[
+    "TheDeskは自称ステイホームの必須アイテム",
+    "あと数秒でPCのファンが全力で回り始める",
+    "カラムの数だけ夢があるがネットワークは逼迫する",
+    "朝起きたらストリーミングが止まっていた…",
+    "誰も使ってない機能1: 未読管理",
+    "誰も使ってない機能2: スタンプ機能",
+    "誰も使ってない機能3: コードセットアップをオフにしたログイン",
+    "誰も使ってない機能4: TheDesk上でのプロフィール更新",
+    "誰も使ってない機能5: フォローレコメンデーション",
+    "TheDeskは重い(ダブルミーニング)",
+    "今日も生茶が美味しい(4ケース96本の在庫)",
+    "jQueryは死すべき(流れ弾)",
+    "なんでTheDeskのバージョン19は無いの？",
+    "デレマス要素なくない？",
+    "今日も「TheDesk」でエゴサが捗る",
+    "開発者はTheDeskのヘビーユーザではない",
+    "アイコンは猫だが開発者は犬派",
+    "#TheDeskのアイコンは猫虐待",
+    "上のアニメーションからしてこの猫は完全に仮想化されている",
+    "TheDeskの歴史は2016年まで遡ることができる",
+    "WIP: Croudia, ネコ型SNS",
+    "リリース間隔は平均1桁日(昔1日に6回アプデを提供したせい)",
+    "node_modulesをignoreせずに上げてしまったせいでCode Frequencyが破壊された",
+    "TheDesk XSS Hunt をしなければならない()",
+    "毎月出る支援お願いしますダイアログで月初めを知る人 #いろいろな人",
+    "Integrated TLは目玉機能なので消せないが消せるものなら消したいくらい内部構造がヤバい",
+    "「アンケート」か「投票」か。「時間指定投稿」か「予約投稿」か",
+    "実装当初は言語を「関西弁」にするとお問い合わせフォームまで関西弁だった",
+    "Ctrl+Kでメニューが出ます",
+    "検索ボックスは入力後Enterで確定できる",
+    "開発者の推しカラーテーマはPolar Night",
+    "TheDeskのユーザーエージェントは毎回起動時に変わります。TheDeskと確定させることはできません",
+    "AppData/Roaming/TheDesk(Windows)の中にcutsom.cssを入れるとカスタムCSSを導入できます",
+    "環境設定の「ウィンドウフレーム」は「オフ」がおすすめ",
+    "各トゥートの右上の時刻表示を押すとトゥートのリンクがコピーされます",
+    "各トゥートの左下の公開範囲のアイコンを押すとそのトゥートの本文がコピーされますが挙動にバグがあります",
+    "TheDeskをMisskeyクライアントだと思って使ってはいけません",
+    "この迷文を追加したい場合はapp/maxim.ja.jsonを編集",
+    "本当はTheDesk 21.0.0(Mayu)専用のアイコンを用意していた",
+    "TheDesk 20.x.xと21.x.xではアイコンがちょっと違う",
+    "三大見てはいけないもの: TheDeskのコード、TheDeskのDevTool console、あと一つは？",
+    "この画面がずっと出続けているのは多分yarn construct忘れてる",
+    "たまにここに何も出ないことがあるけど、なんでかはわからない",
+    "Kawaii->Mayu(今ここ)->Koume->Chieri->Anastasia->Aiko",
+    "言語設定を日本語以外にするとこの表示はどうなると思う？",
+    "今日も使ってくれてありがとう。利用者カウンターがキリ番ならご報告を",
+    "Ctrl+Eで通知の赤くなって「Fav: 1」とかなってるのをリセットできる",
+    "このアプリケーションの正式な名称は小文字thedeskだけど、内部でしか使われてない",
+    "N押すとトゥートのボックスが出て、すぐ打ち込める。",
+    "Xを押すとトゥートのボックスは出るけど、打ち込めない。その代わりもう一度押すと消せる。",
+    "トゥートした後ボックスを閉じるとかそのままにしておくとかは、設定で変えられます。",
+    "OpenStickerへの登録データ募集中"
+    ]

app/nano.html

@@ -128,7 +128,7 @@
 			</select>
 		</div>
 		<button onclick="set()" id="setting">Setting</button>
-		<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post someyhing new"></textarea>
+		<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post something new"></textarea>
 		<button class="btn" onclick="post()">Post</button>
 		<button onclick="window.close()">x</button><br />
 		<div id="timeline_nano">Click "settings" to show TL</div>

app/netlify.toml

@@ -0,0 +1,5 @@
+[[redirects]]
+  from = "/"
+  to = "/app"
+  status = 301
+  force = true

app/opening.html

@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html lang="ja">
+	<head>
+		<title>TheDesk</title>
+		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<meta charset="utf-8" />
+		<style>
+			@font-face {
+				font-family: 'Open Sans';
+				font-style: normal;
+				font-weight: 300;
+				src: local('Open Sans Light'), local('OpenSans-Light'), url('./fonts/OpenSans-Light.ttf') format('truetype');
+			}
+			body {
+				font-family: 'Open Sans';
+				-webkit-app-region: drag;
+				cursor: move;
+				padding: 5px;
+				padding-top: 15px;
+				background-color: #222222;
+				color: white;
+				text-align: center;
+			}
+			.loading {
+				animation: throbber-loader 1000ms 300ms infinite ease-out;
+				background: #3d3d3d;
+				display: inline-block;
+				position: relative;
+				text-indent: -9999px;
+				width: 0.9em;
+				height: 0.9em;
+				margin: 0 .9em;
+			}
+			.loading:before,
+			.loading:after {
+				background: #3d3d3d;
+				content: '\x200B';
+				display: inline-block;
+				width: 0.9em;
+				height: 0.9em;
+				position: absolute;
+				top: 0;
+			}
+			.loading:before {
+				animation: throbber-loader 1000ms 150ms infinite ease-out;
+				left: -1.9em;
+			}
+			.loading:after {
+				animation: throbber-loader 1000ms 450ms infinite ease-out;
+				right: -1.9em;
+			}
+			@keyframes throbber-loader {
+				0% {
+					background: #3d3d3d;
+				}
+				10% {
+					background: #6b9dc8;
+				}
+				40% {
+					background: #3d3d3d;
+				}
+			}
+
+			a,
+			button {
+				-webkit-app-region: no-drag;
+			}
+			h1 {
+				margin: 0;
+            }
+            #maxim {
+                font-size: 0.7rem;
+            }
+		</style>
+	</head>
+
+	<body class="center" style="overflow: hidden;">
+		<img src="./img/desk-animation.svg" style="max-width: 62%;" />
+		<h1>TheDesk</h1>
+		<span id="ver"></span><br />
+		<span class="loading"></span><br />
+		<div class="cp">
+			<span id="maxim"></span><br />
+			<script>
+				if (location.search) {
+					var m = location.search.match(/\?ver=([0-9.]+)&codename=([a-zA-Z]+)&maxim=(.+)/)
+					var ver = m[1]
+					var code = m[2]
+					var maxim = m[3]
+					document.getElementById('ver').innerText = `${ver}(${code})`
+					document.getElementById('maxim').innerText = `${decodeURI(maxim)}`
+				}
+			</script>
+		</div>
+	</body>
+</html>

app/package.json

@@ -1,128 +1,130 @@
 {
-  "name": "thedesk",
+    "name": "thedesk",
-  "version": "20.0.4",
+    "version": "21.0.5",
-  "description": "TheDesk is a Mastodon client for PC.",
+    "codename": "Mayu",
-  "repository": "https://github.com/cutls/TheDesk",
+    "description": "TheDesk is a Mastodon client for PC.",
-  "main": "main.js",
+    "repository": "https://github.com/cutls/TheDesk",
-  "scripts": {
+    "main": "main.js",
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "scripts": {
-    "construct": "cd view/make && node make --automatic && cd ../../",
+        "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "electron ./ --dev",
+        "construct": "cd view/make && node make --automatic && cd ../../",
-    "dist": "build --linux snap",
+        "dev": "npx electron ./ --dev",
-    "watchview": "node view/make/make.js --automatic --watch",
+        "dist": "build --linux snap",
-    "build:js": "node build.js",
+        "watchview": "node view/make/make.js --automatic --watch",
-    "build": "electron-builder",
+        "build:js": "node build.js",
-    "build:all": "electron-builder --win --linux",
+        "build": "node view/make/make.js --automatic && npx electron-builder",
-    "build:win": "electron-builder --win"
+        "build:all": "npx electron-builder --win --linux",
-  },
+        "build:win": "npx electron-builder --win",
-  "keywords": [
+        "build:pwa": "node view/make/make.js --automatic --pwa"
-    "mastodon",
-    "client",
-    "electron",
-    "thedesk"
-  ],
-  "bugs": {
-    "url": "https://github.com/cutls/TheDesk/issues",
-    "email": "web-pro@cutls.com"
-  },
-  "homepage": "https://thedesk.top",
-  "author": {
-    "name": "Cutls",
-    "url": "https://cutls.com/@Cutls",
-    "email": "web-pro@cutls.com"
-  },
-  "contributor": [
-    {
-      "name": "とねぢ",
-      "url": "https://minohdon.jp/@toneji",
-      "email": "solfa.tono@gmail.com"
     },
-    {
+    "keywords": [
-      "name": "ぽぷんじゃ",
+        "mastodon",
-      "url": "https://popon.pptdn.jp/@popn_ja",
+        "client",
-      "email": "popn.ja@gmail.com"
+        "electron",
-    },
+        "thedesk"
-    {
-      "name": "kPherox",
-      "url": "https://pl.kpherox.dev/kPherox",
-      "email": "admin@mail.kr-kp.com"
-    }
-  ],
-  "license": "GPL-3.0",
-  "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.11.2",
-    "electron-dl": "^1.14.0",
-    "jimp": "^0.8.4",
-    "jquery": "^3.4.1",
-    "jquery-ui-dist": "^1.12.1",
-    "materialize-css": "git://github.com/cutls/materialize",
-    "json5": "^2.1.1",
-    "lodash": "^4.17.15",
-    "sumchecker": "^3.0.0",
-    "sweetalert2": "^9.3.10",
-    "vue": "^2.6.10"
-  },
-  "optionalDependencies": {
-    "font-manager": "0.3.0",
-    "itunes-nowplaying-mac": "0.3.1"
-  },
-  "devDependencies": {
-    "chokidar": "^3.3.0",
-    "electron": "^7.1.1",
-    "electron-builder": "^22.1.0",
-    "electron-rebuild": "^1.8.6",
-    "readline-sync": "1.4.10"
-  },
-  "build": {
-    "productName": "TheDesk",
-    "appId": "top.thedesk",
-    "asarUnpack": [
-      "node_modules/itunes-nowplaying-mac"
     ],
-    "directories": {
+    "bugs": {
-      "output": "../build"
+        "url": "https://github.com/cutls/TheDesk/issues",
+        "email": "p@cutls.com"
     },
-    "win": {
+    "homepage": "https://thedesk.top",
-      "icon": "build/thedesk.ico",
+    "author": {
-      "target": [
+        "name": "Cutls",
-        "nsis",
+        "url": "https://cutls.dev",
-        "portable",
+        "email": "p@cutls.com"
-        "appx"
-      ]
     },
-    "appx": {
+    "contributor": [{
-      "identityName": "53491Cutls.TheDesk",
+            "name": "とねぢ",
-      "applicationId": "Cutls.TheDesk",
+            "url": "https://minohdon.jp/@toneji",
-      "publisherDisplayName": "Cutls",
+            "email": "solfa.tono@gmail.com"
-      "publisher": "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+        },
-      "languages": [
+        {
-        "JA-JP",
+            "name": "ぽぷんじゃ",
-        "EN-US"
+            "url": "https://popon.pptdn.jp/@popn_ja",
-      ]
+            "email": "popn.ja@gmail.com"
+        },
+        {
+            "name": "kPherox",
+            "url": "https://pl.kpherox.dev/kPherox",
+            "email": "admin@mail.kr-kp.com"
+        }
+    ],
+    "license": "GPL-3.0",
+    "dependencies": {
+        "@fortawesome/fontawesome-free": "^5.14.0",
+        "custom-electron-titlebar": "^3.2.3",
+        "electron-dl": "^3.0.1",
+        "jimp": "^0.14.0",
+        "jquery": "^3.5.1",
+        "jquery-ui-dist": "^1.12.1",
+        "json5": "^2.1.3",
+        "lodash": "^4.17.19",
+        "materialize-css": "git://github.com/cutls/materialize#v1-dev",
+        "sumchecker": "^3.0.1",
+        "sweetalert2": "^9.17.0",
+        "system-font-families": "^0.4.1",
+        "vue": "^2.6.11"
     },
-    "nsis": {
+    "optionalDependencies": {
-      "oneClick": false,
+        "itunes-nowplaying-mac": "0.3.1"
-      "allowToChangeInstallationDirectory": true,
-      "artifactName": "TheDesk-setup.${ext}"
     },
-    "linux": {
+    "devDependencies": {
-      "icon": "build/icons",
+        "chokidar": "^3.4.1",
-      "target": [
+        "electron": "^9.1.1",
-        "zip",
+        "electron-builder": "^22.7.0",
-        "snap",
+        "electron-rebuild": "^1.11.0",
-        "deb"
+        "readline-sync": "1.4.10"
-      ],
-      "category": "Network"
     },
-    "mac": {
+    "build": {
-      "target": [
+        "productName": "TheDesk",
-        "dmg",
+        "appId": "top.thedesk",
-        "zip"
+        "asarUnpack": [
-      ]
+            "node_modules/itunes-nowplaying-mac"
-    },
+        ],
-    "electronDownload": {
+        "directories": {
-      "version": "6.0.0"
+            "output": "../build"
-    },
+        },
-    "electronVersion": "6.0.0"
+        "win": {
-  }
+            "icon": "build/thedesk.ico",
-}
+            "target": [
+                "nsis",
+                "portable",
+                "appx"
+            ]
+        },
+        "appx": {
+            "identityName": "53491Cutls.TheDesk",
+            "applicationId": "Cutls.TheDesk",
+            "publisherDisplayName": "Cutls",
+            "publisher": "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+            "languages": [
+                "JA-JP",
+                "EN-US"
+            ]
+        },
+        "nsis": {
+            "oneClick": false,
+            "allowToChangeInstallationDirectory": true,
+            "artifactName": "TheDesk-setup.${ext}"
+        },
+        "linux": {
+            "icon": "build/icons",
+            "target": [
+                "zip",
+                "snap",
+                "deb"
+            ],
+            "category": "Network"
+        },
+        "mac": {
+            "target": [
+                "dmg",
+                "zip"
+            ]
+        },
+        "electronDownload": {
+            "version": "9.0.5"
+        },
+        "electronVersion": "9.0.5"
+    }
+}

app/source/version.json

@@ -1,5 +1,18 @@
 {
   "latest":[],
+  "3.1.4": [
+    "リモート限定の連合タイムライン"
+  ],
+  "3.1.3": [],
+  "3.1.2": [],
+  "3.1.1": [],
+  "3.1.0": [
+    "ブックマーク機能",
+    "お知らせ機能",
+    "プロフィールをワードフィルターする",
+    "フォローリクエストが通知に表示される"
+  ],
+  "3.0.1": [],
   "3.0.0": [
     "プロフィールディレクトリの表示",
     "ホワイトリスト式のトレンドタグ(3.0の機能)",

app/sw.pwa.js

@@ -0,0 +1,2 @@
+//PWA用
+self.addEventListener('fetch', function(e) {})

app/view/make/acct.sample.html

@@ -1,178 +1,154 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="@@lang@@">
+	<head>
+		<title>Account Manager - TheDesk</title>
+		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<link
+			href="../../@@node_base@@/materialize-css/dist/css/materialize.css"
+			type="text/css"
+			rel="stylesheet"
+		/>
+		<link href="../../css/themes.css" type="text/css" rel="stylesheet" />
+		<link href="../../css/master.css" type="text/css" rel="stylesheet" />
+		<link href="../../css/tl.css" rel="stylesheet" type="text/css" />
+		<link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
+		<link
+			href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css"
+			type="text/css"
+			rel="stylesheet"
+		/>
+		<link href="../../css/acct.css" rel="stylesheet" type="text/css" />
+		<meta charset="utf-8" />
+		@@comment-start@@
+		<script type="text/javascript">
+			var _jipt = []
+			_jipt.push(['project', 'thedesk'])
+		</script>
+		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+		@@comment-end@@
+		@@pwa@@
+	</head>
 
-<head>
+	<body id="mainView" class="@@pwaClass@@">
-      <title>Account Manager - TheDesk</title>
+		<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
-      <meta content="width=device-width,initial-scale=1.0" name="viewport">
+		<script type="text/javascript" src="../../js/platform/first.js"></script>
-      <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
+		<script
-      <link href="../../css/themes.css" type="text/css" rel="stylesheet">
+			type="text/javascript"
-      <link href="../../css/master.css" type="text/css" rel="stylesheet">
+			src="../../@@node_base@@/materialize-css/dist/js/materialize.js"
-      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+		></script>
-      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+		<script type="text/javascript" src="main.js"></script>
-      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
+		<script
-      <style>
+			type="text/javascript"
-            .acct {
+			src="../../@@node_base@@/sweetalert2/dist/sweetalert2.all.min.js"
-                  display: flex;
+		></script>
-                  justify-content: space-around;
+		<script>
-            }
+			var misskeytoken = false
-
+		</script>
-            .card {
+		<script type="text/javascript" src="../../js/common/time.js"></script>
-                  width: 400px;
+		<div class="hide-first">
-                  background-color: #9e9e9e;
+			<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"
-                  margin: 10px;
+				>@@back@@</a
-            }
+			><br />
-
+			<h5>@@list@@</h5>
-            body,
+			<div id="acct-list"></div>
-            html {
+			<div class="divider"></div>
-                  overflow-y: scroll;
+		</div>
-            }
+		<div class="hide-second">
-
+			<a href="setting.html">@@haveExported@@</a>
-            #acct-list {
+		</div>
-                  display: flex;
+		<div>
-                  flex-wrap: wrap;
+			<h5>@@add@@</h5>
-                  color: white;
+			<br />
-                  align-items: flex-start
+			<div id="add">
-            }
+				<div class="row">
-
+					<div class="col s8">
-            .lts {
+						@@addAcct@@<br />
-                  font-size: 150%
+						<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
-            }
+						<div id="ins-suggest"></div>
-
+						<button class="btn waves-effect" onclick="instance()">Login</button><br />
-            .colorsel {
+						<div class="pwa">
-                  display: flex;
+							@@codesetupwarn@@<br />
-            }
+							<label>
-
+								<input type="checkbox" class="filled-in" id="linux" />
-            .card .colorsel div:not(.exc) {
+								<span>@@codesetup@@</span>
-                  width: 20px;
+							</label>
-                  height: 20px;
+							<br />
-            }
+						</div>
-
+						<label>
-            .card .colorsel div.exc {
+							<input type="checkbox" class="filled-in" id="misskey" />
-                  width: 40px;
+							<span>@@thisismisskey@@</span> </label
-                  height: 20px;
+						><br />
-            }
+					</div>
-
+					<div class="col s4 scr" aria-hidden="true">
-            .first {
+						<span style="font-family:Open Sans;">Supports</span>
-                  display: flex;
+						<div id="support" class="collection transparent"></div>
-                  justify-content: center;
+					</div>
-                  align-items: center
+				</div>
-            }
+			</div>
-
+			<div id="auth" style="display:none">
-            .first .hide-first {
+				@@codepastewarn@@<br />
-                  display: none;
+				<input type="text" id="code" placeholder="@@codepaste@@" required />
-            }
+				<button class="btn waves-effect" onclick="code()">Auth</button><br />
-
+				<br />
-            #compt {
+				<a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
-                  margin-top: 20px;
+				<div id="compt" style="display:none" class="scr">
-                  margin-bottom: 50px;
+					<h5>ログイン前に必ずご確認ください</h5>
-                  border: 1px solid;
+					<span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span
-                  border: 1px solid;
+					>のため以下の機能がご利用いただけません。
-                  padding: 5px;
+					<span id="compt-warn" style="display:none"
-            }
+						>また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span
-
+					>
-            #compt li {
+					<ul id="compt-list"></ul>
-                  list-style-type: disc;
+				</div>
-                  margin-left: 20px;
+			</div>
-            }
+			<div id="misskeylogin" style="display:none">
-      </style>
+				<h5>AppSecret</h5>
-      <meta charset="utf-8">
+				@@misskeylogin@@<br />
-      @@comment-start@@
+				<input type="hidden" id="misskey-url" />
-      <script type="text/javascript">
+				<input type="text" id="misskey-key" placeholder="@@codepaste@@" required />
-            var _jipt = [];
+				<button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br />
-            _jipt.push(['project', 'thedesk']);
+				<br />
-      </script>
+				<a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
-      <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+			</div>
-      @@comment-end@@
+		</div>
-</head>
+		<div class="hide-first">
-
+			<h5>@@mainacct@@</h5>
-<body id="mainView">
+			<div class="input-field" style="width:300px">
-      <script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
+				<span data-trans="your_acct">@@selacct@@</span>
-      <script type="text/javascript" src="../../js/platform/first.js"></script>
+				<br />
-      <script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
+				<select
-      <script type="text/javascript" src="main.js"></script>
+					id="main-acct-sel"
-      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
+					class="acct-sel"
-      <script>
+					style="color:black"
-            var misskeytoken = false;
+					onchange="mainacct()"
-      </script>
+				></select>
-      <script type="text/javascript" src="../../js/common/time.js"></script>
+				<label></label>
-      <div class="hide-first">
+			</div>
-            <a href="index.html" class="btn waves-effect orange nex"
+			<ul id="domain-list" class="collection transparent"></ul>
-                  style="width:100%; max-width:200px;">@@back@@</a><br>
+			<div id="instance-data">
-            <h5>@@list@@</h5>
+				Some instance data by
-            <div id="acct-list"></div>
+				<a href="https://instances.social" target="_blank">instances.social API</a><br />
-            <div class="divider"></div>
+				<h5 id="ins-title"></h5>
-      </div>
+				Administered by:<a id="ins-admin"></a><br />
-      <div>
+				<span id="ins-desc"></span><br />
-            <h5>@@add@@</h5><br>
+				<img src="../../img/loading.svg" id="ins-prof" width="200" /><br />
-            <div id="add">
+				<br />
-                  <div class="row">
+				@@domain@@:<span id="ins-name"></span><br />
-                        <div class="col s8">
+				@@connect@@:<span id="ins-connect"></span>@@ko@@<br />
-                              <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
+				@@toots@@:<span id="ins-toot"></span>@@ko@@<br />
-                              <div id="ins-suggest"></div>
+				@@users@@:<span id="ins-user"></span>@@users@@<br />
-                              @@codesetupwarn@@<br>
+				@@safety@@:<span id="ins-per"></span>%<br />
-                              <label>
+				@@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br />
-                                    <input type="checkbox" class="filled-in" id="linux" />
+			</div>
-                                    <span>@@codesetup@@</span>
+		</div>
-                              </label>
+		<script type="text/javascript" src="../../js/ui/theme.js"></script>
-                              <br>
+		<script type="text/javascript" src="../../js/ui/tips.js"></script>
-                              <label>
+		<script type="text/javascript" src="../../js/platform/end.js"></script>
-                                    <input type="checkbox" class="filled-in" id="misskey" />
+		<script type="text/javascript" src="../../js/common/sha256.js"></script>
-                                    <span>@@thisismisskey@@</span>
+		<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
-                              </label><br>
+		<script type="text/javascript" src="../../js/login/instance.js"></script>
-                              <button class="btn waves-effect" onclick="instance()">Login</button><br>
+		<script type="text/javascript" src="../../js/login/manager.js"></script>
-                        </div>
+		<script type="text/javascript" src="../../js/tl/date.js"></script>
-                        <div class="col s4">
+		<script>$('body').addClass(localStorage.getItem('platform'))</script>
-                              <span style="font-family:Open Sans;">Supports</span>
+	</body>
-                              <div id="support" class="collection transparent"></div>
+</html>
-                        </div>
-                  </div>
-            </div>
-            <div id="auth" style="display:none">
-                  @@codepastewarn@@<br>
-                  <input type="text" id="code" placeholder="@@codepaste@@" required>
-                  <button class="btn waves-effect" onclick="code()">Auth</button><br>
-                  <br>
-                  <a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
-                  <div id="compt" style="display:none">
-                        <h5>ログイン前に必ずご確認ください</h5>
-                        <span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span>のため以下の機能がご利用いただけません。
-                        <span id="compt-warn" style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span>
-                        <ul id="compt-list"></ul>
-                  </div>
-            </div>
-            <div id="misskeylogin" style="display:none">
-                  <h5>AppSecret</h5>
-                  @@misskeylogin@@<br>
-                  <input type="hidden" id="misskey-url">
-                  <input type="text" id="misskey-key" placeholder="@@codepaste@@" required>
-                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
-                  <br>
-                  <a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
-            </div>
-      </div>
-      <div class="hide-first">
-            <h5>@@mainacct@@</h5>
-            <div class="input-field" style="width:300px"><span data-trans="your_acct">@@selacct@@</span>
-                  <br>
-                  <select id="main-acct-sel" class="acct-sel" style="color:black" onchange="mainacct()"></select>
-                  <label></label>
-            </div>
-            Some instance data by <a href="https://instances.social" target="_blank">instances.social API</a><br>
-            <h5 id="ins-title"></h5>
-            Administered by:<a id="ins-admin"></a><br>
-            <span id="ins-desc"></span><br>
-            <img src="../../img/loading.svg" id="ins-prof" width="200"><br>
-            <br>
-            @@domain@@:<span id="ins-name"></span><br>
-            @@connect@@:<span id="ins-connect"></span>@@ko@@<br>
-            @@toots@@:<span id="ins-toot"></span>@@ko@@<br>
-            @@users@@:<span id="ins-user"></span>@@users@@<br>
-            @@safety@@:<span id="ins-per"></span>%<br>
-            @@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
-      </div>
-      <script type="text/javascript" src="../../js/ui/theme.js"></script>
-      <script type="text/javascript" src="../../js/platform/end.js"></script>
-      <script type="text/javascript" src="../../js/common/sha256.js"></script>
-      <script type="text/javascript" src="../../js/login/instance.js"></script>
-      <script type="text/javascript" src="../../js/login/manager.js"></script>
-      <script type="text/javascript" src="../../js/tl/date.js"></script>

app/view/make/language/af-ZA/acct.json

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",
@@ -19,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/af-ZA/index.json

@@ -1,6 +1,8 @@
 {
     "draghere": "Drag here to upload",
     "close": "Close",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Show profile of the selecting account",
     "closethisbox": "Close this box",
     "toot": "Toot",
@@ -9,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -73,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",
@@ -136,6 +139,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",
@@ -168,15 +172,17 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
+    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
+    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

app/view/make/language/af-ZA/main.json

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -59,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -66,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -86,8 +91,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
-    "lang_cards_trasted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
-    "lang_cards_untransted": "Untrusted embed HTML by TheDesk",
+    "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
     "lang_details_nodata": "No data",
     "lang_details_filtered": "Filtered toot",
     "lang_details_embed": "Embed HTML is cliped.",
@@ -122,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -137,6 +143,8 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -153,10 +161,12 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -164,6 +174,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",
@@ -177,7 +188,7 @@
     "lang_parse_direct": "Direct",
     "lang_parse_clickcopy": "Click to copy text of this toot",
     "lang_parse_clickcopyurl": "Click to copy URL of this toot",
-    "lang_parse_trans": "Translate to Japanese",
+    "lang_parse_trans": "Translate to English",
     "lang_parse_replyto": "Reply to this toot",
     "lang_parse_bt": "Boost this toot",
     "lang_parse_fav": "Favourite this toot",
@@ -192,21 +203,25 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "Voted",
+    "lang_parse_voted": "(Voted)",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/af-ZA/setting.json

@@ -4,18 +4,21 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
+  "show": "Show",
+  "hide": "Hide",
   "default": "Default",
   "change": "Change",
   "select": "Select",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -94,7 +102,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
@@ -137,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",
@@ -157,12 +167,15 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

app/view/make/language/ar-SA/acct.json

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",
@@ -19,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/ar-SA/index.json

@@ -1,6 +1,8 @@
 {
     "draghere": "Drag here to upload",
     "close": "Close",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Show profile of the selecting account",
     "closethisbox": "Close this box",
     "toot": "Toot",
@@ -9,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -73,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",
@@ -136,6 +139,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",
@@ -168,15 +172,17 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
+    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
+    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

app/view/make/language/ar-SA/main.json

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -59,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -66,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -86,8 +91,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
-    "lang_cards_trasted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
-    "lang_cards_untransted": "Untrusted embed HTML by TheDesk",
+    "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
     "lang_details_nodata": "No data",
     "lang_details_filtered": "Filtered toot",
     "lang_details_embed": "Embed HTML is cliped.",
@@ -122,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -137,6 +143,8 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -153,10 +161,12 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -164,6 +174,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",
@@ -177,7 +188,7 @@
     "lang_parse_direct": "Direct",
     "lang_parse_clickcopy": "Click to copy text of this toot",
     "lang_parse_clickcopyurl": "Click to copy URL of this toot",
-    "lang_parse_trans": "Translate to Japanese",
+    "lang_parse_trans": "Translate to English",
     "lang_parse_replyto": "Reply to this toot",
     "lang_parse_bt": "Boost this toot",
     "lang_parse_fav": "Favourite this toot",
@@ -192,21 +203,25 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "Voted",
+    "lang_parse_voted": "(Voted)",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/ar-SA/setting.json

@@ -4,18 +4,21 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
+  "show": "Show",
+  "hide": "Hide",
   "default": "Default",
   "change": "Change",
   "select": "Select",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -94,7 +102,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
@@ -137,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",
@@ -157,12 +167,15 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

app/view/make/language/bg-BG/acct.json

@@ -2,6 +2,7 @@
     "list": "Списък на профилите",
     "back": "Назад",
     "add": "Добавяне на профил",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Премахнете отметката за да пропуснете влизането с код. (Вход в Mastodon от Windows или macOS) (Препоръчително: pcheck)",
     "codesetup": "Настройка на код",
     "mainacct": "Основен профил",
@@ -19,5 +20,6 @@
     "thisismisskey": "Влезте като Misskey",
     "misskeylogin": "Прочетете <a href=\"https://thedesk.top/how-to-misskey-login.html\">Документацията</a>, за да влезете в Misskey.",
     "nodata": "Няма данни",
-    "accessTokenSetup": "Използвайте маркера за достъп и вход (щракнете след попълване, но не код, а знак за достъп в поле: Разширено)"
+    "accessTokenSetup": "Използвайте маркера за достъп и вход (щракнете след попълване, но не код, а знак за достъп в поле: Разширено)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/bg-BG/index.json

@@ -1,6 +1,8 @@
 {
     "draghere": "Плъзнете тук за да качите",
     "close": "Затвори",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Показване на профила на избрания акаунт",
     "closethisbox": "Затвори полето",
     "toot": "Тоот",
@@ -9,8 +11,6 @@
     "cwDes": "Скриване на текста зад предупреждение",
     "selfile": "Прикачи..",
     "insertEmoji": "Емотикони",
-    "NPSpotify": "Възпроизвеждане сега (Spotify)",
-    "NPiTunes": "Възпроизвеждане сега (macOS)",
     "schedule": "Планиран тоот",
     "postat": "Публикация в",
     "scheduleWarn": "2.7.0 ~ Минимален интервал от време:5мин. (часовникът на сървъра може да не е точен.)",
@@ -20,6 +20,8 @@
     "yes": "Да",
     "temp": "Прикачени файлове",
     "nothing": "Няма",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Регулирайте поверителността на състоянието",
     "cwtext": "Текст за предупреждение",
     "selectVis": "Регулирайте поверителността на състоянието",
@@ -73,6 +75,7 @@
     "toots": "Тоот",
     "follow": "Следвам",
     "follower": "Последователи",
+    "utlColumn": "Show as a column",
     "timeline": "Времева линия",
     "operateOtherAcct": "Свързан-профил",
     "list": "Списък",
@@ -125,7 +128,7 @@
     "integratedTLDes": "Интегриране (Местно/Начало)",
     "localPlusDes": "LTL+Отговор+BT",
     "notf": "Известия",
-    "bookmark": "Bookmarks",
+    "bookmark": "Отметки",
     "showThisTL": "Показване на този TL:",
     "webviewWarn": "TweetDeck с потребителски TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Код</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Клавишните комбинации ще ви дразнят. Когато се почувствате така, маркирате „Предпочитам WebView“ в горната част на колоната.",
     "add": "Добави",
@@ -136,6 +139,7 @@
     "filterWord": "Филтриране на думи",
     "degree": "Контекстно филтриране",
     "conver": "Разговори",
+    "prof": "Profiles",
     "option": "Настройки",
     "matchWord": "Цяла дума",
     "warnMatchWord": "Ница на латински език",
@@ -168,15 +172,17 @@
     "contactwithlog": "Ако ми кажете за грешки (нещо не работи или подобно) с този дневник, мога по-лесно да открия какво не е наред.",
     "about": "За TheDesk",
     "hereAddColumns": "<- Добави ТЛ",
+    "foundBug": "Намерена е грешка",
     "show": "Покажи",
     "directory": "Директория",
     "active": "Наскоро активен",
     "newcomer": "Новодошли",
     "local_only": "Само местно",
+    "menu": "Menu",
     "demoBottomBtns": "Ръководство за добре дошли",
     "lookAtBottom": "Погледнете в края на този прозорец. Ето няколко съвета за това.",
     "acctManDesc": "Добавете още акаунти и излезте от тях.",
     "settingDesc": "Много. много предпочитания са тук. Няма да можете да ги проверите всички!",
     "nanoDescPlus": "Клиент мини прозорец (експериментално)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

app/view/make/language/bg-BG/main.json

@@ -21,17 +21,17 @@
     "lang_time_suffixAgo": null,
     "lang_time_suffixFromNow": null,
     "lang_time_inPast": null,
-    "lang_time_seconds": "%d s",
+    "lang_time_seconds": "%d сек.",
-    "lang_time_minute": "1 m",
+    "lang_time_minute": "1 мин.",
-    "lang_time_minutes": "%d m",
+    "lang_time_minutes": "%d мин.",
-    "lang_time_hour": "1 h",
+    "lang_time_hour": "1 ч",
-    "lang_time_hours": "%d h",
+    "lang_time_hours": "%d ч",
-    "lang_time_day": "1 d",
+    "lang_time_day": "1 ден",
-    "lang_time_days": "%d d",
+    "lang_time_days": "%d дни",
-    "lang_time_month": "1 month",
+    "lang_time_month": "1 месец",
-    "lang_time_months": "%d months",
+    "lang_time_months": "%d месеца",
-    "lang_time_year": "y",
+    "lang_time_year": "г.",
-    "lang_time_years": "%d y",
+    "lang_time_years": "%d г.",
     "lang_version_usever": "Не е намерена актуализация({{ver}})",
     "lang_version_skipver": "Актуализацията бе игнорирана.",
     "lang_version_platform": "Искате ли автоматични актуализации? (За потребителите инсталирали от Microsoft Store, изберете „Не“)",
@@ -48,17 +48,20 @@
     "lang_manager_none": "Няма",
     "lang_manager_godev": "Отворете DevCenter на Misskey. Ние показваме официални документи, на които се позоваваме.",
     "lang_manager_logout": "Излизане",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk разглежда \"@\" като отговор, но поставя друг параметър. Ако не е включено в Mastodon това означава, че е в Home на Misskey.",
     "lang_emoji_get": "Вземи емотикони",
     "lang_emoji_custom": "Персонализирани емотикони",
     "lang_defaultemojis_text": "Още емотикони {{cat}}",
-    "lang_emoji_uncat": "Uncategorized",
+    "lang_emoji_uncat": "Без категория",
     "lang_postimg_previewdis": "не може да се визуализира",
     "lang_postimg_aftupload": "Не можете да променяте профилите след качването.",
-    "lang_postimg_failupload": "Failed",
+    "lang_postimg_failupload": "Неуспешно",
-    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_delete": "Кликнете за да добавите описание, щракнете с десния бутон за да го изтриете",
-    "lang_postimg_desc": "Description",
+    "lang_postimg_desc": "Описание",
-    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_postimg_leadContext": "щракнете с десния бутон върху миниатюрата за да изтриете това",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?",
     "lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.",
     "lang_post_cwtitle": "Авто CW Сигнал",
@@ -66,6 +69,8 @@
     "lang_post_btn1": "Отказ (няма да се публикува)",
     "lang_post_btn2": "Текстът да се скрива автоматично",
     "lang_post_btn3": "Продължете към публикуването",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "Ще отнеме минута раздумката отдалечено да стане любима.",
     "lang_status_btWarn": "Ще отнеме минута раздумката отдалечено да бъде подсилена.",
     "lang_status_follow": "Следване",
@@ -76,70 +81,73 @@
     "lang_status_unmute": "Със звук",
     "lang_status_redraftTitle": "Изтрий & върни",
     "lang_status_redraft": "Продължете да изтривате & преработвате? Ще изгубите статуса на тази раздумка. В тази функция може да се съдържат някои грешки. Снимките от тази раздумка ще бъдат изтрити на по-стари от Mastodon 2.4.1.",
-    "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
+    "lang_status_emphas": "toots са подчертани. Моля, презаредете след това действие.",
-    "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
+    "lang_status_unemphas": "toots не са подчертани. Моля, презаредете след това действие.",
-    "lang_status_unendorse": "Not feature on profile",
+    "lang_status_unendorse": "Не присъства в профила",
     "lang_status_endorse": "Функция в профила",
-    "lang_status_followers": "Followers",
+    "lang_status_followers": "Последователи",
-    "lang_status_active": "Last status",
+    "lang_status_active": "Последно състояние",
-    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
+    "lang_suggest_nodata": "Моля, вземете списък с емотикони за да покажете състояние.",
-    "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
+    "lang_usetxtbox_reply": "Режим на отговор. Ctrl+Shift+C за изчистване.",
-    "lang_cards_check": " check",
+    "lang_cards_check": " проверка",
-    "lang_cards_pip": "PiP mode",
+    "lang_cards_pip": "PiP режим",
-    "lang_cards_trasted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_trusted": "Доверен вграден HTML от TheDesk (Twitter, nicovideo, YouTube, Spotify, twitcasing)",
-    "lang_cards_untransted": "Untrusted embed HTML by TheDesk",
+    "lang_cards_untrusted": "Ненадеждно вграждане на HTML от TheDesk",
     "lang_details_nodata": "Няма данни",
-    "lang_details_filtered": "Filtered toot",
+    "lang_details_filtered": "Филтриране на toot",
-    "lang_details_embed": "Embed HTML is cliped.",
+    "lang_details_embed": "Вграденият HTML е изрязан.",
-    "lang_details_url": "URL of this toot is cliped.",
+    "lang_details_url": "URL адресът на този toot е изрязан.",
-    "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_txt": "Съдържанието на този toot е изрязано.",
     "lang_filter_nodata": "Няма данни",
-    "lang_filter_errordegree": "Please check a context",
+    "lang_filter_errordegree": "Моля, проверете контекстта",
     "lang_list_nodata": "Няма данни",
     "lang_list_show": "Покажи",
-    "lang_list_users": "Users list",
+    "lang_list_users": "Списък с потребители",
-    "lang_list_nouser": "No users in this list.",
+    "lang_list_nouser": "Няма потребители в този списък.",
-    "lang_list_add": "Add to the list",
+    "lang_list_add": "Добавяне към списъка",
-    "lang_list_add_misskey": "(perhaps this user has been listed)",
+    "lang_list_add_misskey": "(може би този потребител е добавен)",
-    "lang_list_remove": "Remove from the list",
+    "lang_list_remove": "Премахване от списъка",
-    "lang_notf_new": " new notifications",
+    "lang_notf_new": " нови известия",
-    "lang_speech_refresh": "Save value about TTS config",
+    "lang_speech_refresh": "Запазване на стойността за конфигурацията на TTS",
-    "lang_src_ts": "chronological order",
+    "lang_src_ts": "хронологичен ред",
-    "lang_src_people": " people toot",
+    "lang_src_people": " хора toot",
-    "lang_tags_always": "Always toots with ",
+    "lang_tags_always": "Винаги toots с ",
-    "lang_tags_realtime": "Tag-stream toot",
+    "lang_tags_realtime": "Tag-поток toot",
-    "lang_tags_tagunpin": "Unpin {{tag}}",
+    "lang_tags_tagunpin": "Разкачане на {{tag}}",
-    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_unrealtime": "Деактивиране на TsT",
     "lang_tags_tagwarn": "Автоматично попълване на {{tag}}, ако раздумката няма {{tag}}",
-    "lang_tl_media": "Media",
+    "lang_tl_media": "Медия",
-    "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_tl_reconnect": "Свързване отново към API за стрийминг",
-    "lang_tl_postmarkers_title": "Process...",
+    "lang_tl_postmarkers_title": "В процес...",
-    "lang_tl_postmarkers": "POST markers data. Please wait",
+    "lang_tl_postmarkers": "Данни за POST маркери. Моля изчакайте",
-    "lang_img_DLDone": "Downloaded:",
+    "lang_img_DLDone": "Изтеглени:",
-    "lang_img_copyDone": "Copied: URL of this image",
+    "lang_img_copyDone": "Копирано: URL адреса на това изображение",
-    "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
+    "lang_layout_gotop": "Върнете се в горната част на тази колона. Когато иконата е червена, означава че тази колона не може да свърже API за споделане. Моля, презаредете.",
-    "lang_layout_thisacct": "{{notf}} of this account",
+    "lang_layout_thisacct": "{{notf}} от този акаунт",
-    "lang_layout_delthis": "Remove this column",
+    "lang_layout_delthis": "Премахване на тази колона",
-    "lang_layout_setthis": "Preferences of this column",
+    "lang_layout_setthis": "Предпочитания за тази колона",
-    "lang_layout_mediafil": "Media filtering",
+    "lang_layout_mediafil": "Филтриране на медиите",
-    "lang_layout_linkana": "Auto Link Analyzer",
+    "lang_layout_remoteOnly": "Remote only",
-    "lang_layout_linkanades": "Auto link analyzer",
+    "lang_layout_linkana": "Автоматичен анализатор на връзки",
-    "lang_layout_tts": "Text to speech ",
+    "lang_layout_linkanades": "Автоматичен анализатор на връзки",
+    "lang_layout_tts": "Текст към говор ",
     "lang_layout_reconnect": "Reconnect to streaming API",
-    "lang_layout_headercolor": "Header color of this column",
+    "lang_layout_headercolor": "Цвят на заглавката на тази колона",
-    "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
+    "lang_layout_nodata": "[Няма данни]<br>F5/⌘+R за презареждане",
     "lang_layout_dm": "Директни съобщения",
-    "lang_layout_webviewmode": "Prefer WebView",
+    "lang_layout_webviewmode": "Предпочитания за WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_excluded": "Изключване на вид уведомление",
     "lang_layout_excludingbt": "Показване в BT режим (ИЗКЛ./Изключване BT/ Само в BT)",
     "lang_layout_leftFold": "Стъпка наляво",
     "lang_layout_leftUnfold": "Док отдясно",
     "lang_layout_deleteColumn": "Премахване на тази колона",
     "lang_layout_deleteColumnDesc": "Премахване на тази колона",
-    "lang_layout_unread": "Unread",
+    "lang_layout_unread": "Непрочетени",
+    "lang_layout_tagManager": "Мениджър на таговете на времевата линия",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Отидете в тази колона",
     "lang_sort_remthis": "Премахване на тази колона",
-    "lang_spotify_img": "Attach an album artwork",
+    "lang_spotify_img": "Добавете към албум произведенията на изкуството",
     "lang_spotify_imgno": "Not attach an album artwork",
     "lang_spotify_acct": "Connect TheDesk to Spotify",
     "lang_spotify_np": "Готово:шаблон на NowPlaying",
@@ -153,10 +161,12 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Следвайте, за да добавите този потребител към списъците.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -164,6 +174,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Покажи",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "Още",
@@ -177,7 +188,7 @@
     "lang_parse_direct": "Direct",
     "lang_parse_clickcopy": "Click to copy text of this toot",
     "lang_parse_clickcopyurl": "Click to copy URL of this toot",
-    "lang_parse_trans": "Translate to Japanese",
+    "lang_parse_trans": "Translate to English",
     "lang_parse_replyto": "Reply to this toot",
     "lang_parse_bt": "Boost this toot",
     "lang_parse_fav": "Favourite this toot",
@@ -192,35 +203,39 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Изтрий & върни",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
-    "lang_parse_clientmute": "muted",
+    "lang_parse_clientmute": "без звук",
-    "lang_parse_mute": " will be muted. You can remove on preferences.",
+    "lang_parse_mute": " ще бъдат заглушени. Можете да ги премахнете от предпочитания.",
-    "lang_parse_voted": "Voted",
+    "lang_parse_voted": "(Гласуваха)",
-    "lang_parse_vote": "Vote",
+    "lang_parse_myvote": "(Моята собствена анкета)",
-    "lang_parse_unvoted": "Show the result without voting",
+    "lang_parse_vote": "Гласували",
-    "lang_parse_endedvote": "Expired",
+    "lang_parse_unvoted": "Показване на резултата без гласувалите",
-    "lang_parse_thread": "Show thread",
+    "lang_parse_endedvote": "Изтекъл",
-    "lang_parse_unknown": "Attached file",
+    "lang_parse_people": "човека",
+    "lang_parse_thread": "Показване на нишката",
+    "lang_parse_unknown": "Прикачени файлове",
     "lang_parse_nsfw": "NSFW media",
-    "lang_parse_html": "Show embed HTML",
+    "lang_parse_html": "Показване на вграденият HTML код",
-    "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_notffilter": "Показване на известията от този потребител",
-    "lang_misskeyparse_renote": "Repost",
+    "lang_parse_hidden": "Unvisible quoted toot",
-    "lang_misskeyparse_renoteqt": "Renote",
+    "lang_misskeyparse_renote": "Повторно публикуване",
-    "lang_misskeyparse_reaction": "Reaction",
+    "lang_misskeyparse_renoteqt": "Повторна бележка",
-    "lang_misskeyparse_tagnostr": "No streaming API on Tag TLs",
+    "lang_misskeyparse_reaction": "Реакция",
-    "lang_misskeyparse_listnostr": "No streaming API on List TLs",
+    "lang_misskeyparse_tagnostr": "Няма стрийминг API за TLs маркери",
+    "lang_misskeyparse_listnostr": "Няма стрийминг API за TLs списък",
     "lang_misskeyparse_home": "Начало",
     "lang_misskeyparse_followers": "Последователи",
-    "lang_misskeyparse_specified": "Specified User",
+    "lang_misskeyparse_specified": "Посочен потребител",
-    "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
+    "lang_misskeyparse_qt": "Misskey в режим повторна бележка (цитат):Ctrl + Shift + Enter за изчистване",
-    "lang_misskeyparse_renoted": " renoted your following post.",
+    "lang_misskeyparse_renoted": " повторно отбелязали на вашата следваща публикация.",
-    "lang_misskeyparse_quoted": " quoted your following post.",
+    "lang_misskeyparse_quoted": " цитирали следващата ви публикация.",
-    "lang_misskeyparse_reacted": " reacted your following post.",
+    "lang_misskeyparse_reacted": " реагирали на следващата ви публикация.",
-    "lang_setting_time": "Time format:{{set}}",
+    "lang_setting_time": "Времеви формат:{{set}}",
-    "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_theme": "Тема:{{set}}",
     "lang_setting_nsfw": "NSFW:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

app/view/make/language/bg-BG/setting.json

@@ -4,12 +4,15 @@
   "yes": "Да",
   "no": "Не",
   "none": "Няма",
+  "show": "Покажи",
+  "hide": "Hide",
   "default": "По подразбиране",
   "change": "Промяна",
   "select": "Избери",
   "env": "Системни предпочитания",
   "setlang": "Езици",
   "backup": "Внос и износ на предпочитания",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Внос",
   "export": "Износ",
   "hardwareAcceleration": "Деактивиране на хардуерното ускорение",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk ще използва това местоназначение, когато се опитва да запази снимки или да прави екранни снимки.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "абсолютна стойност",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Изберете тема",
   "customtheme": "Редактирайте и добавете персонализирани теми",
   "customthemeDirection": "Цветова схема",
@@ -137,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "Можете да вмъкнете всякакви букви и емотикони само с 3 клавиша",
@@ -157,12 +167,15 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -169,10 +169,11 @@
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
+    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
-}
+}