fix

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.4.0 to 9.5.3.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.4.0...v9.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

LATEST.md

@@ -1,22 +0,0 @@
-## For Astarte(kirishima.cloud), My Primary Instance
-
-TheDesk :thedesk: Akane (16.1.0)  
-・不具合修正(マウスオーバー,クリックに関する)
-・2.5.0に対する対応(リプ数やendorseなど)
-・軽量化を図った
-・一つのカラムをTwitter(TweetDeck)にできる機能
-・画像の保存先を変えられるように
-・インスタンス情報の拡充
-・デザイン変更
-・トゥートバーを左端に持ってこれるように
-・Windowsのネイティブ通知が復活
-
-ほか
-https://thedesk.top
- :github: https://github.com/cutls/TheDesk #Desk #DeskUpdate
-
- ## For Other Instances
-
-TheDesk :thedesk: Akane (16.0.1)  
-
-https://thedesk.top

LICENSE.md

@@ -1,8 +0,0 @@
-# プライバシーポリシー
-
-* TheDeskは「開発者からのお知らせ」配信のためにサーバー(thedesk.top)に常時アクセスしています。
-* 上記の接続によるユーザーの情報提供はありません。(IPアドレス等を含む)
-* thedesk.topのページにおいては、Googleアナリティクスによる解析を採用しています。
-* 配信についてAmazon Web Service CloudFrontを使用しています。CloudFrontにはアクセス解析機能がありますが、これの使用につきましては同プライバシーポリシーに則ります。
-* 接続するインスタンスのプライバシーポリシーはAPIを通じた全てのアクションに対して有効ですので、TheDeskについてもそれらに則ります。
-

app/css/acct.css

@@ -0,0 +1,76 @@
+.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;
+}
+
+#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

@@ -461,6 +461,35 @@ textarea {
 .contributor img {
   width: 1rem;
 }
+.tagComp{
+  display: grid;
+  grid-template-columns: 60px 80px 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: 5px
+}
+.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: 10px;
+  white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
 
 /*スクロールバー*/
 ::-webkit-scrollbar {

app/css/tl.css

@@ -79,6 +79,14 @@
 	padding-right: 5px;
 	margin-right: 15px;
 	border-radius: 5px;
+	height: 35px;
+}
+.bgReport {
+	height: 34px;
+	padding-top: 0.45rem;
+	text-decoration: underline;
+	padding-left: 5px;
+	padding-right: 5px;
 }
 #spot-box {
 	display: grid;
@@ -216,7 +224,10 @@ iframe,
 	margin: -1px 0;
 }
 .bigemoji {
-	width: 60px !important;
+	width: 100px !important;
+	height: auto !important;
+	position: relative;
+	z-index: 9999;
 }
 .faicon_FTL {
 	display: none;
@@ -363,6 +374,31 @@ iframe,
 	grid-area: side;
 }
 
+.cusr {
+	user-select: text;
+	padding-left: 5px;
+	border-bottom: 0.5px solid;
+	padding-right: 2px;
+	word-break: break-word;
+	width: 100%;
+	display: grid;
+	grid-template-columns: 43px 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: 5px;
+}
+
+.cusr .cbadge {
+	margin-top: 6px;
+	margin-left: 6px;
+}
+
 .quote-inline {
 	display: none;
 }
@@ -643,6 +679,8 @@ p:not(:last-child) {
 	margin-top: 3px;
 	padding: 1px;
 	border-radius: 3px;
+	overflow: hidden;
+	position: relative;
 }
 .fa-2x > .emoji-img {
 	width: 36px !important;
@@ -681,6 +719,29 @@ p:not(:last-child) {
 .votebtn:hover {
 	background-color: var(--color);
 }
+.leadPoll {
+	position: absolute;
+	background-color: var(--box);
+	height: 20px;
+	border-radius: 3px;
+}
+.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: 5px !important;
+}
 .jump {
 	display: inline-block;
 	animation: jump 0.75s linear infinite;
@@ -724,6 +785,7 @@ audio {
 	padding-right: 3px;
 	border-radius: 3px;
 	border: 1px solid var(--color);
+	user-select: none;
 }
 .vis-data {
 	font-size: 1rem !important;

app/js/common/version.js

@@ -1,346 +1,375 @@
 //バージョンチェッカー
 function verck(ver, jp) {
-	console.log("%c Welcome😊", "color: red;font-size:200%;");
+	console.log('%c Welcome😊', 'color: red;font-size:200%;')
-	var date = new Date();
+	var date = new Date()
-	var show = false;
+	var show = false
-	if (localStorage.getItem("ver") != ver && localStorage.getItem("winstore")) {
+	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
 		//ちょっと削除とリンク解析の都合上アレ(s)
 		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
-		if (!localStorage.getItem("usamin_18_6_5_flag")) {
+		if (!localStorage.getItem('usamin_18_6_5_flag')) {
-			localStorage.setItem("usamin_18_6_5_flag", true);
+			localStorage.setItem('usamin_18_6_5_flag', true)
-			var multi = localStorage.getItem("column");
+			var multi = localStorage.getItem('column')
-			var obj = JSON.parse(multi);
+			var obj = JSON.parse(multi)
 			for (var i = 0; i < obj.length; i++) {
-				localStorage.removeItem("card_" + i);
+				localStorage.removeItem('card_' + i)
 			}
 		}
 		//ちょっと削除とリンク解析の都合上アレ(e)
-		show = true;
+		show = true
-		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
+		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 		$(document).ready(function() {
-			if (localStorage.getItem("winstore")) {
+			if (localStorage.getItem('winstore')) {
-				$("#releasenote").modal("open");
+				$('#releasenote').modal('open')
 			}
-			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(' ', '_')
-			console.log("%c " + verp, "color: red;font-size:200%;");
+			console.log('%c ' + verp, 'color: red;font-size:200%;')
-			if (lang.language == "ja") {
+			if (lang.language == 'ja') {
-				$("#release-" + verp).show();
+				$('#release-' + verp).show()
 			} else {
-				$("#release-en").show();
+				$('#release-en').show()
 			}
-		});
+		})
 	}
-	localStorage.setItem("ver", ver);
+	localStorage.setItem('ver', ver)
 	if (!show) {
-		console.log(show);
+		console.log(show)
-		if (date.getMonth() + 1 >= localStorage.getItem("showSupportMe") || !localStorage.getItem("showSupportMe")) {
+		if (
+			date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
+			!localStorage.getItem('showSupportMe')
+		) {
 			if (date.getMonth() == 11) {
-				var nextmonth = 1;
+				var yrs = date.getFullYear() + 1
+				var nextmonth = yrs * 100 + 1
 			} else {
-				var nextmonth = date.getMonth() + 2;
+				var yrs = date.getFullYear() 
+				var nextmonth = yrs * 100 + date.getMonth() + 2
 			}
-			if (lang.language != "ja") {
+			if (lang.language != 'ja') {
-				$("#support-btm-ja").addClass("hide");
+				$('#support-btm-ja').addClass('hide')
-				$("#support-btm-en").removeClass("hide");
+				$('#support-btm-en').removeClass('hide')
 			}
-			localStorage.setItem("showSupportMe", nextmonth);
+			localStorage.setItem('showSupportMe', nextmonth)
-			$("#support-btm").removeClass("hide");
+			$('#support-btm').removeClass('hide')
-			$("#support-btm").animate(
+			$('#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')) {
-		$("#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?since_id=' + localStorage.getItem('last-notice-id')
 	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)
-			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 show = 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;
+										show = true
 									} else {
-										show = false;
+										show = false
 									}
 								}
-								if (obj.domain != "") {
+								if (obj.domain != '') {
-									var multi = localStorage.getItem("multi");
+									var multi = localStorage.getItem('multi')
 									if (multi) {
-										show = false;
+										show = 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;
+												show = true
 											}
-										});
+										})
 									}
 								}
 								if (show) {
-									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 show = 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;
+							show = true
 						} else {
-							show = false;
+							show = false
 						}
 					}
-					if (obj.domain != "") {
+					if (obj.domain != '') {
-						var multi = localStorage.getItem("multi");
+						var multi = localStorage.getItem('multi')
 						if (multi) {
-							show = false;
+							show = 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;
+									show = true
 								}
-							});
+							})
 						}
 					}
 					if (show) {
-						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 (platform == 'win32') {
-		var mes = lang.lang_version_platform;
+		var mes = lang.lang_version_platform
-	} else if (platform == "linux") {
+	} else if (platform == 'linux') {
-		var mes = lang.lang_version_platform_linux;
+		var mes = lang.lang_version_platform_linux
-	} else if (platform == "darwin") {
+	} else if (platform == 'darwin') {
-		var mes = lang.lang_version_platform_mac;
+		var mes = lang.lang_version_platform_mac
 	}
 	Swal.fire({
-		title: "Select your platform",
+		title: 'Select your platform',
 		text: mes,
-		type: "info",
+		type: 'info',
 		showCancelButton: true,
-		confirmButtonColor: "#3085d6",
+		confirmButtonColor: '#3085d6',
-		cancelButtonColor: "#3085d6",
+		cancelButtonColor: '#3085d6',
 		confirmButtonText: lang.lang_no,
 		cancelButtonText: lang.lang_yesno
 	}).then(result => {
 		//逆にしてる
 		if (!result.value) {
-			localStorage.setItem("winstore", "winstore");
+			localStorage.setItem('winstore', 'winstore')
 		} else {
-			localStorage.setItem("winstore", "localinstall");
+			localStorage.setItem('winstore', 'localinstall')
 		}
-		localStorage.setItem("ver", ver);
+		localStorage.setItem('ver', ver)
-		show = true;
+		show = true
-		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
+		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 		$(document).ready(function() {
-			$("#releasenote").modal("open");
+			$('#releasenote').modal('open')
-			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(' ', '_')
-			console.log("%c " + verp, "color: red;font-size:200%;");
+			console.log('%c ' + verp, 'color: red;font-size:200%;')
-			if (lang.language == "ja") {
+			if (lang.language == 'ja') {
-				$("#release-" + verp).show();
+				$('#release-' + verp).show()
 			} else {
-				$("#release-en").show();
+				$('#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/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)
-			}
-		})
 }
 
 //アカウントデータ　消す

app/js/platform/end.js

@@ -138,13 +138,13 @@ onmessage = function(e) {
 	} 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}${
 			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 })
 	} else if (e.data[0] == 'parseColumn') {
 		parseColumn(e.data[1])

app/js/platform/first.js

@@ -161,8 +161,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])
 		}
 	}
@@ -211,3 +211,75 @@ function escapeCsv(str) {
 	}
 	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

@@ -13,6 +13,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') {
@@ -112,7 +116,31 @@ 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, resize])
+			} else {
+				postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+			}
+		}
+		element.src = b64
+	} else {
+		postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+	}
 })
 //ui,img.js
 ipc.on('general-dl-prog', function(event, arg) {

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

@@ -284,32 +284,39 @@ function emojiList(target, reaction) {
 
 //絵文字など様々なものをテキストボックスに挿入
 function emojiInsert(code, del) {
-	var now = $('#textarea').val()
-	var selin = $('#textarea').prop('selectionStart')
 	if (localStorage.getItem('emoji-zero-width') == 'yes') {
-		var blank = '​'
+		var blankBefore = '​'
+		var blankAfter = '​'
 	} else {
-		var blank = ' '
+		var blankBefore = ' '
+		var blankAfter = ' '
 	}
-	var before = now.substr(0, selin)
+	var textarea = document.querySelector('#textarea')
-	if (before.slice(-1) != ' ') {
+	var sentence = textarea.value
-		before = before + blank
+	var len = sentence.length
-	}
+	var pos = textarea.selectionStart
-	var after = now.substr(selin, now.length)
+	if (del) {
-	if (after.slice(-1) != ' ') {
+		var delLen = del.length
-		after = blank + after
-	}
-	newt = before + code + after
-	if (!del) {
-		$('#textarea').val(newt)
-		//emoji();
 	} else {
-		var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g')
+		var delLen = 0
-		var now = now.replace(regExp, '')
-		$('#textarea').val(now + blank + code)
 	}
-
+	var before = sentence.substr(0, pos - delLen)
-	$('#textarea').focus()
+	var last = before.substr(-1, 1)
+	if (last == ' ') blankBefore = ''
+	var after = sentence.substr(pos, len)
+	var start = after.substr(0, 1)
+	if (start == ' ') blankAfter = ''
+	if (len == 0) {
+		var word = code
+	} else if (len == pos) {
+		var word = blankBefore + code
+	} else if (pos == 0) {
+		var word = code + blankAfter
+	} else {
+		var word = blankBefore + code + blankAfter
+	}
+	sentence = before + word + after
+	textarea.value = sentence
 }
 //改行挿入
 function brInsert(code) {

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) {
+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,7 +127,6 @@ function media(b64, type, no) {
 		}
 		var previewer = 'url'
 		fd.append('i', at)
-		//fd.append('isSensitive', nsfw);
 		httpreq.send(fd)
 	} else {
 		var previewer = 'preview_url'
@@ -133,11 +155,7 @@ function media(b64, type, no) {
 			}
 			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,7 +169,7 @@ 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()
@@ -300,3 +318,12 @@ function altImage(acct_id, id) {
 		}
 	})
 }
+function stamp() {
+	if ($('#stamp').hasClass('stamp-avail')) {
+		$('#stamp').html('Off')
+		$('#stamp').removeClass('stamp-avail')
+	} else {
+		$('#stamp').html('On')
+		$('#stamp').addClass('stamp-avail')
+	}
+}

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 {
@@ -152,6 +159,7 @@ 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() {
@@ -159,6 +167,8 @@ function post(mode, postvis) {
 			var json = httpreq.response
 			if (this.status !== 200) {
 				setLog(start, this.status, json)
+			} else {
+				$('#ideKey').val('')
 			}
 			var box = localStorage.getItem('box')
 			if (box == 'yes' || !box) {
@@ -255,6 +265,7 @@ function misskeyPost() {
 //クリア(Shift+C)
 function clear() {
 	$('#textarea').val('')
+	$('#ideKey').val('')
 	if (localStorage.getItem('stable')) {
 		$('#textarea').val('#' + localStorage.getItem('stable') + ' ')
 	}
@@ -284,6 +295,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/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,19 +141,19 @@ 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')
 		}
 	}
 }
@@ -389,45 +389,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 +654,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 +683,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/post/suggest.js

@@ -97,7 +97,9 @@ input.addEventListener(
 											his[4].uses * 1 +
 											his[5].uses * 1 +
 											his[6].uses * 1
-										tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(tag.name)}','#${escapeHTML(tag.name)}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
+										tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
+											tag.name
+										)}','#${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
 
 										var item = {
 											uses: uses,
@@ -144,7 +146,9 @@ input.addEventListener(
 									if (acct.acct != q) {
 										//Instance Actorって…
 										if (acct.username.indexOf('.') < 0) {
-											accts = accts + `<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
+											accts =
+												accts +
+												`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
 										}
 									}
 								})
@@ -194,23 +198,34 @@ input.addEventListener(
 	false
 )
 function tagInsert(code, del) {
-	var now = $('#textarea').val()
+	var blankBefore = ' '
-	var selin = $('#textarea').prop('selectionStart')
+	var blankAfter = ' '
-	if (!del) {
+	var textarea = document.querySelector('#textarea')
+	var sentence = textarea.value
+	var len = sentence.length
+	var pos = textarea.selectionStart
+	if (del) {
+		var delLen = del.length
 	} else {
-		var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g')
+		var delLen = 0
-		var now = now.replace(regExp, '')
-		selin = selin - del.length
 	}
-	if (selin > 0) {
+	var before = sentence.substr(0, pos - delLen)
-		var before = now.substr(0, selin)
+	var last = before.substr(-1, 1)
-		var after = now.substr(selin, now.length)
+	if (last == ' ') blankBefore = ''
-		newt = before + ' ' + code + ' ' + after
+	var after = sentence.substr(pos, len)
+	var start = after.substr(0, 1)
+	if (start == ' ') blankAfter = ''
+	if (len == 0) {
+		var word = code
+	} else if (len == pos) {
+		var word = blankBefore + code
+	} else if (pos == 0) {
+		var word = code + blankAfter
 	} else {
-		newt = code + ' ' + now
+		var word = blankBefore + code + blankAfter
 	}
-	$('#textarea').val(newt)
+	sentence = before + word + after
-	$('#textarea').focus()
+	textarea.value = sentence
 	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
 		$('#right-side').hide()
 		$('#right-side').css('width', '300px')
@@ -251,7 +266,9 @@ function cgNPs(q) {
 					var tags = ''
 					Object.keys(json).forEach(function(key4) {
 						var tag = json[key4]
-						tags = tags + `<a onclick="cgNp('${json[key4]}')" class="pointer">${escapeHTML(json[key4])}</a>`
+						tags =
+							tags +
+							`<a onclick="cgNp('${json[key4]}')" class="pointer">${escapeHTML(json[key4])}</a>`
 					})
 					$('#suggest').html('Cinderella NowPlaying:' + tags)
 				} else {

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)
@@ -240,6 +194,7 @@ function cardHtml(json, acct_id, id) {
 		"youtube.com",
 		"youtu.be",
 		"m.youtube.com",
+		"www.youtube.com",
 		"nicovideo.jp",
 		"twitcasting.tv"
 	]
@@ -278,10 +233,10 @@ function cardHtml(json, acct_id, id) {
 			if(isHad) {
 				var prved = `<img class="emoji" draggable="false" alt="✅" 
 					src="https://twemoji.maxcdn.com/v/12.1.3/72x72/2705.png">`
-				var title = lang.lang_cards_transted
+				var title = lang.lang_cards_trusted
 			}else{
 				var prved = '<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/26a0.png">'
-				var title = lang.lang_cards_untransted
+				var title = lang.lang_cards_untrusted
 			}
 			analyze =`<a onclick="cardHtmlShow('${acct_id}','${id}')" class="add-show pointer" title="${title}">
 			${lang.lang_parse_html}(${domain})${prved}
@@ -336,16 +291,20 @@ function cardHtmlShow(acct_id, id) {
 			if (json.provider_name == 'Twitter') {
 				var url = json.author_url
 				var status = json.url.match(/^https:\/\/twitter.com\/[_a-zA-Z0-9-]+\/status\/([0-9]+)/);
+				var statusId = false
 				if(status){
 					if(status.length > 0){
-						status = status[1]
+						var statusId = status[1]
 					}
 				}
-				url = url + '/status/' + status
+				console.log(statusId)
-				analyze = `
+				if(statusId){
-				<blockquote class="twitter-tweet" data-dnt="true"><strong>${json.author_name}</strong><br>${json.description}<a href="${url}">${json.url}</a></blockquote>
+					url = json.url
-				<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script> 
+					analyze = `
-				`
+					<blockquote class="twitter-tweet" data-dnt="true"><strong>${json.author_name}</strong><br>${json.description}<a href="${url}">${json.url}</a></blockquote>
+					<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script> 
+					`
+				}
 			}
 			$('[toot-id=' + id + '] .additional').html(analyze)
 		})

app/js/tl/datails.js

@@ -577,8 +577,8 @@ function staCopy(id) {
 	}
 }
 //翻訳
-function trans(tar, to) {
+function trans(tar, to, elem) {
-	var html = $('#toot-this .toot').html()
+	var html = elem.parents('.cvo').find('.toot').html()
 	if (html.match(/^<p>(.+)<\/p>$/)) {
 		html = html.match(/^<p>(.+)<\/p>$/)[1]
 	}
@@ -615,7 +615,7 @@ function trans(tar, to) {
 			console.error(error)
 		})
 		.then(function(text) {
-			$('#toot-this .additional').html('<span class="gray translate">' + text.text + '</span>')
+			elem.parents('.cvo').find('.toot').append('<span class="gray translate">' + text.text + '</span>')
 		})
 }
 //ブラウザで開く
@@ -630,7 +630,7 @@ function detEx(url, acct_id) {
 	}
 	var domain = localStorage.getItem('domain_' + acct_id)
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + url
+	var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url)
 	fetch(start, {
 		method: 'GET',
 		headers: {

app/js/tl/filter.js

@@ -514,6 +514,7 @@ function resetNotfFilter(tlid) {
 }
 function notfFilter(id, tlid, acct_id) {
 	var excludetxt = localStorage.getItem('exclude-' + tlid)
+	console.log(excludetxt)
 	if (excludetxt || excludetxt != '') {
 		excludetxt = excludetxt + '&account_id=' + id
 	} else {

app/js/tl/misskeyparse.js

@@ -520,7 +520,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);

app/js/tl/mix.js

@@ -87,8 +87,8 @@ function mixre(acct_id, tlid, TLtype, mute, voice, mode) {
 	wsLocal[wslid].onerror = function(error) {
 		console.error('WebSocketLocal Error')
 		console.error(error)
+		$('#notice_icon_' + tlid).addClass('red-text')
 		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
 			todo('WebSocket Error ' + error)
 		} else {
 			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
@@ -100,8 +100,8 @@ function mixre(acct_id, tlid, TLtype, mute, voice, mode) {
 	}
 	wsLocal[wslid].onclose = function() {
 		console.warn('WebSocketLocal Closing:' + tlid)
+		$('#notice_icon_' + tlid).addClass('red-text')
 		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
 			todo('WebSocket Closed')
 		} else {
 			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
@@ -113,8 +113,8 @@ function mixre(acct_id, tlid, TLtype, mute, voice, mode) {
 	}
 	wsHome[wshid].onerror = function(error) {
 		console.error(['WebSocketHome Error', error])
+		$('#notice_icon_' + tlid).addClass('red-text')
 		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
 			todo('WebSocket Error ' + error)
 		} else {
 			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
@@ -126,8 +126,8 @@ function mixre(acct_id, tlid, TLtype, mute, voice, mode) {
 	}
 	wsHome[wshid].onclose = function() {
 		console.warn('WebSocketHome Closing:' + tlid)
+		$('#notice_icon_' + tlid).addClass('red-text')
 		if (mode == 'error') {
-			$('#notice_icon_' + tlid).addClass('red-text')
 			todo('WebSocket Closed')
 		} else {
 			var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
@@ -183,7 +183,7 @@ async function mixmore(tlid, type) {
 	.attr('unique-id')
 	let startLocal = 'https://' + domain + '/api/v1/timelines/public?local=true&max_id=' + sid
 	let local = await getTL(startLocal, acct_id)
-	let startHome = 'https://' + domain + '/api/v1/timelines/home&max_id=' + sid
+	let startHome = 'https://' + domain + '/api/v1/timelines/home?max_id=' + sid
 	let home = await getTL(startHome, acct_id)
 	let concated = _.concat(local, home)
 	let uniqued = _.uniqBy(concated, 'id')

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)
 						}
 					}
 				})
@@ -238,7 +242,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 					if (obj.type != 'follow') {
 						templete = parse([obj], 'notf', acct_id, 'notf', popup)
 					} 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 +342,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)
 							}
 						}
 					})

app/js/tl/parse.js

@@ -217,8 +217,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			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,6 +232,9 @@ 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 {
@@ -364,9 +372,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				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)
 				})
@@ -415,9 +429,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					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)
 					})
@@ -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]
@@ -689,7 +709,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					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}}',
@@ -700,7 +722,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							'{{tag}}',
 							'#' + tag.name
 						)}
-						">Pin</a>featured</span> `
+						">Pin</a>${featured}</span> `
 				})
 				tags = '<div style="float:right">' + tags + '</div>'
 			}
@@ -826,9 +848,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				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)
@@ -874,7 +902,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//日本語じゃない
 			if (toot.language != lang.language && toot.language) {
 				var trans = `<div class="">
-						<a onclick="trans('${toot.language}','${lang.language}')" 
+						<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}
 						</a>
@@ -1032,9 +1060,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</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="rt_ct">${toot.reblogs_count}</span>
 						</a>
 					</div>
@@ -1080,28 +1110,26 @@ 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}
 						</button>
@@ -1133,6 +1161,10 @@ 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) {
@@ -1162,10 +1194,17 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				} 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 {
@@ -1208,9 +1247,15 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					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 +1264,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'
 				}
@@ -1236,7 +1285,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				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}
@@ -1256,21 +1305,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>
 				`
@@ -1342,17 +1390,34 @@ function client(name) {
 	}
 }
 //Poll Parser
-function pollParse(poll, acct_id) {
+function pollParse(poll, acct_id, emojis) {
 	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}')" class="pointer">
-	if (poll.voted) {
+		${lang.lang_manager_refresh}
+	</a>`
+	if (poll.voted && poll.own_votes.length) {
 		var myvote = lang.lang_parse_voted
+		if (poll.expired) myvote = myvote + '/' + lang.lang_parse_endedvote
+		var result_hide = ''
+	} else if (poll.voted && !poll.own_votes.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
@@ -1364,49 +1429,90 @@ function pollParse(poll, acct_id) {
 				myvote +
 				`<a onclick="showResult('${acct_id}','${poll.id}')" class="pointer">
 				${lang.lang_parse_unvoted}
-				</a>`
+				</a>　`
 		}
 		var result_hide = 'hide'
 	}
 	var ended = date(poll.expires_at, datetype)
 	var pollHtml = ''
+	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 + ')'
-			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">${choice.votes_count}<span class="sml">(${per}%)</span></span>`
+		} else {
+			openData = `<span style="float: right">?<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}${voteit}</span>
-					(${choice.votes_count})
+				<span class="vote_${acct_id}_${poll.id}_result ${result_hide} onPoll">
+					${openData}
 				</span>
-				${voteit}
 			</div>`
 	})
+	if (poll.expired) {
+		refresh = ''
+	}
 	pollHtml = `<div class="vote_${acct_id}_${poll.id}">
 			${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

@@ -120,7 +120,7 @@ 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)
 		}
 	}

app/js/tl/src.js

@@ -216,6 +216,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 +235,32 @@ 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(tag.name)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
-				</g>
+						#${escapeHTML(tag.name)}
-			</svg>
+					</a>
-			<span style="font-size:200%">${his[0].uses}</span>
+				</div>
-			toot&nbsp;
+				<div class="tagCompUser">
-			<a onclick="tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer">
+					${his[0].accounts}
-				#${escapeHTML(tag.name)}
+					${lang.lang_src_people}
-			</a>&nbsp;` +
+				</div>
-			his[0].accounts +
+				</div>`
-			lang.lang_src_people
-	}
-
-	return tags
 }
 /*
 <svg version="1.1" viewbox="0 0 50 300" width="100%" height="50">
@@ -303,38 +302,7 @@ 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)
 			})

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

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,7 +95,7 @@ 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))
@@ -266,9 +266,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

@@ -202,7 +202,7 @@ function parseColumn(target, dontclose) {
 				animecss,
 				acct.data
 			)
-		}  else if (acct.type == 'bookmark') {
+		} else if (acct.type == 'bookmark') {
 			if (!acct.left_fold) {
 				basekey = key
 			}
@@ -224,20 +224,21 @@ function parseColumn(target, dontclose) {
 				animecss,
 				acct.domain
 			)
-		}else {
+		} else {
 			var anime = localStorage.getItem('animation')
 			if (anime == 'yes' || !anime) {
 				var animecss = 'box-anime'
 			} else {
 				var animecss = ''
 			}
-			var unread =
+			var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
-				`<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>`
-				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 +282,31 @@ 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_tag = `<div class="column-hide notf-indv-box" id="tag-box_${key}" style="padding:5px;">
+					Base: ${acct.data}<br>
+					<div id="tagManager-${key}"></div>
+					<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Add</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 = ''
 			} else {
 				var exclude = ''
 				unread = ''
 			}
+
 			var markers = localStorage.getItem('markers')
 			if (markers == 'yes') {
 				markers = true
@@ -307,18 +319,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>`
@@ -341,8 +350,7 @@ function parseColumn(target, dontclose) {
 			} else {
 				var addHeight = ''
 			}
-			var html =
+			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">
@@ -361,6 +369,7 @@ function parseColumn(target, dontclose) {
 							<i class="material-icons waves-effect nex notf-icon_${acct.domain}">notifications</i>
 						</a>
 						${unread}
+						${if_tag_btn}
 					</div>
 					<div class="area-sta">
 						<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply">0</span>
@@ -390,7 +399,7 @@ function parseColumn(target, dontclose) {
 						<span id="sta-media-${key}">On</span>
 					</a>
 					${lang.lang_layout_mediafil}<br>
-					<a onclick="cardToggle(${key}')" class="setting nex">
+					<a onclick="cardToggle('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_linkanades}">link</i>
 						<span id="sta-card-${key}">On</span>
 					</a>
@@ -412,7 +421,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}">
@@ -663,9 +672,41 @@ function setToggle(tlid) {
 		)
 	}
 }
+//タグトグル
+//設定トグル
+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 +758,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,25 +793,21 @@ 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 =
+	var html = `<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}">
-		`<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%;" 
@@ -811,9 +847,9 @@ 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)
 	}
@@ -824,7 +860,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

app/js/ui/scroll.js

@@ -1,62 +1,70 @@
 //スクロールで続きを読む
 function scrollevent() {
-	$(".tl-box").scroll(function () {
+	$('.tl-box').scroll(function() {
-		scrollck();
+		scrollck()
-	});
+	})
 }
-scrollevent();
+scrollevent()
 
 function scrollck() {
-	$(".tl-box").each(function (i, elem) {
+	$('.tl-box').each(function(i, elem) {
-		var tlid = $(this).attr('tlid');
+		var tlid = $(this).attr('tlid')
+		var len = $('#timeline_' + tlid + ' .cvo').length
 		//一番上ならためていた新しいトゥートを表示ないしtealなら未読管理モード
 		if ($(this).scrollTop() === 0) {
-			if (!$("#unread_" + tlid + " .material-icons").hasClass("teal-text")) {
+			if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
-				var pool = localStorage.getItem("pool_" + tlid);
+				var pool = localStorage.getItem('pool_' + tlid)
 				if (pool) {
-					$("#timeline_" + tlid).prepend(pool);
+					$('#timeline_' + tlid).prepend(pool)
-					jQuery("time.timeago").timeago();
+					jQuery('time.timeago').timeago()
-					localStorage.removeItem("pool_" + tlid);
+					localStorage.removeItem('pool_' + tlid)
 				}
 			} else {
 				ueload(tlid)
 			}
 			//自動リフレッシュ
-			if ($("#timeline_" + tlid + " .cvo").length > 30) {
+			if (len > 30) {
-				for (var i = 30; i < $("#timeline_" + tlid + " .cvo").length; i++) {
+				for (var i = 30; i < $('#timeline_' + tlid + ' .cvo').length; i++) {
-					$("#timeline_" + tlid + " .cvo").eq(i).remove();
+					$('#timeline_' + tlid + ' .cvo')
+						.eq(i)
+						.remove()
 				}
 			}
 		}
 		//続きを読むトリガー
-		var scrt = $(this).find(".tl").height() - $(window).height();
+		var scrt =
-		var scr = $(this).scrollTop();
+			$(this)
-		if (scr > scrt) {
+				.find('.tl')
-			console.log("kicked more loading:" + tlid);
+				.height() - $(window).height()
-			moreload('', tlid);
+		var scr = $(this).scrollTop()
+		if (scr > scrt && scrt > 0) {
+			console.log('kicked more loading:' + tlid)
+			moreload('', tlid)
 		}
-	});
+	})
 }
 
 function goTop(id) {
-	if ($("#unread_" + id + " .material-icons").hasClass("teal-text")) {
+	if ($('#unread_' + id + ' .material-icons').hasClass('teal-text')) {
-		$("#unread_" + id + " .material-icons").removeClass("teal-text")
+		$('#unread_' + id + ' .material-icons').removeClass('teal-text')
-		var multi = localStorage.getItem("column")
+		var multi = localStorage.getItem('column')
 		var obj = JSON.parse(multi)
 		var acct_id = obj[id * 1].domain
 		var type = obj[id * 1].type
 		console.log(id, type)
 		columnReload(id, type)
 	}
-	if ($("#timeline_box_" + id + "_box .tl-box").scrollTop() > 500) {
+	if ($('#timeline_box_' + id + '_box .tl-box').scrollTop() > 500) {
-		$("#timeline_box_" + id + "_box .tl-box").scrollTop(500)
+		$('#timeline_box_' + id + '_box .tl-box').scrollTop(500)
 	}
-	$("#timeline_box_" + id + "_box .tl-box").animate({ scrollTop: 0 });
+	$('#timeline_box_' + id + '_box .tl-box').animate({ scrollTop: 0 })
 }
 function goColumn(key) {
-	$("#sort-box").addClass("hide");
+	$('#sort-box').addClass('hide')
-	$("#sort-box").removeClass("show");
+	$('#sort-box').removeClass('show')
 	if ($('[tlid=' + key + ']').length) {
-		$("#timeline-container").animate({ scrollLeft: $("#timeline-container").scrollLeft() + $('[tlid=' + key + ']').offset().left });
+		$('#timeline-container').animate({
+			scrollLeft: $('#timeline-container').scrollLeft() + $('[tlid=' + key + ']').offset().left
+		})
 	}
-}
+}

app/js/ui/theme.js

@@ -1,32 +1,33 @@
 //テーマ適用
 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('customtheme')
-	el.classList.add(theme + "theme");
+	el.classList.add(theme + 'theme')
-	var font = localStorage.getItem("font");
+	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

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

app/js/userdata/showOnTL.js

@@ -25,7 +25,7 @@ function udgEx(user, acct_id) {
 		return false;
 	}
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + user;
+	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user);
 	fetch(start, {
 		method: "GET",
 		headers: {

app/main.js

@@ -1,296 +1,280 @@
-var dirname = __dirname;
+var dirname = __dirname
-var dir = "file://" + __dirname;
+var dir = 'file://' + __dirname
-var base = dir + "/view/";
+var base = dir + '/view/'
 // Electronのモジュール
-const electron = require("electron");
+const electron = require('electron')
-const fs = require("fs");
+const fs = require('fs')
-const language = require("./main/language.js");
+const language = require('./main/language.js')
-const css = require("./main/css.js");
+const css = require('./main/css.js')
-const dl = require("./main/dl.js");
+const dl = require('./main/dl.js')
-const img = require("./main/img.js");
+const img = require('./main/img.js')
-const np = require("./main/np.js");
+const np = require('./main/np.js')
-const systemFunc = require("./main/system.js");
+const systemFunc = require('./main/system.js')
-const Menu = electron.Menu;
+const Menu = electron.Menu
-const join = require("path").join;
+const join = require('path').join
+const windowStateKeeper = require('electron-window-state')
 
 // アプリケーションをコントロールするモジュール
-const app = electron.app;
+const app = electron.app
 // ウィンドウを作成するモジュール
-const BrowserWindow = electron.BrowserWindow;
+const BrowserWindow = electron.BrowserWindow
 // メインウィンドウはGCされないようにグローバル宣言
-let mainWindow;
+let mainWindow
 
 // アプリが多重起動しないようにする
-const gotTheLock = app.requestSingleInstanceLock();
+const gotTheLock = app.requestSingleInstanceLock()
 
 if (!gotTheLock) {
-	app.quit();
+	app.quit()
 } else {
-	app.on("second-instance", () => {
+	app.on('second-instance', () => {
 		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
 		// Someone tried to run a second instance, we should focus our window.
 		if (mainWindow) {
-			if (mainWindow.isMinimized()) mainWindow.restore();
+			if (mainWindow.isMinimized()) mainWindow.restore()
-			mainWindow.focus();
+			mainWindow.focus()
 		}
-	});
+	})
 }
 
-if (process.argv.indexOf("--dev") === -1) {
+if (process.argv.indexOf('--dev') === -1) {
-	var packaged = true;
+	var packaged = true
 } else {
-	var packaged = false;
+	var packaged = false
-	console.log("||\\\\\\ \n" + "||||  \\\\\\\\ \n" + "||||     \\\\\\\\ \n" + "|||| Am I a \\\\\\\\ \n" + "|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n" + "||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n" + "||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" + "|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n" + "||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n" + "||||          /////         \n" + "||||       /////\n" + "||||     /////\n" + "||||//////");
+	console.log(
-	console.log("Welcome!");
+		'||\\\\\\ \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 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 lang_path = join(app.getPath("userData"), "language");
+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");
+
 try {
-	fs.readFileSync(ha_path, "utf8");
+	fs.readFileSync(ha_path, 'utf8')
-	app.disableHardwareAcceleration();
+	app.disableHardwareAcceleration()
-	if (!packaged) console.log("disabled: Hardware Acceleration");
+	if (!packaged) console.log('disabled: Hardware Acceleration')
 } catch {
-	if (!packaged) console.log("enabled: Hardware Acceleration");
+	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);
+		fs.statSync(file)
-		return true;
+		return true
 	} catch (err) {
-		if (err.code === "ENOENT") return false;
+		if (err.code === 'ENOENT') return false
 	}
 }
 // 全てのウィンドウが閉じたら終了
-app.on("window-all-closed", function() {
+app.on('window-all-closed', function() {
-	electron.session.defaultSession.clearCache(() => {});
+	electron.session.defaultSession.clearCache(() => {})
-	app.quit();
+	app.quit()
-});
+})
-
 function createWindow() {
+	let window_size = windowStateKeeper({
+		defaultWidth: 1000,
+		defaultHeight: 750
+	  })
 	if (isFile(lang_path)) {
-		var lang = fs.readFileSync(lang_path, "utf8");
+		var lang = fs.readFileSync(lang_path, 'utf8')
 	} else {
-		var langs = app.getLocale();
+		var langs = app.getLocale()
-		console.log(langs);
+		console.log(langs)
-		if (~langs.indexOf("ja")) {
+		if (~langs.indexOf('ja')) {
-			lang = "ja";
+			lang = 'ja'
-		} else if (~langs.indexOf("de")) {
+		} else if (~langs.indexOf('de')) {
-			lang = "de";
+			lang = 'de'
-		} else if (~langs.indexOf("cs")) {
+		} else if (~langs.indexOf('cs')) {
-			lang = "cs";
+			lang = 'cs'
-		} else if (~langs.indexOf("bg")) {
+		} else if (~langs.indexOf('bg')) {
-			lang = "bg";
+			lang = 'bg'
 		} else {
-			lang = "en";
+			lang = 'en'
 		}
-		fs.mkdir(app.getPath("userData"), function(err) {
+		fs.mkdir(app.getPath('userData'), function(err) {
-			fs.writeFileSync(lang_path, lang);
+			fs.writeFileSync(lang_path, lang)
-		});
+		})
 	}
-	if (!packaged) console.log("your lang:" + app.getLocale());
+	if (!packaged) console.log('your lang:' + app.getLocale())
-	if (!packaged) console.log("launch:" + lang);
+	if (!packaged) console.log('launch:' + lang)
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
-	var platform = process.platform;
+	var platform = process.platform
-	var bit = process.arch;
+	var bit = process.arch
-	if (platform == "linux") {
+	if (platform == 'linux') {
 		var arg = {
 			webPreferences: {
 				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(__dirname, "js", "platform", "preload.js")
+				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",
+			icon: __dirname + '/desk.png',
 			show: false
-		};
-	} else if (platform == "win32") {
-		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,
-			simpleFullscreen: true,
-			show: false
-		};
-	} else if (platform == "darwin") {
-		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,
-			simpleFullscreen: true,
-			show: false
-		};
-	}
-	mainWindow = new BrowserWindow(arg);
-	mainWindow.once("page-title-updated", () => {
-		mainWindow.show();
-		if (window_size.max) {
-			mainWindow.maximize();
 		}
-	});
+	} else if (platform == 'win32') {
-	if (!packaged) mainWindow.toggleDevTools();
+		var arg = {
-	electron.session.defaultSession.clearCache(() => {});
+			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 = {
+			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
+		}
+	}
+	mainWindow = new BrowserWindow(arg)
+	mainWindow.once('page-title-updated', () => {
+		mainWindow.show()
+		if (window_size.isMaximized) {
+			mainWindow.maximize()
+		}
+	})
+	if (!packaged) mainWindow.toggleDevTools()
+	electron.session.defaultSession.clearCache(() => {})
 	if (process.argv) {
 		if (process.argv[1]) {
-			var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/);
+			var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
 			if (m) {
-				var mode = m[1];
+				var mode = m[1]
-				var code = m[2];
+				var code = m[2]
-				var plus = "?mode=" + mode + "&code=" + code;
+				var plus = '?mode=' + mode + '&code=' + code
 			} else {
-				var plus = "";
+				var plus = ''
 			}
 		} else {
-			var plus = "";
+			var plus = ''
 		}
 	} else {
-		var plus = "";
+		var plus = ''
 	}
-	var ua;
+	var ua
 	try {
-		ua = fs.readFileSync(ua_path, "utf8");
+		ua = fs.readFileSync(ua_path, 'utf8')
 	} catch (e) {
 		//default UA Example:
 		// Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36
-		const crypto = require("crypto");
+		const crypto = require('crypto')
-		const N = 100;
+		const N = 100
 		var ua =
-			"Mastodon client: " +
+			'Mastodon client: ' +
 			crypto
 				.randomBytes(N)
-				.toString("base64")
+				.toString('base64')
-				.substring(0, N);
+				.substring(0, N)
-	}
-	mainWindow.loadURL(base + lang + "/index.html" + plus, { userAgent: ua });
-	if (!window_size.x && !window_size.y) {
-		mainWindow.center();
 	}
+	mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua })
+	window_size.manage(mainWindow)
 	// ウィンドウが閉じられたらアプリも終了
-	mainWindow.on("closed", function() {
+	mainWindow.on('closed', function() {
-		electron.ipcMain.removeAllListeners();
+		electron.ipcMain.removeAllListeners()
-		mainWindow = null;
+		mainWindow = null
-	});
+	})
-	closeArg = false;
+	closeArg = false
-	mainWindow.on("close", function(e, arg) {
+	mainWindow.on('close', function(e, arg) {
-		writePos(mainWindow);
 		if (!closeArg) {
-			e.preventDefault();
+			e.preventDefault()
 		}
 		const promise = new Promise(function(resolve) {
-			mainWindow.webContents.send("asReadEnd", "");
+			mainWindow.webContents.send('asReadEnd', '')
 			setTimeout(function() {
-				resolve();
+				resolve()
-			}, 3000);
+			}, 3000)
-		});
+		})
 		promise.then(function(response) {
-			closeArg = true;
+			closeArg = true
-			mainWindow.close();
+			mainWindow.close()
-		});
+		})
-	});
+	})
-	electron.ipcMain.on("sendMarkersComplete", function(e, arg) {
+	electron.ipcMain.on('sendMarkersComplete', function(e, arg) {
-		closeArg = true;
+		closeArg = true
-		mainWindow.close();
+		mainWindow.close()
-	});
+	})
-	function writePos(mainWindow) {
+	mainWindow.on('minimize', function() {
-		if (max_window_size.width == mainWindow.getBounds().width && max_window_size.height == mainWindow.getBounds().height && max_window_size.x == mainWindow.getBounds().x && max_window_size.y == mainWindow.getBounds().y) {
+		mainWindow.webContents.send('asRead', '')
-			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y, max: true };
+	})
-		} else {
-			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y };
-		}
-		fs.writeFileSync(info_path, JSON.stringify(size));
-	}
-	mainWindow.on("maximize", function() {
-		writePos(mainWindow);
-		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
-	});
-	mainWindow.on("minimize", function() {
-		writePos(mainWindow);
-		mainWindow.webContents.send("asRead", "");
-	});
 
-	var platform = process.platform;
+	var platform = process.platform
-	var bit = process.arch;
+	var bit = process.arch
-	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname)));
+	Menu.setApplicationMenu(
+		Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname))
+	)
 	//CSS
-	css.css(mainWindow);
+	css.css(mainWindow)
 	//アップデータとダウンロード
-	dl.dl(mainWindow, lang_path, base, dirname);
+	dl.dl(mainWindow, lang_path, base, dirname)
 	//画像選択と画像処理
-	img.img(mainWindow, dir);
+	img.img(mainWindow, dir)
 	//NowPlaying
-	np.TheDeskNowPlaying(mainWindow);
+	np.TheDeskNowPlaying(mainWindow)
 	//その他system
-	systemFunc.system(mainWindow, dir, lang, dirname);
+	systemFunc.system(mainWindow, dir, lang, dirname)
 	setInterval(function() {
-		mouseTrack(mainWindow);
+		mouseTrack(mainWindow)
-	}, 1000);
+	}, 1000)
 }
-var x = 0;
+var x = 0
-var y = 0;
+var y = 0
-var unchanged = 0;
+var unchanged = 0
-var locked = false;
+var locked = false
 function mouseTrack(mainWindow) {
-	let mousePos = electron.screen.getCursorScreenPoint();
+	let mousePos = electron.screen.getCursorScreenPoint()
-	let xNow = mousePos.x;
+	let xNow = mousePos.x
-	let yNow = mousePos.x;
+	let yNow = mousePos.x
 	if (x != xNow || y != yNow) {
-		unchanged = 0;
+		unchanged = 0
-		locked = false;
+		locked = false
 	} else {
-		unchanged++;
+		unchanged++
 		if (unchanged > 60 && !locked) {
-			unchanged = 0;
+			unchanged = 0
-			locked = true;
+			locked = true
-			mainWindow.webContents.send("asRead", "");
+			mainWindow.webContents.send('asRead', '')
 		}
 	}
-	x = xNow;
+	x = xNow
-	y = yNow;
+	y = yNow
 }
 // Electronの初期化完了後に実行
-app.on("ready", createWindow);
+app.on('ready', createWindow)
 var onError = function(err, response) {
-	console.error(err, response);
+	console.error(err, response)
-};
+}
 
-app.setAsDefaultProtocolClient("thedesk");
+app.setAsDefaultProtocolClient('thedesk')

app/main/img.js

@@ -1,43 +1,92 @@
 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) => {
-
+		dialog.showOpenDialog(
-        dialog.showOpenDialog(null, {
+			null,
-            properties: ['openFile', 'multiSelections'],
+			{
-            title: '添付ファイルを選択',
+				properties: ['openFile', 'multiSelections'],
-            defaultPath: '.',
+				title: '添付ファイルを選択',
-            filters: [
+				defaultPath: '.',
-                { name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] },
+				filters: [
-                { name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
+					{
-                { name: '動画', extensions: ['mp4', 'webm'] },
+						name: 'メディアファイル',
-                { name: '全てのファイル', extensions: ['*'] }
+						extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm']
-            ]
+					},
-        }, (fileNames) => {
+					{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
-            if (!fileNames) {
+					{ name: '動画', extensions: ['mp4', 'webm'] },
-                return false;
+					{ name: '全てのファイル', extensions: ['*'] }
-            }
+				]
-            for (var i = 0; i < fileNames.length; i++) {
+			},
-                var path = fileNames[i];
+			fileNames => {
-                var bin = fs.readFileSync(path, 'base64');
+				if (!fileNames) {
-                e.sender.webContents.send('bmp-img-comp', [bin, 'new']);
+					return false
-            }
+				}
-        });
+				for (var i = 0; i < fileNames.length; i++) {
-    });
+					var path = fileNames[i]
-    ipc.on('bmp-image', (e, args) => {
+					var bin = fs.readFileSync(path, 'base64')
-
+					e.sender.webContents.send('resizeJudgement', [bin, 'new'])
-        var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
+				}
-        Jimp.read(args[0], function (err, lenna) {
+			}
-            if (err) throw err;
+		)
-            lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
+	})
-                e.sender.webContents.send('bmp-img-comp', [src, args[1]]);
+	ipc.on('bmp-image', (e, args) => {
-            });
+		Jimp.read(args[0], function(err, lenna) {
-        });
+			if (err) throw err
-
+			lenna.getBase64(Jimp.MIME_PNG, function(err, src) {
-    });
+				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/system.js

@@ -1,300 +1,365 @@
 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 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(
-			null,
+			mainWindow,
 			{
-				title: "Export",
+				title: 'Export',
-				properties: ["openFile", "createDirectory"],
+				properties: ['openFile', 'createDirectory'],
-				defaultPath: "export.thedeskconfig.json5"
+				defaultPath: 'export.thedeskconfig.json5'
 			},
 			savedFiles => {
 				if (!savedFiles) {
-					return false;
+					return false
 				}
-				e.sender.webContents.send("exportSettingsFile", savedFiles);
+				e.sender.webContents.send('exportSettingsFile', savedFiles)
 			}
-		);
+		)
-	});
+	})
 	//インポートのダイアログ
-	ipc.on("importSettings", function(e, args) {
+	ipc.on('importSettings', function(e, args) {
 		dialog.showOpenDialog(
-			null,
+			mainWindow,
 			{
-				title: "Import",
+				title: 'Import',
-				properties: ["openFile"],
+				properties: ['openFile'],
-				filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
+				filters: [
+					{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2', 'json5'] }
+				]
 			},
 			fileNames => {
+				console.log('imported from: ', fileNames)
 				if (!fileNames) {
-					return false;
+					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(
-			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(
-			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'] },
+					{ name: 'All', extensions: ['*'] }
+				]
 			},
 			fileNames => {
-				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) {
+	ipc.on('ua', function(e, arg) {
-		if (arg == "") {
+		if (arg == '') {
-			fs.unlink(ua_path, function(err) {});
+			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('quit', (e, args) => {
-		app.quit();
+		app.quit()
-	});
+	})
-	ipc.on("about", (e, args) => {
+	ipc.on('about', (e, args) => {
-		about();
+		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
-		});
+		})
-		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
-		});
+		})
-		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) {
-			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");
+		const fm = require('font-manager')
-		var fonts = fm.getAvailableFontsSync();
+		var fonts = fm.getAvailableFontsSync()
-		object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
+		object_array_sort(fonts, 'family', 'asc', function(fonts_sorted) {
-			e.sender.webContents.send("font-list", fonts_sorted);
+			e.sender.webContents.send('font-list', fonts_sorted)
-		});
+		})
-	});
+	})
 	//コピー
-	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) {
-			if (err) throw err;
+			if (err) throw err
 			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 => {
 		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) {
-				if (err) throw err;
+				if (err) throw err
 				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))
 					}
-				});
+				})
-			});
+			})
 		}
-	});
+	})
+	var $ = require('nodobjc')
+
+	$.framework('Foundation')
+	$.framework('AppKit')
+
+	var GetSongs = $.NSObject.extend('Delegate')
+
+	GetSongs.addMethod('getMySongs:', 'v@:@', function(self, _cmd, notif) {
+		var userInfo = notif('userInfo')
+		var keys = userInfo('keyEnumerator')
+		var key
+		var song = {}
+
+		while ((key = keys('nextObject'))) {
+			var value = userInfo('objectForKey', key)
+			song[key.toString()] = value.toString()
+		}
+		console.log(song)
+	})
+
+	GetSongs.register()
+
+	var gs = GetSongs('alloc')('init')
+	var nc = $.NSDistributedNotificationCenter('defaultCenter')
+	var selector = $.NSSelectorFromString($('getMySongs:'))
+	var notification = $('com.apple.iTunes.playerInfo')
+
+	nc('addObserver', gs, 'selector', 'getMySongs:', 'name', notification, 'object', null)
+
+	var apps = $.NSApplication('sharedApplication')
+	function runLoop() {
+		var pool = $.NSAutoreleasePool('alloc')('init')
+		try {
+			apps(
+				'nextEventMatchingMask',
+				$.NSAnyEventMask.toString(),
+				'untilDate',
+				$.NSDate('distantFuture'),
+				'inMode',
+				$.NSDefaultRunLoopMode,
+				'dequeue',
+				1
+			)
+		} catch (e) {
+			console.error('run loop error', e.message)
+		}
+		pool('drain')
+		setTimeout(runLoop, 1000)
+		//process.nextTick(runLoop);
+	}
+
+	runLoop()
 }
-exports.system = system;
+exports.system = system

app/package.json

@@ -1,19 +1,19 @@
 {
   "name": "thedesk",
-  "version": "20.0.3",
+  "version": "20.1.0",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "construct": "cd view/make && node make --automatic && cd ../../",
-    "dev": "electron ./ --dev",
+    "dev": "npx electron ./ --dev",
     "dist": "build --linux snap",
     "watchview": "node view/make/make.js --automatic --watch",
     "build:js": "node build.js",
-    "build": "electron-builder",
+    "build": "npx electron-builder",
-    "build:all": "electron-builder --win --linux",
+    "build:all": "npx electron-builder --win --linux",
-    "build:win": "electron-builder --win"
+    "build:win": "npx electron-builder --win"
   },
   "keywords": [
     "mastodon",
@@ -52,25 +52,26 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.11.2",
     "electron-dl": "^1.14.0",
-    "jimp": "^0.8.4",
+    "electron-window-state": "^5.0.3",
+    "jimp": "^0.9.1",
     "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",
+    "materialize-css": "git://github.com/cutls/materialize",
-    "sweetalert2": "^9.3.4",
+    "sumchecker": "^3.0.1",
+    "sweetalert2": "^9.4.0",
     "vue": "^2.6.10"
   },
   "optionalDependencies": {
-    "font-manager": "^0.3.0",
+    "font-manager": "0.3.0",
     "itunes-nowplaying-mac": "0.3.1"
   },
   "devDependencies": {
     "chokidar": "^3.3.0",
-    "electron": "^6.0.12",
+    "electron": "^7.1.1",
     "electron-builder": "^22.1.0",
-    "electron-rebuild": "^1.8.6",
+    "electron-rebuild": "^1.8.8",
     "readline-sync": "1.4.10"
   },
   "build": {

app/view/make/acct.sample.html

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

@@ -205,9 +205,11 @@
 					<div class="col s12 mize" style="margin-bottom:5px; padding:0;">
 						<div id="taglist"></div>
 						<div id="preview" class="mize"></div>
-						<span class=" sml mize"><span data-trans="reply">@@replyMode@@</span>:
+						<span class=" sml mize"><span>@@replyMode@@</span>:
-							<span id="rec">@@no@@</span>/<span data-trans="file">@@temp@@</span>:
+							<span id="rec">@@no@@</span>/<span>@@temp@@</span>:
-							<span id="mec">@@nothing@@</span>/@@poll@@:<span id="pollsta">@@no@@</span>
+							<span id="mec">@@nothing@@</span>
+								<a onclick="stamp()" class="pointer" title="@@stampWarn@@">@@stamp@@: <span id="stamp">Off</span></a>
+							/@@poll@@:<span id="pollsta">@@no@@</span>
 							<span id="vis" class="hide">public</span>
 						</span>
 						<br>
@@ -258,6 +260,7 @@
 				</ul>
 				<!--hidden area-->
 				<input type="hidden" id="reply">
+				<input type="hidden" id="ideKey">
 				<input type="hidden" id="quote">
 				<input type="hidden" id="media">
 				<!--END hidden area-->
@@ -761,31 +764,57 @@
 			<a href="https://thedesk.top" target="_blank">HP</a><br>
 			<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 			<br>
-			<div id="release-20-0-3_Kawaii" class="release-do" style="display:none; ">><br>
+			<div id="release-20-1-0_Kawaii" class="release-do" style="display:none; ">><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note 20.0.3 (Kawaii)</h5>
+				<h5>Release Note 20.1.0 (Kawaii)</h5>
-				・ブックマーク機能(master)
+				・画像のページ送りに失敗する
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
-				・コンテキストメニュー
+				・Pleromaのmove通知タイプの対応
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
-				・日本語(関西)を追加したで
+				・ブーストやお気に入りが解除できなくなるバグの修正(進行中)
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
-				・カードの埋め込みHTMLを自動で展開しないように。セキュリティ対策。YouTube, ニコ動, Spotify, Twitcastingのみ表示
+				・保存先フォルダが表示されないバグの修正
+				<a onclick="udgEx('micchan83@fedibird.com','main')" class="contributor">
+					<img src="https://user-images.githubusercontent.com/17561618/67261210-a46a7980-f4da-11e9-9c9c-704757d3b1a7.png">micchan83
+				</a>
+				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
+					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
+				</a>
+				<br>
+				・ブーストされた投票で最も投票された選択肢の背景色がブースト背景色と一緒で見えにくかった
+				<a onclick="udgEx('kPherox@pl.kpherox.dev','main')" class="contributor">
+					<img src="https://user-images.githubusercontent.com/17561618/66582379-a3714800-ebbc-11e9-8402-d81a35a3be9f.png">kPherox
+				</a>
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
-				・Twitterの埋め込みをAPI展開するようにした
+				・インポートやエクスポートで直接中身をやりとりする方法を追加
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
+				・画像の長辺リサイズ(デフォルトはオフ) 
+				<a onclick="udgEx('popn_ja@popon.pptdn.jp','main')" class="contributor">
+					<img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4">kaias1jp
+				</a>
+				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
+					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
+				</a><br>
+				・画像に自分のアカウント名(acct@aaa.tld)を入れるボタン(アップロード前に押す)
+				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
+					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
+				</a><br>
+				・削除して再編集に関するバグの修正
+				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
+					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
+				</a> 他匿名報告者等<br>
 			</div>
 			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>
@@ -1106,6 +1135,9 @@
 					</a>
 					<span id="fukidashi">@@hereAddColumns@@</span>
 				</div>
+				<a href="https://thedesk.top/bugs/?lang=@@lang@@" target="_blank" class="waves-effect bgReport" draggable="false" title="Feeling unlucky">
+					@@foundBug@@
+				</a>
 			</div>
 		</div>
 		<div>
@@ -1140,11 +1172,11 @@
 	<div id="support-btm" class="z-depth-4 hide">
 		<div id="support-btm-ja">
 			<h5>ご支援いただけませんか？</h5>
-			(これは支援の有無に関わらず定期的に出ます。)<br>
+			(これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br>
 			あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。<br>
 			乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。<br>
-			ご安心ください。インターネット上のフリー百科事典のような高圧的支援要求はいたしません。コーヒーも要求いたしません。<br>
+			<br>
-			(中略)<br>
+			TheDeskになぜ金銭が発生するかについて: 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。<br>
 			<b>全てのユーザーが安心してTheDeskを使っていただける環境のため</b>にも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。<br>
 			<b>@@TheDeskDes@@</b>
 		</div>

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

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

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

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

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

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

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

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

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

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

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

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

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

@@ -125,6 +125,7 @@
     "integratedTLDes": "Интегриране (Местно/Начало)",
     "localPlusDes": "LTL+Отговор+BT",
     "notf": "Известия",
+    "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": "Добави",
@@ -167,6 +168,7 @@
     "contactwithlog": "Ако ми кажете за грешки (нещо не работи или подобно) с този дневник, мога по-лесно да открия какво не е наред.",
     "about": "За TheDesk",
     "hereAddColumns": "<- Добави ТЛ",
+    "foundBug": "I found a bug",
     "show": "Покажи",
     "directory": "Директория",
     "active": "Наскоро активен",
@@ -177,5 +179,5 @@
     "acctManDesc": "Добавете още акаунти и излезте от тях.",
     "settingDesc": "Много. много предпочитания са тук. Няма да можете да ги проверите всички!",
     "nanoDescPlus": "Клиент мини прозорец (експериментално)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "listDesc": "Всички настройки на TheDesk и Mastodon, като <b> добавяне и сортиране на колони </b>, <b> списък и проверка на филтрите </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, изберете „Не“)",
@@ -52,13 +52,13 @@
     "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_tagTL": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?",
     "lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.",
     "lang_post_cwtitle": "Авто CW Сигнал",
@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
     "lang_details_nodata": "Няма данни",
     "lang_details_filtered": "Filtered toot",
     "lang_details_embed": "Embed HTML is cliped.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Премахване на тази колона",
     "lang_layout_deleteColumnDesc": "Премахване на тази колона",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Отидете в тази колона",
     "lang_sort_remthis": "Премахване на тази колона",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
+    "lang_parse_bookmark": "Bookmark this",
+    "lang_parse_unbookmark": "Unbookmark this",
     "lang_parse_del": "Изтрийте тази раздумка",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Изтрий & върни",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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": "NSFW media",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

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

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/ca-ES/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/ca-ES/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/view/make/language/ca-ES/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/cs-CZ/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifikace",
+    "bookmark": "Záložky",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Přidat",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/cs-CZ/main.json

@@ -55,9 +55,9 @@
     "lang_emoji_uncat": "Uncategorized",
     "lang_postimg_previewdis": "nelze vytvořit náhled",
     "lang_postimg_aftupload": "Po nahrání nemůžete změnit účty.",
-    "lang_postimg_failupload": "Failed",
+    "lang_postimg_failupload": "Selhalo",
     "lang_postimg_delete": "Click to add description, right-click to delete this",
-    "lang_postimg_desc": "Description",
+    "lang_postimg_desc": "Popis",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "Tento toot neobsahuje výchozí hashtag. Tento toot nebude zobrazen na výchozí časové ose. Pokračovat?",
     "lang_post_tagVis": "Tento toot (ne „veřejný“ toot) není zobrazen na časové ose tohoto hashtagu.",
@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Režim odpovězení. Pro vymazání stiskněte Ctrl+Shift+C.",
     "lang_cards_check": " kontrolovat",
     "lang_cards_pip": "Režim PiP",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
     "lang_details_nodata": "Žádná data",
     "lang_details_filtered": "Filtrovaný toot",
     "lang_details_embed": "HTML pro vložení je zkopírován.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -180,9 +183,14 @@
     "lang_parse_bt": "Boostnout tento toot",
     "lang_parse_fav": "Oblíbit si tento toot",
     "lang_parse_quote": "Citovat tento toot",
+    "lang_parse_bookmark": "Přidat do záložek",
+    "lang_parse_unbookmark": "Unbookmark this",
     "lang_parse_del": "Smazat tento toot",
     "lang_parse_pin": "Připnout tento toot",
+    "lang_parse_unpin": "Odepnout",
+    "lang_parse_link": "Otevřít v prohlížeči",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Podrobnosti",
     "lang_parse_redraft": "Vymazat a přepsat",
     "lang_parse_followed": "vás nyní sleduje",
     "lang_parse_clientop": "Operace tohoto klienta",
@@ -192,12 +200,15 @@
     "lang_parse_clientmute": "ztlumena",
     "lang_parse_mute": " bude ztlumena. To můžete odstranit v nastavení.",
     "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": "NSFW media",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_misskeyparse_renote": "Znovusdílení",
     "lang_misskeyparse_renoteqt": "Renotování",

app/view/make/language/cs-CZ/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/da-DK/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/da-DK/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/view/make/language/da-DK/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/de-DE/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local and Home)",
     "localPlusDes": "Integrated(Local and replies and BT on Home)",
     "notf": "Benachrichtigungen",
+    "bookmark": "Lesezeichen",
     "showThisTL": "Verlauf anzeigen:",
     "webviewWarn": "TweetDeck mit angepassten TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Tastaturkürzel werden Sie irritieren. Wenn Sie wollen, können Sie \"WebView bevorzugen\" oberhalb der Spalte aktivieren.",
     "add": "Hinzufügen",
@@ -167,6 +168,7 @@
     "contactwithlog": "Wenn Sie mir mit diesem Log Fehler (Funktionsunfähigkeit oder ähnliches) zeigen, kann ich leichter erkennen, was falsch ist.",
     "about": "Über TheDesk",
     "hereAddColumns": "<- Neuer Verlauf",
+    "foundBug": "I found a bug",
     "show": "Zeige",
     "directory": "Verzeichnis",
     "active": "Kürzlich aktiv",

app/view/make/language/de-DE/main.json

@@ -22,14 +22,14 @@
     "lang_time_suffixFromNow": null,
     "lang_time_inPast": null,
     "lang_time_seconds": "%d s",
-    "lang_time_minute": "1 m",
+    "lang_time_minute": "1 Min.",
     "lang_time_minutes": "%d m",
-    "lang_time_hour": "1 h",
+    "lang_time_hour": "1 S",
     "lang_time_hours": "%d h",
-    "lang_time_day": "1 d",
+    "lang_time_day": "1 t",
-    "lang_time_days": "%d d",
+    "lang_time_days": "%d t",
-    "lang_time_month": "1 month",
+    "lang_time_month": "1 Monat",
-    "lang_time_months": "%d months",
+    "lang_time_months": "%d Monate",
     "lang_time_year": "y",
     "lang_time_years": "%d y",
     "lang_version_usever": "Keine Aktualisierung gefunden({{ver}})",
@@ -52,12 +52,12 @@
     "lang_emoji_get": "Hole Emojis",
     "lang_emoji_custom": "Eigene Emojis",
     "lang_defaultemojis_text": "Emojis über {{cat}}",
-    "lang_emoji_uncat": "Uncategorized",
+    "lang_emoji_uncat": "Nicht kategorisiert",
     "lang_postimg_previewdis": "keine Vorschau",
     "lang_postimg_aftupload": "Sie können die Konten nach dem Hochladen nicht mehr ändern.",
-    "lang_postimg_failupload": "Failed",
+    "lang_postimg_failupload": "Gescheitert",
-    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_delete": "Klicken, um Beschreibung hinzuzufügen, Rechtsklick zum Löschen",
-    "lang_postimg_desc": "Description",
+    "lang_postimg_desc": "Beschreibung",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "Dieses Tröt enthält keinen Standard-Tag. Er wird in dem lokalen Verlauf nicht angezeigt. Fortfahren?",
     "lang_post_tagVis": "Dieser Tröt (nicht 'öffentlicher' Tröt) wird nicht in diesem Tag-Verlauf angezeigt.",
@@ -80,12 +80,14 @@
     "lang_status_unemphas": "'s Tröts werden nicht hervorgehoben. Bitte laden Sie nach dieser Aktion neu.",
     "lang_status_unendorse": "Nicht auf dem Profil zeigen",
     "lang_status_endorse": "Auf dem Profil zeigen",
-    "lang_status_followers": "Followers",
+    "lang_status_followers": "Folgende",
-    "lang_status_active": "Last status",
+    "lang_status_active": "Letzter Status",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Antwortmodus. Strg+Umschalt+C zum Löschen.",
     "lang_cards_check": " überprüfen",
-    "lang_cards_pip": "PiP mode",
+    "lang_cards_pip": "PiP-Modus",
+    "lang_cards_trusted": "Vertrautes Einbetten HTML von TheDesk (Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
     "lang_details_nodata": "Keine Daten",
     "lang_details_filtered": "Gefilterter Tröt",
     "lang_details_embed": "Eingefügtes HTML wurde entfernt.",
@@ -107,14 +109,14 @@
     "lang_tags_always": "Immer Tröten mit ",
     "lang_tags_realtime": "Tag-Stream Tröt",
     "lang_tags_tagunpin": "{{tag}} entsperren",
-    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_unrealtime": "TsT deaktivieren",
     "lang_tags_tagwarn": "Automatisch {{tag}} anfügen, wenn Tröt ohne {{tag}} ist",
     "lang_tl_media": "Medien",
     "lang_tl_reconnect": "Mit Streaming API erneut verbinden",
     "lang_tl_postmarkers_title": "Process...",
     "lang_tl_postmarkers": "POST markers data. Please wait",
     "lang_img_DLDone": "Heruntergeladen:",
-    "lang_img_copyDone": "Copied: URL of this image",
+    "lang_img_copyDone": "Kopiert: URL dieses Bildes",
     "lang_layout_gotop": "Gehen Sie zum Anfang dieser Spalte. Wenn das Symbol rot ist, kann diese Spalte keine Verbindung zur Streaming-API herstellen. Bitte neu laden.",
     "lang_layout_thisacct": "{{notf}} dieses Kontos",
     "lang_layout_delthis": "Diese Spalte löschen",
@@ -129,12 +131,13 @@
     "lang_layout_dm": "Direkte Nachricht",
     "lang_layout_webviewmode": "Web-Ansicht bevorzugen",
     "lang_excluded": "Ausgeschlossene Benachrichtigungsart",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_excludingbt": "BT-Modus anzeigen (aus/kein BT/Nur BT)",
     "lang_layout_leftFold": "Nach links Stapeln",
     "lang_layout_leftUnfold": "Rechts Anheften",
     "lang_layout_deleteColumn": "Diese Spalte löschen",
     "lang_layout_deleteColumnDesc": "Diese Spalte löschen",
-    "lang_layout_unread": "Unread",
+    "lang_layout_unread": "ungelesen",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Gehe zu dieser Spalte",
     "lang_sort_remthis": "Diese Spalte löschen",
     "lang_spotify_img": "Albumcover anhängen",
@@ -152,7 +155,7 @@
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Folgt dir",
     "lang_showontl_notf": "Benachrichtigung ",
-    "lang_showontl_domain": "Domain ",
+    "lang_showontl_domain": "Domäne ",
     "lang_showontl_listwarn": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
     "lang_showontl_verified": "This website is verified by owner at ",
     "lang_parse_mentioned": " hat dir geantwortet",
@@ -180,9 +183,14 @@
     "lang_parse_bt": "Diesen Tröt verstärken",
     "lang_parse_fav": "Diesen Tröt favorisieren",
     "lang_parse_quote": "Diesen Tröt zitieren",
+    "lang_parse_bookmark": "Lesezeichen hinzufügen",
+    "lang_parse_unbookmark": "Lesezeichen entfernen",
     "lang_parse_del": "Diesen Tröt löschen",
     "lang_parse_pin": "Dieses Tröt fixieren",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Im Browser öffnen",
     "lang_parse_det": "Details über Ihr Hauptkonto.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Löschen & Neuentwerfen",
     "lang_parse_followed": "Folgt dir",
     "lang_parse_clientop": "Aktion dieses Clients",
@@ -192,12 +200,15 @@
     "lang_parse_clientmute": "Stumm",
     "lang_parse_mute": " wird stumm gemacht. Kann in den Einstellungen wieder entfernt werden.",
     "lang_parse_voted": "Abgestimmt",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Abstimmen",
     "lang_parse_unvoted": "Ergebnis ohne Abstimmung anzeigen",
     "lang_parse_endedvote": "Abgelaufen",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Konversation anzeigen",
     "lang_parse_unknown": "Angehängte Datei",
     "lang_parse_nsfw": "NSFW Medien",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Benachrichtigungen dieses Benutzers anzeigen",
     "lang_misskeyparse_renote": "Weiterleiten",
     "lang_misskeyparse_renoteqt": "Renote",
@@ -214,8 +225,8 @@
     "lang_setting_time": "Zeitformat:{{set}}",
     "lang_setting_theme": "Design:{{set}}",
     "lang_setting_nsfw": "NSFW:{{set}}",
-    "lang_setting_cw": "CW:{{set}}",
+    "lang_setting_cw": "NSFW:{{set}}",
-    "lang_setting_cwtext": "Default CW text:{{set}}",
+    "lang_setting_cwtext": "Standard-NSFW-Text:{{set}}",
     "lang_setting_cws": "Always CW on:{{set}}",
     "lang_setting_rp": "Antwortzähler:{{set}}",
     "lang_setting_vis": "Standardsichtbarkeit:{{set}}",
@@ -251,6 +262,6 @@
     "lang_setting_notftestprof": "Ihr Symbol wird angezeigt.",
     "lang_setting_exportwarn": "Nur wichtige Daten werden exportiert. Sie müssen diese Daten sichern.",
     "lang_setting_importwarn": "Alle Daten werden gelöscht.",
-    "lang_setting_noupd": "No available update",
+    "lang_setting_noupd": "Keine Updates verfügbar",
     "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/de-DE/setting.json

@@ -97,7 +97,7 @@
   "tickerwarn": "Zeigt bunte Sticker über den Server. <a href=\"https://wee.jp/\">Über #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
   "animation": "Animation der Verläufe",
   "markers": "Markers(mark as read) on HTL and notifications",
-  "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
+  "markerswarn": "Mastodon 3.0~. Auf WebUI und Drittanbieter-unterstützten Clients geteilt.",
   "remote_img": "Get images from the remote server",
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "replySound": "Ton bei Antwort",
@@ -126,7 +126,8 @@
   "mention": "URL und Name (Hinweis auf den Benutzer)",
   "full": "URL, Text und Name(Hinweis auf den Benutzer)",
   "notqt": "Deaktiviert (Taste in Verlauf ausgeblendet)",
-  "apiQuote": "API(only some instances)",
+  "apiQuote": "API(nur einige Instanzen)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Standard-Konto für Aktionen",
   "mainwarn": "Das Hauptkonto kann in der Kontoverwaltung gestellt werden.",
   "lastacct": "Konto, das Sie kürzlich verwendet haben",

app/view/make/language/de-DE/update.json

@@ -1,10 +1,10 @@
 {
-    "updatehere": "Neusten TheDesk holen.",
+    "updatehere": "Neusten TheDesk holen",
-    "download": "Start",
+    "download": "Beginnen",
     "portable": "Portable Version",
     "installer": "Installer Version",
-    "linux": "zip",
+    "linux": "Zip",
-    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxdeb": "deb(empfohlen auf buntu, Debian)",
     "linuxsnap": "snap",
     "snap": "Snap-Version kann auf Snapcraft sein",
     "sureupd": "Du kannst ein cooles Erlebnis verpassen!",
@@ -15,5 +15,5 @@
     "problem2": "Bitte von <a href=\"https://thedesk.top\">Offizielle Homepage</a> herunterladen.",
     "continue": "Aktualisieren fortsetzen",
     "dlnow": "Herunterladen...",
-    "checkWhatIsNew": "What is new?"
+    "checkWhatIsNew": "Was gibt es neues?"
 }

app/view/make/language/el-GR/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/el-GR/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/view/make/language/el-GR/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/en-US/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "crwdns3302:0crwdne3302:0",
     "localPlusDes": "crwdns3304:0crwdne3304:0",
     "notf": "crwdns3306:0crwdne3306:0",
+    "bookmark": "crwdns4402:0crwdne4402:0",
     "showThisTL": "crwdns3308:0crwdne3308:0",
     "webviewWarn": "crwdns3310:0crwdne3310:0",
     "add": "crwdns3312:0crwdne3312:0",
@@ -167,6 +168,7 @@
     "contactwithlog": "crwdns4378:0crwdne4378:0",
     "about": "crwdns3384:0crwdne3384:0",
     "hereAddColumns": "crwdns3386:0crwdne3386:0",
+    "foundBug": "crwdns4431:0crwdne4431:0",
     "show": "crwdns3388:0crwdne3388:0",
     "directory": "crwdns3390:0crwdne3390:0",
     "active": "crwdns3392:0crwdne3392:0",

app/view/make/language/en-US/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "crwdns3574:0crwdne3574:0",
     "lang_cards_check": "crwdns3576:0crwdne3576:0",
     "lang_cards_pip": "crwdns3578:0crwdne3578:0",
+    "lang_cards_trusted": "crwdns4408:0crwdne4408:0",
+    "lang_cards_untrusted": "crwdns4410:0crwdne4410:0",
     "lang_details_nodata": "crwdns3580:0crwdne3580:0",
     "lang_details_filtered": "crwdns3582:0crwdne3582:0",
     "lang_details_embed": "crwdns3584:0crwdne3584:0",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "crwdns3670:0crwdne3670:0",
     "lang_layout_deleteColumnDesc": "crwdns3672:0crwdne3672:0",
     "lang_layout_unread": "crwdns3674:0crwdne3674:0",
+    "lang_layout_tagManager": "crwdns4411:0crwdne4411:0",
     "lang_sort_gothis": "crwdns3676:0crwdne3676:0",
     "lang_sort_remthis": "crwdns3678:0crwdne3678:0",
     "lang_spotify_img": "crwdns3680:0crwdne3680:0",
@@ -180,9 +183,14 @@
     "lang_parse_bt": "crwdns3760:0crwdne3760:0",
     "lang_parse_fav": "crwdns3762:0crwdne3762:0",
     "lang_parse_quote": "crwdns3764:0crwdne3764:0",
+    "lang_parse_bookmark": "crwdns4394:0crwdne4394:0",
+    "lang_parse_unbookmark": "crwdns4396:0crwdne4396:0",
     "lang_parse_del": "crwdns3766:0crwdne3766:0",
     "lang_parse_pin": "crwdns3768:0crwdne3768:0",
+    "lang_parse_unpin": "crwdns4398:0crwdne4398:0",
+    "lang_parse_link": "crwdns4400:0crwdne4400:0",
     "lang_parse_det": "crwdns3770:0crwdne3770:0",
+    "lang_parse_detail": "crwdns4406:0crwdne4406:0",
     "lang_parse_redraft": "crwdns3772:0crwdne3772:0",
     "lang_parse_followed": "crwdns3774:0crwdne3774:0",
     "lang_parse_clientop": "crwdns3776:0crwdne3776:0",
@@ -192,12 +200,15 @@
     "lang_parse_clientmute": "crwdns3784:0crwdne3784:0",
     "lang_parse_mute": "crwdns3786:0crwdne3786:0",
     "lang_parse_voted": "crwdns3788:0crwdne3788:0",
+    "lang_parse_myvote": "crwdns4415:0crwdne4415:0",
     "lang_parse_vote": "crwdns3790:0crwdne3790:0",
     "lang_parse_unvoted": "crwdns3792:0crwdne3792:0",
     "lang_parse_endedvote": "crwdns3794:0crwdne3794:0",
+    "lang_parse_people": "crwdns4413:0crwdne4413:0",
     "lang_parse_thread": "crwdns3796:0crwdne3796:0",
     "lang_parse_unknown": "crwdns3798:0crwdne3798:0",
     "lang_parse_nsfw": "crwdns3800:0crwdne3800:0",
+    "lang_parse_html": "crwdns4388:0crwdne4388:0",
     "lang_parse_notffilter": "crwdns3802:0crwdne3802:0",
     "lang_misskeyparse_renote": "crwdns3804:0crwdne3804:0",
     "lang_misskeyparse_renoteqt": "crwdns3806:0crwdne3806:0",

app/view/make/language/en-US/setting.json

@@ -127,6 +127,7 @@
   "full": "crwdns4136:0crwdne4136:0",
   "notqt": "crwdns4138:0crwdne4138:0",
   "apiQuote": "crwdns4140:0crwdne4140:0",
+  "showBookmarkAction": "crwdns4404:0crwdne4404:0",
   "main": "crwdns4142:0crwdne4142:0",
   "mainwarn": "crwdns4144:0crwdne4144:0",
   "lastacct": "crwdns4146:0crwdne4146:0",

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

@@ -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",
@@ -168,6 +170,7 @@
     "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",

app/view/make/language/en/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",
@@ -86,8 +87,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.",
@@ -137,6 +138,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -153,6 +155,7 @@
     "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.",
@@ -177,7 +180,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,16 +195,19 @@
     "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",

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

@@ -10,6 +10,7 @@
   "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 of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -137,6 +138,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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

app/view/make/language/es-AR/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrado (local/principal)",
     "localPlusDes": "Local+Respuesta+retoot",
     "notf": "Notificaciones",
+    "bookmark": "Marcadores",
     "showThisTL": "Mostrar esta línea temporal:",
     "webviewWarn": "TweetDeck con TJDeck personalizado (<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Código</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Los atajos de teclado te irritarán. Cuando lo sientas, revisá \"Preferir WebView\" en la parte superior de la columna.",
     "add": "Agregar",
@@ -162,11 +163,12 @@
     "clockTips": "Reloj",
     "ramTips": "Estado de RAM",
     "changeTips": "Cambiar atajos",
-    "helpAndLogs": "Help & Log",
+    "helpAndLogs": "Ayuda y registro",
     "help": "Ayuda",
-    "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
+    "contactwithlog": "Si me comentás de estos errores (algo que funcione mal o que no funcione en absoluto) con este registro, puedo detectar lo que está mal más fácilmente.",
     "about": "Acerca de TheDesk",
     "hereAddColumns": "« Agregar línea temporal",
+    "foundBug": "I found a bug",
     "show": "Mostrar",
     "directory": "Directorio",
     "active": "Recientemente activo",

app/view/make/language/es-AR/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Modo de respuesta. \"Ctrl\" + \"Mayús\" + \"C\" para limpiar.",
     "lang_cards_check": " comprobado",
     "lang_cards_pip": "Modo de pantalla en pantalla",
+    "lang_cards_trusted": "HTML insertado de confianza por TheDesk (Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_untrusted": "HTML insertado no confiable por TheDesk",
     "lang_details_nodata": "Sin datos",
     "lang_details_filtered": "Toot filtrado",
     "lang_details_embed": "El código HTML de inserción se copió al portapapeles.",
@@ -114,7 +116,7 @@
     "lang_tl_postmarkers_title": "Procesando…",
     "lang_tl_postmarkers": "Datos de marcadores POST. Por favor, esperá.",
     "lang_img_DLDone": "Descargado:",
-    "lang_img_copyDone": "Copied: URL of this image",
+    "lang_img_copyDone": "Copiado: dirección web de esta imagen",
     "lang_layout_gotop": "Ir al comienzo de esta columna. Cuando el ícono está rojo, esta columna no se puede conectar a la API del streaming. En ese caso, por favor, refrescá.",
     "lang_layout_thisacct": "{{notf}} de esta cuenta",
     "lang_layout_delthis": "Quitar esta columna",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Eliminar esta columna",
     "lang_layout_deleteColumnDesc": "Eliminar esta columna",
     "lang_layout_unread": "Sin leer",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Ir a esta columna",
     "lang_sort_remthis": "Eliminar esta columna",
     "lang_spotify_img": "Adjuntar la tapa del álbum",
@@ -180,9 +183,14 @@
     "lang_parse_bt": "Retootear este toot",
     "lang_parse_fav": "Marcar como favorito este toot",
     "lang_parse_quote": "Citar este toot",
+    "lang_parse_bookmark": "Marcar esto",
+    "lang_parse_unbookmark": "Desmarcar esto",
     "lang_parse_del": "Eliminar este toot",
     "lang_parse_pin": "Fijar este toot",
+    "lang_parse_unpin": "Desanclar esto",
+    "lang_parse_link": "Abrir en navegador web",
     "lang_parse_det": "Detalles vía tu cuenta principal.",
+    "lang_parse_detail": "Detalles",
     "lang_parse_redraft": "Eliminar toot original y editarlo",
     "lang_parse_followed": "Te sigue",
     "lang_parse_clientop": "Función de este cliente",
@@ -192,12 +200,15 @@
     "lang_parse_clientmute": "silenciar",
     "lang_parse_mute": " será silenciado. Lo podés quitar en la configuración.",
     "lang_parse_voted": "Votado",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Votar",
     "lang_parse_unvoted": "Mostrar el resultado sin votar",
     "lang_parse_endedvote": "Venció",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Mostrar hilo",
     "lang_parse_unknown": "Archivo adjunto",
     "lang_parse_nsfw": "medios sensibles",
+    "lang_parse_html": "Mostrar HTML insertado",
     "lang_parse_notffilter": "Mostrar notificaciones de este usuario",
     "lang_misskeyparse_renote": "Republicar",
     "lang_misskeyparse_renoteqt": "Renovar",

app/view/make/language/es-AR/setting.json

@@ -31,8 +31,8 @@
   "fontsize": "Tamaño de tipografía",
   "savefolder": "Carpeta para guardar",
   "savefolderwarn": "TheDesk usa esta configuración para guardar imágenes en general y capturas de pantallas.",
-  "useragent": "User agent",
+  "useragent": "Cadena de agente de usuario",
-  "useragentWarn": "Restart when changed",
+  "useragentWarn": "Reiniciar cuando se cambie",
   "absolute": "valor absoluto",
   "themeSel": "Seleccionar tema",
   "customtheme": "Editar y agregar temas personalizados",
@@ -98,8 +98,8 @@
   "animation": "Animación de líneas temporales",
   "markers": "Marcadores (marcar como leído) en línea temporal principal y notificaciones",
   "markerswarn": "Mastodon 3.0~. Compartido en interface web y clientes de terceros soportados.",
-  "remote_img": "Get images from the remote server",
+  "remote_img": "Obtener imágenes del servidor remoto",
-  "remote_imgWarn": "All previews are got from your loginned cache server.",
+  "remote_imgWarn": "Todas las previsualizaciones se obtienen de tu servidor de caché conectado.",
   "replySound": "Sonido (respuesta)",
   "favSound": "Sonido (marcado como favorito)",
   "btSound": "Sonido (retoot)",
@@ -127,6 +127,7 @@
   "full": "Dirección web, texto y cuenta (mención al usuario)",
   "notqt": "Deshabilitado (ocultar botones en las líneas temporales)",
   "apiQuote": "API (sólo algunas instancias)",
+  "showBookmarkAction": "Mostrar un botón de marcador",
   "main": "Acciones de cuenta predeterminada",
   "mainwarn": "Se puede establecer la cuenta predeterminada en el Administrador de cuentas.",
   "lastacct": "Cuenta usada recientemente",

app/view/make/language/es-AR/update.json

@@ -4,7 +4,7 @@
     "portable": "Compilación portátil",
     "installer": "Compilación de instalación",
     "linux": "zip",
-    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxdeb": "deb (Recomendado para Debian y Ubuntu)",
     "linuxsnap": "snap",
     "snap": "La compilación Snap puede encontrarse en Snapcraft",
     "sureupd": "¡Podrías perderte una experiencia copada!",
@@ -15,5 +15,5 @@
     "problem2": "Por favor, descargá desde <a href=\"https://thedesk.top/en/\">el sitio web oficial</a>.",
     "continue": "Continuar con la actualización",
     "dlnow": "Descargando…",
-    "checkWhatIsNew": "What is new?"
+    "checkWhatIsNew": "¿Qué hay de nuevo?"
 }

app/view/make/language/es-ES/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/es-ES/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/view/make/language/es-ES/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/fi-FI/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/fi-FI/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/view/make/language/fi-FI/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/fr-FR/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Intégré (local et principal)",
     "localPlusDes": "Integrated(Local and replies and BT on Home)",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/fr-FR/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
     "lang_details_nodata": "Aucune donnée",
     "lang_details_filtered": "Pouet filtré",
     "lang_details_embed": "Embed HTML is cliped.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -180,9 +183,14 @@
     "lang_parse_bt": "Booster ce pouet",
     "lang_parse_fav": "Mettre ce pouet en favoris",
     "lang_parse_quote": "Citer ce pouet",
+    "lang_parse_bookmark": "Bookmark this",
+    "lang_parse_unbookmark": "Unbookmark this",
     "lang_parse_del": "Supprimer ce pouet",
     "lang_parse_pin": "Épingler ce pouet",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Supprimer & reformuler",
     "lang_parse_followed": "Vous a suivi",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/view/make/language/fr-FR/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/he-IL/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/he-IL/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/view/make/language/he-IL/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/hu-HU/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/hu-HU/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/view/make/language/hu-HU/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/it-IT/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/it-IT/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

app/view/make/language/it-IT/setting.json

@@ -127,6 +127,7 @@
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
   "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
   "lastacct": "Account you used recently",

app/view/make/language/ja-KS/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes":"統合(ローカルとホーム)",
     "localPlusDes":"統合(LTL+BT+返信)",
     "notf":"通知",
+    "bookmark": "ブックマーク",
     "showThisTL":"表示するタイムライン",
     "webviewWarn":"TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。キーボードショートカットと干渉しはるから、文字入れる時はカラムの「WebView優先」にチェック入れてからしてな。",
     "add":"追加",
@@ -167,6 +168,7 @@
     "contactwithlog":"なんか知らんけど動かんとかそういうのを開発者のお兄さんお姉さんに言うときは下のログのそこらへんの時間に起きたなぁってのを拾って連絡するとなんかの助けになるかも知れん。ついでやけどこのウィンドウ全体を横に引き伸ばしたらいい感じに見れるで",
     "about":"このソフトについて",
     "hereAddColumns":"←ここからTL追加",
+    "foundBug": "バグあるんやけど",
     "show": "表示",
     "directory": "ディレクトリ",
     "active": "最新活動順",

app/view/make/language/ja-KS/main.json

@@ -137,6 +137,7 @@
     "lang_layout_deleteColumn": "カラム削除",
     "lang_layout_deleteColumnDesc": "カラムを削除してええ？",
     "lang_layout_unread": "未読",
+    "lang_layout_tagManager": "タグタイムラインをいじる",
     "lang_sort_gothis": "このカラムへ",
     "lang_sort_remthis": "このカラムを消す",
     "lang_spotify_img": "アルバムアートワークを付けるで。",
@@ -181,22 +182,30 @@
     "lang_parse_replyto": "このトゥートに返信",
     "lang_parse_bt": "このトゥートをブースト",
     "lang_parse_fav": "このトゥートをお気に入り登録",
+    "lang_parse_bookmark": "ブックマークに入れる",
+    "lang_parse_unbookmark": "ブックマークから消す",
     "lang_parse_quote": "このトゥートを引用",
-    "lang_parse_del": "このトゥートを削除",
+    "lang_parse_del": "削除",
-    "lang_parse_pin": "このトゥートをピン留め",
+    "lang_parse_pin": "ピン留め",
+    "lang_parse_unpin": "ピン留めを解除する",
+    "lang_parse_link": "ブラウザで開く",
+    "lang_parse_detail": "詳細",
     "lang_parse_det": "詳細(メインアカウント経由)",
     "lang_parse_redraft": "このトゥートを削除して再編集",
     "lang_parse_followed": "フォローしてもろた。",
+    "lang_parse_moved": "他のサーバー行ったで",
     "lang_parse_clientop": "クライアント操作",
     "lang_parse_clienttxt": " どうする？",
     "lang_parse_clientno": "何もせえへん",
     "lang_parse_clientemp": "強調表示/解除",
     "lang_parse_clientmute": "ミュート",
     "lang_parse_mute": "ミュートするけど設定から解除できんで。",
-    "lang_parse_voted": "投票済みや",
+    "lang_parse_voted": "(もう投票しとる)",
+    "lang_parse_myvote": "(あんたの)",
     "lang_parse_vote": "投票",
     "lang_parse_unvoted": "結果だけチラ見や",
     "lang_parse_endedvote": "終了済み",
+    "lang_parse_people": "人",
     "lang_parse_thread": "会話を表示",
     "lang_parse_unknown": "添付ファイル",
     "lang_parse_nsfw": "閲覧注意",

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

@@ -136,6 +136,8 @@
   "nothing": "表示しない",
   "localonly": "ローカル限定",
   "zeroWidthEmoji": "絵文字にゼロ幅スペースを使う",
+  "uploadCrop": "添付画像の自動リサイズ",
+  "uploadCropWarn": "最大の長辺ピクセル指定。JPEG以外は勝手にPNGイメージに変換するで。GIFアニメに注意しいや。0に設定するとリサイズせんで。",
   "keysc": "キーボードショートカットの設定",
   "iks": "簡単文字入力",
   "okswarn": "絵文字やタグ、>BTなどを登録しておくとすぐに使えてええ感じや。",

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

@@ -20,6 +20,8 @@
     "yes":"はい",
     "temp":"添付ファイル",
     "nothing":"なし",
+    "stamp": "スタンプ",
+    "stampWarn": "画像右下にアカウント名(aa@bb.cc)テキストを挿入します",
     "vis":"公開範囲",
     "cwtext":"警告文",
     "selectVis":"公開範囲指定",
@@ -168,6 +170,7 @@
     "contactwithlog":"不具合等のお問合わせは以下のログから発生時刻付近のものを集めてご連絡いただけるとスムーズになるかもしれません。また、このメニューウィンドウ全体を横に引き伸ばすとログが見やすくなります。",
     "about":"このソフトについて",
     "hereAddColumns":"←ここからTL追加",
+    "foundBug": "バグを見つけた",
     "show": "表示",
     "directory": "ディレクトリ",
     "active": "最新活動順",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "なし",
     "lang_manager_godev": "MisskeyのDevセンターに移動します。同時に開かれるドキュメントを参考にログインしてください。",
     "lang_manager_logout": "ログアウト",
+    "lang_manager_maxChars": "投稿最大文字数",
     "lang_bbmd_misskey": "TheDeskにおけるMisskeyでは、@を返信として扱いますが、全ての@は消去され別パラメータに入力されます。また、「未収載」を「ホーム」として扱います。",
     "lang_emoji_get": "絵文字リストを取得",
     "lang_emoji_custom": "カスタム絵文字",
@@ -86,8 +87,8 @@
     "lang_usetxtbox_reply": "返信モードです。クリアするときはCtrl+Shift+Cを押してください。",
     "lang_cards_check": "チェック",
     "lang_cards_pip": "ながら観モード",
-    "lang_cards_transted": "TheDeskが認証した埋め込みHTMLです(Twitter, nicovideo, YouTube, Spotify, twitcasting)",
+    "lang_cards_trusted": "TheDeskが認証した埋め込みHTMLです(Twitter, nicovideo, YouTube, Spotify, twitcasting)",
-    "lang_cards_untransted": "TheDeskはこの埋め込みURLの安全性を確認していません",
+    "lang_cards_untrusted": "TheDeskはこの埋め込みURLの安全性を確認していません",
     "lang_details_nodata": "データなし",
     "lang_details_filtered": "フィルターされました。",
     "lang_details_embed": "埋め込みHTMLがコピーされました。",
@@ -137,6 +138,7 @@
     "lang_layout_deleteColumn": "カラム削除",
     "lang_layout_deleteColumnDesc": "カラムを削除しますか？",
     "lang_layout_unread": "未読",
+    "lang_layout_tagManager": "タグタイムラインの編集",
     "lang_sort_gothis": "このカラムへ",
     "lang_sort_remthis": "このカラムを削除",
     "lang_spotify_img": "アルバムアートワークを添付します。",
@@ -153,6 +155,7 @@
     "lang_showontl_movebtn": "移行先を見る",
     "lang_showontl_botacct": "botアカウント",
     "lang_showontl_followed": "フォローされています",
+    "lang_parse_request": "フォローリクエスト",
     "lang_showontl_notf": "通知",
     "lang_showontl_domain": "ドメイン",
     "lang_showontl_listwarn": "リストに追加するためにはフォローが必要です。",
@@ -192,16 +195,19 @@
     "lang_parse_det": "詳細(メインアカウント経由)",
     "lang_parse_redraft": "削除して再編集",
     "lang_parse_followed": "フォローされました。",
+    "lang_parse_moved": "引っ越ししました。",
     "lang_parse_clientop": "クライアント操作",
     "lang_parse_clienttxt": " に対する処理を選択してください。",
     "lang_parse_clientno": "何もしない",
     "lang_parse_clientemp": "強調表示/解除",
     "lang_parse_clientmute": "ミュート",
     "lang_parse_mute": "ミュートします。設定から解除できます。",
-    "lang_parse_voted": "投票済みです",
+    "lang_parse_voted": "(投票済み)",
+    "lang_parse_myvote": "(自分)",
     "lang_parse_vote": "投票",
     "lang_parse_unvoted": "結果だけ見る",
     "lang_parse_endedvote": "終了済み",
+    "lang_parse_people": "人",
     "lang_parse_thread": "会話を表示",
     "lang_parse_unknown": "添付ファイル",
     "lang_parse_nsfw": "閲覧注意",

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

@@ -10,6 +10,7 @@
   "env": "環境設定",
   "setlang": "言語",
   "backup": "設定のインポートとエクスポート",
+  "backupWarn": "インポートできない場合、ここにバックアップデータの中身をコピーしてください。",
   "import": "インポート",
   "export": "エクスポート",
   "hardwareAcceleration": "ハードウェアアクセラレーションの無効化",
@@ -137,6 +138,8 @@
   "nothing": "表示しない",
   "localonly": "ローカル限定",
   "zeroWidthEmoji": "絵文字にゼロ幅スペースを使う",
+  "uploadCrop": "添付画像の自動リサイズ",
+  "uploadCropWarn": "最大の長辺ピクセル指定。JPEG以外は自動でPNGイメージに変換されます。大きなGIFアニメは静止画になります。0に設定するとリサイズしません。",
   "keysc": "キーボードショートカットの設定",
   "iks": "簡単文字入力",
   "okswarn": "絵文字やタグ、>BTなどを登録しておくとすぐに入力できます。",

app/view/make/language/nl-NL/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,6 +168,7 @@
     "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",

app/view/make/language/nl-NL/main.json

@@ -86,6 +86,8 @@
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "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.",
@@ -135,6 +137,7 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -175,14 +178,19 @@
     "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",
     "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
+    "lang_parse_bookmark": "Bookmark this",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
     "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
     "lang_parse_clientop": "Operation of this client",
@@ -191,13 +199,16 @@
     "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_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",