TheDesk 20.3.2 (Kawaii)

Bump electron-rebuild from 1.10.0 to 1.10.1 in /app

.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
@@ -22,3 +23,4 @@ app/view/es-AR
 app/git
 *.code-workspace
 releasenote.md
+app/yarn-error.log

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についてもそれらに則ります。
-

README.md

@@ -47,19 +47,6 @@ The default sounds of notifications is provided [Creative Commons BY](https://cr
 
 Crowdin project is available! Visit: https://translate.thedesk.top
 
-## Requirement and development
-
-* Electron 4.2 or above(install yourself)
-* electron-dl(in package.json)
-* Jimp(in package.json)
-* font-manager(in package.json)
-  * Python 2.x(install yourself)
-  * VisualC++(Windows)(install yourself)
-* itunes-nowplaying-mac(for macOS)(in package.json)
-* node-notifier(in package.json)
-* sumchecker(in package.json)
-* Ability to read unformated files!(install yourself)
-
 ### Run on developer mode
 
 `npm run dev` on `app` folder.
@@ -159,6 +146,17 @@ Linux
 macOS  
 `electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  
 
+### PWA support
+
+TheDesk is a wed-based app, so you can run it on a browser. Of course, the main stream is as Electron. Some features won't work as well as Electron.
+
+You can run `npm run build:pwa` to build as PWA, including `manifest.json` and the ServiceWorker.
+
+**You have to rename `node_modules` to `dependencies` to run as a web application. (restricted by Netlify)**
+
+Check the app on Chrome or Firefox: [Here](https://app.thedesk.top) (it follows the `master` branch, so not stable.)  
+[![Netlify Status](https://api.netlify.com/api/v1/badges/6916503b-2882-43f7-9681-ab814e6d28f9/deploy-status)](https://app.netlify.com/sites/thedesk/deploys)
+
 ## Pleroma support
 
 Did you find a bug with Pleroma accounts?  

README_ja.md

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

app/css/acct.css

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

app/css/master.css

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

app/css/themes.css

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

app/css/tl.css

@@ -79,6 +79,14 @@
 	padding-right: 5px;
 	margin-right: 15px;
 	border-radius: 5px;
+	height: 35px;
+}
+.bgReport {
+	height: 34px;
+	padding-top: 0.45rem;
+	text-decoration: underline;
+	padding-left: 5px;
+	padding-right: 5px;
 }
 #spot-box {
 	display: grid;
@@ -216,7 +224,10 @@ iframe,
 	margin: -1px 0;
 }
 .bigemoji {
-	width: 60px !important;
+	width: 100px !important;
+	height: auto !important;
+	position: relative;
+	z-index: 9999;
 }
 .faicon_FTL {
 	display: none;
@@ -363,6 +374,31 @@ iframe,
 	grid-area: side;
 }
 
+.cusr {
+	user-select: text;
+	padding-left: 5px;
+	border-bottom: 0.5px solid;
+	padding-right: 2px;
+	word-break: break-word;
+	width: 100%;
+	display: grid;
+	grid-template-columns: 43px 2fr 1fr;
+	grid-template-rows: auto 1.6rem 2fr auto;
+	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions';
+}
+
+.area-status {
+	grid-area: status;
+	display: flex;
+	flex-wrap: wrap;
+	margin-bottom: 5px;
+}
+
+.cusr .cbadge {
+	margin-top: 6px;
+	margin-left: 6px;
+}
+
 .quote-inline {
 	display: none;
 }
@@ -415,6 +451,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);
@@ -489,7 +559,7 @@ p:not(:last-child) {
 	z-index: 500;
 	padding: 5px;
 	display: grid;
-	grid-template-columns: 40px 1fr 1fr 24px;
+	grid-template-columns: 40px 60px 1fr 24px;
 	grid-template-rows: 30px 30px;
 	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }
@@ -609,6 +679,8 @@ p:not(:last-child) {
 	margin-top: 3px;
 	padding: 1px;
 	border-radius: 3px;
+	overflow: hidden;
+	position: relative;
 }
 .fa-2x > .emoji-img {
 	width: 36px !important;
@@ -647,6 +719,29 @@ p:not(:last-child) {
 .votebtn:hover {
 	background-color: var(--color);
 }
+.leadPoll {
+	position: absolute;
+	background-color: var(--box);
+	height: 20px;
+	border-radius: 3px;
+}
+.lpAnime {
+	animation-duration: 1s;
+	animation-name: fadeInLeft;
+}
+.onPoll {
+	position: relative;
+}
+.maxVoter {
+	background-color: var(--emphasized);
+	filter: brightness(120%);
+}
+.ownMark img {
+	width: 1.2rem !important;
+	position: relative;
+	top: -1px;
+	margin-left: 5px !important;
+}
 .jump {
 	display: inline-block;
 	animation: jump 0.75s linear infinite;
@@ -690,6 +785,7 @@ audio {
 	padding-right: 3px;
 	border-radius: 3px;
 	border: 1px solid var(--color);
+	user-select: none;
 }
 .vis-data {
 	font-size: 1rem !important;
@@ -766,3 +862,31 @@ audio {
 .box .ui-resizable-se {
 	display: none !important;
 }
+.announcement {
+	padding: 5px;
+	border-bottom: 1px solid;
+}
+.announReaction {
+	width: 35px;
+	height: 1.7rem;
+	font-size: 1.1rem;
+	margin: 3px;
+	cursor: pointer;
+	border: solid 1px;
+	padding-left: 2px;
+	background-color: var(--notfbox);
+	border-radius: 2px;
+}
+.announReaction img {
+	position: relative;
+	top: 3px;
+}
+.announReaction.reactioned {
+	background-color: var(--emphasized);
+}
+.announReaction.add {
+	width: 19px;
+}
+.reactionsPack {
+	display: flex;
+}

app/img/desk.svg

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

app/img/desk_full.svg

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

app/img/picture.svg

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

app/img/thinking.svg

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

app/index.html

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

app/js/common/keyshortcut.js

@@ -1,191 +1,197 @@
 selectedColumn = 0
 selectedToot = 0
-$(function ($) {
+$(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()
+				}
+			}
+			//Ctrl+F:検索
+			if (event.metaKey || event.ctrlKey) {
+				if (e.keyCode === 70) {
+					srcBox()
 				}
 			}
 			//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 +199,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 +230,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 +265,4 @@ function tootSelector(column, toot) {
 			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
 		}
 	}
-}
+}

app/js/common/version.js

@@ -1,346 +1,400 @@
 //バージョンチェッカー
 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();
+			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.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
+			!localStorage.getItem('showSupportMe')
+		) {
 			if (date.getMonth() == 11) {
-				var nextmonth = 1;
+				var yrs = date.getFullYear() + 1
+				var nextmonth = yrs * 100 + 1
 			} else {
-				var nextmonth = date.getMonth() + 2;
+				var yrs = date.getFullYear() 
+				var nextmonth = yrs * 100 + date.getMonth() + 2
 			}
-			if (lang.language != "ja") {
-				$("#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/");
+	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
+	} else {
+		var mes = false
 	}
-	Swal.fire({
-		title: "Select your platform",
-		text: mes,
-		type: "info",
-		showCancelButton: true,
-		confirmButtonColor: "#3085d6",
-		cancelButtonColor: "#3085d6",
-		confirmButtonText: lang.lang_no,
-		cancelButtonText: lang.lang_yesno
-	}).then(result => {
-		//逆にしてる
-		if (!result.value) {
-			localStorage.setItem("winstore", "winstore");
-		} else {
-			localStorage.setItem("winstore", "localinstall");
-		}
-		localStorage.setItem("ver", ver);
-		show = true;
-		console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
-		$(document).ready(function() {
-			$("#releasenote").modal("open");
-			verp = ver.replace("(", "");
-			verp = verp.replace(".", "-");
-			verp = verp.replace(".", "-");
-			verp = verp.replace("[", "-");
-			verp = verp.replace("]", "");
-			verp = verp.replace(")", "");
-			verp = verp.replace(" ", "_");
-			console.log("%c " + verp, "color: red;font-size:200%;");
-			if (lang.language == "ja") {
-				$("#release-" + verp).show();
+	if (mes) {
+		Swal.fire({
+			title: 'Select your platform',
+			text: mes,
+			type: 'info',
+			showCancelButton: true,
+			confirmButtonColor: '#3085d6',
+			cancelButtonColor: '#3085d6',
+			confirmButtonText: lang.lang_no,
+			cancelButtonText: lang.lang_yesno
+		}).then(result => {
+			//逆にしてる
+			if (!result.value) {
+				localStorage.setItem('winstore', 'winstore')
 			} else {
-				$("#release-en").show();
+				localStorage.setItem('winstore', 'localinstall')
 			}
-		});
-	});
+			localStorage.setItem('ver', ver)
+			show = true
+			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
+			$(document).ready(function() {
+				$('#releasenote').modal('open')
+				verp = ver.replace('(', '')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('[', '-')
+				verp = verp.replace(']', '')
+				verp = verp.replace(')', '')
+				verp = verp.replace(' ', '_')
+				console.log('%c ' + verp, 'color: red;font-size:200%;')
+				if (lang.language == 'ja') {
+					$('#release-' + verp).show()
+				} else {
+					$('#release-en').show()
+				}
+			})
+		})
+	} else {
+		localStorage.setItem('ver', ver)
+			show = true
+			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
+			$(document).ready(function() {
+				$('#releasenote').modal('open')
+				verp = ver.replace('(', '')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('.', '-')
+				verp = verp.replace('[', '-')
+				verp = verp.replace(']', '')
+				verp = verp.replace(')', '')
+				verp = verp.replace(' ', '_')
+				console.log('%c ' + verp, 'color: red;font-size:200%;')
+				if (lang.language == 'ja') {
+					$('#release-' + verp).show()
+				} else {
+					$('#release-en').show()
+				}
+			})
+	}
+	
 }
 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,105 @@
-var defaultemojiList = ["activity", "flag", "food", "nature", "object", "people", "place", "symbol"];
+var defaultemojiList = ['activity', 'flag', 'food', 'nature', 'object', 'people', 'place', 'symbol']
 var defaultemoji = {
-    activity: activity,
-    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 announcement = false
+    if ($('#media').val() == 'announcement') {
+        announcement = true
+    }
+	var json = defaultemoji[target]
+	var emojis = ''
+	Object.keys(json).forEach(function(key) {
+        var emoji = json[key]
+        if (announcement) {
+            var def = `<a onclick="emojiReactionDef('${emoji['shortcode']}')" class="pointer">`
+        } else {
+            var def = `<a onclick="defEmoji('${emoji['shortcode']}')" class="pointer">`
+        }
+		emojis =
+			emojis +
+			`${def}
+            <span style="
+                width: 20px; height: 20px; display: inline-block; background-image: url('../../img/sheet.png'); background-size: 4900%;
+                 background-position:${emoji['css']};"></span>
+            </a>`
+	})
+	$('#emoji-list').html(emojis)
+	$('#now-emoji').text(lang.lang_defaultemojis_text.replace('{{cat}}', defaultemojiname[target]))
+	$('.emoji-control').addClass('hide')
 }
 function customEmoji() {
-    $("#emoji-suggest").val("");
-    $(".emoji-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)
+	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/login/login.js

@@ -47,6 +47,9 @@ function ck() {
 			multiSelector(false)
 			verck(ver, jp)
 			$('.stw').show()
+			if (localStorage.getItem('tips')) {
+				tips(localStorage.getItem('tips'))
+			}
 			$('#something-wrong img').attr('src', '../../img/thinking.svg')
 		}
 	}

app/js/login/manager.js

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

app/js/platform/end.js

@@ -46,10 +46,17 @@ $(document).on('click', 'a', e => {
 					udgEx(url, 'main')
 					return false
 				} else {
-					postMessage(['openUrl', url], '*')
+					if(pwa) {
+						return true
+					} else {
+						postMessage(['openUrl', url], '*')
+					}
 				}
 			}
 		} else {
+			if(pwa) {
+				return true
+			}
 			//hrefがhttp/httpsならブラウザで
 			if (urls) {
 				if (urls[0]) {
@@ -138,13 +145,13 @@ onmessage = function(e) {
 	} else if (e.data[0] == 'udg') {
 		udg(e.data[1][0], e.data[1][1])
 	} else if (e.data[0] == 'media') {
-		media(e.data[1][0], e.data[1][1], e.data[1][2])
+		media(e.data[1][0], e.data[1][1], e.data[1][2], e.data[1][3])
 	} else if (e.data[0] == 'post') {
 		post('pass')
 	} else if (e.data[0] == 'toastSaved') {
 		var show = `${lang.lang_img_DLDone}${
 			e.data[1][0]
-		}<button class="btn-flat toast-action" onclick="openFinder(${e.data[1][1]}')">Show</button>`
+		}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
 		M.toast({ html: show, displayLength: 5000 })
 	} else if (e.data[0] == 'parseColumn') {
 		parseColumn(e.data[1])
@@ -190,3 +197,23 @@ onmessage = function(e) {
 		})
 	}
 }
+/* PWA */
+if(pwa) {
+	function postMessage(e) {
+		if (e[0] == 'openUrl') {
+			urls = e[1].match(/https?:\/\/(.+)/)
+			if (urls) {
+				Swal.fire({
+					title: 'Open URL',
+					icon: 'info',
+					html:
+					  `If you are OK, click: <a href="${urls[0]}" target="_blank" class="btn waves-effect">Here</a>`,
+					showCloseButton: false,
+					showCancelButton: true,
+					focusConfirm: false,
+					confirmButtonText: 'Close'
+				  })
+			}
+		}
+	}
+}

app/js/platform/first.js

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

app/js/platform/preload.js

@@ -1,6 +1,26 @@
 var electron = require('electron')
 const shell = electron.shell
 var ipc = electron.ipcRenderer
+//title bar
+const customTitlebar = require('custom-electron-titlebar')
+window.addEventListener('DOMContentLoaded', () => {
+	ipc.send('frameCheck', '')
+	ipc.on('frame', function(event, args) {
+		const file = location.href.substr(-10)
+		if (
+			file == 'index.html' ||
+			file == '/acct.html' ||
+			file == 'tting.html'
+		) {
+			new customTitlebar.Titlebar({
+				backgroundColor: customTitlebar.Color.fromHex('#000'),
+				titleHorizontalAlignment: 'right',
+				icon: '../../img/desk.png'
+			})
+		}
+		})
+})
+
 onmessage = function(e) {
 	if (e.data[0] == 'openUrl') {
 		urls = e.data[1].match(/https?:\/\/(.+)/)
@@ -13,6 +33,10 @@ onmessage = function(e) {
 		ipc.send('dialogStore', e.data[1])
 	} else if (e.data[0] == 'bmpImage') {
 		ipc.send('bmp-image', e.data[1])
+	} else if (e.data[0] == 'resizeImage') {
+		ipc.send('resize-image', e.data[1])
+	} else if (e.data[0] == 'stampImage') {
+		ipc.send('stamp-image', e.data[1])
 	} else if (e.data[0] == 'dialogCW') {
 		ipc.send('dialogCW', e.data[1])
 	} else if (e.data[0] == 'nativeNotf') {
@@ -44,6 +68,8 @@ onmessage = function(e) {
 		ipc.send('theme-json-request', e.data[1])
 	} else if (e.data[0] == 'ha') {
 		ipc.send('ha', e.data[1])
+	} else if (e.data[0] == 'frameSet') {
+		ipc.send('frameSet', e.data[1])
 	} else if (e.data[0] == 'ua') {
 		ipc.send('ua', e.data[1])
 	} else if (e.data[0] == 'aboutData') {
@@ -112,7 +138,31 @@ ipc.on('theme-css-response', function(event, arg) {
 })
 //img.js
 ipc.on('bmp-img-comp', function(event, b64) {
-	postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+	if (b64[2]) {
+		var stamped = true
+	} else {
+		var stamped = false
+	}
+	postMessage(['media', [b64[0], 'image/png', b64[1], stamped]], '*')
+})
+ipc.on('resizeJudgement', function(event, b64) {
+	var resize = localStorage.getItem('uploadCrop') * 1
+	if (resize > 0) {
+		var element = new Image()
+		var width
+		element.onload = function() {
+			var width = element.naturalWidth
+			var height = element.naturalHeight
+			if (width > resize || height > resize) {
+				ipc.send('resize-image', [b64, resize])
+			} else {
+				postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+			}
+		}
+		element.src = b64
+	} else {
+		postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+	}
 })
 //ui,img.js
 ipc.on('general-dl-prog', function(event, arg) {

app/js/post/bb-md.js

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

app/js/post/emoji.js

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

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

app/js/post/misskeystatus.js

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

app/js/post/post.js

@@ -17,6 +17,13 @@ function post(mode, postvis) {
 	var acct_id = $('#post-acct-sel').val()
 	localStorage.setItem('last-use', acct_id)
 	var domain = localStorage.getItem('domain_' + acct_id)
+	if ($('#ideKey').val() != '') {
+		var ideKey = $('#ideKey').val()
+	} else {
+		var user = localStorage.getItem('user_' + acct_id)
+		var ideKey = Math.floor(Date.now() / 1000) + '/TheDesk/' + user + '@' + domain
+		$('#ideKey').val(ideKey)
+	}
 	if (!localStorage.getItem('cw_sentence')) {
 		var cw_sent = 500
 	} else {
@@ -152,22 +159,39 @@ function post(mode, postvis) {
 	httpreq.open('POST', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.setRequestHeader('Idempotency-Key', ideKey)
 	httpreq.responseType = 'json'
 	httpreq.send(JSON.stringify(toot))
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
-				setLog(start, this.status, json)
+				if(media && this.status == 422) {
+					$('#ideKey').val('')
+					$('.toot-btn-group').prop('disabled', false)
+					alertProcessUnfinished()
+				} else {
+					setLog(start, this.status, json)
+					var box = localStorage.getItem('box')
+					if (box == 'yes' || !box) {
+						$('#textarea').blur()
+						hide()
+					}
+					$('.toot-btn-group').prop('disabled', false)
+					todc()
+					clear()
+				}
+			} else {
+				$('#ideKey').val('')
+				var box = localStorage.getItem('box')
+				if (box == 'yes' || !box) {
+					$('#textarea').blur()
+					hide()
+				}
+				$('.toot-btn-group').prop('disabled', false)
+				todc()
+				clear()
 			}
-			var box = localStorage.getItem('box')
-			if (box == 'yes' || !box) {
-				$('#textarea').blur()
-				hide()
-			}
-			$('.toot-btn-group').prop('disabled', false)
-			todc()
-			clear()
 		}
 	}
 }
@@ -255,6 +279,7 @@ function misskeyPost() {
 //クリア(Shift+C)
 function clear() {
 	$('#textarea').val('')
+	$('#ideKey').val('')
 	if (localStorage.getItem('stable')) {
 		$('#textarea').val('#' + localStorage.getItem('stable') + ' ')
 	}
@@ -284,6 +309,8 @@ function clear() {
 	$('#nsfw').removeClass('yellow-text')
 	$('#nsfw').html('visibility_off')
 	$('#nsfw').removeClass('nsfw-avail')
+	$('#stamp').html('Off')
+	$('#stamp').removeClass('stamp-avail')
 	$('#nsc').text(lang.lang_nothing)
 	$('#drag').css('background-color', '#e0e0e0')
 	$('#preview').html('')

app/js/post/secure.js

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

app/js/post/status.js

@@ -1,7 +1,7 @@
 //お気に入り登録やブースト等、フォローやブロック等
 //お気に入り登録
 function fav(id, acct_id, remote) {
-	if ($('#pub_' + id).hasClass('faved')) {
+	if ($(`.cvo[unique-id=${id}]`).hasClass('faved')) {
 		var flag = 'unfavourite'
 	} else {
 		var flag = 'favourite'
@@ -57,7 +57,7 @@ function fav(id, acct_id, remote) {
 
 //ブースト
 function rt(id, acct_id, remote, vis) {
-	if ($('#pub_' + id).hasClass('rted')) {
+	if ($(`.cvo[toot-id=${id}]`).hasClass('rted')) {
 		var flag = 'unreblog'
 	} else {
 		var flag = 'reblog'
@@ -85,7 +85,7 @@ function rt(id, acct_id, remote, vis) {
 				json = json.reblog
 			}
 			console.log(['Success: boost', json])
-			$('[unique-id=' + id + '] .fav_ct').text(json.favourites_count)
+			$('[toot-id=' + id + '] .fav_ct').text(json.favourites_count)
 			if (!json.reblog) {
 				if (flag == 'unreblog') {
 					var rt = json.reblogs_count - 1
@@ -95,16 +95,16 @@ function rt(id, acct_id, remote, vis) {
 				} else {
 					var rt = json.reblogs_count
 				}
-				$('[unique-id=' + id + '] .rt_ct').text(rt)
+				$('[toot-id=' + id + '] .rt_ct').text(rt)
 			} else {
-				$('[unique-id=' + id + '] .rt_ct').text(json.reblogs_count)
+				$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
 			}
 
-			if ($('[unique-id=' + id + ']').hasClass('rted')) {
-				$('[unique-id=' + id + ']').removeClass('rted')
+			if ($('[toot-id=' + id + ']').hasClass('rted')) {
+				$('[toot-id=' + id + ']').removeClass('rted')
 				$('.rt_' + id).removeClass('light-blue-text')
 			} else {
-				$('[unique-id=' + id + ']').addClass('rted')
+				$('[toot-id=' + id + ']').addClass('rted')
 				$('.rt_' + id).addClass('light-blue-text')
 			}
 		}
@@ -115,6 +115,48 @@ function boostWith(vis) {
 	var acct_id = $('#tootmodal').attr('data-acct')
 	rt(id, acct_id, false, vis)
 }
+//ブックマーク
+function bkm(id, acct_id, tlid) {
+	if ($(`.cvo[unique-id=${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) {
@@ -347,45 +389,92 @@ function redraft(id, acct_id) {
 	}).then(result => {
 		if (result.value) {
 			show()
-			del(id, acct_id)
-			$('#post-acct-sel').prop('disabled', true)
-			$('#post-acct-sel').val(acct_id)
-			$('select').formSelect()
-			mdCheck()
-			var medias = $('[toot-id=' + id + ']').attr('data-medias')
-			var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis')
-			vis(vismode)
-			$('#media').val(medias)
-			var ct = medias.split(',').length
-			$('[toot-id=' + id + '] img.toot-img').each(function(i, elem) {
-				if (i < ct) {
-					var url = $(elem).attr('src')
-					console.log('Play back image data:' + url)
-					$('#preview').append('<img src="' + url + '" style="width:50px; max-height:100px;">')
+			var domain = localStorage.getItem('domain_' + acct_id)
+			var at = localStorage.getItem('acct_' + acct_id + '_at')
+			if (localStorage.getItem('mode_' + domain) == 'misskey') {
+				var start = 'https://' + domain + '/api/notes/delete'
+				var httpreq = new XMLHttpRequest()
+				httpreq.open('POST', start, true)
+				httpreq.setRequestHeader('Content-Type', 'application/json')
+				httpreq.responseType = 'json'
+				httpreq.send(JSON.stringify({ i: at, noteId: id }))
+				$('[toot-id=' + id + ']').hide()
+				$('[toot-id=' + id + ']').remove()
+			} else {
+				var start = 'https://' + domain + '/api/v1/statuses/' + id
+				var httpreq = new XMLHttpRequest()
+				httpreq.open('DELETE', start, true)
+				httpreq.setRequestHeader('Content-Type', 'application/json')
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+				httpreq.responseType = 'json'
+				httpreq.send()
+			}
+			httpreq.onreadystatechange = function() {
+				if (httpreq.readyState === 4) {
+					if (this.status !== 200) {
+						setLog(start, this.status, this.response)
+					}
+					var json = httpreq.response
+					$('#post-acct-sel').prop('disabled', true)
+					$('#post-acct-sel').val(acct_id)
+					$('select').formSelect()
+					mdCheck()
+					var medias = $('[toot-id=' + id + ']').attr('data-medias')
+					var mediack = json.media_attachments[0]
+					//メディアがあれば
+					var media_ids = []
+					if (mediack) {
+						for (var i = 0; i <= 4; i++) {
+							if (json.media_attachments[i]) {
+								media_ids.push(json.media_attachments[i].id)
+								$('#preview').append(
+									'<img src="' +
+										json.media_attachments[i].preview_url +
+										'" style="width:50px; max-height:100px;">'
+								)
+							} else {
+								break
+							}
+						}
+					}
+					var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis')
+					vis(vismode)
+					var medias = media_ids.join(',');
+					$('#media').val(medias)
+					localStorage.setItem('nohide', true)
+					show()
+					if (json.text) {
+						var html = json.text
+					} else {
+						var html = $('[toot-id=' + id + '] .toot').html()
+						html = html.replace(/^<p>(.+)<\/p>$/, '$1')
+						html = html.replace(/<br\s?\/?>/, '\n')
+						html = html.replace(/<p>/, '\n')
+						html = html.replace(/<\/p>/, '\n')
+						html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, '$1')
+						html = $.strip_tags(html)
+					}
+					$('#textarea').val(html)
+					if (json.spoiler_text) {
+						cw()
+						$('#cw-text').val(json.spoiler_text)
+					}
+					if (json.sensitive) {
+						$('#nsfw').addClass('yellow-text')
+						$('#nsfw').html('visibility')
+						$('#nsfw').addClass('nsfw-avail')
+					}
+					if (json.in_reply_to_id) {
+						$('#reply').val(json.in_reply_to_id)
+					}
 				}
-			})
-			var html = $('[toot-id=' + id + '] .toot').html()
-			html = html.replace(/^<p>(.+)<\/p>$/, '$1')
-			html = html.replace(/<br\s?\/?>/, '\n')
-			html = html.replace(/<p>/, '\n')
-			html = html.replace(/<\/p>/, '\n')
-			html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, '$1')
-			html = $.strip_tags(html)
-			localStorage.setItem('nohide', true)
-			show()
-			$('#textarea').val(html)
-			var cwtxt = $('[toot-id=' + id + '] .cw_text').html()
-			if (cwtxt != '') {
-				cwtxt = $.strip_tags(cwtxt)
-				cw()
-				$('#cw-text').val(cwtxt)
 			}
 		}
 	})
 }
 //ピン留め
 function pin(id, acct_id) {
-	if ($('#pub_' + id).hasClass('pined')) {
+	if ($(`.cvo[unique-id=${id}]`).hasClass('pined')) {
 		var flag = 'unpin'
 	} else {
 		var flag = 'pin'
@@ -406,12 +495,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)
 			}
 		}
 	}
@@ -563,34 +654,50 @@ function staEx(mode) {
 			console.error(error)
 		})
 		.then(function(json) {
-			var id = json.statuses[0].id
-			if (mode == 'rt') {
-				rt(id, acct_id, 'remote')
-			} else if (mode == 'fav') {
-				fav(id, acct_id, 'remote')
-			} else if (mode == 'reply') {
-				reEx(id)
+			if (json.statuses) {
+				if (json.statuses[0]) {
+					var id = json.statuses[0].id
+					if (mode == 'rt') {
+						rt(id, acct_id, 'remote')
+					} else if (mode == 'fav') {
+						fav(id, acct_id, 'remote')
+					} else if (mode == 'reply') {
+						reEx(id)
+					}
+				}
 			}
 		})
 	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

@@ -97,7 +97,9 @@ input.addEventListener(
 											his[4].uses * 1 +
 											his[5].uses * 1 +
 											his[6].uses * 1
-										tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(tag.name)}','#${escapeHTML(tag.name)}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
+										tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
+											tag.name
+										)}','#${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
 
 										var item = {
 											uses: uses,
@@ -144,7 +146,9 @@ input.addEventListener(
 									if (acct.acct != q) {
 										//Instance Actorって…
 										if (acct.username.indexOf('.') < 0) {
-											accts = accts + `<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
+											accts =
+												accts +
+												`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
 										}
 									}
 								})
@@ -194,23 +198,34 @@ input.addEventListener(
 	false
 )
 function tagInsert(code, del) {
-	var now = $('#textarea').val()
-	var 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 +266,9 @@ function cgNPs(q) {
 					var tags = ''
 					Object.keys(json).forEach(function(key4) {
 						var tag = json[key4]
-						tags = tags + `<a onclick="cgNp('${json[key4]}')" class="pointer">${escapeHTML(json[key4])}</a>`
+						tags =
+							tags +
+							`<a onclick="cgNp('${json[key4]}')" class="pointer">${escapeHTML(json[key4])}</a>`
 					})
 					$('#suggest').html('Cinderella NowPlaying:' + tags)
 				} else {

app/js/tl/announParse.js

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

app/js/tl/card.js

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

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

app/js/tl/misskeyparse.js

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

app/js/tl/mix.js

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

app/js/tl/notification.js

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

app/js/tl/parse.js

@@ -8,12 +8,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'
@@ -35,6 +35,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')
@@ -148,13 +154,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'
@@ -211,8 +217,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			Object.keys(toot.account.emojis).forEach(function(key5) {
 				var emoji = toot.account.emojis[key5]
 				var shortcode = emoji.shortcode
+				if (gif == 'yes') {
+					var emoSource = emoji.url
+				} else {
+					var emoSource = emoji.static_url
+				}
 				var emoji_url = `
-					<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
 						alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
 				`
 				var regExp = new RegExp(':' + shortcode + ':', 'g')
@@ -221,6 +232,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}
 		var noticeavatar = ''
 		if (mix == 'notf') {
+			if (!toot.status) {
+				toot.status = statusModel(toot.created_at)
+			}
 			if (gif == 'yes') {
 				noticeavatar = toot.account.avatar
 			} else {
@@ -358,9 +372,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				Object.keys(toot.account.emojis).forEach(function(key5) {
 					var emoji = toot.account.emojis[key5]
 					var shortcode = emoji.shortcode
+					if (gif == 'yes') {
+						var emoSource = emoji.url
+					} else {
+						var emoSource = emoji.static_url
+					}
 					var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+					`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					dis_name = dis_name.replace(regExp, emoji_url)
 				})
@@ -409,9 +429,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					Object.keys(toot.account.emojis).forEach(function(key5) {
 						var emoji = toot.account.emojis[key5]
 						var shortcode = emoji.shortcode
+						if (gif == 'yes') {
+							var emoSource = emoji.url
+						} else {
+							var emoSource = emoji.static_url
+						}
 						var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+						`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
 					})
@@ -460,6 +486,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) {
 					//強調チェック
@@ -485,9 +516,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			if (toot.spoiler_text && cw) {
 				var spoil = escapeHTML(toot.spoiler_text)
-				var spoiler = 'cw cw_hide_' + toot.id
+				var spoiler = 'cw cw_hide'
 				var api_spoil = 'gray'
-				var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
+				var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
 			} else {
 				if (content) {
 					var ct1 = content.split('</p>').length + content.split('<br />').length - 2
@@ -507,14 +538,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5)
 				) {
 					var content = `<span class="gray">${lang.lang_parse_fulltext}</span><br>` + content
-					var spoil = `<span class="cw-long-${toot.id}">${$.mb_substr(
+					var spoil = `<span class="cw_long">${$.mb_substr(
 						$.strip_tags(content),
 						0,
 						100
 					)}</span>
 						<span class="gray">${lang.lang_parse_autofold}</span>`
-					var spoiler = 'cw cw_hide_' + toot.id
-					var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">
+					var spoiler = 'cw cw_hide'
+					var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">
 							${lang.lang_parse_more}
 						</a><br>`
 				} else {
@@ -557,7 +588,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//Poll
 			var poll = ''
 			if (toot.poll) {
-				var poll = pollParse(toot.poll, acct_id)
+				var poll = pollParse(toot.poll, acct_id, false)
 			}
 
 			var mediack = toot.media_attachments[0]
@@ -621,7 +652,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 										id="${id}-image-${key2}" data-url="${url}" data-original="${remote_url}" data-type="${media.type}" 
 										class="img-parsed img-link" style="width:calc(${cwdt}% - 1px); height:${imh};">
 									<img draggable="false" src="${purl}" class="${sense} toot-img pointer" 
-										onerror="this.src=\'../../img/loading.svg\'" title="${desc}">
+										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}">
 									${nsfwmes}
 								</a>`
 						}
@@ -661,13 +692,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 = ''
@@ -678,7 +709,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					var featured = `　<a onclick="tagFeature('${tag.name}','${acct_id}')" class="pointer" title="add it to Featured tags">Feature</a>　`
 					tags =
 						tags +
-						`<span class="hide" data-tag="${tag.name}">#${tag.name}:
+						`<span class="hide" data-tag="${tag.name}" data-regTag="${tag.name.toLowerCase()}">#${
+							tag.name
+						}:
 							<a onclick="tl('tag','${tag.name}','${acct_id}','add')" class="pointer"
 							 title="${lang.lang_parse_tagTL.replace(
 									'{{tag}}',
@@ -689,7 +722,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							'{{tag}}',
 							'#' + tag.name
 						)}
-						">Pin</a>featured</span> `
+						">Pin</a>${featured}</span> `
 				})
 				tags = '<div style="float:right">' + tags + '</div>'
 			}
@@ -733,7 +766,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'
@@ -756,9 +789,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') {
@@ -804,9 +848,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				Object.keys(toot.emojis).forEach(function(key5) {
 					var emoji = toot.emojis[key5]
 					var shortcode = emoji.shortcode
+					if (gif == 'yes') {
+						var emoSource = emoji.url
+					} else {
+						var emoSource = emoji.static_url
+					}
 					var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+					`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					content = content.replace(regExp, emoji_url)
 					spoil = spoil.replace(regExp, emoji_url)
@@ -851,10 +901,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 {
@@ -863,29 +913,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 = ''
@@ -947,11 +975,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'
@@ -961,15 +1003,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;">
@@ -983,7 +1025,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>
@@ -992,12 +1034,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}
@@ -1018,9 +1060,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</a>
 					</div>
 					<div class="action ${can_rt} ${disp['rt']} ${noauth}">
-						<a onclick="rt('${uniqueid}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
+						<a onclick="rt('${
+							toot.id
+						}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
 							style="padding:0" title="${lang.lang_parse_bt}">
-							<i class="fas fa-retweet ${if_rt} rt_${uniqueid}"></i>
+							<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
 							<span class="rt_ct">${toot.reblogs_count}</span>
 						</a>
 					</div>
@@ -1030,6 +1074,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"
@@ -1038,42 +1089,58 @@ 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('${uniqueid}','${acct_id}','${tlid}')"
+						class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0">
+						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
+						<span class="bkmStr_${uniqueid}">${bkmStr}</span>
+					</button>
+					</div>
+					<div class="${if_mine}">
+						<button onclick="del('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+							style="padding:0">
+							<i class="fas fa-trash"></i>${lang.lang_parse_del}
+						</button>
+					</div>
+					<div class="${if_mine}">
+						<button onclick="pin('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
+							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>
+							<span class="pinStr_${uniqueid}">${pinStr}</span>
+						</button>
+					</div>
+					<div class="${if_mine}">
+						<button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+							style="padding:0">
+							<i class="material-icons">redo</i>${lang.lang_parse_redraft}
+						</button>
+					</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>
@@ -1094,12 +1161,15 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	if (locale == 'yes') {
 		var locale = false
 	}
+	var gif = localStorage.getItem('gif')
+	if (!gif) {
+		gif = 'yes'
+	}
 	var templete = ''
 	var datetype = localStorage.getItem('datetype')
 	Object.keys(obj).forEach(function(key) {
 		var toot = obj[key]
 		if (toot) {
-			console.log(['Parsing', toot])
 			if (!toot.username) {
 				var raw = toot
 				toot = toot.account
@@ -1115,8 +1185,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">
@@ -1125,10 +1194,17 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				} else {
 					var authhtml = ''
 				}
-				var ftxt = lang.lang_parse_followed
-				if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
-					ftxt = localStorage.getItem('followlocale_' + acct_id)
+				if (auth == 'follow') {
+					var ftxt = lang.lang_parse_followed
+					if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
+						ftxt = localStorage.getItem('followlocale_' + acct_id)
+					}
+				} else if (auth == 'moved') {
+					var ftxt = lang.lang_parse_moved
+				} else if (auth == 'request') {
+					var ftxt = lang.lang_parse_request
 				}
+				console.log(auth, ftxt)
 				if (popup > 0 || popup == -1 || notf) {
 					var notftext = ftxt + '<br>'
 				} else {
@@ -1171,9 +1247,15 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					Object.keys(toot.emojis).forEach(function(key5) {
 						var emoji = toot.emojis[key5]
 						var shortcode = emoji.shortcode
+						if (gif == 'yes') {
+							var emoSource = emoji.url
+						} else {
+							var emoSource = emoji.static_url
+						}
 						var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+						`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
 					})
@@ -1182,16 +1264,18 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					dis_name = twemoji.parse(dis_name)
 				}
 				if (toot.avatar) {
-					var avatar = toot.avatar
+					if (gif == 'yes') {
+						var avatar = toot.avatar
+					} else {
+						var avatar = toot.avatar_static
+					}
 				} else {
 					var avatar = '../../img/missing.svg'
 				}
 				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) {
@@ -1201,7 +1285,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				templete =
 					templete +
-					`<div class="cvo" style="padding-top:5px;" user-id="${toot.id}">
+					`<div class="cusr" style="padding-top:5px;" user-id="${toot.id}">
 					<div class="area-notice">${notftext}</div>
 					<div class="area-icon">
 						${udg}
@@ -1221,21 +1305,20 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 								class="sml gray"
 								style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"
 							>
-								@ ${toot.acct}${locked}</span
-							>
+								@ ${toot.acct}${locked}</span>
 						</div>
 					</div>
-					<div class="area-toot acct-note">
-						${toot.note.replace(/<br\s?\/?>.+/g, '<span class="gray">...</span>')}
-					</div>
-					<div style="justify-content:space-around;top:5px" class="area-actions">
+					<div class="area-status">
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_follow}:${toot.following_count}
 						</div>
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_followers}:${toot.followers_count}
 						</div>
-						${latesthtml}${authhtml}
+						${latesthtml}
+					</div>
+					<div class="area-actions" style="justify-content: flex-end;">
+						${authhtml}
 					</div>
 				</div>
 				`
@@ -1246,6 +1329,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 }
 //クライアントダイアログ
 function client(name) {
+	$('#contextWrap').addClass('hide')
 	if (name != 'Unknown') {
 		//聞く
 		Swal.fire({
@@ -1306,73 +1390,130 @@ function client(name) {
 	}
 }
 //Poll Parser
-function pollParse(poll, acct_id) {
+function pollParse(poll, acct_id, emojis) {
+	var rand = randomStr(8)
 	var datetype = localStorage.getItem('datetype')
+	var anime = localStorage.getItem('animation')
+	if (anime == 'yes' || !anime) {
+		var lpAnime = 'lpAnime'
+	} else {
+		var lpAnime = ''
+	}
+	var gif = localStorage.getItem('gif')
+	if (!gif) {
+		gif = 'yes'
+	}
 	var choices = poll.options
 	if (poll.own_votes) {
 		var minechoice = poll.own_votes
 	} else {
 		var minechoice = []
 	}
-
-	if (poll.voted) {
+	var refresh = `<a onclick="voteMastodonrefresh('${acct_id}','${poll.id}','${rand}')" class="pointer">
+		${lang.lang_manager_refresh}
+	</a>`
+	if (poll.voted && minechoice.length) {
 		var myvote = lang.lang_parse_voted
+		if (poll.expired) myvote = myvote + '/' + lang.lang_parse_endedvote
+		var result_hide = ''
+	} else if (poll.voted && !minechoice.length) {
+		var myvote = lang.lang_parse_myvote
+		if (poll.expired) myvote = myvote + '/' + lang.lang_parse_endedvote
 		var result_hide = ''
 	} else if (poll.expired) {
 		var myvote = lang.lang_parse_endedvote
 		var result_hide = ''
 	} else {
-		var myvote =
-			`<a onclick="voteMastodon('${acct_id}','${poll.id}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
+		var myvote = `<a onclick="voteMastodon('${acct_id}','${poll.id}','${rand}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
 		if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
 			myvote =
 				myvote +
-				`<a onclick="showResult('${acct_id}','${poll.id}')" class="pointer">
+				`<a onclick="showResult('${acct_id}','${poll.id}','${rand}')" class="pointer">
 				${lang.lang_parse_unvoted}
-				</a>`
+				</a>　`
 		}
 		var result_hide = 'hide'
 	}
 	var ended = date(poll.expires_at, datetype)
 	var pollHtml = ''
+	if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
+		var max = _.maxBy(choices, 'votes_count').votes_count
+	} else {
+		var max = 0
+	}
+
 	Object.keys(choices).forEach(function(keyc) {
 		var choice = choices[keyc]
 		var voteit = ''
 		for (var i = 0; i < minechoice.length; i++) {
 			var me = minechoice[i]
 			if (me == keyc) {
-				var voteit = '✅'
+				var voteit =
+					'<span class="ownMark"><img class="emoji" draggable="false" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/2705.png"></span>'
 				break
 			}
 		}
 		if (!poll.voted && !poll.expired) {
 			var votesel =
-				"voteSelMastodon('" + acct_id + "','" + poll.id + "'," + keyc + ',' + poll.multiple + ')'
-			var voteclass = 'pointer waves-effect waves-light'
+				`voteSelMastodon('${acct_id}','${poll.id}',${keyc},${poll.multiple}, this)`
+			var voteclass = 'pointer'
 		} else {
 			var votesel = ''
 			var voteclass = ''
 		}
+		var per = Math.ceil((choice.votes_count / poll.votes_count) * 100)
+		if (!per) per = 0
+		if (max == choice.votes_count) {
+			var addPoll = 'maxVoter'
+		} else {
+			var addPoll = ''
+		}
+		var openData = ''
+		if (choice.votes_count !== null) {
+			openData = `<span style="float: right">${voteit}${choice.votes_count}<span class="sml">(${per}%)</span></span>`
+		} else {
+			openData = `<span style="float: right">${voteit}?<span class="sml">(-%)</span></span>`
+		}
+		var choiceText = escapeHTML(choice.title)
+		if (emojis) {
+			//絵文字があれば
+			Object.keys(emojis).forEach(function(key5) {
+				var emoji = emojis[key5]
+				var shortcode = emoji.shortcode
+				if (gif == 'yes') {
+					var emoSource = emoji.url
+				} else {
+					var emoSource = emoji.static_url
+				}
+				var emoji_url = `
+			<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+				alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+		`
+				var regExp = new RegExp(':' + shortcode + ':', 'g')
+				choiceText = choiceText.replace(regExp, emoji_url)
+			})
+			choiceText = twemoji.parse(choiceText)
+		}
 		pollHtml =
 			pollHtml +
 			`<div class="${voteclass} vote vote_${acct_id}_${poll.id}_${keyc}" onclick="${votesel}">
-				${escapeHTML(choice.title)}
-				<span class="vote_${acct_id}_${poll.id}_result ${result_hide}">
-					(${choice.votes_count})
+				<span class="vote_${acct_id}_${poll.id}_result leadPoll ${result_hide} ${addPoll} ${lpAnime}" style="width: ${per}%"></span>
+				<span class="onPoll">${choiceText}</span>
+				<span class="vote_${acct_id}_${poll.id}_result ${result_hide} onPoll">
+					${openData}
 				</span>
-				${voteit}
 			</div>`
 	})
-	pollHtml =
-		`<div class="vote_${acct_id}_${poll.id}">
+	if (poll.expired) {
+		refresh = ''
+	}
+	pollHtml = `<div class="vote_${acct_id}_${poll.id}" id="vote${rand}">
 			${pollHtml}${myvote}
-			<a onclick="voteMastodonrefresh(${acct_id}','${poll.id}')" class="pointer">
-				${lang.lang_manager_refresh}
-			</a>
+			${refresh}
 			<span class="cbadge cbadge-hover" title="${date(poll.expires_at, 'absolute')}">
 				<i class="far fa-calendar-times"></i>
 				${ended}
-			</span>
+			</span>${poll.voters_count} ${lang.lang_parse_people}
 		</div>`
 	return pollHtml
 }

app/js/tl/poll.js

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

app/js/tl/src.js

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

app/js/tl/tag.js

@@ -10,7 +10,8 @@ if (location.search) {
 }
 //よく使うタグ
 function tagShow(tag) {
-	$('[data-tag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
+	console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']')
+	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
 }
 //タグ追加
 function tagPin(tag) {
@@ -69,7 +70,7 @@ function favTag() {
 		tags =
 			tags +
 			`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
-			${nowon}<span class="hide" data-tag="${tag}">　
+			${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 			<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}">
 				TL
 			</a>　
@@ -124,7 +125,7 @@ function trendTag() {
 					tags =
 						tags +
 						`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
-						<span class="hide" data-tag="${tag}">　
+						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 						<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
 						<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">
 							Toot

app/js/tl/tl.js

@@ -56,14 +56,18 @@ 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
+	} else if (type == 'home') {
+		//ホームならお知らせ「も」取りに行く
+		announ(acct_id, tlid);
+	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -269,15 +273,15 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				if (typeA == 'delete') {
 					var obj = JSON.parse(mess.data).payload
 					if (delc == 'true') {
-						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+						$('#timeline_' + tlid + ' [unique-id=' + JSON.parse(mess.data).payload + ']').addClass(
 							'emphasized'
 						)
-						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+						$('#timeline_' + tlid + ' [unique-id=' + JSON.parse(mess.data).payload + ']').addClass(
 							'by_delcatch'
 						)
 					} else {
-						$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
-						$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
 					}
 				} else if (typeA == 'update' || typeA == 'conversation') {
 					if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
@@ -310,6 +314,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					}
 				} else if (typeA == 'filters_changed') {
 					filterUpdate(acct_id)
+				} else if (~typeA.indexOf('announcement')) {
+					announ(acct_id, tlid)
 				}
 			}
 		}
@@ -387,6 +393,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)
@@ -708,6 +717,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
 }
@@ -730,6 +741,8 @@ function com(type, data) {
 		return 'list/' + data + '?'
 	} else if (type == 'dm') {
 		return 'direct?'
+	} else if (type == 'bookmark') {
+		return 'bookmarks?'
 	}
 }
 //Misskey
@@ -800,6 +813,8 @@ function icon(type) {
 		var response = 'language'
 	} else if (type == 'tootsearch') {
 		var response = 'search'
+	} else if (type == 'bookmark') {
+		var response = 'bookmark'
 	}
 	return response
 }
@@ -835,6 +850,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
@@ -850,6 +868,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()
@@ -1102,3 +1123,91 @@ 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()
+		}
+	}
+}
+//Announcement
+function announ(acct_id, tlid) {
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var start = 'https://' + domain + '/api/v1/announcements'
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('GET', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			if (json.length > 0) {
+				$('.notf-announ_' + acct_id).removeClass('hide')
+				var ct = 0
+				for (var i = 0; i < json.length; i++) {
+					if (localStorage.getItem('announ_' + acct_id) == json[i].id) {
+						break
+					}
+					ct++
+				}
+				if(ct > 0) {
+					$('.notf-announ_' + acct_id + '_ct').text(ct)
+				}
+			} else {
+				$('.notf-announ_' + acct_id).addClass('hide')
+			}
+			var templete = announParse(json, acct_id, tlid)
+			$('#announce_' + tlid).html(templete)
+			jQuery('time.timeago').timeago()
+			todc()
+		}
+	}
+}

app/js/ui/img.js

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

app/js/ui/layout.js

@@ -202,6 +202,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 +231,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>`
+				</a>${lang.lang_layout_unread}<br>`
+			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 +282,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 +319,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 +350,7 @@ function parseColumn(target, dontclose) {
 			} else {
 				var addHeight = ''
 			}
-			var html =
-				`
+			var html = `
 				<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}" data-acct="${acct.domain}" style="${addHeight}">
 					<div class="notice-box z-depth-2" id="menu_${key}" style="${insert}">
 						<div class="area-notice">
@@ -334,7 +368,12 @@ function parseColumn(target, dontclose) {
 							title="${unique_notf}" ${icnsert}>
 							<i class="material-icons waves-effect nex notf-icon_${acct.domain}">notifications</i>
 						</a>
-						${unread}
+						<span class="cbadge hide notf-announ_${acct.domain}" style="margin-right:0" 
+							onclick="notfToggle('${acct.domain}','${key}')" title="${lang.lang_layout_announ}">
+							<i class="fas fa-bullhorn"></i>
+							<span class="notf-announ_${acct.domain}_ct"></span>
+						</span>
+						${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,18 +392,20 @@ 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="announce_${notfKey}" style="border: 1px solid"></div>
+					<div id="notifications_${notfKey}" data-notf="${notfDomain}" data-type="notf" class="notf-timeline">
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
+					${unread}
 					${exclude}${left_hold}
 					<a onclick="mediaToggle('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
 						<span id="sta-media-${key}">On</span>
 					</a>
 					${lang.lang_layout_mediafil}<br>
-					<a onclick="cardToggle(${key}')" class="setting nex">
+					<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 +427,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 +678,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>
+	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 +764,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 +796,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 +866,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/post-box.js

@@ -1,135 +1,141 @@
 /*ささやきボックス(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')
+	srcBox('close')
+})
+$('#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/scroll.js

@@ -1,62 +1,70 @@
 //スクロールで続きを読む
 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/spotify.js

@@ -42,6 +42,12 @@ function checkSpotify() {
 	} else {
 		$("#awk_no").prop("checked", true);
 	}
+	var flag2 = localStorage.getItem("complete-artwork");
+	if (flag2) {
+		$("#amw_yes").prop("checked", true);
+	} else {
+		$("#amw_no").prop("checked", true);
+	}
 }
 function spotifyFlagSave() {
 	var awk = $("[name=awk]:checked").val();
@@ -53,6 +59,16 @@ function spotifyFlagSave() {
 		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
 	}
 }
+function aMusicFlagSave() {
+	var awk = $("[name=amw]:checked").val();
+	if (awk == "yes") {
+		localStorage.setItem("complete-artwork", "yes");
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
+	} else {
+		localStorage.removeItem("complete-artwork");
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
+	}
+}
 function nowplaying(mode) {
 	if (mode == "spotify") {
 		var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
@@ -124,11 +140,7 @@ function nowplaying(mode) {
 		postMessage(["itunes", ""], "*");
 	}
 }
-function npCore(arg) {
-	if (arg.cmd) {
-		console.error(arg);
-		return;
-	}
+async function npCore(arg) {
 	console.table(arg);
 	var content = localStorage.getItem("np-temp");
 	if (!content || content == "" || content == "null") {
@@ -143,6 +155,9 @@ function npCore(arg) {
 	} else if (platform == "darwin") {
 		if (flag && arg.artwork) {
 			media(arg.artwork, "image/png", "new");
+		} else if (flag && localStorage.getItem('complete-artwork')) {
+			var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name;
+			postMessage(["bmpImage", [await getUnknownAA(q), 0]], "*");
 		}
 	}
 	var regExp = new RegExp("{song}", "g");
@@ -187,3 +202,15 @@ if (location.search) {
 	} else {
 	}
 }
+async function getUnknownAA(q) {
+	const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song'
+	let promise = await fetch(start, {
+		method: 'GET'
+	})
+	const json = await promise.json()
+	if(!json.resultCount) {
+		return []
+	}
+	const data = json.results[0].artworkUrl100
+	return data.replace(/100x100/, '512x512')
+}

app/js/ui/theme.js

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

app/js/ui/tips.js

@@ -111,7 +111,7 @@ function trendTagonTip() {
 						`<a onclick="tagShow('${tag}')" class="pointer">
 							#${escapeHTML(tag)}
 						</a>
-						<span class="hide" data-tag="${tag}">　
+						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 							<a onclick="tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
 							<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">Toot</a>
 						</span><br>`
@@ -159,6 +159,10 @@ function spotifytips() {
 			})
 			.then(function(json) {
 				var ms = json.progress_ms
+				if(!ms) {
+					tips('ver')
+					return false
+				}
 				var last = 1000 - (ms % 1000)
 				var item = json.item
 				var img = item.album.images[0].url
@@ -218,6 +222,8 @@ function spotifytips() {
 			type: 'info',
 			title: lang.lang_spotify_acct
 		})
+		tips('ver')
+		return false
 	}
 }
 function spotStart() {
@@ -288,6 +294,4 @@ function tipsToggle() {
 	$('#tips').toggleClass('hide')
 	$('#tips-menu').toggleClass('hide')
 }
-if (localStorage.getItem('tips')) {
-	tips(localStorage.getItem('tips'))
-}
+

app/js/userdata/showOnTL.js

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

app/main.js

@@ -1,296 +1,348 @@
-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('If it does not show the window, you might forget `npm run construct`.')
 }
-var info_path = join(app.getPath("userData"), "window-size.json");
-var max_info_path = join(app.getPath("userData"), "max-window-size.json");
-var 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')
+var frame_path = join(app.getPath('userData'), 'frame')
 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
 	}
 }
+try {
+	var frameRaw = fs.readFileSync(frame_path, 'utf8')
+	if(frameRaw == 'false') {
+		var frame = false
+		var frameTitle = 'hidden'
+	} else {
+		var frame = true
+		var frameTitle = 'default'
+	}
+} catch {
+	var frame = true
+}
 // 全てのウィンドウが閉じたら終了
-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",
-			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();
+			icon: __dirname + '/desk.png',
+			show: false,
+			frame: frame,
+			resizable: true
 		}
-	});
-	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,
+			frame: frame
+		}
+	} 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,
+			titleBarStyle: frameTitle,
+			frame: frame,
+		}
+	}
+	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, frame))
+	)
+	if(!frame) {
+		mainWindow.setMenu(null)
+	}
 	//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/main/dl.js

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

app/main/img.js

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

app/main/language.js

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

app/main/np.js

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

app/main/system.js

@@ -12,6 +12,7 @@ function system(mainWindow, dir, lang, dirname) {
 	var ua_path = join(app.getPath("userData"), "useragent");
 	var lang_path = join(app.getPath("userData"), "language");
 	var log_dir_path = join(app.getPath("userData"), "logs");
+	var frame_path = join(app.getPath("userData"), "frame");
 	//ログ
 	var today = new Date();
 	//今日のやつ
@@ -45,7 +46,7 @@ function system(mainWindow, dir, lang, dirname) {
 	//エクスポートのダイアログ
 	ipc.on("exportSettings", function(e, args) {
 		dialog.showSaveDialog(
-			null,
+			mainWindow,
 			{
 				title: "Export",
 				properties: ["openFile", "createDirectory"],
@@ -62,13 +63,14 @@ function system(mainWindow, dir, lang, dirname) {
 	//インポートのダイアログ
 	ipc.on("importSettings", function(e, args) {
 		dialog.showOpenDialog(
-			null,
+			mainWindow,
 			{
 				title: "Import",
 				properties: ["openFile"],
 				filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
 			},
 			fileNames => {
+				console.log("imported from: ", fileNames)
 				if (!fileNames) {
 					return false;
 				}
@@ -79,7 +81,7 @@ function system(mainWindow, dir, lang, dirname) {
 	//保存フォルダのダイアログ
 	ipc.on("savefolder", function(e, args) {
 		dialog.showOpenDialog(
-			null,
+			mainWindow,
 			{
 				title: "Save folder",
 				properties: ["openDirectory"]
@@ -92,7 +94,7 @@ function system(mainWindow, dir, lang, dirname) {
 	//カスタムサウンドのダイアログ
 	ipc.on("customSound", function(e, arg) {
 		dialog.showOpenDialog(
-			null,
+			mainWindow,
 			{
 				title: "Custom sound",
 				properties: ["openFile"],
@@ -114,6 +116,7 @@ function system(mainWindow, dir, lang, dirname) {
 		app.relaunch();
 		app.exit();
 	});
+	//ユーザーエージェント
 	ipc.on("ua", function(e, arg) {
 		if (arg == "") {
 			fs.unlink(ua_path, function(err) {});
@@ -123,6 +126,12 @@ function system(mainWindow, dir, lang, dirname) {
 		app.relaunch();
 		app.exit();
 	});
+	//フレームのありなし
+	ipc.on("frameSet", function(e, arg) {
+		fs.writeFileSync(frame_path, arg);
+		app.relaunch();
+		app.exit();
+	});
 
 	ipc.on("quit", (e, args) => {
 		app.quit();
@@ -233,11 +242,10 @@ function system(mainWindow, dir, lang, dirname) {
 		fn(data); // ソート後の配列を返す
 	}
 	ipc.on("fonts", (e, arg) => {
-		const fm = require("font-manager");
-		var fonts = fm.getAvailableFontsSync();
-		object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
-			e.sender.webContents.send("font-list", fonts_sorted);
-		});
+		var SystemFonts = require('system-font-families').default;
+		var fm = new SystemFonts();
+		const fontList = fm.getFontsSync();
+		e.sender.webContents.send("font-list", fontList);
 	});
 	//コピー
 	ipc.on("copy", (e, arg) => {
@@ -277,6 +285,7 @@ function system(mainWindow, dir, lang, dirname) {
 			e.sender.webContents.send("logData", logs);
 		});
 	});
+	
 	//起動時ログディレクトリ存在確認と作成、古ログ削除
 	fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, error => {
 		if (error) {

app/manifest.json

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

app/package.json

@@ -1,19 +1,21 @@
 {
   "name": "thedesk",
-  "version": "20.0.2",
+  "version": "20.3.2",
+  "codename": "Kawaii",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "construct": "cd view/make && node make --automatic && cd ../../",
-    "dev": "electron ./ --dev",
+    "dev": "npx electron ./ --dev",
     "dist": "build --linux snap",
     "watchview": "node view/make/make.js --automatic --watch",
     "build:js": "node build.js",
-    "build": "electron-builder",
-    "build:all": "electron-builder --win --linux",
-    "build:win": "electron-builder --win"
+    "build": "node view/make/make.js --automatic && npx electron-builder",
+    "build:all": "npx electron-builder --win --linux",
+    "build:win": "npx electron-builder --win",
+    "build:pwa": "node view/make/make.js --automatic --pwa"
   },
   "keywords": [
     "mastodon",
@@ -50,27 +52,28 @@
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.11.2",
-    "electron-dl": "^1.14.0",
-    "jimp": "^0.8.4",
+    "@fortawesome/fontawesome-free": "^5.13.0",
+    "custom-electron-titlebar": "^3.2.2-hotfix62",
+    "electron-dl": "^3.0.0",
+    "jimp": "^0.10.1",
     "jquery": "^3.4.1",
     "jquery-ui-dist": "^1.12.1",
-    "materialize-css": "git://github.com/cutls/materialize",
-    "json5": "^2.1.1",
+    "json5": "^2.1.3",
     "lodash": "^4.17.15",
-    "sumchecker": "^3.0.0",
-    "sweetalert2": "^8.18.6",
-    "vue": "^2.6.10"
+    "materialize-css": "git://github.com/cutls/materialize#v1-dev",
+    "sumchecker": "^3.0.1",
+    "sweetalert2": "^9.10.9",
+    "system-font-families": "^0.4.1",
+    "vue": "^2.6.11"
   },
   "optionalDependencies": {
-    "font-manager": "^0.3.0",
-    "itunes-nowplaying-mac": "0.3.1"
+    "itunes-nowplaying-mac": "git://github.com/cutls/itunes-nowplaying-mac"
   },
   "devDependencies": {
-    "chokidar": "^3.2.3",
-    "electron": "^6.0.12",
-    "electron-builder": "^21.1.5",
-    "electron-rebuild": "^1.8.6",
+    "chokidar": "^3.3.1",
+    "electron": "^8.0.0",
+    "electron-builder": "^22.4.1",
+    "electron-rebuild": "^1.10.1",
     "readline-sync": "1.4.10"
   },
   "build": {

app/source/version.json

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

app/sw.pwa.js

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

app/view/make/acct.sample.html

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

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

@@ -1,6 +1,8 @@
 {
     "draghere": "Drag here to upload",
     "close": "Close",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Show profile of the selecting account",
     "closethisbox": "Close this box",
     "toot": "Toot",
@@ -20,6 +22,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -68,7 +72,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 +129,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,15 +172,17 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
+    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
+    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -86,6 +87,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 +138,8 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -151,6 +156,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -175,29 +181,38 @@
     "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_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "Voted",
+    "lang_parse_voted": "(Voted)",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

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

@@ -4,18 +4,21 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
+  "show": "Show",
+  "hide": "Hide",
   "default": "Default",
   "change": "Change",
   "select": "Select",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -94,7 +102,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
@@ -127,6 +135,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",
@@ -136,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -1,6 +1,8 @@
 {
     "draghere": "Drag here to upload",
     "close": "Close",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Show profile of the selecting account",
     "closethisbox": "Close this box",
     "toot": "Toot",
@@ -20,6 +22,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -68,7 +72,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 +129,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,15 +172,17 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
+    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
+    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -86,6 +87,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 +138,8 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -151,6 +156,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -175,29 +181,38 @@
     "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_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "Voted",
+    "lang_parse_voted": "(Voted)",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

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

@@ -4,18 +4,21 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
+  "show": "Show",
+  "hide": "Hide",
   "default": "Default",
   "change": "Change",
   "select": "Select",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -94,7 +102,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
@@ -127,6 +135,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",
@@ -136,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -1,6 +1,8 @@
 {
     "draghere": "Плъзнете тук за да качите",
     "close": "Затвори",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Показване на профила на избрания акаунт",
     "closethisbox": "Затвори полето",
     "toot": "Тоот",
@@ -20,6 +22,8 @@
     "yes": "Да",
     "temp": "Прикачени файлове",
     "nothing": "Няма",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Регулирайте поверителността на състоянието",
     "cwtext": "Текст за предупреждение",
     "selectVis": "Регулирайте поверителността на състоянието",
@@ -125,6 +129,7 @@
     "integratedTLDes": "Интегриране (Местно/Начало)",
     "localPlusDes": "LTL+Отговор+BT",
     "notf": "Известия",
+    "bookmark": "Отметки",
     "showThisTL": "Показване на този TL:",
     "webviewWarn": "TweetDeck с потребителски TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Код</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Клавишните комбинации ще ви дразнят. Когато се почувствате така, маркирате „Предпочитам WebView“ в горната част на колоната.",
     "add": "Добави",
@@ -167,15 +172,17 @@
     "contactwithlog": "Ако ми кажете за грешки (нещо не работи или подобно) с този дневник, мога по-лесно да открия какво не е наред.",
     "about": "За TheDesk",
     "hereAddColumns": "<- Добави ТЛ",
+    "foundBug": "Намерена е грешка",
     "show": "Покажи",
     "directory": "Директория",
     "active": "Наскоро активен",
     "newcomer": "Новодошли",
     "local_only": "Само местно",
+    "menu": "Menu",
     "demoBottomBtns": "Ръководство за добре дошли",
     "lookAtBottom": "Погледнете в края на този прозорец. Ето няколко съвета за това.",
     "acctManDesc": "Добавете още акаунти и излезте от тях.",
     "settingDesc": "Много. много предпочитания са тук. Няма да можете да ги проверите всички!",
     "nanoDescPlus": "Клиент мини прозорец (експериментално)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

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

@@ -21,17 +21,17 @@
     "lang_time_suffixAgo": null,
     "lang_time_suffixFromNow": null,
     "lang_time_inPast": null,
-    "lang_time_seconds": "%d s",
-    "lang_time_minute": "1 m",
-    "lang_time_minutes": "%d m",
-    "lang_time_hour": "1 h",
-    "lang_time_hours": "%d h",
-    "lang_time_day": "1 d",
-    "lang_time_days": "%d d",
-    "lang_time_month": "1 month",
-    "lang_time_months": "%d months",
-    "lang_time_year": "y",
-    "lang_time_years": "%d y",
+    "lang_time_seconds": "%d сек.",
+    "lang_time_minute": "1 мин.",
+    "lang_time_minutes": "%d мин.",
+    "lang_time_hour": "1 ч",
+    "lang_time_hours": "%d ч",
+    "lang_time_day": "1 ден",
+    "lang_time_days": "%d дни",
+    "lang_time_month": "1 месец",
+    "lang_time_months": "%d месеца",
+    "lang_time_year": "г.",
+    "lang_time_years": "%d г.",
     "lang_version_usever": "Не е намерена актуализация({{ver}})",
     "lang_version_skipver": "Актуализацията бе игнорирана.",
     "lang_version_platform": "Искате ли автоматични актуализации? (За потребителите инсталирали от Microsoft Store, изберете „Не“)",
@@ -48,17 +48,18 @@
     "lang_manager_none": "Няма",
     "lang_manager_godev": "Отворете DevCenter на Misskey. Ние показваме официални документи, на които се позоваваме.",
     "lang_manager_logout": "Излизане",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk разглежда \"@\" като отговор, но поставя друг параметър. Ако не е включено в Mastodon това означава, че е в Home на Misskey.",
     "lang_emoji_get": "Вземи емотикони",
     "lang_emoji_custom": "Персонализирани емотикони",
     "lang_defaultemojis_text": "Още емотикони {{cat}}",
-    "lang_emoji_uncat": "Uncategorized",
+    "lang_emoji_uncat": "Без категория",
     "lang_postimg_previewdis": "не може да се визуализира",
     "lang_postimg_aftupload": "Не можете да променяте профилите след качването.",
-    "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Click to add description, right-click to delete this",
-    "lang_postimg_desc": "Description",
-    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_postimg_failupload": "Неуспешно",
+    "lang_postimg_delete": "Кликнете за да добавите описание, щракнете с десния бутон за да го изтриете",
+    "lang_postimg_desc": "Описание",
+    "lang_postimg_leadContext": "щракнете с десния бутон върху миниатюрата за да изтриете това",
     "lang_post_tagTL": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?",
     "lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.",
     "lang_post_cwtitle": "Авто CW Сигнал",
@@ -76,68 +77,72 @@
     "lang_status_unmute": "Със звук",
     "lang_status_redraftTitle": "Изтрий & върни",
     "lang_status_redraft": "Продължете да изтривате & преработвате? Ще изгубите статуса на тази раздумка. В тази функция може да се съдържат някои грешки. Снимките от тази раздумка ще бъдат изтрити на по-стари от Mastodon 2.4.1.",
-    "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
-    "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
-    "lang_status_unendorse": "Not feature on profile",
+    "lang_status_emphas": "toots са подчертани. Моля, презаредете след това действие.",
+    "lang_status_unemphas": "toots не са подчертани. Моля, презаредете след това действие.",
+    "lang_status_unendorse": "Не присъства в профила",
     "lang_status_endorse": "Функция в профила",
-    "lang_status_followers": "Followers",
-    "lang_status_active": "Last status",
-    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
-    "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
-    "lang_cards_check": " check",
-    "lang_cards_pip": "PiP mode",
+    "lang_status_followers": "Последователи",
+    "lang_status_active": "Последно състояние",
+    "lang_suggest_nodata": "Моля, вземете списък с емотикони за да покажете състояние.",
+    "lang_usetxtbox_reply": "Режим на отговор. Ctrl+Shift+C за изчистване.",
+    "lang_cards_check": " проверка",
+    "lang_cards_pip": "PiP режим",
+    "lang_cards_trusted": "Доверен вграден HTML от TheDesk (Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_untrusted": "Ненадеждно вграждане на HTML от TheDesk",
     "lang_details_nodata": "Няма данни",
-    "lang_details_filtered": "Filtered toot",
-    "lang_details_embed": "Embed HTML is cliped.",
-    "lang_details_url": "URL of this toot is cliped.",
-    "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_filtered": "Филтриране на toot",
+    "lang_details_embed": "Вграденият HTML е изрязан.",
+    "lang_details_url": "URL адресът на този toot е изрязан.",
+    "lang_details_txt": "Съдържанието на този toot е изрязано.",
     "lang_filter_nodata": "Няма данни",
-    "lang_filter_errordegree": "Please check a context",
+    "lang_filter_errordegree": "Моля, проверете контекстта",
     "lang_list_nodata": "Няма данни",
     "lang_list_show": "Покажи",
-    "lang_list_users": "Users list",
-    "lang_list_nouser": "No users in this list.",
-    "lang_list_add": "Add to the list",
-    "lang_list_add_misskey": "(perhaps this user has been listed)",
-    "lang_list_remove": "Remove from the list",
-    "lang_notf_new": " new notifications",
-    "lang_speech_refresh": "Save value about TTS config",
-    "lang_src_ts": "chronological order",
-    "lang_src_people": " people toot",
-    "lang_tags_always": "Always toots with ",
-    "lang_tags_realtime": "Tag-stream toot",
-    "lang_tags_tagunpin": "Unpin {{tag}}",
-    "lang_tags_unrealtime": "Disable TsT",
+    "lang_list_users": "Списък с потребители",
+    "lang_list_nouser": "Няма потребители в този списък.",
+    "lang_list_add": "Добавяне към списъка",
+    "lang_list_add_misskey": "(може би този потребител е добавен)",
+    "lang_list_remove": "Премахване от списъка",
+    "lang_notf_new": " нови известия",
+    "lang_speech_refresh": "Запазване на стойността за конфигурацията на TTS",
+    "lang_src_ts": "хронологичен ред",
+    "lang_src_people": " хора toot",
+    "lang_tags_always": "Винаги toots с ",
+    "lang_tags_realtime": "Tag-поток toot",
+    "lang_tags_tagunpin": "Разкачане на {{tag}}",
+    "lang_tags_unrealtime": "Деактивиране на TsT",
     "lang_tags_tagwarn": "Автоматично попълване на {{tag}}, ако раздумката няма {{tag}}",
-    "lang_tl_media": "Media",
-    "lang_tl_reconnect": "Reconnect to streaming API",
-    "lang_tl_postmarkers_title": "Process...",
-    "lang_tl_postmarkers": "POST markers data. Please wait",
-    "lang_img_DLDone": "Downloaded:",
-    "lang_img_copyDone": "Copied: URL of this image",
-    "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
-    "lang_layout_thisacct": "{{notf}} of this account",
-    "lang_layout_delthis": "Remove this column",
-    "lang_layout_setthis": "Preferences of this column",
-    "lang_layout_mediafil": "Media filtering",
-    "lang_layout_linkana": "Auto Link Analyzer",
-    "lang_layout_linkanades": "Auto link analyzer",
-    "lang_layout_tts": "Text to speech ",
+    "lang_tl_media": "Медия",
+    "lang_tl_reconnect": "Свързване отново към API за стрийминг",
+    "lang_tl_postmarkers_title": "В процес...",
+    "lang_tl_postmarkers": "Данни за POST маркери. Моля изчакайте",
+    "lang_img_DLDone": "Изтеглени:",
+    "lang_img_copyDone": "Копирано: URL адреса на това изображение",
+    "lang_layout_gotop": "Върнете се в горната част на тази колона. Когато иконата е червена, означава че тази колона не може да свърже API за споделане. Моля, презаредете.",
+    "lang_layout_thisacct": "{{notf}} от този акаунт",
+    "lang_layout_delthis": "Премахване на тази колона",
+    "lang_layout_setthis": "Предпочитания за тази колона",
+    "lang_layout_mediafil": "Филтриране на медиите",
+    "lang_layout_linkana": "Автоматичен анализатор на връзки",
+    "lang_layout_linkanades": "Автоматичен анализатор на връзки",
+    "lang_layout_tts": "Текст към говор ",
     "lang_layout_reconnect": "Reconnect to streaming API",
-    "lang_layout_headercolor": "Header color of this column",
-    "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
+    "lang_layout_headercolor": "Цвят на заглавката на тази колона",
+    "lang_layout_nodata": "[Няма данни]<br>F5/⌘+R за презареждане",
     "lang_layout_dm": "Директни съобщения",
-    "lang_layout_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_webviewmode": "Предпочитания за WebView",
+    "lang_excluded": "Изключване на вид уведомление",
     "lang_layout_excludingbt": "Показване в BT режим (ИЗКЛ./Изключване BT/ Само в BT)",
     "lang_layout_leftFold": "Стъпка наляво",
     "lang_layout_leftUnfold": "Док отдясно",
     "lang_layout_deleteColumn": "Премахване на тази колона",
     "lang_layout_deleteColumnDesc": "Премахване на тази колона",
-    "lang_layout_unread": "Unread",
+    "lang_layout_unread": "Непрочетени",
+    "lang_layout_tagManager": "Мениджър на таговете на времевата линия",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Отидете в тази колона",
     "lang_sort_remthis": "Премахване на тази колона",
-    "lang_spotify_img": "Attach an album artwork",
+    "lang_spotify_img": "Добавете към албум произведенията на изкуството",
     "lang_spotify_imgno": "Not attach an album artwork",
     "lang_spotify_acct": "Connect TheDesk to Spotify",
     "lang_spotify_np": "Готово:шаблон на NowPlaying",
@@ -151,6 +156,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Следвайте, за да добавите този потребител към списъците.",
@@ -175,44 +181,53 @@
     "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_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
-    "lang_parse_clientmute": "muted",
-    "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "Voted",
-    "lang_parse_vote": "Vote",
-    "lang_parse_unvoted": "Show the result without voting",
-    "lang_parse_endedvote": "Expired",
-    "lang_parse_thread": "Show thread",
-    "lang_parse_unknown": "Attached file",
+    "lang_parse_clientmute": "без звук",
+    "lang_parse_mute": " ще бъдат заглушени. Можете да ги премахнете от предпочитания.",
+    "lang_parse_voted": "(Гласуваха)",
+    "lang_parse_myvote": "(Моята собствена анкета)",
+    "lang_parse_vote": "Гласували",
+    "lang_parse_unvoted": "Показване на резултата без гласувалите",
+    "lang_parse_endedvote": "Изтекъл",
+    "lang_parse_people": "човека",
+    "lang_parse_thread": "Показване на нишката",
+    "lang_parse_unknown": "Прикачени файлове",
     "lang_parse_nsfw": "NSFW media",
-    "lang_parse_notffilter": "Show this user's notifications",
-    "lang_misskeyparse_renote": "Repost",
-    "lang_misskeyparse_renoteqt": "Renote",
-    "lang_misskeyparse_reaction": "Reaction",
-    "lang_misskeyparse_tagnostr": "No streaming API on Tag TLs",
-    "lang_misskeyparse_listnostr": "No streaming API on List TLs",
+    "lang_parse_html": "Показване на вграденият HTML код",
+    "lang_parse_notffilter": "Показване на известията от този потребител",
+    "lang_misskeyparse_renote": "Повторно публикуване",
+    "lang_misskeyparse_renoteqt": "Повторна бележка",
+    "lang_misskeyparse_reaction": "Реакция",
+    "lang_misskeyparse_tagnostr": "Няма стрийминг API за TLs маркери",
+    "lang_misskeyparse_listnostr": "Няма стрийминг API за TLs списък",
     "lang_misskeyparse_home": "Начало",
     "lang_misskeyparse_followers": "Последователи",
-    "lang_misskeyparse_specified": "Specified User",
-    "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
-    "lang_misskeyparse_renoted": " renoted your following post.",
-    "lang_misskeyparse_quoted": " quoted your following post.",
-    "lang_misskeyparse_reacted": " reacted your following post.",
-    "lang_setting_time": "Time format:{{set}}",
-    "lang_setting_theme": "Theme:{{set}}",
+    "lang_misskeyparse_specified": "Посочен потребител",
+    "lang_misskeyparse_qt": "Misskey в режим повторна бележка (цитат):Ctrl + Shift + Enter за изчистване",
+    "lang_misskeyparse_renoted": " повторно отбелязали на вашата следваща публикация.",
+    "lang_misskeyparse_quoted": " цитирали следващата ви публикация.",
+    "lang_misskeyparse_reacted": " реагирали на следващата ви публикация.",
+    "lang_setting_time": "Времеви формат:{{set}}",
+    "lang_setting_theme": "Тема:{{set}}",
     "lang_setting_nsfw": "NSFW:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -4,12 +4,15 @@
   "yes": "Да",
   "no": "Не",
   "none": "Няма",
+  "show": "Покажи",
+  "hide": "Hide",
   "default": "По подразбиране",
   "change": "Промяна",
   "select": "Избери",
   "env": "Системни предпочитания",
   "setlang": "Езици",
   "backup": "Внос и износ на предпочитания",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Внос",
   "export": "Износ",
   "hardwareAcceleration": "Деактивиране на хардуерното ускорение",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk ще използва това местоназначение, когато се опитва да запази снимки или да прави екранни снимки.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "абсолютна стойност",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Изберете тема",
   "customtheme": "Редактирайте и добавете персонализирани теми",
   "customthemeDirection": "Цветова схема",
@@ -127,6 +135,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",
@@ -136,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "Можете да вмъкнете всякакви букви и емотикони само с 3 клавиша",

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

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

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

@@ -1,6 +1,8 @@
 {
     "draghere": "Drag here to upload",
     "close": "Close",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Show profile of the selecting account",
     "closethisbox": "Close this box",
     "toot": "Toot",
@@ -20,6 +22,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -68,7 +72,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 +129,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,15 +172,17 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
+    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
+    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -86,6 +87,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 +138,8 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -151,6 +156,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -175,29 +181,38 @@
     "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_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "Voted",
+    "lang_parse_voted": "(Voted)",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

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

@@ -4,18 +4,21 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
+  "show": "Show",
+  "hide": "Hide",
   "default": "Default",
   "change": "Change",
   "select": "Select",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -94,7 +102,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
@@ -127,6 +135,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",
@@ -136,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -1,6 +1,8 @@
 {
     "draghere": "Přetáhněte sem pro nahrání",
     "close": "Zavřít",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Zobrazit profil výběrového účtu",
     "closethisbox": "Zavřít toto okno",
     "toot": "Tootnout",
@@ -20,6 +22,8 @@
     "yes": "Ano",
     "temp": "Přiložení souborů",
     "nothing": "Nic",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Upravit soukromí statusu",
     "cwtext": "Varovní text",
     "selectVis": "Upravit soukromí statusu",
@@ -125,6 +129,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifikace",
+    "bookmark": "Záložky",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Přidat",
@@ -167,15 +172,17 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
+    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
+    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "Žádný",
     "lang_manager_godev": "Otevřené vývojářské centrum softwaru Misskey. Zobrazujeme také oficiální dokumentaci.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk považuje „@“ za odpověď, ale vkládá ho do jiných parametrů. „Neuvedeno“ na Mastodonu znamená „Domů“ na Misskey.",
     "lang_emoji_get": "Získat emoji",
     "lang_emoji_custom": "Vlastní emoji",
@@ -55,9 +56,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 +87,8 @@
     "lang_usetxtbox_reply": "Režim odpovězení. Pro vymazání stiskněte Ctrl+Shift+C.",
     "lang_cards_check": " kontrolovat",
     "lang_cards_pip": "Režim PiP",
+    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
     "lang_details_nodata": "Žádná data",
     "lang_details_filtered": "Filtrovaný toot",
     "lang_details_embed": "HTML pro vložení je zkopírován.",
@@ -135,6 +138,8 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -151,6 +156,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[robot]",
     "lang_showontl_followed": "Sledují vás",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Oznámení ",
     "lang_showontl_domain": "Doména ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -180,11 +186,17 @@
     "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_moved": "Moved to...",
     "lang_parse_clientop": "Operace tohoto klienta",
     "lang_parse_clienttxt": " bude",
     "lang_parse_clientno": "nic nedělat",
@@ -192,12 +204,15 @@
     "lang_parse_clientmute": "ztlumena",
     "lang_parse_mute": " bude ztlumena. To můžete odstranit v nastavení.",
     "lang_parse_voted": "Voted",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "NSFW media",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_misskeyparse_renote": "Znovusdílení",
     "lang_misskeyparse_renoteqt": "Renotování",

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

@@ -4,12 +4,15 @@
   "yes": "Ano",
   "no": "Ne",
   "none": "None",
+  "show": "Show",
+  "hide": "Hide",
   "default": "Default",
   "change": "Změnit",
   "select": "Vybrat",
   "env": "Systémové předvolby",
   "setlang": "Jazyky",
   "backup": "Import a export předvoleb",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolutní hodnota",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Vybrat motiv",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -127,6 +135,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",
@@ -136,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

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

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

@@ -1,6 +1,8 @@
 {
     "draghere": "Drag here to upload",
     "close": "Close",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Show profile of the selecting account",
     "closethisbox": "Close this box",
     "toot": "Toot",
@@ -20,6 +22,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -68,7 +72,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 +129,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,15 +172,17 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
+    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
+    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -86,6 +87,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 +138,8 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -151,6 +156,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -175,29 +181,38 @@
     "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_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "Voted",
+    "lang_parse_voted": "(Voted)",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

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

@@ -4,18 +4,21 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
+  "show": "Show",
+  "hide": "Hide",
   "default": "Default",
   "change": "Change",
   "select": "Select",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -94,7 +102,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
@@ -127,6 +135,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",
@@ -136,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -1,6 +1,8 @@
 {
     "draghere": "Zum Hochladen hier her ziehen",
     "close": "Schließen",
+    "webSrc": "Suche im Internet",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Ausgewähltes Konto anzeigen",
     "closethisbox": "Diesen Dialog schließen",
     "toot": "Tröt",
@@ -10,19 +12,21 @@
     "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",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
+    "vis": "Status Privatsphäre anpassen",
     "cwtext": "Warntext",
-    "selectVis": "Adjust status privacy",
+    "selectVis": "Status Privatsphäre anpassen",
     "publicJP": "",
     "unlistedJP": "",
     "privateJP": "",
@@ -61,8 +65,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 +85,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 +129,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 +147,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 +162,27 @@
     "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",
+    "foundBug": "Ich habe einen Fehler gefunden",
+    "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.",
+    "menu": "Menu",
+    "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)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "nanoDescPlus": "Mini-Fenster-Klient (experimentell)",
+    "menuDesc": "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_hour": "1 S",
     "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_day": "1 t",
+    "lang_time_days": "%d t",
+    "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}})",
@@ -48,16 +48,17 @@
     "lang_manager_none": "Ohne",
     "lang_manager_godev": "Öffnen Sie das DevCenter von Misskey. Wir zeigen auch ein offizielles Dokument als Referenz.",
     "lang_manager_logout": "Abmelden",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk betrachtet \"@\" als Antwort, setzt aber einen anderen Parameter. Nicht auf Mastodon gelistet bedeutet Home on Misskey.",
     "lang_emoji_get": "Hole Emojis",
     "lang_emoji_custom": "Eigene Emojis",
     "lang_defaultemojis_text": "Emojis über {{cat}}",
-    "lang_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 +81,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 +110,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 +132,14 @@
     "lang_layout_dm": "Direkte Nachricht",
     "lang_layout_webviewmode": "Web-Ansicht bevorzugen",
     "lang_excluded": "Ausgeschlossene Benachrichtigungsart",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_excludingbt": "BT-Modus anzeigen (aus/kein BT/Nur BT)",
     "lang_layout_leftFold": "Nach links Stapeln",
     "lang_layout_leftUnfold": "Rechts Anheften",
     "lang_layout_deleteColumn": "Diese Spalte löschen",
     "lang_layout_deleteColumnDesc": "Diese Spalte löschen",
-    "lang_layout_unread": "Unread",
+    "lang_layout_unread": "ungelesen",
+    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Gehe zu dieser Spalte",
     "lang_sort_remthis": "Diese Spalte löschen",
     "lang_spotify_img": "Albumcover anhängen",
@@ -151,8 +156,9 @@
     "lang_showontl_movebtn": "Auf dem neuen Konto fortfahren",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Folgt dir",
+    "lang_parse_request": "Follow request",
     "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,11 +186,17 @@
     "lang_parse_bt": "Diesen Tröt verstärken",
     "lang_parse_fav": "Diesen Tröt favorisieren",
     "lang_parse_quote": "Diesen Tröt zitieren",
+    "lang_parse_bookmark": "Lesezeichen hinzufügen",
+    "lang_parse_unbookmark": "Lesezeichen entfernen",
     "lang_parse_del": "Diesen Tröt löschen",
     "lang_parse_pin": "Dieses Tröt fixieren",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Im Browser öffnen",
     "lang_parse_det": "Details über Ihr Hauptkonto.",
+    "lang_parse_detail": "Details",
     "lang_parse_redraft": "Löschen & Neuentwerfen",
     "lang_parse_followed": "Folgt dir",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Aktion dieses Clients",
     "lang_parse_clienttxt": " wird",
     "lang_parse_clientno": "Nichts unternehmen",
@@ -192,12 +204,15 @@
     "lang_parse_clientmute": "Stumm",
     "lang_parse_mute": " wird stumm gemacht. Kann in den Einstellungen wieder entfernt werden.",
     "lang_parse_voted": "Abgestimmt",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Abstimmen",
     "lang_parse_unvoted": "Ergebnis ohne Abstimmung anzeigen",
     "lang_parse_endedvote": "Abgelaufen",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Konversation anzeigen",
     "lang_parse_unknown": "Angehängte Datei",
     "lang_parse_nsfw": "NSFW Medien",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Benachrichtigungen dieses Benutzers anzeigen",
     "lang_misskeyparse_renote": "Weiterleiten",
     "lang_misskeyparse_renoteqt": "Renote",
@@ -214,8 +229,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}}",
@@ -251,6 +266,6 @@
     "lang_setting_notftestprof": "Ihr Symbol wird angezeigt.",
     "lang_setting_exportwarn": "Nur wichtige Daten werden exportiert. Sie müssen diese Daten sichern.",
     "lang_setting_importwarn": "Alle Daten werden gelöscht.",
-    "lang_setting_noupd": "No available update",
+    "lang_setting_noupd": "Keine Updates verfügbar",
     "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

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

@@ -4,12 +4,15 @@
   "yes": "Ja",
   "no": "Nein",
   "none": "Ohne",
+  "show": "Zeige",
+  "hide": "Hide",
   "default": "Standard",
   "change": "Ändern",
   "select": "Auswahl",
   "env": "Systemeinstellungen",
   "setlang": "Sprachen",
   "backup": "Import und Export von Einstellungen",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Hardwarebeschleunigung deaktivieren",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk verwendet diesen Ordner, wenn es versucht Bilder zu speichern oder Screenshots zu machen.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "Absoluter Wert",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Design auswählen",
   "customtheme": "Bearbeiten und hinzufügen von eigenen Designs",
   "customthemeDirection": "Farbschema",
@@ -97,7 +105,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 +134,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",
@@ -136,6 +145,8 @@
   "nothing": "Versteckt",
   "localonly": "Nur lokal",
   "zeroWidthEmoji": "Emojis ohne Abstand Einfügen",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Tastaturkürzel Einstellungen",
   "iks": "Schnell Einfügen",
   "okswarn": "Sie können Buchstaben und Emojis mit 3-Tasten-Kombination einfügen",

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/de/index.json

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

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

@@ -1,6 +1,8 @@
 {
     "draghere": "Drag here to upload",
     "close": "Close",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Show profile of the selecting account",
     "closethisbox": "Close this box",
     "toot": "Toot",
@@ -20,6 +22,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -68,7 +72,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 +129,7 @@
     "integratedTLDes": "Integrated(Local/Home)",
     "localPlusDes": "LTL+Reply+BT",
     "notf": "Notifications",
+    "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
     "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
     "add": "Add",
@@ -167,15 +172,17 @@
     "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
     "about": "About TheDesk",
     "hereAddColumns": "<- Add TL",
+    "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",
+    "menu": "Menu",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",
     "settingDesc": "Many and many preferences here. You will couldn't check it all!",
     "nanoDescPlus": "Mini window client(experimental)",
-    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -86,6 +87,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 +138,8 @@
     "lang_layout_deleteColumn": "Delete this column",
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
+    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
     "lang_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -151,6 +156,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -175,29 +181,38 @@
     "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_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
     "lang_parse_clientmute": "muted",
     "lang_parse_mute": " will be muted. You can remove on preferences.",
-    "lang_parse_voted": "Voted",
+    "lang_parse_voted": "(Voted)",
+    "lang_parse_myvote": "(My own poll)",
     "lang_parse_vote": "Vote",
     "lang_parse_unvoted": "Show the result without voting",
     "lang_parse_endedvote": "Expired",
+    "lang_parse_people": "people",
     "lang_parse_thread": "Show thread",
     "lang_parse_unknown": "Attached file",
     "lang_parse_nsfw": "sensitive media",
+    "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",

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

@@ -4,18 +4,21 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
+  "show": "Show",
+  "hide": "Hide",
   "default": "Default",
   "change": "Change",
   "select": "Select",
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -33,7 +36,12 @@
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -94,7 +102,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
@@ -127,6 +135,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",
@@ -136,6 +145,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -1,6 +1,8 @@
 {
     "draghere": "crwdns3058:0crwdne3058:0",
     "close": "crwdns3060:0crwdne3060:0",
+    "webSrc": "crwdns4451:0crwdne4451:0",
+    "tsSrc": "crwdns4453:0crwdne4453:0",
     "showSelectProf": "crwdns3062:0crwdne3062:0",
     "closethisbox": "crwdns3064:0crwdne3064:0",
     "toot": "crwdns3066:0crwdne3066:0",
@@ -20,6 +22,8 @@
     "yes": "crwdns3094:0crwdne3094:0",
     "temp": "crwdns3096:0crwdne3096:0",
     "nothing": "crwdns3098:0crwdne3098:0",
+    "stamp": "crwdns4435:0crwdne4435:0",
+    "stampWarn": "crwdns4437:0crwdne4437:0",
     "vis": "crwdns3100:0crwdne3100:0",
     "cwtext": "crwdns3102:0crwdne3102:0",
     "selectVis": "crwdns3104:0crwdne3104:0",
@@ -125,6 +129,7 @@
     "integratedTLDes": "crwdns3302:0crwdne3302:0",
     "localPlusDes": "crwdns3304:0crwdne3304:0",
     "notf": "crwdns3306:0crwdne3306:0",
+    "bookmark": "crwdns4402:0crwdne4402:0",
     "showThisTL": "crwdns3308:0crwdne3308:0",
     "webviewWarn": "crwdns3310:0crwdne3310:0",
     "add": "crwdns3312:0crwdne3312:0",
@@ -167,15 +172,17 @@
     "contactwithlog": "crwdns4378:0crwdne4378:0",
     "about": "crwdns3384:0crwdne3384:0",
     "hereAddColumns": "crwdns3386:0crwdne3386:0",
+    "foundBug": "crwdns4431:0crwdne4431:0",
     "show": "crwdns3388:0crwdne3388:0",
     "directory": "crwdns3390:0crwdne3390:0",
     "active": "crwdns3392:0crwdne3392:0",
     "newcomer": "crwdns3394:0crwdne3394:0",
     "local_only": "crwdns3396:0crwdne3396:0",
+    "menu": "crwdns4466:0crwdne4466:0",
     "demoBottomBtns": "crwdns3398:0crwdne3398:0",
     "lookAtBottom": "crwdns3400:0crwdne3400:0",
     "acctManDesc": "crwdns3402:0crwdne3402:0",
     "settingDesc": "crwdns3404:0crwdne3404:0",
     "nanoDescPlus": "crwdns3406:0crwdne3406:0",
-    "listDesc": "crwdns3408:0crwdne3408:0"
+    "menuDesc": "crwdns4468:0crwdne4468:0"
 }