WIP: use-strict 'login'

* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

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

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations index.json (Czech)

* New translations main.json (Czech)

* New translations index.json (German)

* New translations main.json (German)

* New translations main.json (German)

* New translations setting.json (German)

* New translations update.json (German)

.gitignore

@@ -14,6 +14,7 @@ app/node_modules
 app/js/login/tkn.js
 app/view/en
 app/view/ja
+app/view/ja-KS
 app/view/de
 app/view/bg
 app/view/cs

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/master.css

@@ -180,26 +180,6 @@ blockquote:before,
   right: 0;
   top: 0;
 }
-.twitter-tweet {
-  color: black;
-  background-color: #fff;
-  padding: 1em 1em 1em;
-  position: relative;
-  border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
-  border-left: 5px solid #0c7abf;
-}
-.twitter-tweet :before {
-  content: "From Twitter";
-  font-size: 1.8rem;
-  line-height: 1em;
-  font-family: Open Sans;
-  color: #999;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
 .pixiv-post {
   color: black;
   background-color: #fff;

app/css/tl.css

@@ -415,6 +415,40 @@ iframe,
 	color: var(--color);
 	transition: 0.5s;
 }
+#contextWrap {
+	position: fixed;
+	width: 199vw;
+	height: 100vh;
+	z-index: 100;
+}
+.contextMenu {
+	position: fixed;
+	background-color: var(--box);
+	z-index: 9999;
+	border-radius: 5px;
+	padding: 5px;
+}
+.contextMenu.bottom:before {
+	content: '';
+	position: absolute;
+	top: 100%;
+	right: 27px;
+	border: 15px solid transparent;
+	border-top: 15px solid var(--box);
+}
+.contextMenu.top:before {
+	content: '';
+	position: absolute;
+	top: -30px;
+	right: 27px;
+	border: 15px solid transparent;
+	border-bottom: 15px solid var(--box);
+}
+.contextMenu .btn-flat {
+	text-transform: none !important;
+	width: 100%;
+	text-align: left;
+}
 
 .gray {
 	color: var(--gray);

app/js/common/about.js

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

app/js/common/blurhash.js

@@ -1,3 +1,4 @@
+'use strict'
 var digitCharacters = [
     "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
     "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",

app/js/common/hammer.min.js

@@ -1,3 +1,4 @@
+'use strict'
 /*! Hammer.JS - v2.0.8 - 2016-04-23
  * http://hammerjs.github.io/
  *

app/js/common/keyshortcut.js

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

app/js/common/modal.js

@@ -1,3 +1,4 @@
+'use strict'
 //モーダル・ドロップダウンの各種設定
 $(document).ready(function () {
   // the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered

app/js/common/sha256.js

@@ -1,3 +1,4 @@
+'use strict'
 var sha256 = function sha256(ascii) {
 	function rightRotate(value, amount) {
 		return (value >>> amount) | (value << (32 - amount));

app/js/common/version.js

@@ -1,346 +1,373 @@
+'use strict'
 //バージョンチェッカー
 function verck(ver, jp) {
-	console.log("%c Welcome😊", "color: red;font-size:200%;");
-	var date = new Date();
-	var show = false;
-	if (localStorage.getItem("ver") != ver && localStorage.getItem("winstore")) {
+	console.log('%c Welcome😊', 'color: red;font-size:200%;')
+	var date = new Date()
+	var show = false
+	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
 		//ちょっと削除とリンク解析の都合上アレ(s)
 		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
-		if (!localStorage.getItem("usamin_18_6_5_flag")) {
-			localStorage.setItem("usamin_18_6_5_flag", true);
-			var multi = localStorage.getItem("column");
-			var obj = JSON.parse(multi);
+		if (!localStorage.getItem('usamin_18_6_5_flag')) {
+			localStorage.setItem('usamin_18_6_5_flag', true)
+			var multi = localStorage.getItem('column')
+			var obj = JSON.parse(multi)
 			for (var i = 0; i < obj.length; i++) {
-				localStorage.removeItem("card_" + i);
+				localStorage.removeItem('card_' + i)
 			}
 		}
 		//ちょっと削除とリンク解析の都合上アレ(e)
-		show = true;
-		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
+		show = true
+		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 		$(document).ready(function() {
-			if (localStorage.getItem("winstore")) {
-				$("#releasenote").modal("open");
+			if (localStorage.getItem('winstore')) {
+				$('#releasenote').modal('open')
 			}
-			verp = ver.replace("(", "");
-			verp = verp.replace(".", "-");
-			verp = verp.replace(".", "-");
-			verp = verp.replace("[", "-");
-			verp = verp.replace("]", "");
-			verp = verp.replace(")", "");
-			verp = verp.replace(" ", "_");
-			console.log("%c " + verp, "color: red;font-size:200%;");
-			if (lang.language == "ja") {
-				$("#release-" + verp).show();
+			var verp = ver.replace('(', '')
+			verp = verp.replace('.', '-')
+			verp = verp.replace('.', '-')
+			verp = verp.replace('[', '-')
+			verp = verp.replace(']', '')
+			verp = verp.replace(')', '')
+			verp = verp.replace(' ', '_')
+			console.log('%c ' + verp, 'color: red;font-size:200%;')
+			if (lang.language == 'ja') {
+				$('#release-' + verp).show()
 			} else {
-				$("#release-en").show();
+				$('#release-en').show()
 			}
-		});
+		})
 	}
-	localStorage.setItem("ver", ver);
+	localStorage.setItem('ver', ver)
 	if (!show) {
-		console.log(show);
-		if (date.getMonth() + 1 >= localStorage.getItem("showSupportMe") || !localStorage.getItem("showSupportMe")) {
+		console.log(show)
+		if (
+			date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
+			!localStorage.getItem('showSupportMe')
+		) {
 			if (date.getMonth() == 11) {
-				var nextmonth = 1;
+				var nextmonth = 1
 			} else {
-				var nextmonth = date.getMonth() + 2;
+				var nextmonth = date.getMonth() + 2
 			}
-			if (lang.language != "ja") {
-				$("#support-btm-ja").addClass("hide");
-				$("#support-btm-en").removeClass("hide");
+			if (lang.language != 'ja') {
+				$('#support-btm-ja').addClass('hide')
+				$('#support-btm-en').removeClass('hide')
 			}
-			localStorage.setItem("showSupportMe", nextmonth);
-			$("#support-btm").removeClass("hide");
-			$("#support-btm").animate(
+			localStorage.setItem('showSupportMe', nextmonth)
+			$('#support-btm').removeClass('hide')
+			$('#support-btm').animate(
 				{
-					bottom: "0"
+					bottom: '0'
 				},
 				{
 					duration: 300
 				}
-			);
+			)
 		}
 	}
-	var platform = localStorage.getItem("platform");
-	console.log("Your platform:" + platform);
-	if (!localStorage.getItem("winstore")) {
-		$("#start").css("display", "flex");
+	var platform = localStorage.getItem('platform')
+	console.log('Your platform:' + platform)
+	if (!localStorage.getItem('winstore')) {
+		$('#start').css('display', 'flex')
 	}
-	if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
-		var winstore = true;
+	if (
+		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 cl = c.length;
-	var r = "";
+	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
+	var cl = c.length
+	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);
-			setLog(start, "JSON", error);
-			console.error(error);
+			todo(error)
+			setLog(start, 'JSON', 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")) {
-					localStorage.setItem("askjp_jp_ua", true);
-					$("#askjp_jp_ua").removeClass("hide");
+				if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
+					localStorage.setItem('askjp_jp_ua', true)
+					$('#askjp_jp_ua').removeClass('hide')
 				}
-				var platform = localStorage.getItem("platform");
-				if (platform == "darwin") {
-					var newest = mess.desk_mac;
+				var platform = localStorage.getItem('platform')
+				if (platform == 'darwin') {
+					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");
-					if (localStorage.getItem("new-ver-skip")) {
-						if (localStorage.getItem("next-ver") != newest) {
-							postMessage(["sendSinmpleIpc", "update"], "*");
+					localStorage.removeItem('instance')
+					if (localStorage.getItem('new-ver-skip')) {
+						if (localStorage.getItem('next-ver') != newest) {
+							postMessage(['sendSinmpleIpc', 'update'], '*')
 						} else {
-							console.warn(lang.lang_version_skipver);
-							todo(lang.lang_version_skipver);
+							console.warn(lang.lang_version_skipver)
+							todo(lang.lang_version_skipver)
 						}
 					} else {
-						postMessage(["sendSinmpleIpc", "update"], "*");
+						postMessage(['sendSinmpleIpc', 'update'], '*')
 					}
 				}
 			}
-		});
-	if (!localStorage.getItem("last-notice-id")) {
-		localStorage.setItem("last-notice-id", 0);
+		})
+	if (!localStorage.getItem('last-notice-id')) {
+		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);
-			console.error(error);
+			todo(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");
-				localStorage.setItem("last-notice-id", mess[0].ID);
+				var last = localStorage.getItem('last-notice-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;
-								if (obj.toot != "") {
-									var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + "','main')\">Show</button>";
+								var show = true
+								if (obj.toot != '') {
+									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 != "") {
-									var multi = localStorage.getItem("multi");
+								if (obj.domain != '') {
+									var multi = localStorage.getItem('multi')
 									if (multi) {
-										show = false;
-										var accts = JSON.parse(multi);
+										show = false
+										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/");
+	var infows = new WebSocket('wss://thedesk.top/ws/')
 	infows.onopen = function(mess) {
-		console.log([tlid, ":Connect Streaming Info:", mess]);
-		infostreaming = true;
-	};
+		console.log([tlid, ':Connect Streaming Info:', mess])
+		infostreaming = true
+	}
 	infows.onmessage = function(mess) {
-		console.log([tlid, ":Receive Streaming:", JSON.parse(mess.data)]);
-		var obj = JSON.parse(mess.data);
-		if (obj.type != "counter") {
-			if (obj.type == "textv2") {
+		console.log([tlid, ':Receive Streaming:', JSON.parse(mess.data)])
+		var obj = JSON.parse(mess.data)
+		if (obj.type != 'counter') {
+			if (obj.type == 'textv2') {
 				if (~obj.languages.indexOf(lang.language)) {
-					localStorage.setItem("last-notice-id", obj.id);
-					var show = true;
-					if (obj.toot != "") {
-						var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + "','main')\">Show</button>";
+					localStorage.setItem('last-notice-id', obj.id)
+					var show = true
+					if (obj.toot != '') {
+						var toot =
+							'<button class="btn-flat toast-action" onclick="detEx(\'' +
+							obj.toot +
+							"','main')\">Show</button>"
 					} else {
-						var toot = "";
+						var toot = ''
 					}
-					if (obj.ver != "") {
+					if (obj.ver != '') {
 						if (obj.ver == ver) {
-							show = true;
+							show = true
 						} else {
-							show = false;
+							show = false
 						}
 					}
-					if (obj.domain != "") {
-						var multi = localStorage.getItem("multi");
+					if (obj.domain != '') {
+						var multi = localStorage.getItem('multi')
 						if (multi) {
-							show = false;
-							var accts = JSON.parse(multi);
+							show = false
+							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(escapeHTML(obj.text));
-						M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 });
+						console.log(obj.text)
+						console.log(escapeHTML(obj.text))
+						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;
-		console.error("Error closing:info");
-		console.error(error);
-		return false;
-	};
+		infostreaming = false
+		console.error('Error closing:info')
+		console.error(error)
+		return false
+	}
 	infows.onclose = function() {
-		infostreaming = false;
-		console.error("Closing:info");
-	};
+		infostreaming = false
+		console.error('Closing:info')
+	}
 }
 setInterval(function() {
 	if (!infostreaming) {
-		console.log("try to connect to base-streaming");
-		infowebsocket();
+		console.log('try to connect to base-streaming')
+		infowebsocket()
 	}
-}, 10000);
+}, 10000)
 function openRN() {
-	$("#releasenote").modal("open");
-	if (lang.language == "ja") {
-		verp = ver.replace("(", "");
-		verp = verp.replace(".", "-");
-		verp = verp.replace(".", "-");
-		verp = verp.replace("[", "-");
-		verp = verp.replace("]", "");
-		verp = verp.replace(")", "");
-		verp = verp.replace(" ", "_");
-		$("#release-" + verp).show();
+	$('#releasenote').modal('open')
+	if (lang.language == 'ja') {
+		verp = ver.replace('(', '')
+		verp = verp.replace('.', '-')
+		verp = verp.replace('.', '-')
+		verp = verp.replace('[', '-')
+		verp = verp.replace(']', '')
+		verp = verp.replace(')', '')
+		verp = verp.replace(' ', '_')
+		$('#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") {
-		var mes = lang.lang_version_platform;
-	} else if (platform == "linux") {
-		var mes = lang.lang_version_platform_linux;
-	} else if (platform == "darwin") {
-		var mes = lang.lang_version_platform_mac;
+	if (platform == 'win32') {
+		var mes = lang.lang_version_platform
+	} else if (platform == 'linux') {
+		var mes = lang.lang_version_platform_linux
+	} else if (platform == 'darwin') {
+		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",
-		cancelButtonColor: "#3085d6",
+		confirmButtonColor: '#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);
-		show = true;
-		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
+		localStorage.setItem('ver', ver)
+		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 		$(document).ready(function() {
-			$("#releasenote").modal("open");
-			verp = ver.replace("(", "");
-			verp = verp.replace(".", "-");
-			verp = verp.replace(".", "-");
-			verp = verp.replace("[", "-");
-			verp = verp.replace("]", "");
-			verp = verp.replace(")", "");
-			verp = verp.replace(" ", "_");
-			console.log("%c " + verp, "color: red;font-size:200%;");
-			if (lang.language == "ja") {
-				$("#release-" + verp).show();
+			$('#releasenote').modal('open')
+			var verp = ver.replace('(', '')
+			verp = verp.replace('.', '-')
+			verp = verp.replace('.', '-')
+			verp = verp.replace('[', '-')
+			verp = verp.replace(']', '')
+			verp = verp.replace(')', '')
+			verp = verp.replace(' ', '_')
+			console.log('%c ' + verp, 'color: red;font-size:200%;')
+			if (lang.language == 'ja') {
+				$('#release-' + verp).show()
 			} else {
-				$("#release-en").show();
+				$('#release-en').show()
 			}
-		});
-	});
+		})
+	})
 }
 function closeStart() {
-	$("#start").css("display", "none");
-	var platform = localStorage.getItem("platform");
-	var ver = localStorage.getItem("ver");
-	storeDialog(platform, ver);
+	$('#start').css('display', 'none')
+	var platform = localStorage.getItem('platform')
+	var ver = localStorage.getItem('ver')
+	storeDialog(platform, ver)
 }

app/js/emoji/default-emoji.js

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

app/js/emoji/emojipack.js

@@ -1,3 +1,4 @@
+'use strict'
 var activity=[
     {shortcode:"soccer",css:"4.16667% 10.4167%"},
     {shortcode:"basketball",css:"16.6667% 56.25%"},

app/js/login/instance.js

@@ -1,3 +1,4 @@
+'use strict'
 //インスタンスリスト
 var idata = {
 	"kirishima.cloud": "instance",

app/js/login/login.js

@@ -1,129 +1,139 @@
+'use strict'
 /*ログイン処理・認証までのJS*/
 //最初に読むやつ
 //アスタルテ判定初期化
 
-localStorage.removeItem("kirishima");
-localStorage.removeItem("quoters");
-localStorage.removeItem("imas");
-localStorage.removeItem("image");
-localStorage.removeItem("stable");
-localStorage.setItem("mode_misskey.xyz", "misskey");
+localStorage.removeItem('kirishima')
+localStorage.removeItem('quoters')
+localStorage.removeItem('imas')
+localStorage.removeItem('image')
+localStorage.removeItem('stable')
+localStorage.setItem('mode_misskey.xyz', 'misskey')
 function ck() {
-	var main = localStorage.getItem("main");
+	var main = localStorage.getItem('main')
 	if (!main) {
-		localStorage.setItem("main", 0);
+		localStorage.setItem('main', 0)
 	}
 
 	//コード受信
 	if (location.search) {
-		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
-		var mode = m[1];
-		var codex = m[2];
-		if (mode == "manager" || mode == "login") {
-			code(codex, mode);
+		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
+		var mode = m[1]
+		var codex = m[2]
+		if (mode == 'manager' || mode == 'login') {
+			code(codex, mode)
 		} else {
 		}
 	}
-	var multi = localStorage.getItem("multi");
-	if (!multi || multi == "[]") {
-		var date = new Date();
-		localStorage.setItem("showSupportMe", date.getMonth() + 2);
-		location.href = "acct.html?mode=first&code=true";
+	var multi = localStorage.getItem('multi')
+	if (!multi || multi == '[]') {
+		var date = new Date()
+		localStorage.setItem('showSupportMe', date.getMonth() + 2)
+		location.href = 'acct.html?mode=first&code=true'
 	} else {
-		var obj = JSON.parse(multi);
-		var jp = false;
+		var obj = JSON.parse(multi)
+		var jp = false
 		Object.keys(obj).forEach(function(key) {
-			var acct = obj[key];
+			var acct = obj[key]
 			if (acct.domain) {
-				refresh(key, true);
+				refresh(key, true)
 			}
-			if (acct.domain == "mstdn.jp") {
-				jp = true;
+			if (acct.domain == 'mstdn.jp') {
+				jp = true
 			}
-		});
+		})
 		if (obj[0].domain) {
-			$("#tl").show();
-			ticker();
-			multiSelector(false);
-			verck(ver, jp);
-			$(".stw").show();
-			$("#something-wrong img").attr("src", "../../img/thinking.svg");
+			$('#tl').show()
+			ticker()
+			multiSelector(false)
+			verck(ver, jp)
+			$('.stw').show()
+			$('#something-wrong img').attr('src', '../../img/thinking.svg')
 		}
 	}
 }
-ck();
+ck()
 
 //ログインポップアップ
 function login(url) {
-	if ($("#linux:checked").val() == "on") {
-		var red = "urn:ietf:wg:oauth:2.0:oob";
+	if ($('#linux:checked').val() == 'on') {
+		var red = 'urn:ietf:wg:oauth:2.0:oob'
 	} else {
-		var red = "thedesk://login";
+		var red = 'thedesk://login'
 	}
-	localStorage.setItem("redirect", red);
-	var start = "https://" + url + "/api/v1/apps";
-	var httpreq = new XMLHttpRequest();
-	httpreq.open("POST", start, true);
-	httpreq.setRequestHeader("Content-Type", "application/json");
-	httpreq.responseType = "json";
+	localStorage.setItem('redirect', red)
+	var start = 'https://' + url + '/api/v1/apps'
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.responseType = 'json'
 	httpreq.send(
 		JSON.stringify({
-			scopes: "read write follow",
-			client_name: "TheDesk(PC)",
+			scopes: 'read write follow',
+			client_name: 'TheDesk(PC)',
 			redirect_uris: red,
-			website: "https://thedesk.top"
+			website: 'https://thedesk.top'
 		})
-	);
+	)
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response;
+			var json = httpreq.response
 			if (this.status !== 200) {
-				setLog(start, this.status, json);
+				setLog(start, this.status, json)
 			}
-			var auth = "https://" + url + "/oauth/authorize?client_id=" + json["client_id"] + "&client_secret=" + json["client_secret"] + "&response_type=code&redirect_uri=" + red + "&scope=read+write+follow";
-			localStorage.setItem("domain_" + acct_id, url);
-			localStorage.setItem("client_id", json["client_id"]);
-			localStorage.setItem("client_secret", json["client_secret"]);
-			$("#auth").show();
-			$("#masara").hide();
-			postMessage(["openUrl", auth], "*");
+			var auth =
+				'https://' +
+				url +
+				'/oauth/authorize?client_id=' +
+				json['client_id'] +
+				'&client_secret=' +
+				json['client_secret'] +
+				'&response_type=code&redirect_uri=' +
+				red +
+				'&scope=read+write+follow'
+			localStorage.setItem('domain_' + acct_id, url)
+			localStorage.setItem('client_id', json['client_id'])
+			localStorage.setItem('client_secret', json['client_secret'])
+			$('#auth').show()
+			$('#masara').hide()
+			postMessage(['openUrl', auth], '*')
 
-			if ($("#linux:checked").val() == "on") {
+			if ($('#linux:checked').val() == 'on') {
 			} else {
-				postMessage(["sendSinmpleIpc", "quit"], "*");
+				postMessage(['sendSinmpleIpc', 'quit'], '*')
 			}
 		}
-	};
+	}
 }
 
 //テキストボックスにURL入れた
 function instance() {
-	var url = $("#url").val();
-	login(url);
+	var url = $('#url').val()
+	login(url)
 }
 
 //コードを入れた後認証
 function code(code, mode) {
-	var red = localStorage.getItem("redirect");
-	localStorage.removeItem("redirect");
+	var red = localStorage.getItem('redirect')
+	localStorage.removeItem('redirect')
 	if (!code) {
-		var code = $("#code").val();
+		var code = $('#code').val()
 	}
-	if (localStorage.getItem("domain_tmp")) {
-		var url = localStorage.getItem("domain_tmp");
+	if (localStorage.getItem('domain_tmp')) {
+		var url = localStorage.getItem('domain_tmp')
 	} else {
-		var url = localStorage.getItem("domain_" + acct_id);
+		var url = localStorage.getItem('domain_' + acct_id)
 	}
-	var start = "https://" + url + "/oauth/token";
-	var id = localStorage.getItem("client_id");
-	var secret = localStorage.getItem("client_secret");
+	var start = 'https://' + url + '/oauth/token'
+	var id = localStorage.getItem('client_id')
+	var secret = localStorage.getItem('client_secret')
 	fetch(start, {
-		method: "POST",
+		method: 'POST',
 		headers: {
-			"content-type": "application/json"
+			'content-type': 'application/json'
 		},
 		body: JSON.stringify({
-			grant_type: "authorization_code",
+			grant_type: 'authorization_code',
 			redirect_uri: red,
 			client_id: id,
 			client_secret: secret,
@@ -133,451 +143,470 @@ function code(code, mode) {
 		.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);
-			console.error(error);
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(json) {
-			todo(json);
-			if (json["access_token"]) {
-				localStorage.setItem(url + "_at", json["access_token"]);
-				if (mode == "manager") {
-					getdataAdv(url, json["access_token"]);
+			todo(json)
+			if (json['access_token']) {
+				localStorage.setItem(url + '_at', json['access_token'])
+				if (mode == 'manager') {
+					getdataAdv(url, json['access_token'])
 				} else {
-					getdata();
+					getdata()
 				}
 			}
-		});
+		})
 }
 
 //ユーザーデータ取得(最初)
 function getdata() {
-	var acct_id = 0;
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
+	var acct_id = 0
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + at
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
 		}
 	})
 		.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);
-			console.error(error);
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(json) {
 			if (json.error) {
-				console.error("Error:" + json.error);
-				M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 });
-				return;
+				console.error('Error:' + json.error)
+				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				return
 			}
-			var avatar = json["avatar"];
+			var avatar = json['avatar']
 			//missingがmissingなやつ
-			if (avatar == "/avatars/original/missing.png") {
-				avatar = "./img/missing.svg";
+			if (avatar == '/avatars/original/missing.png') {
+				avatar = './img/missing.svg'
 			}
 			var obj = [
 				{
 					at: at,
-					name: json["display_name"],
+					name: json['display_name'],
 					domain: domain,
-					user: json["acct"],
+					user: json['acct'],
 					prof: avatar,
-					id: json["id"],
-					vis: json["source"]["privacy"]
+					id: json['id'],
+					vis: json['source']['privacy']
 				}
-			];
-			var json = JSON.stringify(obj);
-			localStorage.setItem("multi", json);
-			localStorage.setItem("name_" + acct_id, json["display_name"]);
-			localStorage.setItem("user_" + acct_id, json["acct"]);
-			localStorage.setItem("user-id_" + acct_id, json["id"]);
-			localStorage.setItem("prof_" + acct_id, avatar);
-			$("#masara").hide();
-			$("#auth").hide();
-			$("#tl").show();
-			parseColumn();
-			ckdb();
-		});
+			]
+			var json = JSON.stringify(obj)
+			localStorage.setItem('multi', json)
+			localStorage.setItem('name_' + acct_id, json['display_name'])
+			localStorage.setItem('user_' + acct_id, json['acct'])
+			localStorage.setItem('user-id_' + acct_id, json['id'])
+			localStorage.setItem('prof_' + acct_id, avatar)
+			$('#masara').hide()
+			$('#auth').hide()
+			$('#tl').show()
+			parseColumn()
+			ckdb()
+		})
 }
 //ユーザーデータ取得(追加)
 function getdataAdv(domain, at) {
-	var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
+	var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + at
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
 		}
 	})
 		.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);
-			console.error(error);
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(json) {
 			if (json.error) {
-				console.error("Error:" + json.error);
-				M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 });
-				return;
+				console.error('Error:' + json.error)
+				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				return
 			}
-			var avatar = json["avatar"];
+			var avatar = json['avatar']
 			//missingがmissingなやつ
-			if (avatar == "/avatars/original/missing.png") {
-				avatar = "../../img/missing.svg";
+			if (avatar == '/avatars/original/missing.png') {
+				avatar = '../../img/missing.svg'
 			}
-			if (json["source"]["privacy"]) {
-				var priv = json["source"]["privacy"];
+			if (json['source']['privacy']) {
+				var priv = json['source']['privacy']
 			} else {
-				var priv = "public";
+				var priv = 'public'
 			}
 			var add = {
 				at: at,
-				name: json["display_name"],
+				name: json['display_name'],
 				domain: domain,
-				user: json["acct"],
+				user: json['acct'],
 				prof: avatar,
-				id: json["id"],
+				id: json['id'],
 				vis: priv
-			};
-			var multi = localStorage.getItem("multi");
-			var obj = JSON.parse(multi);
-			var target = obj.lengtth;
-			obj.push(add);
-			localStorage.setItem("name_" + target, json["display_name"]);
-			localStorage.setItem("user_" + target, json["acct"]);
-			localStorage.setItem("user-id_" + target, json["id"]);
-			localStorage.setItem("prof_" + target, avatar);
-			var json = JSON.stringify(obj);
-			localStorage.setItem("multi", json);
-			location.href = "index.html";
-		});
+			}
+			var multi = localStorage.getItem('multi')
+			var obj = JSON.parse(multi)
+			var target = obj.lengtth
+			obj.push(add)
+			localStorage.setItem('name_' + target, json['display_name'])
+			localStorage.setItem('user_' + target, json['acct'])
+			localStorage.setItem('user-id_' + target, json['id'])
+			localStorage.setItem('prof_' + target, avatar)
+			var json = JSON.stringify(obj)
+			localStorage.setItem('multi', json)
+			location.href = 'index.html'
+		})
 }
 //ユーザーデータ更新
 function refresh(target, loadskip) {
-	var multi = localStorage.getItem("multi");
-	var obj = JSON.parse(multi);
-	if (obj[target].mode == "misskey") {
-		return;
+	var multi = localStorage.getItem('multi')
+	var obj = JSON.parse(multi)
+	if (obj[target].mode == 'misskey') {
+		return
 	}
-	var start = "https://" + obj[target].domain + "/api/v1/accounts/verify_credentials";
+	var start = 'https://' + obj[target].domain + '/api/v1/accounts/verify_credentials'
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + obj[target].at
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + obj[target].at
 		}
 	})
 		.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);
-			console.error(error);
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(json) {
 			if (json.error) {
-				console.error("Error:" + json.error);
-				M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 });
-				return;
+				console.error('Error:' + json.error)
+				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				return
 			}
-			var avatar = json["avatar"];
+			var avatar = json['avatar']
 			//missingがmissingなやつ
-			if (avatar == "/avatars/original/missing.png" || !avatar) {
-				avatar = "./img/missing.svg";
+			if (avatar == '/avatars/original/missing.png' || !avatar) {
+				avatar = './img/missing.svg'
 			}
 			var ref = {
 				at: obj[target].at,
-				name: json["display_name"],
+				name: json['display_name'],
 				domain: obj[target].domain,
-				user: json["acct"],
+				user: json['acct'],
 				prof: avatar,
-				id: json["id"],
-				vis: json["source"]["privacy"]
-			};
-			localStorage.setItem("name_" + target, json["display_name"]);
-			localStorage.setItem("user_" + target, json["acct"]);
-			localStorage.setItem("user-id_" + target, json["id"]);
-			localStorage.setItem("prof_" + target, avatar);
-			localStorage.setItem("follow_" + target, json["following_count"]);
-			if (json["source"]["sensitive"]) {
-				localStorage.setItem("nsfw_" + target, "true");
+				id: json['id'],
+				vis: json['source']['privacy']
+			}
+			if (obj[target].background) {
+				ref.background = obj[target].background
+			}
+			if (obj[target].text) {
+				ref.text = obj[target].text
+			}
+			localStorage.setItem('name_' + target, json['display_name'])
+			localStorage.setItem('user_' + target, json['acct'])
+			localStorage.setItem('user-id_' + target, json['id'])
+			localStorage.setItem('prof_' + target, avatar)
+			localStorage.setItem('follow_' + target, json['following_count'])
+			if (json['source']['sensitive']) {
+				localStorage.setItem('nsfw_' + target, 'true')
 			} else {
-				localStorage.removeItem("nsfw_" + target);
+				localStorage.removeItem('nsfw_' + target)
 			}
-			obj[target] = ref;
-			var json = JSON.stringify(obj);
-			localStorage.setItem("multi", json);
+			obj[target] = ref
+			var json = JSON.stringify(obj)
+			localStorage.setItem('multi', json)
 			if (!loadskip) {
-				load();
+				load()
 			}
-		});
+		})
 }
 //MarkdownやBBCodeの対応、文字数制限をチェック
 //絶対ストリーミングを閉じさせないマン
 function ckdb(acct_id) {
-	var domain = localStorage.getItem("domain_" + acct_id);
-	localStorage.removeItem("home_" + acct_id);
-	localStorage.removeItem("bb_" + acct_id);
-	localStorage.removeItem("md_" + acct_id);
-	localStorage.removeItem("local_" + acct_id);
-	localStorage.removeItem("public_" + acct_id);
-	localStorage.removeItem("notification_" + acct_id);
-	localStorage.removeItem("post_" + acct_id);
-	localStorage.removeItem("fav_" + acct_id);
-	localStorage.removeItem("bt_" + acct_id);
-	localStorage.removeItem("followlocale_" + acct_id);
-	if (domain == "kirishima.cloud") {
-		localStorage.setItem("kirishima", "true");
-	} else if (domain == "imastodon.net") {
-		localStorage.setItem("imas", "true");
-		$(".imasonly").show();
+	var domain = localStorage.getItem('domain_' + acct_id)
+	localStorage.removeItem('home_' + acct_id)
+	localStorage.removeItem('bb_' + acct_id)
+	localStorage.removeItem('md_' + acct_id)
+	localStorage.removeItem('local_' + acct_id)
+	localStorage.removeItem('public_' + acct_id)
+	localStorage.removeItem('notification_' + acct_id)
+	localStorage.removeItem('post_' + acct_id)
+	localStorage.removeItem('fav_' + acct_id)
+	localStorage.removeItem('bt_' + acct_id)
+	localStorage.removeItem('followlocale_' + acct_id)
+	if (domain == 'kirishima.cloud') {
+		localStorage.setItem('kirishima', 'true')
+	} else if (domain == 'imastodon.net') {
+		localStorage.setItem('imas', 'true')
+		$('.imasonly').show()
 	}
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var bbcode = domain + "_bbcode";
-	var letters = domain + "_letters";
-	var quoteMarker = domain + "_quote";
-	if (localStorage.getItem("instance")) {
-		var json = JSON.parse(localStorage.getItem("instance"));
-		if (json[quoteMarker] == "enabled") {
-			localStorage.setItem("quoters", "true");
-			localStorage.setItem("quote_" + acct_id, "true");
+	var bbcode = domain + '_bbcode'
+	var quoteMarker = domain + '_quote'
+	if (localStorage.getItem('instance')) {
+		var json = JSON.parse(localStorage.getItem('instance'))
+		if (json[quoteMarker] == 'enabled') {
+			localStorage.setItem('quoters', 'true')
+			localStorage.setItem('quote_' + acct_id, 'true')
 		}
 		if (json[bbcode]) {
-			if (json[bbcode] == "enabled") {
-				localStorage.setItem("bb_" + acct_id, "true");
+			if (json[bbcode] == 'enabled') {
+				localStorage.setItem('bb_' + acct_id, 'true')
 			} else {
-				localStorage.removeItem("bb_" + acct_id);
-				$("[data-activates='bbcode']").addClass("disabled");
-				$("[data-activates='bbcode']").prop("disabled", true);
+				localStorage.removeItem('bb_' + acct_id)
+				$("[data-activates='bbcode']").addClass('disabled')
+				$("[data-activates='bbcode']").prop('disabled', true)
 			}
 		} else {
-			localStorage.removeItem("bb_" + acct_id);
-			$("[data-activates='bbcode']").addClass("disabled");
-			$("[data-activates='bbcode']").addClass("disabled", true);
+			localStorage.removeItem('bb_' + acct_id)
+			$("[data-activates='bbcode']").addClass('disabled')
+			$("[data-activates='bbcode']").addClass('disabled', true)
 		}
 
-		if (json[domain + "_markdown"] == "enabled") {
-			localStorage.setItem("md_" + acct_id, "true");
-			$(".markdown").show();
+		if (json[domain + '_markdown'] == 'enabled') {
+			localStorage.setItem('md_' + acct_id, 'true')
+			$('.markdown').show()
 		} else {
-			$(".anti-markdown").hide();
-			$(".markdown").hide();
-			localStorage.removeItem("bb_" + acct_id);
+			$('.anti-markdown').hide()
+			$('.markdown').hide()
+			localStorage.removeItem('bb_' + acct_id)
 		}
-		if (json[domain + "_home"]) {
-			localStorage.setItem("home_" + acct_id, json[domain + "_home"]);
+		if (json[domain + '_home']) {
+			localStorage.setItem('home_' + acct_id, json[domain + '_home'])
 		}
-		if (json[domain + "_local"]) {
-			localStorage.setItem("local_" + acct_id, json[domain + "_local"]);
+		if (json[domain + '_local']) {
+			localStorage.setItem('local_' + acct_id, json[domain + '_local'])
 		}
-		if (json[domain + "_public"]) {
-			localStorage.setItem("public_" + acct_id, json[domain + "_public"]);
+		if (json[domain + '_public']) {
+			localStorage.setItem('public_' + acct_id, json[domain + '_public'])
 		}
-		if (json[domain + "_notification"]) {
-			localStorage.setItem("notification_" + acct_id, json[domain + "_notification"]);
+		if (json[domain + '_notification']) {
+			localStorage.setItem('notification_' + acct_id, json[domain + '_notification'])
 		}
-		if (json[domain + "_post"]) {
-			localStorage.setItem("post_" + acct_id, json[domain + "_post"]);
+		if (json[domain + '_post']) {
+			localStorage.setItem('post_' + acct_id, json[domain + '_post'])
 		}
-		if (json[domain + "_fav"]) {
-			localStorage.setItem("fav_" + acct_id, json[domain + "_fav"]);
+		if (json[domain + '_fav']) {
+			localStorage.setItem('fav_' + acct_id, json[domain + '_fav'])
 		}
-		if (json[domain + "_bt"]) {
-			localStorage.setItem("bt_" + acct_id, json[domain + "_bt"]);
+		if (json[domain + '_bt']) {
+			localStorage.setItem('bt_' + acct_id, json[domain + '_bt'])
 		}
-		if (json[domain + "_follow"]) {
-			localStorage.setItem("followlocale_" + acct_id, json[domain + "_follow"]);
+		if (json[domain + '_follow']) {
+			localStorage.setItem('followlocale_' + acct_id, json[domain + '_follow'])
 		}
 	}
-	if (localStorage.getItem("mode_" + domain) != "misskey") {
-		var start = "https://" + domain + "/api/v1/instance";
+	if (localStorage.getItem('mode_' + domain) != 'misskey') {
+		var start = 'https://' + domain + '/api/v1/instance'
 		fetch(start, {
-			method: "GET",
+			method: 'GET',
 			headers: {
-				"content-type": "application/json"
+				'content-type': 'application/json'
 			}
 		})
 			.then(function(response) {
-				return response.json();
+				return response.json()
 			})
 			.catch(function(error) {
-				console.error(error);
+				console.error(error)
 			})
 			.then(function(json) {
 				if (json.error) {
-					console.error(json.error);
-					return;
+					console.error(json.error)
+					return
 				}
 				if (json) {
-					if (json["max_toot_chars"]) {
-						localStorage.setItem("letters_" + acct_id, json["max_toot_chars"]);
+					if (json['max_toot_chars']) {
+						localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
 					}
-					if (json["urls"]["streaming_api"]) {
-						localStorage.setItem("streaming_" + acct_id, json["urls"]["streaming_api"]);
+					if (json['urls']['streaming_api']) {
+						localStorage.setItem('streaming_' + acct_id, json['urls']['streaming_api'])
 					} else {
-						localStorage.removeItem("streaming_" + acct_id);
+						localStorage.removeItem('streaming_' + acct_id)
 					}
 				}
-			});
+			})
 	} else {
 	}
 }
 
 //アカウントを選択…を実装
 function multiSelector(parseC) {
-	var multi = localStorage.getItem("multi");
+	var multi = localStorage.getItem('multi')
 	if (!multi) {
-		var obj = [];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
+		var obj = []
+		var json = JSON.stringify(obj)
+		localStorage.setItem('multi', json)
 	} else {
-		var obj = JSON.parse(multi);
+		var obj = JSON.parse(multi)
 	}
-	var templete;
-	if (localStorage.getItem("mainuse") == "main") {
-		var last = localStorage.getItem("main");
-	} else if (localStorage.getItem("last-use")) {
-		var last = localStorage.getItem("last-use");
-		if (last == "webview" || last == "noauth") {
-			last = "0";
+	var templete
+	if (localStorage.getItem('mainuse') == 'main') {
+		var last = localStorage.getItem('main')
+	} else if (localStorage.getItem('last-use')) {
+		var last = localStorage.getItem('last-use')
+		if (last == 'webview' || last == 'noauth') {
+			last = '0'
 		}
 	} else {
-		var last = "0";
+		var last = '0'
 	}
-	last = last + "";
-	var sel;
+	last = last + ''
+	var sel
 	if (obj.length < 1) {
-		$("#src-acct-sel").html('<option value="tootsearch">Tootsearch</option>');
-		$("#add-acct-sel").html('<option value="noauth">' + lang.lang_login_noauth + "</option>");
+		$('#src-acct-sel').html('<option value="tootsearch">Tootsearch</option>')
+		$('#add-acct-sel').html('<option value="noauth">' + lang.lang_login_noauth + '</option>')
 	} else {
 		Object.keys(obj).forEach(function(key) {
-			var acct = obj[key];
-			var list = key * 1 + 1;
-			if (key + "" === last) {
-				sel = "selected";
-				var domain = acct.domain;
-				localStorage.setItem("domain_" + key, domain);
-				if (idata[domain + "_letters"]) {
-					$("#textarea").attr("data-length", idata[domain + "_letters"]);
+			var acct = obj[key]
+			var list = key * 1 + 1
+			if (key + '' === last) {
+				sel = 'selected'
+				var domain = acct.domain
+				localStorage.setItem('domain_' + key, domain)
+				if (idata[domain + '_letters']) {
+					$('#textarea').attr('data-length', idata[domain + '_letters'])
 				} else {
-					var maxletters = localStorage.getItem("letters_" + key);
+					var maxletters = localStorage.getItem('letters_' + key)
 					if (maxletters > 0) {
-						$("#textarea").attr("data-length", maxletters);
+						$('#textarea').attr('data-length', maxletters)
 					} else {
-						$("#textarea").attr("data-length", 500);
+						$('#textarea').attr('data-length', 500)
 					}
 				}
-				if (idata[domain + "_glitch"]) {
-					$("#local-button").removeClass("hide");
+				if (idata[domain + '_glitch']) {
+					$('#local-button').removeClass('hide')
 				}
-				var profimg = acct.prof;
+				var profimg = acct.prof
 				//localStorage.setItem("prof_" + key, profimg);
 				if (!profimg) {
-					profimg = "../../img/missing.svg";
+					profimg = '../../img/missing.svg'
 				}
-				$("#acct-sel-prof").attr("src", profimg);
+				$('#acct-sel-prof').attr('src', profimg)
 				if (domain) {
-					var cc = "(" + domain + ")";
+					var cc = '(' + domain + ')'
 				} else {
-					var cc = "";
+					var cc = ''
 				}
-				$("#toot-post-btn").text(lang.lang_toot + cc);
-				if (acct.background && acct.background != "def" && acct.text && acct.text != "def") {
-					$("#toot-post-btn").removeClass("indigo");
-					$("#toot-post-btn").css("background-color", "#" + acct.background);
-					$("#toot-post-btn").css("color", acct.text);
+				$('#toot-post-btn').text(lang.lang_toot + cc)
+				if (acct.background && acct.background != 'def' && acct.text && acct.text != 'def') {
+					$('#toot-post-btn').removeClass('indigo')
+					$('#toot-post-btn').css('background-color', '#' + acct.background)
+					$('#toot-post-btn').css('color', acct.text)
 				} else {
 				}
-				if (domain == "kirishima.cloud") {
-					$("#faicon-btn").show();
+				if (domain == 'kirishima.cloud') {
+					$('#faicon-btn').show()
 				} else {
-					$("#faicon-btn").hide();
+					$('#faicon-btn').hide()
 				}
-				if (domain == "imastodon.net") {
-					trendTag();
+				if (domain == 'imastodon.net') {
+					trendTag()
 				} else {
-					$("#trendtag").html("");
+					$('#trendtag').html('')
 				}
 			} else {
-				sel = "";
+				sel = ''
 			}
-			templete = '<option value="' + key + '" data-icon="' + acct.prof + '" class="left circle" ' + sel + ">" + acct.user + "@" + acct.domain + "</option>";
-			$(".acct-sel").append(templete);
-		});
-		$("#src-acct-sel").append('<option value="tootsearch">Tootsearch</option>');
-		$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
-		$("#dir-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + "</option>");
+			templete =
+				'<option value="' +
+				key +
+				'" data-icon="' +
+				acct.prof +
+				'" class="left circle" ' +
+				sel +
+				'>' +
+				acct.user +
+				'@' +
+				acct.domain +
+				'</option>'
+			$('.acct-sel').append(templete)
+		})
+		$('#src-acct-sel').append('<option value="tootsearch">Tootsearch</option>')
+		$('#add-acct-sel').append(
+			'<option value="noauth">' +
+				lang.lang_login_noauth +
+				'</option><option value="webview">Twitter</option>'
+		)
+		$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
 	}
-	$("select").formSelect();
+	$('select').formSelect()
 	if (!parseC) {
-		parseColumn(null, true);
+		parseColumn(null, true)
 	}
 }
 
 //バージョンエンコ
 function enc(ver) {
-	var ver = ver.replace(/\s/g, "");
-	var ver = ver.replace(/\(/g, "-");
-	var ver = ver.replace(/\)/g, "");
-	var ver = ver.replace(/\[/g, "_");
-	var ver = ver.replace(/\]/g, "");
-	return ver;
+	var ver = ver.replace(/\s/g, '')
+	ver = ver.replace(/\(/g, '-')
+	ver = ver.replace(/\)/g, '')
+	ver = ver.replace(/\[/g, '_')
+	ver = ver.replace(/\]/g, '')
+	return ver
 }
 //インスタンスティッカー
 function ticker() {
-	var start = "https://toot.app/toot/";
+	var start = 'https://toot.app/toot/'
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json"
+			'content-type': 'application/json'
 		}
 	})
 		.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) {
-			console.error(error);
+			console.error(error)
 		})
 		.then(function(json) {
 			if (json) {
-				localStorage.setItem("ticker", JSON.stringify(json));
+				localStorage.setItem('ticker', JSON.stringify(json))
 			}
-		});
+		})
 }

app/js/login/logout.js

@@ -1,3 +1,4 @@
+'use strict'
 //ログアウトします
 function logout() {
 	localStorage.removeItem("acct_" + acct_id + "_at");

app/js/login/manager.js

@@ -1,3 +1,4 @@
+'use strict'
 //アカウントマネージャ
 //最初に読むやつ
 function load() {
@@ -61,7 +62,7 @@ function load() {
 					<i class="material-icons">refresh</i>${lang.lang_manager_refresh}
 				</a>
 				<a class="waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
-					<i class="material-icons">delete</i>${lang.lang_manager_delete}"
+					<i class="material-icons">delete</i>${lang.lang_manager_delete}
 				</a><br />${lang.lang_manager_color}
 				<div id="colorsel_${key}" class="colorsel"></div>
 			</div>
@@ -316,14 +317,8 @@ function support() {
 	Object.keys(idata).forEach(function(key) {
 		var instance = idata[key]
 		if (instance == 'instance') {
-			templete =
-				'<a onclick="login(\'' +
-				key +
-				'\')" class="collection-item pointer transparent">' +
-				idata[key + '_name'] +
-				'(' +
-				key +
-				')</a>'
+			var templete =
+				`<a onclick="login('${key}')" class="collection-item pointer transparent">${idata[key + '_name']}(${key})</a>`
 			$('#support').append(templete)
 		}
 	})
@@ -331,8 +326,6 @@ function support() {
 
 //URL指定してポップアップ
 function login(url) {
-	var multi = localStorage.getItem('multi')
-	var obj = JSON.parse(multi)
 	if ($('#misskey:checked').val() == 'on') {
 		$('#misskey').prop('checked', true)
 		misskeyLogin(url)
@@ -862,6 +855,12 @@ function refresh(target) {
 				id: json['id'],
 				vis: json['source']['privacy']
 			}
+			if (obj[target].background) {
+				ref.background = obj[target].background
+			}
+			if (obj[target].text) {
+				ref.text = obj[target].text
+			}
 			localStorage.setItem('name_' + target, json['display_name'])
 			localStorage.setItem('user_' + target, json['acct'])
 			localStorage.setItem('user-id_' + target, json['id'])
@@ -932,7 +931,6 @@ function multisel() {
 	} else {
 		var obj = JSON.parse(multi)
 	}
-	var templete
 	var last = localStorage.getItem('main')
 	var sel
 	if (obj.length < 1) {
@@ -941,21 +939,18 @@ function multisel() {
 	} else {
 		Object.keys(obj).forEach(function(key) {
 			var acct = obj[key]
-			var list = key * 1 + 1
 			if (key == last) {
 				sel = 'selected'
-				mainb = '(' + lang.lang_manager_def + ')'
-				var domain = localStorage.getItem('domain_' + key)
+				var mainb = '(' + lang.lang_manager_def + ')'
 				var profimg = localStorage.getItem('prof_' + key)
-				var domain = localStorage.getItem('domain_' + key)
 				if (!profimg) {
 					profimg = '../../img/missing.svg'
 				}
 			} else {
 				sel = ''
-				mainb = ''
+				var mainb = ''
 			}
-			template = `
+			var template = `
 			<option value="${key}" data-icon="${acct.prof}" class="left circle" ${sel}>
 				${acct.user}@${acct.domain}${mainb}
 			</option>
@@ -971,7 +966,7 @@ function mainacct() {
 	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
 }
 function colorpicker(key) {
-	temp = `<div onclick="coloradd('${key}','def','def')" class="pointer exc">${lang.lang_manager_none}</div>
+	var temp = `<div onclick="coloradd('${key}','def','def')" class="pointer exc">${lang.lang_manager_none}</div>
 		<div onclick="coloradd('${key}','f44336','white')" class="red white-text pointer"></div>
 		<div onclick="coloradd('${key}','e91e63','white')" class="pink white-text pointer"></div>
 		<div onclick="coloradd('${key}','9c27b0','white')" class="purple white-text pointer"></div>

app/js/platform/end.js

@@ -1,3 +1,4 @@
+'use strict'
 //プラットフォーム別　最後に読むやつ
 //リンクを外部で開くか内部で出すか
 $(document).on('click', 'a', e => {
@@ -10,7 +11,7 @@ $(document).on('click', 'a', e => {
 	if (url) {
 		urls = url.match(/https?:\/\/(.+)/)
 		//トゥートのURLぽかったら
-		toot = url.match(/https:\/\/([^+_]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
+		var toot = url.match(/https:\/\/([^+_]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
 		if (!toot) {
 			//Pleroma対策
 			toot = url.match(/https:\/\/([^+_]+)\/users\/([a-zA-Z0-9_]+)\/statuses\/([0-9]+)/)
@@ -103,7 +104,7 @@ function playSound() {
 	if (soundFile) {
 		soundFile.stop()
 	}
-	context = new AudioContext()
+	var context = new AudioContext()
 	context.createBufferSource().start(0)
 	context.decodeAudioData(request.response, function(buf) {
 		//console.log("Playing:" , source)
@@ -123,11 +124,6 @@ function playSound() {
 	volumeControl.gain.value = vol
 	source.start(0)
 	soundFile = source
-
-	function newFunction() {
-		var source
-		return source
-	}
 }
 function nano() {
 	postMessage(['nano', null], '*')

app/js/platform/first-not-view.js

@@ -1 +1,2 @@
+'use strict'
 //jQuery読む

app/js/platform/first.js

@@ -1,3 +1,4 @@
+'use strict'
 document.title = 'TheDesk'
 $.strip_tags = function(str, allowed) {
 	if (!str) {
@@ -152,33 +153,21 @@ $.isSurrogatePear = function(upper, lower) {
 	return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
 }
 $.mb_strlen = function(str) {
-	var ret = 0
-	for (var i = 0; i < str.length; i++, ret++) {
-		var upper = str.charCodeAt(i)
-		var lower = str.length > i + 1 ? str.charCodeAt(i + 1) : 0
-		if ($.isSurrogatePear(upper, lower)) {
-			i++
-		}
-	}
-	return ret
+	var splitter = new GraphemeSplitter()
+	var arr = splitter.splitGraphemes(str)
+	return arr.length
 }
 $.mb_substr = function(str, begin, end) {
-	var ret = ''
-	for (var i = 0, len = 0; i < str.length; i++, len++) {
-		var upper = str.charCodeAt(i)
-		var lower = str.length > i + 1 ? str.charCodeAt(i + 1) : 0
-		var s = ''
-		if ($.isSurrogatePear(upper, lower)) {
-			i++
-			s = String.fromCharCode(upper, lower)
-		} else {
-			s = String.fromCharCode(upper)
-		}
-		if (begin <= len && len < end) {
-			ret += s
+	//配列にする
+	var splitter = new GraphemeSplitter()
+	var arr = splitter.splitGraphemes(str)
+	var newarr = []
+	for(var i = 0; i < arr.length; i++){
+		if(i >= begin && i <= end){
+			newarr.push(arr[i])
 		}
 	}
-	return ret
+	return newarr.join('')
 }
 //ソートするやつ
 function object_array_sort(data, key, order, fn) {

app/js/platform/nano.js

@@ -1,3 +1,4 @@
+'use strict'
 //TL取得
 var websocket
 function tl(data) {

app/js/platform/preload.js

@@ -1,9 +1,10 @@
+'use strict'
 var electron = require('electron')
 const shell = electron.shell
 var ipc = electron.ipcRenderer
 onmessage = function(e) {
 	if (e.data[0] == 'openUrl') {
-		urls = e.data[1].match(/https?:\/\/(.+)/)
+		var urls = e.data[1].match(/https?:\/\/(.+)/)
 		if (urls) {
 			shell.openExternal(e.data[1])
 		}

app/js/platform/punycode.js

@@ -1,3 +1,4 @@
+'use strict'
 /*! https://mths.be/punycode v1.4.1 by @mathias */
 ;(function(root) {
 	/** Detect free variables */

app/js/post/bb-md.js

@@ -1,3 +1,4 @@
+'use strict'
 //BBCodeとMarkdownの入力・パーサー
 //アカウント変えた時にBBとかMDとか
 function mdCheck() {

app/js/post/emoji.js

@@ -1,3 +1,4 @@
+'use strict'
 //絵文字ピッカー
 //最初に読み込む
 $('#emoji-before').addClass('disabled')
@@ -284,32 +285,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)
-	if (before.slice(-1) != ' ') {
-		before = before + blank
-	}
-	var after = now.substr(selin, now.length)
-	if (after.slice(-1) != ' ') {
-		after = blank + after
-	}
-	newt = before + code + after
-	if (!del) {
-		$('#textarea').val(newt)
-		//emoji();
+	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 now = now.replace(regExp, '')
-		$('#textarea').val(now + blank + code)
+		var delLen = 0
 	}
-
-	$('#textarea').focus()
+	var before = sentence.substr(0, pos - delLen)
+	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

@@ -1,3 +1,4 @@
+'use strict'
 //ドラッグ・アンド・ドロップからアップロードまで。uiのimg.jsとは異なります。
 var obj = $('body')
 var system

app/js/post/misskeystatus.js

@@ -1,3 +1,4 @@
+'use strict'
 //Renpost
 function renote(id, acct_id, remote) {
 	if ($('#pub_' + id).hasClass('rted')) {

app/js/post/post.js

@@ -1,3 +1,4 @@
+'use strict'
 /*投稿系*/
 //投稿
 function sec() {

app/js/post/secure.js

@@ -1,3 +1,4 @@
+'use strict'
 /*保護系*/
 //画像保護
 function nsfw() {

app/js/post/status.js

@@ -1,3 +1,4 @@
+'use strict'
 //お気に入り登録やブースト等、フォローやブロック等
 //お気に入り登録
 function fav(id, acct_id, remote) {
@@ -115,6 +116,48 @@ function boostWith(vis) {
 	var acct_id = $('#tootmodal').attr('data-acct')
 	rt(id, acct_id, false, vis)
 }
+//ブックマーク
+function bkm(id, acct_id, tlid) {
+	if ($('#pub_' + id).hasClass('bkmed')) {
+		var flag = 'unbookmark'
+	} else {
+		var flag = 'bookmark'
+	}
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/statuses/' + id + '/' + flag
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, json)
+			}
+			if (json.reblog) {
+				json = json.reblog
+			}
+			var fav = json.favourites_count
+				$('[toot-id=' + id + '] .fav_ct').text(fav)
+				$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
+				if (flag == 'unbookmark') {
+					$('.bkmStr_' + id).text(lang.lang_parse_bookmark)
+					$('.bkm_' + id).removeClass('red-text')
+					$('[toot-id=' + id + ']').removeClass('bkmed')
+				} else {
+					$('.bkmStr_' + id).text(lang.lang_parse_unbookmark)
+					$('.bkm_' + id).addClass('red-text')
+					$('[toot-id=' + id + ']').addClass('bkmed')
+				}
+				var tlidTar = $(`.bookmark-timeline[data-acct=${acct_id}]`).attr('tlid')
+				columnReload(tlidTar,'bookmark')
+		}
+	}
+}
 
 //フォロー
 async function follow(acct_id, resolve) {
@@ -406,12 +449,14 @@ function pin(id, acct_id) {
 				setLog(start, this.status, this.response)
 			}
 			console.log(['Success: pinned', json])
-			if ($('[toot-id=' + id + ']').hasClass('pined')) {
+			if (flag == 'unpin') {
 				$('[toot-id=' + id + ']').removeClass('pined')
 				$('.pin_' + id).removeClass('blue-text')
+				$('.pinStr_' + id).text(lang.lang_parse_pin)
 			} else {
 				$('[toot-id=' + id + ']').addClass('pined')
 				$('.pin_' + id).addClass('blue-text')
+				$('.pinStr_' + id).text(lang.lang_parse_unpin)
 			}
 		}
 	}
@@ -574,23 +619,35 @@ function staEx(mode) {
 		})
 	return
 }
-function toggleAction(id, tlid, acct_id) {
-	if (tlid == 'notf') {
-		var tlide = '[data-acct=' + acct_id + '] .notf-timeline'
-	} else if (tlid == 'user') {
-		var tlide = '#his-tl-contents'
+function toggleAction(elem, height) {
+	var cont = elem.parents('.cvo').find('.contextMenu')
+	if (cont.hasClass('hide')) {
+		$('#contextWrap').removeClass('hide')
+		var left = elem.offset().left + 60
+		var top = elem.offset().top - height
+		if (top < 75) {
+			top = elem.offset().top + 45
+			cont.removeClass('bottom')
+			cont.addClass('top')
+		} else {
+			cont.removeClass('top')
+			cont.addClass('bottom')
+		}
+		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
+		}
+		cont.css('top', top + 'px')
+		cont.css('right', `calc(100vw - ${left}px)`)
+		cont.removeClass('hide')
+		elem
+			.parents('.cvo')
+			.find('.act-icon')
+			.text('expand_less')
 	} else {
-		var tlide = '[tlid=' + tlid + ']'
-	}
-	if (!$(tlide + ' [toot-id=' + id + ']').hasClass('ext-mode')) {
-		$(tlide + ' [toot-id=' + id + '] .type-a').hide()
-		$(tlide + ' [toot-id=' + id + '] .type-b').show()
-		$(tlide + ' [toot-id=' + id + ']').addClass('ext-mode')
-		$(tlide + ' [toot-id=' + id + '] .act-icon').text('expand_less')
-	} else {
-		$(tlide + ' [toot-id=' + id + '] .type-b').hide()
-		$(tlide + ' [toot-id=' + id + '] .type-a').show()
-		$(tlide + ' [toot-id=' + id + ']').removeClass('ext-mode')
-		$(tlide + ' [toot-id=' + id + '] .act-icon').text('expand_more')
+		$('#contextWrap').addClass('hide')
+		$('.contextMenu').addClass('hide')
+		$('.act-icon').text('expand_more')
 	}
 }

app/js/post/suggest.js

@@ -1,3 +1,4 @@
+'use strict'
 //入力時にハッシュタグと@をサジェスト
 var timer = null
 
@@ -97,7 +98,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 +147,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 +199,34 @@ input.addEventListener(
 	false
 )
 function tagInsert(code, del) {
-	var now = $('#textarea').val()
-	var selin = $('#textarea').prop('selectionStart')
-	if (!del) {
+	var blankBefore = ' '
+	var blankAfter = ' '
+	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 now = now.replace(regExp, '')
-		selin = selin - del.length
+		var delLen = 0
 	}
-	if (selin > 0) {
-		var before = now.substr(0, selin)
-		var after = now.substr(selin, now.length)
-		newt = before + ' ' + code + ' ' + after
+	var before = sentence.substr(0, pos - delLen)
+	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 {
-		newt = code + ' ' + now
+		var word = blankBefore + code + blankAfter
 	}
-	$('#textarea').val(newt)
-	$('#textarea').focus()
+	sentence = before + word + after
+	textarea.value = sentence
 	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
 		$('#right-side').hide()
 		$('#right-side').css('width', '300px')
@@ -251,7 +267,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/post/use-txtbox.js

@@ -1,3 +1,4 @@
+'use strict'
 /*リプライ*/
 function re(id, ats_cm, acct_id, mode) {
 	clear()

app/js/tl/card.js

@@ -1,3 +1,4 @@
+'use strict'
 //カード処理やメンション、ハッシュタグの別途表示
 //全てのTL処理で呼び出し
 function additional(acct_id, tlid) {
@@ -9,24 +10,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', '#')
+			$(this).attr('href', "javascript:tagShow('" + tagThis + "')")
+			
 		}
 	})
 
 	//トゥートサムネ
 	$('#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) {
@@ -40,7 +38,7 @@ function additional(acct_id, tlid) {
 		}
 
 		//トゥートのURLぽかったら
-		toot = text.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
+		var toot = text.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
 		if (toot) {
 			if (toot[1]) {
 				$(this).attr('data-acct', acct_id)
@@ -48,48 +46,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 +95,7 @@ function additional(acct_id, tlid) {
 		var id = $(this)
 			.parents('.cvo')
 			.attr('toot-id')
-		$(this).attr('href', '#')
-		$(this).attr('onclick', "imgv('" + id + "','" + i + "')")
+		$(this).attr('href', `javascript:imgv('${id}','${i}')`)
 		$(this).attr('data-type', 'image')
 		$(this).attr('id', id + '-image-' + i)
 		$(this).attr('data-url', ilink)
@@ -218,71 +173,9 @@ function additionalIndv(tlid, acct_id, id) {
 					console.error(error)
 				})
 				.then(function(json) {
-					json = json.card
-					//このリンク鳥やんけ、ってとき
-					if (json.provider_name == 'Twitter') {
-						if (json.image) {
-							var twiImg = `
-								<br><img src="${json.image}" style="max-width:100%" 
-										onclick="imgv('twi_${id}',0,'twitter')" id="twi_${id}-image-0" 
-										data-url="${json.image}" 
-									data-type="image">
-								`
-						} else {
-							var twiImg = ''
-						}
-						$('[toot-id=' + id + '] .additional').html(`
-							<div class="twitter-tweet"><b>
-								${escapeHTML(json.author_name)}
-								</b><br>
-								${escapeHTML(json.description)}
-								${twiImg}
-								</div>
-						`)
-					} else if (json.provider_name == 'pixiv') {
-						if (json.image) {
-							var pxvImg = `
-							<br><img src="${json.image}" style="max-width:100%" 
-									onclick="imgv('pixiv_${id}',0,'pixiv')" id="pixiv_${id}-image-0" 
-									data-url="${json.embed_url}" 
-								data-type="image">
-							`
-						} else {
-							var pxvImg = ''
-						}
-						$('[toot-id=' + id + '] .additional').html(
-							`<div class="pixiv-post"><b><a href="
-								${json.author_url}
-								" target="_blank">
-								${escapeHTML(json.author_name)}
-								</a></b><br>
-								${escapeHTML(json.title)}
-								${pxvImg}
-								</div>`
-						)
-					} else {
-						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>`
-							)
-						}
-						if (json.html) {
-							$('[toot-id=' + id + '] .additional').html(
-								json.html +
-									`<i class="material-icons sml pointer" onclick="pip('
-									${id}
-									')" title="
-									${lang.lang_cards_pip}
-									">picture_in_picture_alt</i>`
-							)
-						}
-					}
+					var cards = json.card
+					var analyze = cardHtml(cards, acct_id, id)
+					$('[toot-id=' + id + '] .additional').html(analyze)
 					if (json.title) {
 						$('[toot-id=' + id + '] a:not(.parsed)').addClass('parsed')
 						$('[toot-id=' + id + ']').addClass('parsed')
@@ -291,7 +184,132 @@ function additionalIndv(tlid, acct_id, id) {
 		}
 	}
 }
+function cardHtml(json, acct_id, id) {
+	var analyze = ''
+	var domain = json.url.match(/^https?:\/{2,}(.*?)(?:\/|\?|#|$)/)[1];
+	var ok = [
+		"pixiv.net",
+		"twitter.com",
+		"mobile.twitter.com",
+		"open.spotify.com",
+		"youtube.com",
+		"youtu.be",
+		"m.youtube.com",
+		"www.youtube.com",
+		"nicovideo.jp",
+		"twitcasting.tv"
+	]
+	var isHad = _.includes(ok, domain);
+	if (json.provider_name == 'pixiv') {
+		if (json.image) {
+			var pxvImg = `
+			<br><img src="${json.image}" style="max-width:100%" 
+					onclick="imgv('pixiv_${id}',0,'pixiv')" id="pixiv_${id}-image-0" 
+					data-url="${json.embed_url}" 
+				data-type="image">
+			`
+		} else {
+			var pxvImg = ''
+		}
+		analyze = `<div class="pixiv-post"><b><a href="
+				${json.author_url}
+				" target="_blank">
+				${escapeHTML(json.author_name)}
+				</a></b><br>
+				${escapeHTML(json.title)}
+				${pxvImg}
+				</div>`
+	} else {
+		if (json.title) {
+			analyze = `<span class="gray">URL
+					${lang.lang_cards_check}
+					:<br>Title:
+					${escapeHTML(json.title)}
+					<br>
+					${escapeHTML(json.description)}
+					</span>`
+		}
 
+		if (json.html || json.provider_name == 'Twitter') {
+			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_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_untrusted
+			}
+			analyze =`<a onclick="cardHtmlShow('${acct_id}','${id}')" class="add-show pointer" title="${title}">
+			${lang.lang_parse_html}(${domain})${prved}
+			</a>${analyze}<br>`
+		}
+	}
+	return analyze
+}
+function cardHtmlShow(acct_id, id) {
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var text = $('[toot-id=' + id + '] .toot a').attr('href')
+	var urls = text.match(
+		/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
+	)
+	var id = $('[toot-id=' + id + '] .toot a')
+		.parents('.cvo')
+		.attr('toot-id')
+	var start = 'https://' + domain + '/api/v1/statuses/' + id
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
+		}
+		//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) {
+			json = json.card
+			if (json.html) {
+				analyze =
+					json.html +
+					`<i class="material-icons sml pointer" onclick="pip('
+								${id}
+								')" title="
+								${lang.lang_cards_pip}
+								">picture_in_picture_alt</i>`
+			}
+			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){
+						var statusId = status[1]
+					}
+				}
+				console.log(statusId)
+				if(statusId){
+					url = json.url
+					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)
+		})
+}
 //各TL上方のLink[On/Off]
 function cardToggle(tlid) {
 	var card = localStorage.getItem('card_' + tlid)

app/js/tl/datails.js

@@ -1,3 +1,4 @@
+'use strict'
 //トゥートの詳細
 function details(id, acct_id, tlid, mode) {
 	if (mode == 'dm') {
@@ -577,8 +578,8 @@ function staCopy(id) {
 	}
 }
 //翻訳
-function trans(tar, to) {
-	var html = $('#toot-this .toot').html()
+function trans(tar, to, elem) {
+	var html = elem.parents('.cvo').find('.toot').html()
 	if (html.match(/^<p>(.+)<\/p>$/)) {
 		html = html.match(/^<p>(.+)<\/p>$/)[1]
 	}
@@ -615,7 +616,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 +631,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/date.js

@@ -1,3 +1,4 @@
+'use strict'
 //日付パーサー
 function date(str, datetype) {
 	if (datetype == "relative") {

app/js/tl/directory.js

@@ -1,3 +1,4 @@
+'use strict'
 //ディレクトリ
 //ディレクトリトグル
 function dirMenu() {

app/js/tl/filter.js

@@ -1,3 +1,4 @@
+'use strict'
 /*メディアフィルター機能*/
 //各TL上方のMedia[On/Off]
 function mediaToggle(tlid) {

app/js/tl/list.js

@@ -1,3 +1,4 @@
+'use strict'
 function listMenu() {
 	$('#left-menu div').removeClass('active')
 	$('#listMenu').addClass('active')

app/js/tl/misskeyparse.js

@@ -1,3 +1,4 @@
+'use strict'
 function escapeHTMLtemp(str) {
 	if (!str) {
 		return "";
@@ -520,7 +521,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

@@ -1,3 +1,4 @@
+'use strict'
 //Integrated TL
 async function mixtl(acct_id, tlid, type, delc, voice) {
 	localStorage.setItem('now', type)
@@ -87,8 +88,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 +101,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 +114,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 +127,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 +184,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

@@ -1,3 +1,4 @@
+'use strict'
 //通知
 //取得+Streaming接続
 function notf(acct_id, tlid, sys) {

app/js/tl/old-mix.js

@@ -1,3 +1,4 @@
+'use strict'
 //Integrated TL
 function mixtl(acct_id, tlid, type, delc, voice) {
 	localStorage.removeItem('morelock')

app/js/tl/parse.js

@@ -1,5 +1,7 @@
+'use strict'
 //オブジェクトパーサー(トゥート)
 function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
+	var splitter = new GraphemeSplitter()
 	var templete = ''
 	if (obj[0]) {
 		if (tlid === 1) {
@@ -7,12 +9,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		localStorage.setItem('lastunix_' + tlid, date(obj[0].created_at, 'unix'))
 	}
 
-	var actb = 're,rt,fav,qt,del,pin,red'
+	var actb = 're,rt,fav,qt,bkm'
 	if (actb) {
 		var actb = actb.split(',')
 		var disp = {}
 		for (var k = 0; k < actb.length; k++) {
-			if (k < 4) {
+			if (k < 5) {
 				var tp = 'type-a'
 			} else {
 				var tp = 'type-b'
@@ -34,6 +36,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var qtClass = ''
 		}
 	}
+	var bkm = localStorage.getItem('bookmark')
+	if (bkm == 'no' || !bkm) {
+		var bkmClass = 'hide'
+	} else {
+		var bkmClass = ''
+	}
 	var datetype = localStorage.getItem('datetype')
 	var nsfwtype = localStorage.getItem('nsfw')
 	var sent = localStorage.getItem('sentence')
@@ -147,13 +155,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		var wordmute = []
 	}
 	//via通知
-	var viashow = localStorage.getItem('viashow')
-	if (!viashow) {
-		viashow = 'via-hide'
-	}
-	if (viashow == 'hide') {
-		viashow = 'via-hide'
+	var viashowVal = localStorage.getItem('viashow')
+	if (viashowVal == 'yes') {
+		var viashowSet = true
+	} else {
+		var viashowSet = false
 	}
+	var viashow = ''
 	//認証なしTL
 	if (mix == 'noauth') {
 		var noauth = 'hide'
@@ -459,6 +467,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var via = ''
 				viashow = 'hide'
 			} else {
+				if (viashowSet) {
+					viashow = ''
+				} else {
+					viashow = 'hide'
+				}
 				var via = escapeHTML(toot.application.name)
 				if (empCli) {
 					//強調チェック
@@ -500,9 +513,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				} else {
 					var ct = ct2
 				}
+
 				if (
 					(sent < ct && $.mb_strlen($.strip_tags(content)) > 5) ||
-					($.strip_tags(content).length > ltr && $.mb_strlen($.strip_tags(content)) > 5)
+					($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5)
 				) {
 					var content = `<span class="gray">${lang.lang_parse_fulltext}</span><br>` + content
 					var spoil = `<span class="cw-long-${toot.id}">${$.mb_substr(
@@ -526,11 +540,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				.match(
 					/https?:\/\/([^+_]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/
 				)
-			urlsck = content.match(/(https?):\/\/([^<>]*?)\/([^"]*)/g)
+			var urlsck = content.match(/(https?):\/\/([^<>]*?)\/([^"]*)/g)
 			if (urlsck) {
 				for (var urlct = 0; urlct < urlsck.length; urlct++) {
 					var urlindv = urlsck[urlct]
-					urlCont = urlindv.match(/(https?):\/\/([^a-zA-Z0-9.-]*?)\.(.+?)\/([^"]*)/)
+					var urlCont = urlindv.match(/(https?):\/\/([^a-zA-Z0-9.-]*?)\.(.+?)\/([^"]*)/)
 					if (urlCont) {
 						urlindv = urlindv.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&')
 						var encoded = encodeURI(urlCont[4])
@@ -659,13 +673,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				mentions = '<div style="float:right">' + mentions + '</div>'
 			} else {
 				var to_mention = [toot.account.acct]
-				//メンションじゃなくてもlang_parse_thread
-				if (toot.in_reply_to_id) {
-					mentions = `<div style="float:right">
-							<a onclick="details('${toot.id}','${acct_id}','${tlid}')" class="pointer waves-effect">
-								${lang.lang_parse_thread}
-							</a></div>`
-				}
+			}
+			//メンションじゃなくてもlang_parse_thread
+			if (toot.in_reply_to_id) {
+				mentions = `<div style="float:right">
+						<a onclick="details('${toot.id}','${acct_id}','${tlid}')" class="pointer waves-effect">
+							${lang.lang_parse_thread}
+						</a></div>`
 			}
 			var tagck = toot.tags[0]
 			var tags = ''
@@ -676,7 +690,7 @@ 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}}',
@@ -687,7 +701,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>'
 			}
@@ -731,7 +745,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			if (toot.account.acct == localStorage.getItem('user_' + acct_id)) {
 				var if_mine = ''
-				var mine_via = 'type-b'
+				var mine_via = ''
 				var can_rt = ''
 			} else {
 				var if_mine = 'hide'
@@ -754,9 +768,20 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			if (toot.pinned) {
 				var if_pin = 'blue-text'
 				var pin_app = 'pinnedToot'
+				var pinStr = lang.lang_parse_unpin
 			} else {
 				var if_pin = ''
 				var pin_app = ''
+				var pinStr = lang.lang_parse_pin
+			}
+			if (toot.bookmarked) {
+				var if_bkm = 'red-text'
+				var bkm_app = 'bkmed'
+				var bkmStr = lang.lang_parse_unbookmark
+			} else {
+				var if_bkm = ''
+				var bkm_app = ''
+				var bkmStr = lang.lang_parse_bookmark
 			}
 			//アニメ再生
 			if (gif == 'yes') {
@@ -849,10 +874,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//日本語じゃない
 			if (toot.language != lang.language && toot.language) {
-				var trans = `<div class="action pin">
-						<a onclick="trans('${toot.language}','${lang.language}')" 
-							class="waves-effect waves-dark btn-flat actct" style="padding:0" title="${lang.lang_parse_trans}">
-								<i class="material-icons">g_translate</i>
+				var trans = `<div class="">
+						<a onclick="trans('${toot.language}','${lang.language}', $(this))" 
+							class="waves-effect waves-dark btn-flat actct" style="padding:0">
+								<i class="material-icons">g_translate</i>${lang.lang_parse_trans}
 						</a>
 					</div>`
 			} else {
@@ -861,29 +886,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//Cards
 			if (!card && toot.card) {
 				var cards = toot.card
-				if (cards.provider_name == 'Twitter') {
-					if (cards.image) {
-						var twiImg = '<br><img draggable="false" src="' + cards.image + '">'
-					} else {
-						var twiImg = ''
-					}
-					analyze = `<blockquote class="twitter-tweet">
-							<b>${escapeHTML(cards.author_name)}</b><br>
-							${escapeHTML(cards.description)}${twiImg}
-						</blockquote>`
-				}
-				if (cards.title) {
-					analyze = `<span class="gray">
-							URL${lang.lang_cards_check}:<br>
-							Title:${escapeHTML(cards.title)}<br>
-							${escapeHTML(cards.description)}
-						</span>`
-				}
-				if (cards.html) {
-					analyze =
-						cards.html +
-						`<i class="material-icons" onclick="pip('${id}')" title="${lang.lang_cards_pip}">picture_in_picture_alt</i>`
-				}
+				analyze = cardHtml(cards, acct_id, id)
 			}
 			//Ticker
 			var tickerdom = ''
@@ -945,11 +948,25 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</div>
 					</div>`
 			}
+			//menuは何個？
+			var menuct = 2
+			if (viashow != 'hide') {
+				menuct++
+			}
+			if (if_mine != 'hide') {
+				menuct = menuct + 3
+			}
+			if (noauth == 'hide') {
+				menuct = 0
+			}
+			if (trans != '') {
+				menuct++
+			}
 			templete =
 				templete +
 				`<div
 					id="pub_${toot.id}"
-					class="cvo ${mouseover} ${boostback} ${fav_app} ${rt_app} ${pin_app} ${hasmedia} ${animecss}"
+					class="cvo ${mouseover} ${boostback} ${fav_app} ${rt_app} ${pin_app} ${bkm_app} ${hasmedia} ${animecss}"
 					toot-id="${id}" unique-id="${uniqueid}" data-medias="${media_ids}" unixtime="${date(
 					obj[key].created_at,
 					'unix'
@@ -959,15 +976,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					onclick="mov('${toot.id}','${tlid}','cl')"
 					onmouseout="resetmv('mv')"
 				>
-				<div class="area-notice"><span class="gray sharesta">${notice}${home}</span></div>
-				<div class="area-icon">
+				<div class="area-notice grid"><span class="gray sharesta">${notice}${home}</span></div>
+				<div class="area-icon grid">
 					<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
 						<img draggable="false" src="${avatar}" width="40" class="prof-img"
 							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'"/>
 					</a>
 					${noticeavatar}
 				</div>
-				<div class="area-display_name">
+				<div class="area-display_name grid">
 					<div class="flex-name">
 						<span class="user">${dis_name}</span>
 						<span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;">
@@ -981,7 +998,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</span>
 					</div>
 				</div>
-				<div class="area-toot">
+				<div class="area-toot grid">
 					${tickerdom}
 					<span class="${api_spoil} cw_text_${toot.id}">
 						<span class="cw_text">${spoil}</span>
@@ -990,12 +1007,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="toot ${spoiler}">${content}</div>
 					${poll}${viewer}
 				</div>
-				<div class="area-additional">
+				<div class="area-additional grid">
 					<span class="additional">${analyze}</span>
 					${mentions}${tags}
 				</div>
-				<div class="area-vis">${vis}</div>
-				<div class="area-actions">
+				<div class="area-vis grid">${vis}</div>
+				<div class="area-actions grid">
 					<div class="action ${antinoauth}">
 						<a onclick="detEx('${toot.url}','main')" class="waves-effect waves-dark details" style="padding:0">
 							${lang.lang_parse_det}
@@ -1028,6 +1045,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							<i class="text-darken-3 fas fa-quote-right"></i>
 						</a>
 					</div>
+					<div class="action ${disp['bkm']} ${noauth} ${bkmClass}">
+						<a onclick="bkm('${toot.id}','${acct_id}','${tlid}')"
+							class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0"
+							title="${lang.lang_parse_bookmark}">
+							<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
+					</a>
+					</div>
 					<div class="action ${disp['fav']} ${noauth}">
 						<a onclick="fav('${uniqueid}','${acct_id}','${tlid}')"
 							class="waves-effect waves-dark btn-flat actct fav-btn" style="padding:0"
@@ -1036,42 +1060,60 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							<span class="fav_ct">${toot.favourites_count}</span>
 						</a>
 					</div>
-					<div class="${if_mine} action ${disp['del']} ${noauth}">
-						<a onclick="del('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
-							style="padding:0" title="${lang.lang_parse_del}">
-							<i class="fas fa-trash"></i>
-						</a>
-					</div>
-					<div class="${if_mine} action pin ${disp['pin']} ${noauth}">
-							<a onclick="pin('${
-								toot.id
-							}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0"
-								title="${lang.lang_parse_pin}">
-								<i class="fas fa-map-pin pin_${toot.id} ${if_pin}"></i>
-							</a>
-					</div>
-					<div class="${if_mine} action ${disp['red']} ${noauth}">
-							<a onclick="redraft('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
-								style="padding:0" title="${lang.lang_parse_redraft}">
-								<i class="material-icons">redo</i>
-							</a>
-					</div>
-					${trans}
 				</div>
 				<div class="area-side">
-					<span class="cbadge viabadge waves-effect ${viashow} ${mine_via}" style="max-width:60px;"
-						onclick="client('${$.strip_tags(via)}')" title="via ${$.strip_tags(via)}">${via}</span>
-					<div class="action ${if_mine} ${noauth}">
-						<a onclick="toggleAction('${
-							toot.id
-						}','${tlid}','${acct_id}')" class="waves-effect waves-dark btn-flat" style="padding:0">
+					<div class="action ${noauth}">
+						<a onclick="toggleAction($(this), ${menuct * 39 + 6})" 
+							class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0">
 							<i class="text-darken-3 material-icons act-icon">expand_more</i>
 						</a>
 					</div>
 					<div class="action ${noauth}">
-							<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
-								class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0">
-								<i class="text-darken-3 material-icons">more_vert</i></a>
+						<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
+							class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0"
+							title="${lang.lang_parse_detail}">
+						<i class="text-darken-3 material-icons">menu_open</i></a>
+					</div>
+				</div>
+				<div class="contextMenu hide z-depth-4">
+					<div class="${viashow}">
+						via ${escapeHTML(via)}<br>
+						<a onclick="client('${$.strip_tags(via)}')" class="pointer">${lang.lang_parse_clientop}</a>
+					</div>
+					<div>
+					<button onclick="bkm('${toot.id}','${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>
+					</button>
+					</div>
+					<div class="${if_mine}">
+						<button onclick="del('${toot.id}','${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('${
+							toot.id
+						}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
+							<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"
+							style="padding:0">
+							<i class="material-icons">redo</i>${lang.lang_parse_redraft}
+						</button>
+					</div>
+					${trans}
+					<div>
+					<button onclick="postMessage(['openUrl', '${toot.url}'], '*')"
+						class="waves-effect waves-dark btn-flat actct" style="padding:0">
+						<i class="fas text-darken-3 fa-globe"></i>
+						${lang.lang_parse_link}
+					</button>
 					</div>
 				</div>
 			</div>
@@ -1097,7 +1139,6 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	Object.keys(obj).forEach(function(key) {
 		var toot = obj[key]
 		if (toot) {
-			console.log(['Parsing', toot])
 			if (!toot.username) {
 				var raw = toot
 				toot = toot.account
@@ -1113,8 +1154,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					var locked = ''
 				}
 				if (auth == 'request') {
-					var authhtml =
-						`<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept">
+					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept">
 							person_add
 						</i>　
 						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject">
@@ -1185,11 +1225,9 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					var avatar = '../../img/missing.svg'
 				}
 				if (tlid == 'dir' && acct_id == 'noauth') {
-					var udg =
-						`<a onclick="udgEx('${toot.url}','main');" user="${toot.acct}" class="udg">`
+					var udg = `<a onclick="udgEx('${toot.url}','main');" user="${toot.acct}" class="udg">`
 				} else {
-					var udg =
-						`<a onclick="udg('${toot.id}','${acct_id}');" user="${toot.acct}" class="udg">`
+					var udg = `<a onclick="udg('${toot.id}','${acct_id}');" user="${toot.acct}" class="udg">`
 				}
 				var latest = date(toot.last_status_at, 'relative')
 				if (toot.last_status_at) {
@@ -1244,6 +1282,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 }
 //クライアントダイアログ
 function client(name) {
+	$('#contextWrap').addClass('hide')
 	if (name != 'Unknown') {
 		//聞く
 		Swal.fire({
@@ -1320,8 +1359,7 @@ function pollParse(poll, acct_id) {
 		var myvote = lang.lang_parse_endedvote
 		var result_hide = ''
 	} else {
-		var myvote =
-			`<a onclick="voteMastodon('${acct_id}','${poll.id}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
+		var myvote = `<a onclick="voteMastodon('${acct_id}','${poll.id}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
 		if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
 			myvote =
 				myvote +
@@ -1361,10 +1399,9 @@ function pollParse(poll, acct_id) {
 				${voteit}
 			</div>`
 	})
-	pollHtml =
-		`<div class="vote_${acct_id}_${poll.id}">
+	pollHtml = `<div class="vote_${acct_id}_${poll.id}">
 			${pollHtml}${myvote}
-			<a onclick="voteMastodonrefresh(${acct_id}','${poll.id}')" class="pointer">
+			<a onclick="voteMastodonrefresh('${acct_id}','${poll.id}')" class="pointer">
 				${lang.lang_manager_refresh}
 			</a>
 			<span class="cbadge cbadge-hover" title="${date(poll.expires_at, 'absolute')}">

app/js/tl/poll.js

@@ -1,3 +1,4 @@
+'use strict'
 //アンケートのトグル
 function pollToggle() {
 	if ($('#poll').hasClass('hide')) {

app/js/tl/speech.js

@@ -1,8 +1,9 @@
-$voise = null
-isBouyomi = localStorage.getItem('voice_bouyomi')
-$voiseName = lang.lang_speech
-$voices = speechSynthesis.getVoices()
-$synthes = new SpeechSynthesisUtterance()
+'use strict'
+var $voise = null
+var isBouyomi = localStorage.getItem('voice_bouyomi')
+var $voiseName = lang.lang_speech
+var $voices = speechSynthesis.getVoices()
+var $synthes = new SpeechSynthesisUtterance()
 $voise = $.grep($voices, function(n, i) {
 	return n.name == $voiseName
 })[0]
@@ -12,14 +13,14 @@ speechSynthesis.cancel()
 if (!localStorage.getItem('voice_vol')) {
 	localStorage.setItem('voice_vol', 1)
 }
-voiceRate = localStorage.getItem('voice_speed')
+var voiceRate = localStorage.getItem('voice_speed')
 $synthes.rate = voiceRate
-voicePitch = localStorage.getItem('voice_pitch')
+var voicePitch = localStorage.getItem('voice_pitch')
 $synthes.pitch = voicePitch
-voiceVol = localStorage.getItem('voice_vol')
+var voiceVol = localStorage.getItem('voice_vol')
 $synthes.volume = voiceVol
 function say(msgr) {
-	msg = voiceParse(msgr)
+	var msg = voiceParse(msgr)
 	var voice = localStorage.getItem('voicebank')
 	var obj = JSON.parse(voice)
 	if (!obj) {
@@ -31,7 +32,7 @@ function say(msgr) {
 		localStorage.setItem('voicebank', json)
 	}
 }
-$repeat = setInterval(function() {
+var $repeat = setInterval(function() {
 	if (!speechSynthesis.speaking) {
 		var voice = localStorage.getItem('voicebank')
 		if (voice) {
@@ -72,7 +73,7 @@ $repeat = setInterval(function() {
 	}
 }, 300)
 function voiceParse(msg) {
-	msg = $.strip_tags(msg)
+	var msg = $.strip_tags(msg)
 	msg = msg.replace(/#/g, '')
 	msg = msg.replace(/'/g, '')
 	msg = msg.replace(/"/g, '')

app/js/tl/src.js

@@ -1,3 +1,4 @@
+'use strict'
 //検索
 //検索ボックストグル
 function searchMenu() {

app/js/tl/tag.js

@@ -1,3 +1,4 @@
+'use strict'
 //タグ表示
 if (location.search) {
 	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
@@ -10,7 +11,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 +71,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 +126,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/tl/tl.js

@@ -1,5 +1,6 @@
+'use strict'
 //TL取得
-moreloading = false
+var moreloading = false
 var errorct = 0
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	scrollevent()
@@ -56,14 +57,15 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		)
 		$('#notice_icon_' + tlid).text('notifications')
 		return
-	} /*else if (type == "dm") {
-		//DMなら飛ばす
-		dm(acct_id, tlid, "plus",delc,voice);
-		$("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem(
-			"user_" + acct_id) + "@" + domain + ")");
-			$("#notice_icon_" + tlid).text("mail_outline");
-		return;
-	}*/
+	} else if (type == 'bookmark') {
+		//ブックマークなら飛ばす
+		getBookmark(acct_id, tlid)
+		$('#notice_' + tlid).text(
+			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+		)
+		$('#notice_icon_' + tlid).text('bookmark')
+		return
+	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -267,12 +269,6 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			} else {
 				var typeA = JSON.parse(mess.data).event
 				if (typeA == 'delete') {
-					var del = localStorage.getItem('delete')
-					if (del > 10) {
-						reconnector(tlid, type, acct_id, data)
-					} else {
-						localStorage.setItem('delete', del * 1 + 1)
-					}
 					var obj = JSON.parse(mess.data).payload
 					if (delc == 'true') {
 						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
@@ -286,7 +282,6 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 						$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
 					}
 				} else if (typeA == 'update' || typeA == 'conversation') {
-					localStorage.removeItem('delete')
 					if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
 						//markers show中はダメ
 						var obj = JSON.parse(JSON.parse(mess.data).payload)
@@ -394,6 +389,9 @@ function moreload(type, tlid) {
 			var data = obj[tlid].data
 			moreTs(tlid, data)
 			return
+		} else if (type == 'bookmark') {
+			getBookmark(acct_id, tlid, true)
+			return
 		}
 		moreloading = true
 		localStorage.setItem('now', type)
@@ -715,6 +713,8 @@ function cap(type, data, acct_id) {
 		var response = 'Twitter'
 	} else if (type == 'tootsearch') {
 		var response = 'tootsearch(' + escapeHTML(data) + ')'
+	} else if (type == 'bookmark') {
+		var response = 'Bookmarks'
 	}
 	return response
 }
@@ -737,6 +737,8 @@ function com(type, data) {
 		return 'list/' + data + '?'
 	} else if (type == 'dm') {
 		return 'direct?'
+	} else if (type == 'bookmark') {
+		return 'bookmarks?'
 	}
 }
 //Misskey
@@ -807,31 +809,11 @@ function icon(type) {
 		var response = 'language'
 	} else if (type == 'tootsearch') {
 		var response = 'search'
+	} else if (type == 'bookmark') {
+		var response = 'bookmark'
 	}
 	return response
 }
-function strAlive() {
-	var date = new Date()
-	var a = date.getTime()
-	var unix = Math.floor(a / 1000)
-	var col = localStorage.getItem('column')
-	if (col) {
-		var obj = JSON.parse(col)
-		Object.keys(obj).forEach(function(key) {
-			if ($('#notice_icon_' + key).hasClass('red-text')) {
-				var type = obj[key].type
-				var acct_id = obj[key].domain
-				var data = obj[key].data
-				reconnector(key, type, acct_id, data, 'error')
-			}
-		})
-	}
-	return
-}
-
-function strAliveInt() {
-	setTimeout(strAlive, 10000)
-}
 function reconnector(tlid, type, acct_id, data, mode) {
 	console.log('%c Reconnector:' + mode + '(timeline' + tlid + ')', 'color:pink')
 	if (type == 'mix' || type == 'integrated' || type == 'plus') {
@@ -864,6 +846,9 @@ function reconnector(tlid, type, acct_id, data, mode) {
 function columnReload(tlid, type) {
 	$('#notice_icon_' + tlid).addClass('red-text')
 	$('#unread_' + tlid + ' .material-icons').removeClass('teal-text')
+	var multi = localStorage.getItem('column')
+	var obj = JSON.parse(multi)
+	var acct_id = obj[tlid].domain
 	if (type == 'mix' || type == 'integrated' || type == 'plus') {
 		if (localStorage.getItem('voice_' + tlid)) {
 			var voice = true
@@ -879,6 +864,9 @@ function columnReload(tlid, type) {
 	} else if (type == 'notf') {
 		$('#notice_icon_' + tlid).removeClass('red-text')
 		notfColumn(acct_id, tlid, '')
+	} else if (type == 'bookmark') {
+		$('#notice_icon_' + tlid).removeClass('red-text')
+		getBookmark(acct_id, tlid, false)
 	} else {
 		var wss = localStorage.getItem('wss_' + tlid)
 		websocket[wss].close()
@@ -891,7 +879,6 @@ function columnReload(tlid, type) {
 		parseColumn(tlid)
 	}
 }
-strAliveInt()
 //Markers
 function getMarker(tlid, type, acct_id) {
 	var domain = localStorage.getItem('domain_' + acct_id)
@@ -1132,3 +1119,52 @@ function asReadEnd() {
 		postMessage(['asReadComp', ''], '*')
 	}
 }
+//ブックマーク
+function getBookmark(acct_id, tlid, more) {
+	moreloading = true
+	console.log(acct_id, tlid, more)
+	if (more) {
+		var sid = $('#timeline_' + tlid + ' .notif-marker')
+			.last()
+			.attr('data-maxid')
+		var ad = '?max_id=' + sid
+	} else {
+		var ad = ''
+	}
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var start = 'https://' + domain + '/api/v1/bookmarks' + ad
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('GET', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			var max_ids = httpreq.getResponseHeader('link')
+			var max_id = 0
+			if (max_ids) {
+				max_ids = max_ids.match(/[?&]{1}max_id=([0-9]+)/)
+				if (max_ids) {
+					max_id = max_ids[1]
+				}
+			}
+			var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
+			templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
+			if (more) {
+				$('#timeline_' + tlid).append(templete)
+			} else {
+				$('#timeline_' + tlid).html(templete)
+			}
+			$('#landing_' + tlid).hide()
+			jQuery('time.timeago').timeago()
+			moreloading = false
+			todc()
+		}
+	}
+}

app/js/ui/img.js

@@ -1,3 +1,4 @@
+'use strict'
 /*イメージビューワー*/
 //postのimg.jsとは異なります。
 function imgv(id, key, acct_id) {
@@ -76,7 +77,7 @@ function imgCont(type) {
 }
 function imageXhr(id, key, murl) {
 	var startTime = new Date()
-	xhr = new XMLHttpRequest()
+	var xhr = new XMLHttpRequest()
 	xhr.open('GET', murl, true)
 	xhr.responseType = 'arraybuffer'
 	xhr.addEventListener(
@@ -104,7 +105,7 @@ function imageXhr(id, key, murl) {
 	)
 	xhr.onreadystatechange = function() {
 		if (this.readyState == 4 && this.status == 200) {
-			r = new FileReader()
+			var r = new FileReader()
 			r.readAsDataURL(this.response)
 			r.onload = function() {
 				var b64 = r.result

app/js/ui/layout.js

@@ -1,3 +1,4 @@
+'use strict'
 //レイアウトの設定
 
 var websocketOld = []
@@ -202,6 +203,28 @@ function parseColumn(target, dontclose) {
 				animecss,
 				acct.data
 			)
+		} else if (acct.type == 'bookmark') {
+			if (!acct.left_fold) {
+				basekey = key
+			}
+
+			var anime = localStorage.getItem('animation')
+			if (anime == 'yes' || !anime) {
+				var animecss = 'box-anime'
+			} else {
+				var animecss = ''
+			}
+			unstreamingTL(
+				acct.type,
+				key,
+				basekey,
+				insert,
+				icnsert,
+				acct.left_fold,
+				css,
+				animecss,
+				acct.domain
+			)
 		} else {
 			var anime = localStorage.getItem('animation')
 			if (anime == 'yes' || !anime) {
@@ -209,11 +232,14 @@ function parseColumn(target, dontclose) {
 			} else {
 				var animecss = ''
 			}
-			var unread =
-				`<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
+			var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
 					 class="setting nex" title="${lang.lang_layout_unread}">
 					<i class="material-icons waves-effect nex">more</i>
 				</a>`
+			var notfDomain = acct.domain
+			var notfKey = key
+			var if_tag = ''
+			var if_tag_btn = ''
 			if (acct.type == 'notf') {
 				var exclude =
 					lang.lang_excluded +
@@ -257,18 +283,31 @@ function parseColumn(target, dontclose) {
 						</button>`
 				}
 				exclude = exclude + '<br>'
+				notfDomain = 'dummy'
+				notfKey = 'dummy'
 			} else if (acct.type == 'home') {
-				var exclude =
-					`<a onclick="ebtToggle('${key}')" class="setting nex">
+				var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex">
 						<i class="fas fa-retweet waves-effect nex" title="${lang.lang_layout_excludingbt}" style="font-size:24px"></i>
 						<span id="sta-bt-${key}">Off</span>
 					</a>
 					${lang.lang_layout_excludingbt}
 					<br>`
+			} else 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
@@ -281,18 +320,15 @@ function parseColumn(target, dontclose) {
 			if (!acct.left_fold) {
 				basekey = key
 				if (!numtarget) {
-					var basehtml =
-						`<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
+					var basehtml = `<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
 					$('#timeline-container').append(basehtml)
 				}
-				var left_hold =
-					`<a onclick="leftFoldSet('${key}')" class="setting nex">
+				var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
 					</a>
 					${lang.lang_layout_leftFold}<br>`
 			} else {
-				var left_hold =
-					`<a onclick="leftFoldRemove('${key}')" class="setting nex">
+				var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
 					</a>
 					${lang.lang_layout_leftUnfold}<br>`
@@ -315,8 +351,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">
@@ -335,6 +370,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>
@@ -353,8 +389,8 @@ function parseColumn(target, dontclose) {
 						</a>
 					</div>
 				</div>
-				<div class="column-hide notf-indv-box z-depth-4" id="notf-box_${key}">
-					<div id="notifications_${key}" data-notf="${acct.domain}" data-type="notf" class="notf-timeline">
+				<div class="column-hide notf-indv-box z-depth-4" id="notf-box_${notfKey}">
+					<div id="notifications_${notfKey}" data-notf="${notfDomain}" data-type="notf" class="notf-timeline">
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
@@ -364,7 +400,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>
@@ -386,7 +422,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}">
@@ -637,9 +673,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 =
-		`<div onclick="coloradd('${key}','def','def')" class="pointer">Default</div>
+	var temp = `<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>
@@ -691,8 +759,7 @@ function coloradd(key, bg, txt) {
 }
 //禁断のTwitter
 function webviewParse(url, key, insert, icnsert, css) {
-	var html =
-		`<div class="box" id="timeline_box_${key}_box" tlid="${key}" style="${css}">
+	var html = `<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>
@@ -724,105 +791,69 @@ function webviewParse(url, key, insert, icnsert, css) {
 		</div>`
 	return html
 }
-function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, animecss, q) {
+function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, animecss, data) {
+	//type名が関数名
 	if (!left_fold) {
-		var basehtml =
-			'<div style="' +
-			css +
-			'" class="box ' +
-			animecss +
-			'" id="timeline_box_' +
-			basekey +
-			'_parentBox"></div>'
+		var basehtml = `<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
 		$('#timeline-container').append(basehtml)
-		var left_hold =
-			'<a onclick="leftFoldSet(' +
-			key +
-			')" class="setting nex"><i class="material-icons waves-effect nex" title="' +
-			lang.lang_layout_leftFold +
-			'">view_agenda</i></a>' +
-			lang.lang_layout_leftFold +
-			'</span><br>'
+		var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex">
+				<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
+			</a>
+			${lang.lang_layout_leftFold}
+			</span><br>`
 	} else {
-		var left_hold =
-			'<a onclick="leftFoldRemove(' +
-			key +
-			')" class="setting nex"><i class="material-icons waves-effect nex" title="' +
-			lang.lang_layout_leftUnfold +
-			'">view_column</i></a>' +
-			lang.lang_layout_leftUnfold +
-			'</span><br>'
+		var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex">
+				<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
+			</a>
+			${lang.lang_layout_leftUnfold}
+			</span><br>`
 	}
-	var html =
-		'<div class="boxIn" id="timeline_box_' +
-		key +
-		'_box" tlid="' +
-		key +
-		'"><div class="notice-box z-depth-2" id="menu_' +
-		key +
-		'" style="' +
-		insert +
-		' ">' +
-		'<div class="area-notice"><i class="material-icons waves-effect" id="notice_icon_' +
-		key +
-		'" style="font-size:40px; padding-top:25%;" onclick="tootsearch(' +
-		key +
-		",'" +
-		q +
-		'\');" title="' +
-		lang.lang_layout_gotop +
-		'"></i></div>' +
-		'<div class="area-notice_name"><span id="notice_' +
-		key +
-		'" class="tl-title"></span></div>' +
-		'<div class="area-a1"></div><div class="area-sta"></div>' +
-		'<div class="area-a2"><a onclick="removeColumn(' +
-		key +
-		')" class="setting nex"><i class="material-icons waves-effect nex" title="' +
-		lang.lang_layout_delthis +
-		'"' +
-		icnsert +
-		'>cancel</i></a></div>' +
-		'<div class="area-a3"><a onclick="setToggle(' +
-		key +
-		')" class="setting nex" title="' +
-		lang.lang_layout_setthis +
-		'"' +
-		icnsert +
-		'><i class="material-icons waves-effect nex">settings</i></a></div></div>' +
-		'<div class="column-hide notf-indv-box" id="util-box_' +
-		key +
-		'" style="padding:5px;">' +
-		left_hold +
-		'<a onclick="mediaToggle(' +
-		key +
-		')" class="setting nex"><i class="material-icons waves-effect nex" title="' +
-		lang.lang_layout_mediafil +
-		'">perm_media</i><span id="sta-media-' +
-		key +
-		'">On</span></a>' +
-		lang.lang_layout_mediafil +
-		'<br>' +
-		lang.lang_layout_headercolor +
-		'<br><div id="picker_' +
-		key +
-		'" class="color-picker"></div></div><div class="tl-box" tlid="' +
-		key +
-		'"><div id="timeline_' +
-		key +
-		'" class="tl ' +
-		type +
-		'-timeline " tlid="' +
-		key +
-		'" data-type="' +
-		type +
-		'" data-acct="nostr"><div id="landing_' +
-		key +
-		'" style="text-align:center">' +
-		lang.lang_layout_nodata +
-		'</div></div></div>'
+	var html = `<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}">
+			<div class="notice-box z-depth-2" id="menu_${key}" style="${insert} ">
+				<div class="area-notice">
+					<i class="material-icons waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;" 
+						onclick="${type}('${key}','${data}');" title="${lang.lang_layout_gotop}"></i>
+				</div>
+				<div class="area-notice_name">
+					<span id="notice_${key}" class="tl-title"></span>
+				</div>
+				<div class="area-a1"></div>
+				<div class="area-sta"></div>
+				<div class="area-a2">
+					<a onclick="removeColumn('${key}')" class="setting nex">
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}"${icnsert}>cancel</i>
+					</a>
+				</div>
+				<div class="area-a3">
+					<a onclick="setToggle('${key}')" class="setting nex" title="${lang.lang_layout_setthis}" ${icnsert}>
+						<i class="material-icons waves-effect nex">settings</i>
+					</a>
+				</div>
+			</div>
+		<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
+			${left_hold}
+			<a onclick="mediaToggle('${key}')" class="setting nex">
+				<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
+				<span id="sta-media-${key}">On</span>
+			</a>
+			${lang.lang_layout_mediafil}<br>
+			${lang.lang_layout_headercolor}<br>
+			<div id="picker_${key}" class="color-picker"></div>
+		</div>
+		<div class="tl-box" tlid="${key}">
+			<div id="timeline_${key}" class="tl ${type}-timeline" tlid="${key}" data-type="${type}" data-acct="${data}">
+				<div id="landing_${key}" style="text-align:center">
+					${lang.lang_layout_nodata}
+				</div>
+			</div>
+		</div>`
 	$('#timeline_box_' + basekey + '_parentBox').append(html)
-	tootsearch(key, q)
+	if (type == 'tootsearch') {
+		tootsearch(key, data)
+	} else if (type == 'bookmark') {
+		console.log(key, data)
+		bookmark(key, data)
+	}
 	cardCheck(key)
 	ebtCheck(key)
 	mediaCheck(key)
@@ -830,6 +861,15 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 	voiceCheck(key)
 	return true
 }
+function bookmark(key, data) {
+	console.log(key, data)
+	if (localStorage.getItem('voice_' + key)) {
+		var voice = true
+	} else {
+		var voice = false
+	}
+	tl('bookmark', '', data, key, 'false', voice, '')
+}
 function leftFoldSet(key) {
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)

app/js/ui/menu.js

@@ -1,3 +1,4 @@
+'use strict'
 function menu() {
   localStorage.setItem("menu-done", true);
   $("#fukidashi").addClass("hide")

app/js/ui/pip.js

@@ -1,3 +1,4 @@
+'use strict'
 function pip(id) {
     $("#pip-content").html($("[toot-id=" + id + "] .additional").html());
     $("#pip").removeClass("hide");

app/js/ui/post-box.js

@@ -1,135 +1,141 @@
+'use strict'
 /*ささやきボックス(Cr民並感)*/
 //✕隠す
 function hide() {
-	$("#right-side").hide()
-	$("#right-side").css("width", "300px")
-	$("#left-side").css("width", "100%")
-	var width = localStorage.getItem("postbox-width");
-	if(width){
-		width = width.replace("px", "") * 1
+	$('#right-side').hide()
+	$('#right-side').css('width', '300px')
+	$('#left-side').css('width', '100%')
+	var width = localStorage.getItem('postbox-width')
+	if (width) {
+		width = width.replace('px', '') * 1
 	} else {
 		width = 300
 	}
-	$("#post-box").css("width", width)
+	$('#post-box').css('width', width)
 	$('#post-box').fadeOut()
-	$("#post-box").removeClass("appear")
-	$("#emoji").addClass("hide")
-	$("#left-side").show();
-	$("#default-emoji").show();
-	$("#unreact").show();
-	$("#addreact").addClass("hide");
+	$('#post-box').removeClass('appear')
+	$('#emoji').addClass('hide')
+	$('#left-side').show()
+	$('#default-emoji').show()
+	$('#unreact').show()
+	$('#addreact').addClass('hide')
 }
 //最小化
 function mini() {
-	$("body").toggleClass("mini-post");
-	if ($("body").hasClass("mini-post")) {
-		$(".mini-btn").text("expand_less");
+	$('body').toggleClass('mini-post')
+	if ($('body').hasClass('mini-post')) {
+		$('.mini-btn').text('expand_less')
 	} else {
-		$(".mini-btn").text("expand_more");
+		$('.mini-btn').text('expand_more')
 	}
 }
 //最小化時に展開
 function show() {
-	$("#post-box").addClass("appear")
-	$("#textarea").focus();
-	console.log("show" + localStorage.getItem("postbox-left"));
-	var left = localStorage.getItem("postbox-left");
+	$('#post-box').addClass('appear')
+	$('#textarea').focus()
+	console.log('show' + localStorage.getItem('postbox-left'))
+	var left = localStorage.getItem('postbox-left')
 	if (left > $('body').width() - $('#post-box').width()) {
-		left = $('body').width() - $('#post-box').width();
+		left = $('body').width() - $('#post-box').width()
 	} else if (left < 0) {
-		left = 0;
+		left = 0
 	}
-	var top = localStorage.getItem("postbox-top");
+	var top = localStorage.getItem('postbox-top')
 	if (top > $('body').height() - $('#post-box').height()) {
-		top = $('body').height() - $('#post-box').height();
+		top = $('body').height() - $('#post-box').height()
 	} else if (top < 0) {
-		top = 0;
+		top = 0
 	}
-	$('#post-box').css("left", left + "px")
-	$('#post-box').css("top", top + "px")
-	var width = localStorage.getItem("postbox-width");
+	$('#post-box').css('left', left + 'px')
+	$('#post-box').css('top', top + 'px')
+	var width = localStorage.getItem('postbox-width')
 	if (width) {
-		$('#post-box').css("width", width + "px")
+		$('#post-box').css('width', width + 'px')
 	} else {
-		$('#post-box').css("width", "300px")
+		$('#post-box').css('width', '300px')
 	}
-	$('#post-box').fadeIn();
-	$('#textarea').characterCounter();
+	$('#post-box').fadeIn()
+	$('#textarea').characterCounter()
 	mdCheck()
 }
 
-$(function () {
-	$("#post-box").draggable({
-		handle: "#post-bar",
-		stop: function () {
-			var left = $('#post-box').offset().left;
+$(function() {
+	$('#post-box').draggable({
+		handle: '#post-bar',
+		stop: function() {
+			var left = $('#post-box').offset().left
 			if (left > $('body').width() - $('#post-box').width()) {
-				left = $('body').width() - $('#post-box').width();
+				left = $('body').width() - $('#post-box').width()
 			} else if (left < 0) {
-				left = 0;
+				left = 0
 			}
-			var top = $('#post-box').offset().top;
+			var top = $('#post-box').offset().top
 			if (top > $('body').height() - $('#post-box').height()) {
-				top = $('body').height() - $('#post-box').height();
+				top = $('body').height() - $('#post-box').height()
 			} else if (top < 0) {
-				top = 0;
+				top = 0
 			}
-			localStorage.setItem("postbox-left", left);
-			localStorage.setItem("postbox-top", top);
+			localStorage.setItem('postbox-left', left)
+			localStorage.setItem('postbox-top', top)
 		}
-	});
-	$("#post-box").resizable({
+	})
+	$('#post-box').resizable({
 		minHeight: 150,
 		minWidth: 100,
-		stop: function (event, ui) {
-			$("#textarea").blur()
-			localStorage.setItem("postbox-width", ui.size.width);
+		stop: function(event, ui) {
+			$('#textarea').blur()
+			localStorage.setItem('postbox-width', ui.size.width)
 		}
-	});
-});
+	})
+})
 
 //コード受信
 if (location.search) {
-	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
-	var mode = m[1];
-	var codex = m[2];
-	if (mode == "share") {
-		$('textarea').focus();
-		$("#textarea").val(decodeURI(codex));
-		show();
-		$("body").removeClass("mini-post");
-		$(".mini-btn").text("expand_less");
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
+	var mode = m[1]
+	var codex = m[2]
+	if (mode == 'share') {
+		$('textarea').focus()
+		$('#textarea').val(decodeURI(codex))
+		show()
+		$('body').removeClass('mini-post')
+		$('.mini-btn').text('expand_less')
 	}
 }
-$('#posttgl').click(function (e) {
-	if (!$('#post-box').hasClass("appear")) {
-		show();
+$('#posttgl').click(function(e) {
+	if (!$('#post-box').hasClass('appear')) {
+		show()
 	} else {
-		hide();
+		hide()
 	}
-	$('.cvo').removeClass("selectedToot")
+	$('.cvo').removeClass('selectedToot')
 	selectedColumn = 0
 	selectedToot = 0
-});
+})
 
-$("#timeline-container,#group").click(function (e) {
-	if (localStorage.getItem("box") != "absolute") {
-		if ($('#post-box').hasClass("appear") && !localStorage.getItem("nohide")) {
-			hide();
+$('#timeline-container,#group').click(function(e) {
+	if (localStorage.getItem('box') != 'absolute') {
+		if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
+			hide()
 		}
 	}
-	$('.cvo').removeClass("selectedToot")
+	$('.cvo').removeClass('selectedToot')
 	selectedColumn = 0
 	selectedToot = 0
-	localStorage.removeItem("nohide")
-});
-$('#textarea,#cw-text').focusout(function (e) {
-	localStorage.setItem("nohide", true)
-	var countup = function () {
-		localStorage.removeItem("nohide")
+	localStorage.removeItem('nohide')
+})
+$('#contextWrap').click(function(e) {
+	$('#contextWrap').addClass('hide')
+	$('.contextMenu').addClass('hide')
+	$('.act-icon').text('expand_more')
+})
+$('#textarea,#cw-text').focusout(function(e) {
+	localStorage.setItem('nohide', true)
+	var countup = function() {
+		localStorage.removeItem('nohide')
 	}
 	//setTimeout(remove, 100);
-	$('.cvo').removeClass("selectedToot")
+	$('.cvo').removeClass('selectedToot')
 	selectedColumn = 0
 	selectedToot = 0
-});
+})

app/js/ui/radio.js

@@ -1,3 +1,4 @@
+'use strict'
 var r = document.getElementById("radio");
 function Rtoggle() {
     if ($("#radio").hasClass("play")) {

app/js/ui/scroll.js

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

@@ -1,3 +1,4 @@
+'use strict'
 //設定(setting.html)で読む
 var envView = new Vue({
 	el: "#envView",

app/js/ui/sort.js

@@ -1,3 +1,4 @@
+'use strict'
 //ソートデータ読み込み
 function sortLoad () {
 	$("#sort").html("");

app/js/ui/spotify.js

@@ -1,3 +1,4 @@
+'use strict'
 function spotifyConnect() {
 	var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing";
 	var platform = localStorage.getItem("platform");

app/js/ui/theme.js

@@ -1,3 +1,4 @@
+'use strict'
 //テーマ適用
 function themes(theme) {
 	if (!theme) {

app/js/ui/tips.js

@@ -1,3 +1,4 @@
+'use strict'
 //左下のメッセージ
 var todcTrigger = null
 function todo(mes) {
@@ -111,7 +112,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>`
@@ -128,7 +129,7 @@ function trendTagonTip() {
 		})
 }
 //Spotify
-spotint = null
+var spotint = null
 function spotifytips() {
 	if (spotint) clearInterval(spotint)
 	var start =

app/js/userdata/his-data.js

@@ -1,3 +1,4 @@
+'use strict'
 //ユーザーデータ表示
 //タイムライン
 function utl(user, more, acct_id) {

app/js/userdata/prof-edit.js

@@ -1,3 +1,4 @@
+'use strict'
 //プロフ編集
 //文字系
 function profedit() {

app/js/userdata/showOnTL.js

@@ -1,3 +1,4 @@
+'use strict'
 //ユーザーデータ表示
 localStorage.removeItem("history");
 //コード受信
@@ -25,7 +26,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,327 @@
-var dirname = __dirname;
-var dir = "file://" + __dirname;
-var base = dir + "/view/";
+var dirname = __dirname
+var dir = 'file://' + __dirname
+var base = dir + '/view/'
 // Electronのモジュール
-const electron = require("electron");
-const fs = require("fs");
-const language = require("./main/language.js");
-const css = require("./main/css.js");
-const dl = require("./main/dl.js");
-const img = require("./main/img.js");
-const np = require("./main/np.js");
-const systemFunc = require("./main/system.js");
-const Menu = electron.Menu;
-const join = require("path").join;
+const electron = require('electron')
+const fs = require('fs')
+const language = require('./main/language.js')
+const css = require('./main/css.js')
+const dl = require('./main/dl.js')
+const img = require('./main/img.js')
+const np = require('./main/np.js')
+const systemFunc = require('./main/system.js')
+const Menu = electron.Menu
+const join = require('path').join
 
 // アプリケーションをコントロールするモジュール
-const 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();
-			mainWindow.focus();
+			if (mainWindow.isMinimized()) mainWindow.restore()
+			mainWindow.focus()
 		}
-	});
+	})
 }
 
-if (process.argv.indexOf("--dev") === -1) {
-	var packaged = true;
+if (process.argv.indexOf('--dev') === -1) {
+	var packaged = true
 } else {
-	var packaged = false;
-	console.log("||\\\\\\ \n" + "||||  \\\\\\\\ \n" + "||||     \\\\\\\\ \n" + "|||| Am I a \\\\\\\\ \n" + "|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n" + "||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n" + "||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" + "|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n" + "||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n" + "||||          /////         \n" + "||||       /////\n" + "||||     /////\n" + "||||//////");
-	console.log("Welcome!");
+	var packaged = false
+	console.log(
+		'||\\\\\\ \n' +
+			'||||  \\\\\\\\ \n' +
+			'||||     \\\\\\\\ \n' +
+			'|||| Am I a \\\\\\\\ \n' +
+			'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
+			'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
+			"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
+			'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
+			'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
+			'||||          /////         \n' +
+			'||||       /////\n' +
+			'||||     /////\n' +
+			'||||//////'
+	)
+	console.log('Welcome!')
 }
-var info_path = join(app.getPath("userData"), "window-size.json");
-var max_info_path = join(app.getPath("userData"), "max-window-size.json");
-var lang_path = join(app.getPath("userData"), "language");
-var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
-var ua_path = join(app.getPath("userData"), "useragent");
+var info_path = join(app.getPath('userData'), 'window-size.json')
+var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
+var lang_path = join(app.getPath('userData'), 'language')
+var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
+var ua_path = join(app.getPath('userData'), 'useragent')
 try {
-	fs.readFileSync(ha_path, "utf8");
-	app.disableHardwareAcceleration();
-	if (!packaged) console.log("disabled: Hardware Acceleration");
+	fs.readFileSync(ha_path, 'utf8')
+	app.disableHardwareAcceleration()
+	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;
+var window_size
 try {
-	window_size = JSON.parse(fs.readFileSync(info_path, "utf8"));
+	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
 } catch (e) {
 	window_size = {
 		width: 1000,
 		height: 750
-	}; // デフォルトバリュー
+	} // デフォルトバリュー
 }
-var max_window_size;
+var max_window_size
 try {
-	max_window_size = JSON.parse(fs.readFileSync(max_info_path, "utf8"));
+	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
 } catch (e) {
 	max_window_size = {
-		width: "string",
-		height: "string",
-		x: "string",
-		y: "string"
-	}; // デフォルトバリュー
+		width: 'string',
+		height: 'string',
+		x: 'string',
+		y: 'string'
+	} // デフォルトバリュー
 }
 function isFile(file) {
 	try {
-		fs.statSync(file);
-		return true;
+		fs.statSync(file)
+		return true
 	} catch (err) {
-		if (err.code === "ENOENT") return false;
+		if (err.code === 'ENOENT') return false
 	}
 }
 // 全てのウィンドウが閉じたら終了
-app.on("window-all-closed", function() {
-	electron.session.defaultSession.clearCache(() => {});
-	app.quit();
-});
-
+app.on('window-all-closed', function() {
+	electron.session.defaultSession.clearCache(() => {})
+	app.quit()
+})
 function createWindow() {
 	if (isFile(lang_path)) {
-		var lang = fs.readFileSync(lang_path, "utf8");
+		var lang = fs.readFileSync(lang_path, 'utf8')
 	} else {
-		var langs = app.getLocale();
-		console.log(langs);
-		if (~langs.indexOf("ja")) {
-			lang = "ja";
-		} else if (~langs.indexOf("de")) {
-			lang = "de";
-		} else if (~langs.indexOf("cs")) {
-			lang = "cs";
-		} else if (~langs.indexOf("bg")) {
-			lang = "bg";
+		var langs = app.getLocale()
+		console.log(langs)
+		if (~langs.indexOf('ja')) {
+			lang = 'ja'
+		} else if (~langs.indexOf('de')) {
+			lang = 'de'
+		} else if (~langs.indexOf('cs')) {
+			lang = 'cs'
+		} else if (~langs.indexOf('bg')) {
+			lang = 'bg'
 		} else {
-			lang = "en";
+			lang = 'en'
 		}
-		fs.mkdir(app.getPath("userData"), function(err) {
-			fs.writeFileSync(lang_path, lang);
-		});
+		fs.mkdir(app.getPath('userData'), function(err) {
+			fs.writeFileSync(lang_path, lang)
+		})
 	}
-	if (!packaged) console.log("your lang:" + app.getLocale());
-	if (!packaged) console.log("launch:" + lang);
+	if (!packaged) console.log('your lang:' + app.getLocale())
+	if (!packaged) console.log('launch:' + lang)
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
-	var platform = process.platform;
-	var bit = process.arch;
-	if (platform == "linux") {
+	var platform = process.platform
+	var bit = process.arch
+	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();
 		}
-	});
-	if (!packaged) mainWindow.toggleDevTools();
-	electron.session.defaultSession.clearCache(() => {});
+	} 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()
+		}
+	})
+	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 code = m[2];
-				var plus = "?mode=" + mode + "&code=" + code;
+				var mode = m[1]
+				var code = m[2]
+				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 N = 100;
+		const crypto = require('crypto')
+		const N = 100
 		var ua =
-			"Mastodon client: " +
+			'Mastodon client: ' +
 			crypto
 				.randomBytes(N)
-				.toString("base64")
-				.substring(0, N);
+				.toString('base64')
+				.substring(0, N)
 	}
-	mainWindow.loadURL(base + lang + "/index.html" + plus, { userAgent: ua });
+	mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua })
 	if (!window_size.x && !window_size.y) {
-		mainWindow.center();
+		mainWindow.center()
 	}
 	// ウィンドウが閉じられたらアプリも終了
-	mainWindow.on("closed", function() {
-		electron.ipcMain.removeAllListeners();
-		mainWindow = null;
-	});
-	closeArg = false;
-	mainWindow.on("close", function(e, arg) {
-		writePos(mainWindow);
+	mainWindow.on('closed', function() {
+		electron.ipcMain.removeAllListeners()
+		mainWindow = null
+	})
+	closeArg = false
+	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();
-			}, 3000);
-		});
+				resolve()
+			}, 3000)
+		})
 		promise.then(function(response) {
-			closeArg = true;
-			mainWindow.close();
-		});
-	});
-	electron.ipcMain.on("sendMarkersComplete", function(e, arg) {
-		closeArg = true;
-		mainWindow.close();
-	});
+			closeArg = true
+			mainWindow.close()
+		})
+	})
+	electron.ipcMain.on('sendMarkersComplete', function(e, arg) {
+		closeArg = true
+		mainWindow.close()
+	})
 	function writePos(mainWindow) {
-		if (max_window_size.width == mainWindow.getBounds().width && max_window_size.height == mainWindow.getBounds().height && max_window_size.x == mainWindow.getBounds().x && max_window_size.y == mainWindow.getBounds().y) {
-			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y, max: true };
+		if (
+			max_window_size.width == mainWindow.getBounds().width &&
+			max_window_size.height == mainWindow.getBounds().height &&
+			max_window_size.x == mainWindow.getBounds().x &&
+			max_window_size.y == mainWindow.getBounds().y
+		) {
+			var size = {
+				width: mainWindow.getBounds().width,
+				height: mainWindow.getBounds().height,
+				x: mainWindow.getBounds().x,
+				y: mainWindow.getBounds().y,
+				max: true
+			}
 		} else {
-			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y };
+			var size = {
+				width: mainWindow.getBounds().width,
+				height: mainWindow.getBounds().height,
+				x: mainWindow.getBounds().x,
+				y: mainWindow.getBounds().y
+			}
 		}
-		fs.writeFileSync(info_path, JSON.stringify(size));
+		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", "");
-	});
+	mainWindow.on('maximize', function() {
+		writePos(mainWindow)
+		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()))
+	})
+	mainWindow.on('minimize', function() {
+		writePos(mainWindow)
+		mainWindow.webContents.send('asRead', '')
+	})
 
-	var platform = process.platform;
-	var bit = process.arch;
-	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname)));
+	var platform = process.platform
+	var bit = process.arch
+	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);
-	}, 1000);
+		mouseTrack(mainWindow)
+	}, 1000)
 }
-var x = 0;
-var y = 0;
-var unchanged = 0;
-var locked = false;
+var x = 0
+var y = 0
+var unchanged = 0
+var locked = false
 function mouseTrack(mainWindow) {
-	let mousePos = electron.screen.getCursorScreenPoint();
-	let xNow = mousePos.x;
-	let yNow = mousePos.x;
+	let mousePos = electron.screen.getCursorScreenPoint()
+	let xNow = mousePos.x
+	let yNow = mousePos.x
 	if (x != xNow || y != yNow) {
-		unchanged = 0;
-		locked = false;
+		unchanged = 0
+		locked = false
 	} else {
-		unchanged++;
+		unchanged++
 		if (unchanged > 60 && !locked) {
-			unchanged = 0;
-			locked = true;
-			mainWindow.webContents.send("asRead", "");
+			unchanged = 0
+			locked = true
+			mainWindow.webContents.send('asRead', '')
 		}
 	}
-	x = xNow;
-	y = yNow;
+	x = xNow
+	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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "20.0.1",
+  "version": "20.0.4",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
@@ -55,22 +55,22 @@
     "jimp": "^0.8.4",
     "jquery": "^3.4.1",
     "jquery-ui-dist": "^1.12.1",
+    "materialize-css": "git://github.com/cutls/materialize",
     "json5": "^2.1.1",
     "lodash": "^4.17.15",
-    "materialize-css": "^1.0.0",
     "sumchecker": "^3.0.0",
-    "sweetalert2": "^8.18.6",
+    "sweetalert2": "^9.3.16",
     "vue": "^2.6.10"
   },
   "optionalDependencies": {
-    "font-manager": "^0.3.0",
+    "font-manager": "0.3.0",
     "itunes-nowplaying-mac": "0.3.1"
   },
   "devDependencies": {
-    "chokidar": "^3.2.3",
-    "electron": "^6.0.12",
-    "electron-builder": "^21.1.5",
-    "electron-rebuild": "^1.8.6",
+    "chokidar": "^3.3.0",
+    "electron": "^7.1.1",
+    "electron-builder": "^22.1.0",
+    "electron-rebuild": "^1.8.8",
     "readline-sync": "1.4.10"
   },
   "build": {

app/view/make/index.sample.html

@@ -84,6 +84,7 @@
 			</div>
 		</div>
 	</div>
+	<div id="contextWrap" class="hide"></div>
 	<div id="post-box" class="z-depth-5">
 		<div id="post-bar" class="drag-bar"><span id="unreact">@@post-new@@</span><span id="addreact"
 				class="hide">Reaction</span></div>
@@ -760,47 +761,31 @@
 			<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-1_Kawaii" class="release-do" style="display:none; ">><br>
+			<div id="release-20-0-4_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.1 (Kawaii)</h5>
-				・緊急DoS対策(Spotify Tips)
+				<h5>Release Note 20.0.4 (Kawaii)</h5>
+				・YouTubeの一部の埋め込みがtrustedになっていなかった
 				<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>
-				<h5>Release Note 20.0.0 (Kawaii)</h5>
-				・コードがKawaii感じ(Prettier)になりました
-				<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>
-				・リクエストエラーログ表示(例えばTLが表示されないのが、TheDeskが悪いのかサーバーが悪いのかなどがわかる)
-				<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('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('noellabo@fedibird.com','main')" class="contributor">
-					<img src="https://user-images.githubusercontent.com/17561618/68497129-345c4180-0297-11ea-8001-1853bc0c84b8.png">noellabo
+				・Integrated TLを下にもっと読み込むことができなかった
+				<a onclick="udgEx('naokisz@kirishima.cloud','main')" class="contributor">
+					<img src="https://user-images.githubusercontent.com/17561618/69067796-0fba5380-0a67-11ea-9924-ffc3e1401672.png">naokisz
 				</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>
-				・Integrated TLについて改善
+				・Integrated TLのストリーミングも切れたらアイコンが赤くなるように
 				<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>
-				・イメージビューアのソースを自サーバーキャッシュかリモートかを選べるように。自鯖のCDN代圧縮に2mmくらい役立つかも
+				・翻訳が上手く表示されていなかった
 				<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>
-				・画像URLのコピー
-				<a onclick="udgEx('Zergling_man@openweb.social','main')" class="contributor">
-					<img src="https://user-images.githubusercontent.com/17561618/68497404-cebc8500-0297-11ea-8b21-99c6a40ecde0.png">Zergling_man
-				</a>
+				・トゥートを外部URLから検索して表示するのが上手くいってなかった
 				<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>
@@ -913,6 +898,9 @@
 								<div class="type waves-effect" data-type="notf">
 									<div><i class="material-icons">notifications</i></div><span>@@notf@@</span>
 								</div>
+								<div class="type waves-effect" data-type="bookmark">
+									<div><i class="material-icons">bookmark</i></div><span>@@bookmark@@</span>
+								</div>
 							</div>
 						</div>
 						<div id="noauth" class="hide">@@showThisTL@@
@@ -1208,6 +1196,7 @@
 	<!--JS-->
 	<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
 	<script type="text/javascript" src="../../js/platform/first.js"></script>
+	<script type="text/javascript" src="../../node_modules/grapheme-splitter/index.js"></script>
 	<script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
 	<script type="text/javascript" src="../../node_modules/lodash/lodash.min.js"></script>
 	<script type="text/javascript" src="main.js"></script>
@@ -1219,17 +1208,15 @@
 	<script type="text/javascript" src="../../node_modules/jquery-ui-dist/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script type="text/javascript" src="../../js/platform/punycode.js"></script>
-
-
 	<script type="text/javascript" src="../../js/ui/tips.js"></script>
 	<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
 	<script type="text/javascript" src="../../js/common/about.js"></script>
-	<script type="text/javascript" src="../../js/tl/parse.js"></script>
 	<script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
 	<script type="text/javascript" src="../../js/tl/dm.js"></script>
 	<script type="text/javascript" src="../../js/ui/scroll.js"></script>
 	<script type="text/javascript" src="../../js/tl/tl.js"></script>
 	<script type="text/javascript" src="../../js/tl/card.js"></script>
+	<script type="text/javascript" src="../../js/tl/parse.js"></script>
 	<script type="text/javascript" src="../../js/tl/poll.js"></script>
 	<script type="text/javascript" src="../../js/tl/date.js"></script>
 	<script type="text/javascript" src="../../js/tl/notification.js"></script>

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

@@ -68,7 +68,7 @@
     "favRegist": "Favourite",
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -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",

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.",
@@ -175,14 +177,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_pin": "Pin this toot",
+    "lang_parse_bookmark": "Bookmark this",
+    "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",
@@ -198,6 +205,7 @@
     "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

@@ -68,7 +68,7 @@
     "favRegist": "Favourite",
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -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",

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.",
@@ -175,14 +177,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_pin": "Pin this toot",
+    "lang_parse_bookmark": "Bookmark this",
+    "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",
@@ -198,6 +205,7 @@
     "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": "Bookmarks",
     "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": "Добави",

app/view/make/language/bg-BG/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": "Няма данни",
     "lang_details_filtered": "Filtered toot",
     "lang_details_embed": "Embed HTML is cliped.",
@@ -175,14 +177,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",
@@ -198,6 +205,7 @@
     "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

@@ -68,7 +68,7 @@
     "favRegist": "Favourite",
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -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",

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.",
@@ -175,14 +177,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_pin": "Pin this toot",
+    "lang_parse_bookmark": "Bookmark this",
+    "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",
@@ -198,6 +205,7 @@
     "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",

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.",
@@ -180,9 +182,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",
@@ -198,6 +205,7 @@
     "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

@@ -68,7 +68,7 @@
     "favRegist": "Favourite",
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -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",

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.",
@@ -175,14 +177,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_pin": "Pin this toot",
+    "lang_parse_bookmark": "Bookmark this",
+    "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",
@@ -198,6 +205,7 @@
     "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/acct.json

@@ -1,5 +1,5 @@
 {
-    "list": "Konten",
+    "list": "Accountliste",
     "back": "Zurück",
     "add": "Konto hinzufügen",
     "codesetupwarn": "Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.",
@@ -8,9 +8,9 @@
     "selacct": "Konto auswählen",
     "codepastewarn": "Fügen Sie den Code ein und schließen Sie den Browser.",
     "codepaste": "Code",
-    "domain": "Domain",
+    "domain": "Domäne",
     "connect": "Föderierte Server",
-    "toots": "Toots",
+    "toots": "Tröts",
     "users": "Nutzer",
     "users2": "Nutzer",
     "safety": "Verbindung",
@@ -19,5 +19,5 @@
     "thisismisskey": "Als Misskey anmelden",
     "misskeylogin": "Lies die <a href=\"https://thedesk.top/how-to-misskey-login.html\">Doku (japanisch)</a> um dich bei Misskey einzuloggen.",
     "nodata": "Keine Daten",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Benutze Zugangs-Token zum Anmelden (Klicke nach Ausfüllen nicht den Code, sondern den Access-Token im Kästchen: Erweitert)"
 }

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

@@ -10,15 +10,15 @@
     "selfile": "Anhängen...",
     "insertEmoji": "Emojis",
     "NPSpotify": "Wird gerade gespielt (Spotify)",
-    "NPiTunes": "Wird gerade gespielt(macOS)",
+    "NPiTunes": "Wird gerade wiedergegeben(macOS)",
     "schedule": "Geplanter Tröt",
     "postat": "Senden um",
-    "scheduleWarn": "2.7.0~ Mindestzeitraum: von 5min(Uhr auf dem Server ist möglicherweise ungenau.)",
+    "scheduleWarn": "2.7.0~ Mindestzeitabstand: von 5min(Uhr auf dem Server ist möglicherweise ungenau.)",
     "clearToot": "Eingabe löschen",
     "replyMode": "Antworten",
     "no": "Nein",
     "yes": "Ja",
-    "temp": "Hinzugefügte Inhalte",
+    "temp": "Dateien anhängen",
     "nothing": "Keine",
     "vis": "Adjust status privacy",
     "cwtext": "Warntext",
@@ -61,8 +61,8 @@
     "favedPeople": "Leute, die es bevorzugt haben",
     "btedPeople": "Leute, die es verstärkt haben",
     "useOtherAcct1": "Anderes Konto verwenden",
-    "useOtherAcct2": ":unfav and unBT are disabled.",
-    "btWithVis": "Boost with visibility",
+    "useOtherAcct2": ":unfav und unBT sind deaktiviert.",
+    "btWithVis": "Boost mit Sichtbarkeit",
     "reply": "Antworten",
     "bt": "Verstärkung",
     "favRegist": "Favoriten",
@@ -81,29 +81,29 @@
     "mutes": "Stumm geschaltet",
     "block": "Blockieren",
     "mute": "Stummschalten",
-    "domainBlock": "Domain block",
+    "domainBlock": "Domänenblockade",
     "editProf": "Profil bearbeiten",
     "change": "Speichern",
     "followReq": "Anfragen folgen",
-    "likeHimOrHer": "Resembling",
+    "likeHimOrHer": "ähnlich wie",
     "endorse": "Auf dem Profil zeigen",
     "openinbrowser": "Im Browser öffnen",
     "mainacct": "Im Hauptkonto einstellen",
     "frc": "Vorschlagen",
     "more": "Mehr",
     "revoverJP": " an ",
-    "warnUseOtherAcct": "(Unable to unfollow)",
+    "warnUseOtherAcct": "(Kann nicht entfolgen)",
     "revoverJPde": "",
     "or": "oder",
     "openProf": "Benutzerprofil",
     "warnListRegist": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
-    "blockDomain": "Add blocking domain",
+    "blockDomain": "Sperrdomain hinzufügen",
     "name": "Anzeigename",
     "note": "Notiz",
     "editProfImg": "Avatar ändern",
-    "editHeader": "Change header image",
+    "editHeader": "Kopfzeilenbild ändern",
     "blocked": "Sie sind blockiert. Warum?",
-    "likeUserDes": "Get people resembling this user.",
+    "likeUserDes": "Hole Leute die diesem Nutzer ähneln.",
     "get": "Holen",
     "historyBack": "Zurück",
     "empUser": "Diesen Benutzer hervorheben",
@@ -125,8 +125,9 @@
     "integratedTLDes": "Integrated(Local and Home)",
     "localPlusDes": "Integrated(Local and replies and BT on Home)",
     "notf": "Benachrichtigungen",
+    "bookmark": "Lesezeichen",
     "showThisTL": "Verlauf anzeigen:",
-    "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.",
+    "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",
     "search": "Suche",
     "sortSet": "Sortieren",
@@ -142,13 +143,13 @@
     "exceptWorn": "Gefilterte Toots verschwinden unwiderruflich, auch wenn der Filter später entfernt wird",
     "avalableBefore": "Verfällt nach",
     "warnAvBefore": "Nicht gesetzt oder \"0\" bedeutet \"Nie\"",
-    "warnAvBefore2": "This value may contain some error",
+    "warnAvBefore2": "Dieser Wert kann einen Fehler enthalten",
     "unlimited": "Niemals",
     "days": "Tag(e)",
     "hours": "Stunde(n)",
     "mins": "Minute(n)",
     "secs": "Sekunde(n)",
-    "warnOnIntegratedTL": "Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
+    "warnOnIntegratedTL": "Integrierte TL/Plus TL verbirgt sowohl Home-Filter-Wörter als auch Lokal-Filter-Wörter.",
     "helloTheDesk": "Interner Fehler: Bitte löschen Sie alle Daten (auf der Einstellungsseite) <b>Alle Daten werden gelöscht.</b>",
     "addColumn": "Spalte hinzufügen",
     "sortColumns": "Sortieren",
@@ -157,25 +158,25 @@
     "setting": "Einstellungen",
     "reverse": "Tröt-Button Seite tauschen",
     "f5": "Verlauf neu laden",
-    "nanoDes": "The smallest Mastodon,",
+    "nanoDes": "Das kleinste Mastodon,",
     "verTips": "Version",
     "clockTips": "Uhr",
     "ramTips": "RAM-Status",
     "changeTips": "Tipps ändern",
-    "helpAndLogs": "Help & Log",
+    "helpAndLogs": "Hilfe & Log",
     "help": "Hilfe",
-    "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
+    "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",
-    "show": "Show",
-    "directory": "Directory",
-    "active": "Recently active",
-    "newcomer": "New arrivals",
+    "show": "Zeige",
+    "directory": "Verzeichnis",
+    "active": "Kürzlich aktiv",
+    "newcomer": "Neu eingetroffen",
     "local_only": "Nur lokal",
-    "demoBottomBtns": "Welcome guide",
-    "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
-    "acctManDesc": "Add more accounts and logout them.",
+    "demoBottomBtns": "Willkommensguide",
+    "lookAtBottom": "Schauen Sie sich den unteren Teil des Fensters an. Hier sind einige Tipps darüber.",
+    "acctManDesc": "Fügen Sie weitere Konten hinzu und loggen Sie sie aus.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
-    "nanoDescPlus": "Mini window client(experimental)",
+    "nanoDescPlus": "Mini-Fenster-Klient (experimentell)",
     "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

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_hours": "%d h",
     "lang_time_day": "1 d",
     "lang_time_days": "%d d",
-    "lang_time_month": "1 month",
-    "lang_time_months": "%d months",
+    "lang_time_month": "1 Monat",
+    "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_delete": "Click to add description, right-click to delete this",
-    "lang_postimg_desc": "Description",
+    "lang_postimg_failupload": "Gescheitert",
+    "lang_postimg_delete": "Klicken, um Beschreibung hinzuzufügen, Rechtsklick zum Löschen",
+    "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_active": "Last status",
+    "lang_status_followers": "Folgende",
+    "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,12 @@
     "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_sort_gothis": "Gehe zu dieser Spalte",
     "lang_sort_remthis": "Diese Spalte löschen",
     "lang_spotify_img": "Albumcover anhängen",
@@ -152,7 +154,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 +182,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": "Bookmark this",
+    "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",
@@ -198,6 +205,7 @@
     "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 +222,8 @@
     "lang_setting_time": "Zeitformat:{{set}}",
     "lang_setting_theme": "Design:{{set}}",
     "lang_setting_nsfw": "NSFW:{{set}}",
-    "lang_setting_cw": "CW:{{set}}",
-    "lang_setting_cwtext": "Default CW text:{{set}}",
+    "lang_setting_cw": "NSFW:{{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}}",

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.",
-    "download": "Start",
+    "updatehere": "Neusten TheDesk holen",
+    "download": "Beginnen",
     "portable": "Portable Version",
     "installer": "Installer Version",
-    "linux": "zip",
-    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linux": "Zip",
+    "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

@@ -68,7 +68,7 @@
     "favRegist": "Favourite",
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -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",

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.",
@@ -175,14 +177,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_pin": "Pin this toot",
+    "lang_parse_bookmark": "Bookmark this",
+    "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",
@@ -198,6 +205,7 @@
     "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",

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",
@@ -180,9 +182,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",
@@ -198,6 +205,7 @@
     "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

@@ -68,7 +68,7 @@
     "favRegist":"Favourite",
     "openBrowser":"Open in browser",
     "screenshot":"Take a screenshot",
-    "copyURL":"Copy URL of this toot",
+    "copyURL":"Copy the URL",
     "embed":"Embed",
     "toots":"Toots",
     "follow":"Follow",
@@ -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",

app/view/make/language/en/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_pin": "Pin this toot",
+    "lang_parse_bookmark": "Bookmark this",
+    "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",
@@ -198,6 +206,7 @@
     "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/en/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/es-AR/index.json

@@ -125,6 +125,7 @@
     "integratedTLDes": "Integrado (local/principal)",
     "localPlusDes": "Local+Respuesta+retoot",
     "notf": "Notificaciones",
+    "bookmark": "Bookmarks",
     "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",