TheDesk 20.3.2 (Kawaii)

Bump electron-rebuild from 1.10.0 to 1.10.1 in /app

.gitignore

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

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

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

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

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

app/js/common/version.js

@@ -329,43 +329,68 @@ function storeDialog(platform, ver) {
 		var mes = lang.lang_version_platform_linux
 	} else if (platform == 'darwin') {
 		var mes = lang.lang_version_platform_mac
+	} else {
+		var mes = false
 	}
-	Swal.fire({
+	if (mes) {
-		title: 'Select your platform',
+		Swal.fire({
-		text: mes,
+			title: 'Select your platform',
-		type: 'info',
+			text: mes,
-		showCancelButton: true,
+			type: 'info',
-		confirmButtonColor: '#3085d6',
+			showCancelButton: true,
-		cancelButtonColor: '#3085d6',
+			confirmButtonColor: '#3085d6',
-		confirmButtonText: lang.lang_no,
+			cancelButtonColor: '#3085d6',
-		cancelButtonText: lang.lang_yesno
+			confirmButtonText: lang.lang_no,
-	}).then(result => {
+			cancelButtonText: lang.lang_yesno
-		//逆にしてる
+		}).then(result => {
-		if (!result.value) {
+			//逆にしてる
-			localStorage.setItem('winstore', 'winstore')
+			if (!result.value) {
-		} else {
+				localStorage.setItem('winstore', 'winstore')
-			localStorage.setItem('winstore', 'localinstall')
-		}
-		localStorage.setItem('ver', ver)
-		show = true
-		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-		$(document).ready(function() {
-			$('#releasenote').modal('open')
-			verp = ver.replace('(', '')
-			verp = verp.replace('.', '-')
-			verp = verp.replace('.', '-')
-			verp = verp.replace('[', '-')
-			verp = verp.replace(']', '')
-			verp = verp.replace(')', '')
-			verp = verp.replace(' ', '_')
-			console.log('%c ' + verp, 'color: red;font-size:200%;')
-			if (lang.language == 'ja') {
-				$('#release-' + verp).show()
 			} else {
-				$('#release-en').show()
+				localStorage.setItem('winstore', 'localinstall')
 			}
+			localStorage.setItem('ver', ver)
+			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')

app/js/emoji/default-emoji.js

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

app/js/login/login.js

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

app/js/login/manager.js

@@ -506,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]) {
@@ -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

@@ -205,7 +205,7 @@ function escapeCsv(str) {
 		return str
 	}
 	var result
-	result = str.replace(/\"/g, '""')
+	result = str.toString().replace(/\"/g, '""')
 	if (result.indexOf(',') >= 0) {
 		result = '"' + result + '"'
 	}

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?:\/\/(.+)/)
@@ -48,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') {

app/js/post/emoji.js

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

app/js/post/img.js

@@ -86,7 +86,7 @@ function handleFileUpload(files, obj, no) {
 }
 
 //ファイルアップロード
-function media(b64, type, no, stamped) {
+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)
@@ -130,12 +130,45 @@ function media(b64, type, no, stamped) {
 		httpreq.send(fd)
 	} else {
 		var previewer = 'preview_url'
-		var start = 'https://' + domain + '/api/v1/media'
+		//v2/media
-		httpreq.open('POST', start, true)
+		try {
-		httpreq.upload.addEventListener('progress', progshow, false)
+			var id = await v2MediaUpload(domain, at, fd)
-		httpreq.responseType = 'json'
+			if(!id) {
-		httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+				var start = 'https://' + domain + '/api/v1/media'
-		httpreq.send(fd)
+				httpreq.open('POST', start, true)
+				httpreq.upload.addEventListener('progress', progshow, false)
+				httpreq.responseType = 'json'
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+				httpreq.send(fd)
+			} else {
+				var mediav = $('#media').val()
+				var regExp = new RegExp('tmp_' + r, 'g')
+				mediav = mediav.replace(regExp, id)
+				$('#media').val(mediav)
+				var html = `<img src="../../img/picture.svg" class="preview-img pointer unknown" data-media="${id}" oncontextmenu="deleteImage('${id}')" onclick="altImage('${acct_id}','${id}')" title="${lang.lang_postimg_delete}">`
+				$('#preview').append(html)
+				todc()
+				if (localStorage.getItem('nsfw_' + acct_id)) {
+					$('#nsfw').addClass('yellow-text')
+					$('#nsfw').html('visibility')
+					$('#nsfw').addClass('nsfw-avail')
+				}
+				$('.toot-btn-group').prop('disabled', false)
+				$('select').formSelect()
+				$('#mec').text(lang.lang_there)
+				M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
+				$('#imgup').text('')
+				$('#imgsel').show()
+				localStorage.removeItem('image')
+			} 
+		} catch {
+			var start = 'https://' + domain + '/api/v1/media'
+			httpreq.open('POST', start, true)
+			httpreq.upload.addEventListener('progress', progshow, false)
+			httpreq.responseType = 'json'
+			httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+			httpreq.send(fd)
+		}
 	}
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
@@ -159,6 +192,10 @@ function media(b64, type, no, stamped) {
 				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}">`
@@ -178,19 +215,6 @@ function media(b64, type, no, stamped) {
 			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')
 		}
 	}
 }
@@ -275,54 +299,84 @@ 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')) {
-	Swal.fire({
+		fetch(start, {
-		title: lang.lang_postimg_desc,
+			method: 'GET',
-		text: lang.lang_postimg_leadContext,
+			headers: {
-		input: 'text',
+				'content-type': 'application/json',
-		inputAttributes: {
+				Authorization: 'Bearer ' + at
-			autocapitalize: 'off'
+			}
-		},
+		})
-		showCancelButton: true,
+		.then(function(response) {
-		confirmButtonText: 'Post',
+			if (!response.ok) {
-		showLoaderOnConfirm: true,
+				response.text().then(function(text) {
-		preConfirm: data => {
+					setLog(response.url, response.status, text)
-			return fetch(start, {
-				method: 'PUT',
-				headers: {
-					'content-type': 'application/json',
-					Authorization: 'Bearer ' + at
-				},
-				body: JSON.stringify({
-					description: data
 				})
-			})
+			}
-				.then(function(response) {
+			return response.json()
-					if (!response.ok) {
+		})
-						response.text().then(function(text) {
+		.catch(function(error) {
-							setLog(response.url, response.status, text)
+			todo(error)
-						})
+			setLog(start, 'JSON', error)
-					}
+			console.error(error)
-					return response.json()
+		})
+		.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
+					})
 				})
-				.catch(function(error) {
+					.then(function(response) {
-					todo(error)
+						if (!response.ok) {
-					setLog(start, 'JSON', error)
+							response.text().then(function(text) {
-					console.error(error)
+								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'
 				})
-				.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')) {
@@ -332,4 +386,42 @@ function stamp() {
 		$('#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_post_unfinishedMedia,
+		type: 'error',
+		showCancelButton: true,
+		confirmButtonText: lang.lang_post_retry,
+		cancelButtonText: lang.lang_no
+	}).then(result => {
+		if (result.value) {
+			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

@@ -166,18 +166,32 @@ function post(mode, postvis) {
 		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()
 		}
 	}
 }

app/js/post/secure.js

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

app/js/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/misskeyparse.js

@@ -360,22 +360,20 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if ((toot.cw || toot.cw == "") && cw) {
 			var content = escapeHTML(toot.text);
 			var spoil = escapeHTMLtemp(toot.cw);
-			var spoiler = "cw cw_hide_" + toot.id;
+			var spoiler = "cw cw_hide";
 			var api_spoil = "gray";
-			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+			var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
-				'\')" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
 		} else {
 			var ct1 = nl2br(toot.text).split('<br />').length - 2;
 			var ct2 = nl2br(toot.text).split('<br>').length - 2;
 			if (ct1 > ct2) { var ct = ct1; } else { var ct = ct2; }
 			if ((sent < ct && $.mb_strlen($.strip_tagstemp(toot.text)) > 5) || ($.strip_tagstemp(toot.text).length > ltr && $.mb_strlen($.strip_tagstemp(toot.text)) > 5)) {
 				var content = '<span class="gray">' + lang.lang_parse_fulltext + '</span><br>' + escapeHTMLtemp(toot.text)
-				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tagstemp(
+				var spoil = '<span class="cw_long">' + $.mb_substr($.strip_tagstemp(
 					toot.text), 0, 100) +
 					'</span><span class="gray">' + lang.lang_parse_autofold + '</span>';
-				var spoiler = "cw cw_hide_" + toot.id;
+				var spoiler = "cw cw_hide";
-				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+				var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
-					'\')" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
 			} else {
 				var content = escapeHTMLtemp(toot.text);
 				if (toot.cw) {
@@ -880,7 +878,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		}
 		var ftxt = lang.lang_parse_followed;
 		if (popup > 0 || popup == -1) {
-			var notftext = '<span class="cbadge"title="' + date(toot.createdAt,
+			var notftext = '<span class="cbadge" title="' + date(toot.createdAt,
 				'absolute') + '(' + lang.lang_parse_notftime + ')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 					datetype) +
 				'</span>' + ftxt + '<br>';

app/js/tl/notification.js

@@ -406,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

@@ -516,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
@@ -538,14 +538,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5)
 				) {
 					var content = `<span class="gray">${lang.lang_parse_fulltext}</span><br>` + content
-					var spoil = `<span class="cw-long-${toot.id}">${$.mb_substr(
+					var spoil = `<span class="cw_long">${$.mb_substr(
 						$.strip_tags(content),
 						0,
 						100
 					)}</span>
 						<span class="gray">${lang.lang_parse_autofold}</span>`
-					var spoiler = 'cw cw_hide_' + toot.id
+					var spoiler = 'cw cw_hide'
-					var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">
+					var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">
 							${lang.lang_parse_more}
 						</a><br>`
 				} else {
@@ -1391,6 +1391,7 @@ function client(name) {
 }
 //Poll Parser
 function pollParse(poll, acct_id, emojis) {
+	var rand = randomStr(8)
 	var datetype = localStorage.getItem('datetype')
 	var anime = localStorage.getItem('animation')
 	if (anime == 'yes' || !anime) {
@@ -1408,14 +1409,14 @@ function pollParse(poll, acct_id, emojis) {
 	} else {
 		var minechoice = []
 	}
-	var refresh = `<a onclick="voteMastodonrefresh('${acct_id}','${poll.id}')" class="pointer">
+	var refresh = `<a onclick="voteMastodonrefresh('${acct_id}','${poll.id}','${rand}')" class="pointer">
 		${lang.lang_manager_refresh}
 	</a>`
-	if (poll.voted && poll.own_votes.length) {
+	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 && !poll.own_votes.length) {
+	} else if (poll.voted && !minechoice.length) {
 		var myvote = lang.lang_parse_myvote
 		if (poll.expired) myvote = myvote + '/' + lang.lang_parse_endedvote
 		var result_hide = ''
@@ -1423,11 +1424,11 @@ function pollParse(poll, acct_id, emojis) {
 		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>　`
 		}
@@ -1454,7 +1455,7 @@ function pollParse(poll, acct_id, emojis) {
 		}
 		if (!poll.voted && !poll.expired) {
 			var votesel =
-				"voteSelMastodon('" + acct_id + "','" + poll.id + "'," + keyc + ',' + poll.multiple + ')'
+				`voteSelMastodon('${acct_id}','${poll.id}',${keyc},${poll.multiple}, this)`
 			var voteclass = 'pointer'
 		} else {
 			var votesel = ''
@@ -1469,9 +1470,9 @@ function pollParse(poll, acct_id, emojis) {
 		}
 		var openData = ''
 		if (choice.votes_count !== null) {
-			openData = `<span style="float: right">${choice.votes_count}<span class="sml">(${per}%)</span></span>`
+			openData = `<span style="float: right">${voteit}${choice.votes_count}<span class="sml">(${per}%)</span></span>`
 		} else {
-			openData = `<span style="float: right">?<span class="sml">(-%)</span></span>`
+			openData = `<span style="float: right">${voteit}?<span class="sml">(-%)</span></span>`
 		}
 		var choiceText = escapeHTML(choice.title)
 		if (emojis) {
@@ -1497,7 +1498,7 @@ function pollParse(poll, acct_id, emojis) {
 			pollHtml +
 			`<div class="${voteclass} vote vote_${acct_id}_${poll.id}_${keyc}" onclick="${votesel}">
 				<span class="vote_${acct_id}_${poll.id}_result leadPoll ${result_hide} ${addPoll} ${lpAnime}" style="width: ${per}%"></span>
-				<span class="onPoll">${choiceText}${voteit}</span>
+				<span class="onPoll">${choiceText}</span>
 				<span class="vote_${acct_id}_${poll.id}_result ${result_hide} onPoll">
 					${openData}
 				</span>
@@ -1506,7 +1507,7 @@ function pollParse(poll, acct_id, emojis) {
 	if (poll.expired) {
 		refresh = ''
 	}
-	pollHtml = `<div class="vote_${acct_id}_${poll.id}">
+	pollHtml = `<div class="vote_${acct_id}_${poll.id}" id="vote${rand}">
 			${pollHtml}${myvote}
 			${refresh}
 			<span class="cbadge cbadge-hover" title="${date(poll.expires_at, 'absolute')}">

app/js/tl/poll.js

@@ -49,30 +49,25 @@ function pollCalc() {
 	return days * 86400 + hrs * 3600 + mins * 60
 }
 //Vote
-function voteSelMastodon(acct_id, id, to, mul) {
+function voteSelMastodon(acct_id, id, to, mul, elem) {
-	if ($('.vote_' + acct_id + '_' + id + '_' + to).hasClass('sel')) {
+	if ($(elem).hasClass('sel')) {
-		$('.vote_' + acct_id + '_' + id + '_' + to).css('background-color', 'transparent')
+		$(elem).css('background-color', 'transparent')
-		$('.vote_' + acct_id + '_' + id + '_' + to).removeClass('sel')
+		$(elem).removeClass('sel')
 	} else {
 		if (!mul) {
-			$('.vote_' + acct_id + '_' + id + ' div').each(function(i, elem) {
+			$('.vote_' + acct_id + '_' + id + ' div').css('background-color', 'transparent')
-				if (i == to) {
+			$('.vote_' + acct_id + '_' + id + ' div').removeClass('sel')
-					$(this).css('background-color', 'var(--emphasized)')
+			$(elem).css('background-color', 'var(--emphasized)')
-					$(this).addClass('sel')
+			$(elem).addClass('sel')
-				} else {
-					$(this).css('background-color', 'transparent')
-					$(this).removeClass('sel')
-				}
-			})
 		} else {
-			$('.vote_' + acct_id + '_' + id + '_' + to).css('background-color', 'var(--emphasized)')
+			$(elem).css('background-color', 'var(--emphasized)')
-			$('.vote_' + acct_id + '_' + id + '_' + to).addClass('sel')
+			$(elem).addClass('sel')
 		}
 	}
 }
-function voteMastodon(acct_id, id) {
+function voteMastodon(acct_id, id, target) {
 	var choice = []
-	$('.vote_' + acct_id + '_' + id + ' div').each(function(i, elem) {
+	$(`#vote${target} div`).each(function(i, elem) {
 		if ($(this).hasClass('sel')) {
 			choice.push(i + '')
 		}
@@ -90,13 +85,13 @@ function voteMastodon(acct_id, id) {
 	httpreq.responseType = 'json'
 	httpreq.send(JSON.stringify({ choices: choice }))
 	httpreq.onreadystatechange = function() {
-		voteMastodonrefresh(acct_id, id)
+		voteMastodonrefresh(acct_id, id, target)
 	}
 }
 function showResult(acct_id, id) {
 	$('.vote_' + acct_id + '_' + id + '_result').toggleClass('hide')
 }
-function voteMastodonrefresh(acct_id, id) {
+function voteMastodonrefresh(acct_id, id, target) {
 	var datetype = localStorage.getItem('datetype')
 	if (!datetype) {
 		datetype = 'absolute'
@@ -121,7 +116,7 @@ function voteMastodonrefresh(acct_id, id) {
 				return false
 			}
 			var poll = pollParse(json, acct_id, json.emojis)
-			$('.vote_' + acct_id + '_' + json.id).html(poll)
+			$(`#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?resolve=true&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, {
@@ -218,7 +221,7 @@ function graphDraw(tag, acct_id) {
 	var his = tag.history
 	return graphDrawCore(his, tag)
 }
-function graphDrawCore(his, tag){
+function graphDrawCore(his, tag) {
 	var max = Math.max.apply(null, [
 		his[0].uses,
 		his[1].uses,
@@ -252,7 +255,9 @@ function graphDrawCore(his, tag){
 					toot
 				</div>
 				<div class="tagCompTag">
-					<a onclick="tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
+					<a onclick="tl('tag','${escapeHTML(
+						tag.name
+					)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
 						#${escapeHTML(tag.name)}
 					</a>
 				</div>
@@ -308,3 +313,48 @@ function trend() {
 			})
 		})
 }
+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/tl.js

@@ -64,6 +64,9 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		)
 		$('#notice_icon_' + tlid).text('bookmark')
 		return
+	} else if (type == 'home') {
+		//ホームならお知らせ「も」取りに行く
+		announ(acct_id, tlid);
 	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
@@ -270,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()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
-						$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
 					}
 				} else if (typeA == 'update' || typeA == 'conversation') {
 					if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
@@ -311,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)
 				}
 			}
 		}
@@ -1167,3 +1172,42 @@ function getBookmark(acct_id, tlid, more) {
 		}
 	}
 }
+//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

@@ -102,6 +102,13 @@ function imageXhr(id, key, murl) {
 		},
 		false
 	)
+	xhr.addEventListener(
+		'error',
+		function(event) {
+			$('#imgmodal').attr('src', murl)
+		},
+		false
+	)
 	xhr.onreadystatechange = function() {
 		if (this.readyState == 4 && this.status == 200) {
 			r = new FileReader()
@@ -112,19 +119,22 @@ function imageXhr(id, key, murl) {
 				var width
 				element.onload = function() {
 					var width = element.naturalWidth
+					if(width < 650) {
+						width = 650;
+					}
 					var height = element.naturalHeight
 					var windowH = $(window).height()
 					var windowW = $(window).width()
 					$('#imagemodal').css('bottom', '0')
 					$('#imagemodal img').css('width', 'auto')
 					if (height < windowH) {
-						$('#imagemodal').css('height', height + 60 + 'px')
+						$('#imagemodal').css('height', height + 100 + 'px')
-						$('#imagemodal img').css('height', '100%')
+						$('#imagemodal img').css('height',  height + 'px')
 						if (width > windowW * 0.8) {
 							$('#imagemodal').css('width', '80vw')
-							$('#imagemodal img').css('width', '100%')
+							$('#imagemodal img').css('width', 'auto')
 							var heightS = ((windowW * 0.8) / width) * height
-							$('#imagemodal').css('height', heightS + 60 + 'px')
+							$('#imagemodal').css('height', heightS + 100 + 'px')
 						} else {
 							$('#imagemodal').css('width', width + 'px')
 						}

app/js/ui/layout.js

@@ -234,7 +234,7 @@ function parseColumn(target, dontclose) {
 			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 = ''
@@ -368,7 +368,11 @@ 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">
@@ -389,10 +393,12 @@ function parseColumn(target, dontclose) {
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box z-depth-4" id="notf-box_${notfKey}">
+					<div id="announce_${notfKey}" style="border: 1px solid"></div>
 					<div id="notifications_${notfKey}" data-notf="${notfDomain}" data-type="notf" class="notf-timeline">
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
+					${unread}
 					${exclude}${left_hold}
 					<a onclick="mediaToggle('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>

app/js/ui/post-box.js

@@ -122,6 +122,7 @@ $('#timeline-container,#group').click(function(e) {
 	selectedColumn = 0
 	selectedToot = 0
 	localStorage.removeItem('nohide')
+	srcBox('close')
 })
 $('#contextWrap').click(function(e) {
 	$('#contextWrap').addClass('hide')

app/js/ui/settings.js

@@ -17,6 +17,9 @@ var envView = new Vue({
 			if (ls == 'ua_setting') {
 				useragent(val)
 			}
+			if (ls == 'frame') {
+				frameSet(val)
+			}
 			return true
 		}
 	}
@@ -504,11 +507,11 @@ function fontList(arg) {
 		var font = arg[i]
 		$('#fonts').append(
 			'<div class="font pointer" style="font-family:' +
-				font.family +
+				font +
 				'" onclick="insertFont(\'' +
-				font.family +
+				font +
 				'\')">' +
-				font.family +
+				font +
 				'</div>'
 		)
 	}
@@ -764,6 +767,9 @@ function hardwareAcceleration(had) {
 function useragent(val) {
 	postMessage(['ua', val], '*')
 }
+function frameSet(val) {
+	postMessage(['frameSet', val], '*')
+}
 function customSound(key) {
 	postMessage(['customSound', key], '*')
 }

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,7 +140,7 @@ function nowplaying(mode) {
 		postMessage(["itunes", ""], "*");
 	}
 }
-function npCore(arg) {
+async function npCore(arg) {
 	console.table(arg);
 	var content = localStorage.getItem("np-temp");
 	if (!content || content == "" || content == "null") {
@@ -139,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");
@@ -183,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

@@ -14,6 +14,8 @@ function themes(theme) {
 	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')

app/js/ui/tips.js

@@ -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/main.js

@@ -55,13 +55,14 @@ if (process.argv.indexOf('--dev') === -1) {
 			'||||     /////\n' +
 			'||||//////'
 	)
-	console.log('Welcome!')
+	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 frame_path = join(app.getPath('userData'), 'frame')
 try {
 	fs.readFileSync(ha_path, 'utf8')
 	app.disableHardwareAcceleration()
@@ -97,6 +98,18 @@ function isFile(file) {
 		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(() => {})
@@ -141,7 +154,9 @@ function createWindow() {
 			x: window_size.x,
 			y: window_size.y,
 			icon: __dirname + '/desk.png',
-			show: false
+			show: false,
+			frame: frame,
+			resizable: true
 		}
 	} else if (platform == 'win32') {
 		var arg = {
@@ -156,7 +171,8 @@ function createWindow() {
 			x: window_size.x,
 			y: window_size.y,
 			simpleFullscreen: true,
-			show: false
+			show: false,
+			frame: frame
 		}
 	} else if (platform == 'darwin') {
 		var arg = {
@@ -171,7 +187,9 @@ function createWindow() {
 			x: window_size.x,
 			y: window_size.y,
 			simpleFullscreen: true,
-			show: false
+			show: false,
+			titleBarStyle: frameTitle,
+			frame: frame,
 		}
 	}
 	mainWindow = new BrowserWindow(arg)
@@ -280,8 +298,11 @@ function createWindow() {
 	var platform = process.platform
 	var bit = process.arch
 	Menu.setApplicationMenu(
-		Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname))
+		Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame))
 	)
+	if(!frame) {
+		mainWindow.setMenu(null)
+	}
 	//CSS
 	css.css(mainWindow)
 	//アップデータとダウンロード

app/main/dl.js

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

@@ -25,6 +25,7 @@ function np(mainWindow) {
 					
 				} catch (error) {
 					console.error(error)
+					e.sender.webContents.send('itunes-np', error)
 				}
 			} else {
 			}

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();
 	//今日のやつ
@@ -115,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) {});
@@ -124,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();
@@ -234,11 +242,10 @@ function system(mainWindow, dir, lang, dirname) {
 		fn(data); // ソート後の配列を返す
 	}
 	ipc.on("fonts", (e, arg) => {
-		const fm = require("font-manager");
+		var SystemFonts = require('system-font-families').default;
-		var fonts = fm.getAvailableFontsSync();
+		var fm = new SystemFonts();
-		object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
+		const fontList = fm.getFontsSync();
-			e.sender.webContents.send("font-list", fonts_sorted);
+		e.sender.webContents.send("font-list", fontList);
-		});
 	});
 	//コピー
 	ipc.on("copy", (e, arg) => {
@@ -278,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,6 +1,7 @@
 {
   "name": "thedesk",
-  "version": "20.1.1",
+  "version": "20.3.2",
+  "codename": "Kawaii",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
@@ -11,9 +12,10 @@
     "dist": "build --linux snap",
     "watchview": "node view/make/make.js --automatic --watch",
     "build:js": "node build.js",
-    "build": "npx electron-builder",
+    "build": "node view/make/make.js --automatic && npx electron-builder",
     "build:all": "npx electron-builder --win --linux",
-    "build:win": "npx electron-builder --win"
+    "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",
+    "@fortawesome/fontawesome-free": "^5.13.0",
+    "custom-electron-titlebar": "^3.2.2-hotfix62",
     "electron-dl": "^3.0.0",
-    "jimp": "^0.9.1",
+    "jimp": "^0.10.1",
     "jquery": "^3.4.1",
     "jquery-ui-dist": "^1.12.1",
-    "materialize-css": "git://github.com/cutls/materialize",
+    "json5": "^2.1.3",
-    "json5": "^2.1.1",
     "lodash": "^4.17.15",
+    "materialize-css": "git://github.com/cutls/materialize#v1-dev",
     "sumchecker": "^3.0.1",
-    "sweetalert2": "^9.5.4",
+    "sweetalert2": "^9.10.9",
-    "vue": "^2.6.10"
+    "system-font-families": "^0.4.1",
+    "vue": "^2.6.11"
   },
   "optionalDependencies": {
-    "font-manager": "0.3.0",
+    "itunes-nowplaying-mac": "git://github.com/cutls/itunes-nowplaying-mac"
-    "itunes-nowplaying-mac": "0.3.1"
   },
   "devDependencies": {
-    "chokidar": "^3.3.0",
+    "chokidar": "^3.3.1",
-    "electron": "^7.1.8",
+    "electron": "^8.0.0",
-    "electron-builder": "^22.1.0",
+    "electron-builder": "^22.4.1",
-    "electron-rebuild": "^1.8.8",
+    "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

@@ -4,7 +4,7 @@
 		<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"
+			href="../../@@node_base@@/materialize-css/dist/css/materialize.css"
 			type="text/css"
 			rel="stylesheet"
 		/>
@@ -13,7 +13,7 @@
 		<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"
+			href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css"
 			type="text/css"
 			rel="stylesheet"
 		/>
@@ -26,19 +26,20 @@
 		</script>
 		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 		@@comment-end@@
+		@@pwa@@
 	</head>
 
 	<body id="mainView">
-		<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
+		<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_modules/materialize-css/dist/js/materialize.js"
+			src="../../@@node_base@@/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"
+			src="../../@@node_base@@/sweetalert2/dist/sweetalert2.all.min.js"
 		></script>
 		<script>
 			var misskeytoken = false
@@ -135,9 +136,10 @@
 			</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_modules/lodash/lodash.min.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>

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",
@@ -176,10 +178,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/af-ZA/main.json

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

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

@@ -4,19 +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 of file and click import",
+  "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",
@@ -34,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",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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",
@@ -176,10 +178,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/ar-SA/main.json

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

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

@@ -4,19 +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 of file and click import",
+  "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",
@@ -34,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",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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": "Тоот",
@@ -176,10 +178,11 @@
     "active": "Наскоро активен",
     "newcomer": "Новодошли",
     "local_only": "Само местно",
+    "menu": "Menu",
     "demoBottomBtns": "Ръководство за добре дошли",
     "lookAtBottom": "Погледнете в края на този прозорец. Ето няколко съвета за това.",
     "acctManDesc": "Добавете още акаунти и излезте от тях.",
     "settingDesc": "Много. много предпочитания са тук. Няма да можете да ги проверите всички!",
     "nanoDescPlus": "Клиент мини прозорец (експериментално)",
-    "listDesc": "Всички настройки на TheDesk и Mastodon, като <b> добавяне и сортиране на колони </b>, <b> списък и проверка на филтрите </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

@@ -139,6 +139,7 @@
     "lang_layout_deleteColumnDesc": "Премахване на тази колона",
     "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": "Добавете към албум произведенията на изкуството",

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

@@ -4,13 +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 of file and click import",
+  "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": "Деактивиране на хардуерното ускорение",
@@ -34,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": "Цветова схема",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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",
@@ -176,10 +178,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/main.json

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

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

@@ -4,19 +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 of file and click import",
+  "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",
@@ -34,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",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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",
@@ -176,10 +178,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/cs-CZ/main.json

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

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

@@ -4,13 +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 of file and click import",
+  "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",
@@ -34,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",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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",
@@ -176,10 +178,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/main.json

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

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

@@ -4,19 +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 of file and click import",
+  "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",
@@ -34,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",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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/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",
@@ -22,9 +24,9 @@
     "nothing": "Keine",
     "stamp": "Stamp",
     "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
-    "vis": "Adjust status privacy",
+    "vis": "Status Privatsphäre anpassen",
     "cwtext": "Warntext",
-    "selectVis": "Adjust status privacy",
+    "selectVis": "Status Privatsphäre anpassen",
     "publicJP": "",
     "unlistedJP": "",
     "privateJP": "",
@@ -170,16 +172,17 @@
     "contactwithlog": "Wenn Sie mir mit diesem Log Fehler (Funktionsunfähigkeit oder ähnliches) zeigen, kann ich leichter erkennen, was falsch ist.",
     "about": "Über TheDesk",
     "hereAddColumns": "<- Neuer Verlauf",
-    "foundBug": "I found a bug",
+    "foundBug": "Ich habe einen Fehler gefunden",
     "show": "Zeige",
     "directory": "Verzeichnis",
     "active": "Kürzlich aktiv",
     "newcomer": "Neu eingetroffen",
     "local_only": "Nur lokal",
+    "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-Fenster-Klient (experimentell)",
-    "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/de-DE/main.json

@@ -139,6 +139,7 @@
     "lang_layout_deleteColumnDesc": "Diese Spalte löschen",
     "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",

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

@@ -4,13 +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 of file and click import",
+  "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",
@@ -34,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",
@@ -139,7 +146,7 @@
   "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. Pay attention to GIF animation.",
+  "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/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",
@@ -176,10 +178,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/main.json

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

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

@@ -4,19 +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 of file and click import",
+  "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",
@@ -34,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",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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",
@@ -176,10 +178,11 @@
     "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"
 }

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

@@ -139,6 +139,7 @@
     "lang_layout_deleteColumnDesc": "crwdns3672:0crwdne3672:0",
     "lang_layout_unread": "crwdns3674:0crwdne3674:0",
     "lang_layout_tagManager": "crwdns4411:0crwdne4411:0",
+    "lang_layout_announ": "crwdns4449:0crwdne4449:0",
     "lang_sort_gothis": "crwdns3676:0crwdne3676:0",
     "lang_sort_remthis": "crwdns3678:0crwdne3678:0",
     "lang_spotify_img": "crwdns3680:0crwdne3680:0",

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

@@ -4,6 +4,8 @@
   "yes": "crwdns3912:0crwdne3912:0",
   "no": "crwdns3914:0crwdne3914:0",
   "none": "crwdns3916:0crwdne3916:0",
+  "show": "crwdns4458:0crwdne4458:0",
+  "hide": "crwdns4460:0crwdne4460:0",
   "default": "crwdns3918:0crwdne3918:0",
   "change": "crwdns3920:0crwdne3920:0",
   "select": "crwdns3922:0crwdne3922:0",
@@ -34,7 +36,12 @@
   "savefolderwarn": "crwdns3970:0crwdne3970:0",
   "useragent": "crwdns4372:0crwdne4372:0",
   "useragentWarn": "crwdns4374:0crwdne4374:0",
+  "frame": "crwdns4462:0crwdne4462:0",
+  "frameWarn": "crwdns4464:0crwdne4464:0",
+  "downloadWin": "crwdns4470:0crwdne4470:0",
   "absolute": "crwdns3972:0crwdne3972:0",
+  "srcUrl": "crwdns4455:0crwdne4455:0",
+  "srcUrlWarn": "crwdns4457:0{q}crwdne4457:0",
   "themeSel": "crwdns3974:0crwdne3974:0",
   "customtheme": "crwdns3976:0crwdne3976:0",
   "customthemeDirection": "crwdns3978:0crwdne3978:0",

app/view/make/language/en/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",
@@ -176,10 +178,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/en/main.json

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -139,6 +143,7 @@
     "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",

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

@@ -4,19 +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 of file and click import",
+  "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",
@@ -34,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",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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",
@@ -166,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -1,6 +1,8 @@
 {
     "draghere": "Arrastrá y soltá acá para subir",
     "close": "Cerrar",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf": "Mostrar perfil de la cuenta seleccionada",
     "closethisbox": "Cerrar esta caja",
     "toot": "Tootear",
@@ -20,8 +22,8 @@
     "yes": "Sí",
     "temp": "Adjuntar archivos",
     "nothing": "Ninguno",
-    "stamp": "Stamp",
+    "stamp": "Sello",
-    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
+    "stampWarn": "Tu cuenta (aa@bb.cc) está impresa en la parte inferior derecha de la imagen subida",
     "vis": "Establecer privacidad del estado",
     "cwtext": "Texto de advertencia",
     "selectVis": "Establecer estado de privacidad",
@@ -176,10 +178,11 @@
     "active": "Recientemente activo",
     "newcomer": "Recién llegados",
     "local_only": "Sólo local",
+    "menu": "Menu",
     "demoBottomBtns": "Guía de bienvenida",
     "lookAtBottom": "Mirá en la parte inferior de esta ventana. Acá tenés algunas sugerencias.",
     "acctManDesc": "Agregá más cuentas y administralas.",
     "settingDesc": "Muchas configuraciones. ¡No vas a poder con todas!",
     "nanoDescPlus": "Miniventana (experimental)",
-    "listDesc": "Toda la configuración diaria de TheDesk y Mastodon como <b>agergar y ordenar columnas</b>, <b>revisión de listas y filtros</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/es-AR/main.json

@@ -48,7 +48,7 @@
     "lang_manager_none": "Nada",
     "lang_manager_godev": "Abrí DevCenter de Misskey. También mostramos documentos oficiales como referencia.",
     "lang_manager_logout": "Cerrar sesión",
-    "lang_manager_maxChars": "Max chars of toots",
+    "lang_manager_maxChars": "Máx. de caracteres para toots",
     "lang_bbmd_misskey": "TheDesk considera \"@\" como respuesta, pero podés poner otro parámetro. \"No listado\" en Mastodon significa \"Principal\" en Misskey.",
     "lang_emoji_get": "Obtené emojis",
     "lang_emoji_custom": "Emojis personalizados",
@@ -139,6 +139,7 @@
     "lang_layout_deleteColumnDesc": "Eliminar esta columna",
     "lang_layout_unread": "Sin leer",
     "lang_layout_tagManager": "Administrador de etiqueta de línea temporal",
+    "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": "Ir a esta columna",
     "lang_sort_remthis": "Eliminar esta columna",
     "lang_spotify_img": "Adjuntar la tapa del álbum",
@@ -155,7 +156,7 @@
     "lang_showontl_movebtn": "Continuar en la nueva cuenta",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Te sigue",
-    "lang_parse_request": "Follow request",
+    "lang_parse_request": "Solicitud de seguimiento",
     "lang_showontl_notf": "Notificación ",
     "lang_showontl_domain": "Dominio ",
     "lang_showontl_listwarn": "Seguí a este usuario para agregarlo a las listas.",
@@ -195,7 +196,7 @@
     "lang_parse_detail": "Detalles",
     "lang_parse_redraft": "Eliminar toot original y editarlo",
     "lang_parse_followed": "Te sigue",
-    "lang_parse_moved": "Moved to...",
+    "lang_parse_moved": "Se mudó a…",
     "lang_parse_clientop": "Función de este cliente",
     "lang_parse_clienttxt": " hará lo siguiente",
     "lang_parse_clientno": "nada",

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

@@ -4,13 +4,15 @@
   "yes": "Sí",
   "no": "No",
   "none": "Ninguno",
+  "show": "Mostrar",
+  "hide": "Hide",
   "default": "Predeterminado",
   "change": "Cambiar",
   "select": "Seleccionar",
   "env": "Configuración del sistema",
   "setlang": "Idiomas",
   "backup": "Importación y exportación de la configuración",
-  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
+  "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": "Importar",
   "export": "Exportar",
   "hardwareAcceleration": "Deshabilitar la aceleración por hardware",
@@ -34,7 +36,12 @@
   "savefolderwarn": "TheDesk usa esta configuración para guardar imágenes en general y capturas de pantallas.",
   "useragent": "Cadena de agente de usuario",
   "useragentWarn": "Reiniciar cuando se cambie",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "valor absoluto",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Seleccionar tema",
   "customtheme": "Editar y agregar temas personalizados",
   "customthemeDirection": "Esquema de colores",
@@ -138,8 +145,8 @@
   "nothing": "Oculto",
   "localonly": "Sólo local",
   "zeroWidthEmoji": "No agregar espacio al insertar emojis",
-  "uploadCrop": "Auto scale to fit",
+  "uploadCrop": "Escalar automáticamente para ajustar",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "uploadCropWarn": "Anchura máxima (píxeles). Las imágenes subidas son convertidas a JPEG (desde JPEG) o PNG (desde otros formatos). Si establecés \"0\" las imágenes no se redimensionarán. Nota: si subís una imagen animada, como un archivo GIF, se convertirá como imagen estática.",
   "keysc": "Configuración de atajos del teclado",
   "iks": "Inserción fácil",
   "okswarn": "Podés insertar cualquier letra y emoji con sólo 3 teclas",

app/view/make/language/es-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",
@@ -176,10 +178,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/es-ES/main.json

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

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

@@ -4,13 +4,15 @@
   "yes": "Yes",
   "no": "No",
   "none": "None",
+  "show": "Show",
+  "hide": "Hide",
   "default": "Default",
   "change": "Cambiar",
   "select": "Seleccionar",
   "env": "Preferencias del sistema",
   "setlang": "Idiomas",
   "backup": "Importación y exportación de la configuración",
-  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
+  "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": "Importar",
   "export": "Exportar",
   "hardwareAcceleration": "Deshabilitar la aceleración por hardware",
@@ -34,7 +36,12 @@
   "savefolderwarn": "TheDesk utiliza este valor cuando intenta guardar fotos o tomar capturas de pantalla.",
   "useragent": "Agente de usuario",
   "useragentWarn": "Reiniciar al cambiar",
+  "frame": "Window frame",
+  "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "valor absoluto",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Seleccionar tema",
   "customtheme": "Editar y añadir temas personalizados",
   "customthemeDirection": "Esquema de colores",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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/fi-FI/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",
@@ -176,10 +178,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/fi-FI/main.json

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

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

@@ -4,19 +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 of file and click import",
+  "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",
@@ -34,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",
@@ -139,7 +146,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
+  "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/fr-FR/acct.json

@@ -5,7 +5,7 @@
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",
-    "selacct": "Select an account",
+    "selacct": "Choisir un compte",
     "codepastewarn": "Paste the code and close browser.",
     "codepaste": "Code",
     "domain": "Domaine",