Merge remote-tracking branch 'refs/remotes/upstream/master'

I updated a little bit of typos and grammatical errors in the en/setting.json

.github/dependabot.yml

@@ -0,0 +1,49 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/app"
+  schedule:
+    interval: daily
+    time: "20:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: font-manager
+    versions:
+    - "> 0.3.0, < 0.4"
+  - dependency-name: sweetalert2
+    versions:
+    - 10.14.1
+    - 10.15.0
+    - 10.15.1
+    - 10.15.2
+    - 10.15.3
+    - 10.15.5
+    - 10.15.6
+    - 10.16.0
+    - 10.16.2
+    - 10.16.5
+  - dependency-name: electron
+    versions:
+    - 11.2.1
+    - 12.0.2
+    - 12.0.3
+    - 12.0.4
+  - dependency-name: eslint
+    versions:
+    - 7.18.0
+    - 7.19.0
+    - 7.20.0
+    - 7.21.0
+    - 7.22.0
+    - 7.24.0
+  - dependency-name: itunes-nowplaying-mac
+    versions:
+    - 0.4.0
+  - dependency-name: electron-dl
+    versions:
+    - 3.0.3
+    - 3.1.0
+    - 3.2.0
+  - dependency-name: electron-rebuild
+    versions:
+    - 2.3.4

.gitignore

@@ -21,11 +21,12 @@ app/view/cs
 app/view/ps
 app/view/es-AR
 app/view/it-IT
+app/view/pl-PL
 app/git
 *.code-workspace
 releasenote.md
 app/yarn-error.log
-app/js/platform/aiscript.js
+app/js/platform/native.js
 app/view/es-ES
 app/view/fr-FR
 app/view/no-NO
@@ -33,7 +34,9 @@ app/view/zh-CN
 app/view/ru-RU
 app/view/zh-TW
 app/view/pt-BR
+app/view/si-LK
 app/build.js
 app/view/make/make.js
 app/view/make/makeCli.ts
 app/.env
+app/view/make/index.generated.html

.prettierrc

@@ -0,0 +1,8 @@
+{
+    "tabWidth": 4,
+    "useTabs": true,
+    "semi": false,
+    "singleQuote": true,
+    "printWidth": 200,
+    "jsxBracketSameLine": true
+}

README.md

@@ -16,7 +16,7 @@
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)  
   
-Download:[TheDesk](https://thedesk.top)
+[![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
 
 </div>
 
@@ -44,9 +44,7 @@ Please write issues to improve TheDesk affinity with Pleroma.
 
 ## Contributors
 
-* <img src="https://user-images.githubusercontent.com/17561618/66582029-162df380-ebbc-11e9-8a6f-1832b3a35d89.png" width="20">[toneji](https://minohdon.jp/@toneji) Build for macOS(Now: Travis CI)  
+[![](https://opencollective.com/TheDesk/contributors.svg?width=400&button=false)](https://github.com/cutls/TheDesk/graphs/contributors)
-* <img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4" width="20">[popn_ja](https://popon.pptdn.jp/@popn_ja) Build for Linux(Now: Travis CI)  
-* <img src="https://user-images.githubusercontent.com/17561618/66582379-a3714800-ebbc-11e9-8402-d81a35a3be9f.png" width="20">[kPherox](https://pl.kpherox.dev/kPherox) Fellow coder
 
 ## Support
 

README_ja.md

@@ -15,7 +15,8 @@
 ![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント  
-Download:[TheDesk](https://thedesk.top)
+
+[![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
 
 </div>
 
@@ -34,9 +35,10 @@ Crowdinから翻訳に参加してみませんか？: https://translate.thedesk.
 Pleromaは、Mastodon APIとの互換性を謳っていますが、実際には様々な差異があり、TheDeskで不具合が発生することがあります。  
 Issuesに書いてある問題についてはなるべく対処しますので、ぜひお知らせください。
 
-## 詳しく
+## よみもの
 
-[TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
+* [TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
+* [TheDeskを作って思う今クライアントを作る意味 | Cutls Code Archives ](https://code.cutls.com/thedesk-log/)
 
 ## ライセンス
 
@@ -46,9 +48,7 @@ Issuesに書いてある問題についてはなるべく対処しますので
 
 ## 主なコントリビューター
 
-* <img src="https://user-images.githubusercontent.com/17561618/66582029-162df380-ebbc-11e9-8a6f-1832b3a35d89.png" width="20">[とねぢ](https://minohdon.jp/@toneji) macOSビルダー(現在はTravis CI)
+[![](https://opencollective.com/TheDesk/contributors.svg?width=400&button=false)](https://github.com/cutls/TheDesk/graphs/contributors)
-* <img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4" width="20">[ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja) Linuxビルダー(現在はTravis CI)
-* <img src="https://user-images.githubusercontent.com/17561618/66582379-a3714800-ebbc-11e9-8402-d81a35a3be9f.png" width="20">[kPherox](https://pl.kpherox.dev/kPherox)
 
 ## 支援
 

app/about.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="ja">
-	<head>
+
+<head>
     <title>TheDesk</title>
     <meta content="width=device-width,initial-scale=1.0" name="viewport" />
     <link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
@@ -81,13 +82,13 @@
             grid-area: data6;
         }
     </style>
-	</head>
+</head>
 
-	<body class="center" style="overflow: hidden;">
+<body class="center" style="overflow: hidden;">
     <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
     <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
     <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
-		<img src="./img/desk.svg" style="max-width: 62%;" />
+    <img src="./img/desk.svg" style="max-width: 58%;" />
     <h5>TheDesk</h5>
     <div class="container">
         <div class="area-name1">Display version</div>
@@ -104,15 +105,8 @@
         <div class="area-data6" id="node"></div>
     </div>
     <div class="cp">
-			Copyright &copy; TheDesk 2018<br />
+        Copyright &copy; TheDesk 2018<br /> Main developer(author): <a href="https://1m.cutls.com/@Cutls" target="_blank">Cutls P</a><br />
-			Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br />
+        <a href="https://github.com/cutls/TheDesk/graphs/contributors" style="text-align: center; user-select: none;"><img src="https://opencollective.com/TheDesk/contributors.svg?width=700&button=false" style="width: 100%"></a>
-			Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a
-				href="https://pl.kpherox.dev/kPherox"
-				target="_blank"
-				>kPherox</a
-			>
-			and all users
-			<img draggable="false" style="width: 0.8rem; top: 1px; margin-left: 1px; position: relative;" alt="❤️" title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png" />
         <br /><a href="https://thedesk.top" target="_blank">Web site</a>
     </div>
     <button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
@@ -135,5 +129,6 @@
             return false
         })
     </script>
-	</body>
+</body>
+
 </html>

app/build.js

@@ -70,8 +70,8 @@ async function cmd(options) {
     if (isTrue(options, 'onlyStore') || isTrue(options, 'withStore')) {
         console.log('start building for application stores')
         construct(ver, basefile, false, true)
-        if ((platform == 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
+        if ((platform === 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
-            if ((isTrue(options, 'withIa32') && arch == 'x64') || arch == 'ia32') {
+            if ((isTrue(options, 'withIa32') && arch === 'x64') || arch === 'ia32') {
                 config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
                 await build(Platform.WINDOWS, Arch.ia32, config)
                 fs.renameSync(
@@ -83,7 +83,7 @@ async function cmd(options) {
                     '../build/TheDesk-setup-ia32-store.exe'
                 )
             }
-            if (arch == 'x64') {
+            if (arch === 'x64') {
                 config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
                 await build(Platform.WINDOWS, Arch.x64, config)
                 fs.renameSync(
@@ -96,14 +96,14 @@ async function cmd(options) {
                 )
             }
         }
-        if ((platform == 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
+        if ((platform === 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
-            if (arch == 'ia32') {
+            if (arch === 'ia32') {
                 await build(Platform.LINUX, Arch.ia32, config)
             }
-            if ((isTrue(options, 'withIa32') && arch == 'x64')) {
+            if ((isTrue(options, 'withIa32') && arch === 'x64')) {
                 console.log('snapcraft does not curretly support builing i386 on amd64')
             }
-            if (arch == 'x64') {
+            if (arch === 'x64') {
                 await build(Platform.LINUX, Arch.x64, config)
                 if (!isTrue(options, 'onlyStore')) {
                     fs.renameSync(
@@ -117,8 +117,8 @@ async function cmd(options) {
     if (!isTrue(options, 'onlyStore')) {
         console.log('start building for normal usage')
         construct(ver, basefile, false, false)
-        if ((platform == 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
+        if ((platform === 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
-            if ((isTrue(options, 'withIa32') && arch == 'x64') || arch == 'ia32') {
+            if ((isTrue(options, 'withIa32') && arch === 'x64') || arch === 'ia32') {
                 config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
                 await build(Platform.WINDOWS, Arch.ia32, config)
                 fs.renameSync(
@@ -126,7 +126,7 @@ async function cmd(options) {
                     '../build/TheDesk-ia32.exe'
                 )
             }
-            if (arch == 'x64') {
+            if (arch === 'x64') {
                 config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
                 await build(Platform.WINDOWS, Arch.x64, config)
                 fs.renameSync(
@@ -138,7 +138,8 @@ async function cmd(options) {
                     '../build/TheDesk-setup.exe'
                 )
             }
-            if ((isTrue(options, 'withArm64') && arch == 'x64') || arch == 'arm64') {
+            if ((isTrue(options, 'withArm64') && arch === 'x64') || arch === 'arm64') {
+                config.nsis.artifactName = artifactName.replace('${arch}', 'arm64')
                 await build(Platform.WINDOWS, Arch.arm64, config)
                 fs.renameSync(
                     `../build/TheDesk ${version}.exe`,
@@ -146,14 +147,14 @@ async function cmd(options) {
                 )
             }
         }
-        if ((platform == 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
+        if ((platform === 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {
-            if (arch == 'ia32') {
+            if (arch === 'ia32') {
                 await build(Platform.LINUX, Arch.ia32, config)
             }
-            if (isTrue(options, 'withIa32') && arch == 'x64') {
+            if (isTrue(options, 'withIa32') && arch === 'x64') {
                 console.log('snapcraft does not curretly support builing i386 on amd64')
             }
-            if (arch == 'x64') {
+            if (arch === 'x64') {
                 await build(Platform.LINUX, Arch.x64, config)
                 fs.renameSync(
                     `../build/thedesk_${version}_amd64.snap`,
@@ -167,9 +168,37 @@ async function cmd(options) {
                 }
             }
         }
-        if (platform == 'darwin' && !isTrue(options, 'skipMacOS')) {
+        if (platform === 'darwin' && !isTrue(options, 'skipMacOS')) {
             if(isTrue(options, 'unnotarize')) delete config.afterSign
+            if (arch === 'x64') {
                 await build(Platform.MAC, Arch.x64, config)
+                fs.renameSync(
+                    `../build/TheDesk-${version}.dmg`,
+                    `../build/TheDesk-${version}-x64.dmg`
+                )
+                if (isTrue(options, 'withArm64')) {
+                    delete config.afterSign
+                    await build(Platform.MAC, Arch.arm64, config)
+                    fs.renameSync(
+                        `../build/TheDesk-${version}.dmg`,
+                        `../build/TheDesk-${version}-arm64.dmg`
+                    )
+                }
+                fs.renameSync(
+                    `../build/TheDesk-${version}-x64.dmg`,
+                    `../build/TheDesk-${version}.dmg`
+                )
+            }
+            if (arch === 'arm64') {
+                delete config.afterSign
+                await build(Platform.MAC, Arch.arm64, config)
+                fs.renameSync(
+                    `../build/TheDesk-${version}.dmg`,
+                    `../build/TheDesk-${version}-arm64.dmg`
+                )
+                if(isTrue(options, 'skipX64')) await build(Platform.MAC, Arch.x64, config)
+            }
+
         }
     }
 }

app/css/acct.css

@@ -92,3 +92,18 @@ i.left {
 .text-line-icon {
 	font-size: 1rem;
 }
+.loginBtnWrap {
+	padding-top: 10px !important;
+}
+#add {
+	max-width: 1000px;
+}
+.autocomplete-content {
+	min-width: 450px;
+}
+.autocomplete-content li {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    word-break: break-word;
+    overflow: hidden;
+}

app/css/master.css

@@ -28,7 +28,9 @@ html {
 	text-transform: none;
 	height: 2.76rem;
 	line-height: 2.76rem;
+	border-radius: 0.5rem;
 }
+
 .markdown {
 	display: none;
 }
@@ -84,20 +86,21 @@ option {
 #imagemodal .modal-footer {
 	overflow-x: hidden;
 	overflow-y: hidden;
+	height: 56px;
 }
 
 #imagewrap {
 	width: 100%;
-	height: 100%;
+	height: calc(100% - 4px);
 }
 #imagewrap img.rotate-90 {
-	transform: rotate(-90deg)
+	transform: rotate(-90deg);
 }
 #imagewrap img.rotate-180 {
-	transform: rotate(-180deg)
+	transform: rotate(-180deg);
 }
 #imagewrap img.rotate-270 {
-	transform: rotate(-270deg)
+	transform: rotate(-270deg);
 }
 .pointer {
 	cursor: pointer;
@@ -234,6 +237,12 @@ blockquote:before,
 	right: 0;
 	top: 0;
 }
+.menu-icon {
+	font-size: 1.4rem !important;
+	top: 0.3rem;
+	line-height: 1rem !important;
+	position: relative;
+}
 #start {
 	display: none;
 	position: fixed;
@@ -329,8 +338,26 @@ blockquote:before,
 .collapsible-header:focus {
 	background-color: var(--thirdColor) !important;
 }
-.modal-footer {
+.modal .modal-footer {
 	background-color: var(--modalfooter) !important;
+	border-radius: 0;
+	padding: 0;
+}
+.modal {
+	border-radius: 1.5rem;
+}
+.progress .determinate,
+.progress .indeterminate {
+	background-color: var(--active);
+}
+.nomargin {
+	margin: 0;
+}
+#imginfo {
+	float: left;
+	padding-top: 0.23rem;
+	line-height: normal;
+	padding-left: 1rem;
 }
 .font {
 	font-size: 1.5rem;
@@ -342,7 +369,8 @@ blockquote:before,
 .release-do {
 	border: solid 2px;
 	border-color: var(--text);
-	padding: 5px;
+	padding: 1.5rem;
+	border-radius: 0.5rem;
 }
 #pickers {
 	display: flex;
@@ -392,7 +420,8 @@ input[type='color']::-webkit-color-swatch {
 	color: var(--text);
 }
 #left-menu a:hover {
-	background-color: var(--beforehover);
+	background-color: var(--emphasized);
+    filter: brightness(80%);
 }
 #left-menu span {
 	margin-left: 0.4rem;
@@ -401,7 +430,9 @@ input[type='color']::-webkit-color-swatch {
 	background-color: var(--emphasized);
 }
 #left-menu a.active span {
-	text-decoration: underline;
+	text-decoration: none;
+	border-bottom: 1px solid;
+	padding-bottom: 0.5px;
 }
 #right-menu {
 	width: 100%;
@@ -417,16 +448,27 @@ input[type='color']::-webkit-color-swatch {
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
-	width: 13rem;
+	min-width: 150px;
-	height: 3.1rem;
+	width: 50%;
+	height: 2.5rem;
 	cursor: pointer;
 	color: var(--text);
 }
+#tltype .type div {
+	margin-left: 5px;
+	margin-right: 5px;
+	margin-top: 3px;
+}
 #tltype .type span {
-	width: calc(100% - 2.3rem);
+	width: calc(100% - 4rem);
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	word-break: break-word;
+	overflow: hidden;
 }
 #tltype .type:hover {
-	background-color: var(--beforehover);
+	background-color: var(--emphasized);
+    filter: brightness(80%);
 }
 #tltype .active {
 	background-color: var(--emphasized);
@@ -498,7 +540,8 @@ textarea {
 	font-size: 1rem !important;
 	font-family: inherit;
 }
-.swal2-popup, .swal2-header {
+.swal2-popup,
+.swal2-header {
 	background-color: var(--subcolor) !important;
 }
 .swal2-title,
@@ -558,6 +601,7 @@ h2.swal2-title {
 	background-color: var(--emphasized);
 }
 #pageSrc {
+	border-radius: 10px;
 	position: absolute;
 	top: 0;
 	left: calc(50vw - 11.53rem);
@@ -565,10 +609,22 @@ h2.swal2-title {
 	max-width: 100%;
 	background-color: var(--subcolor);
 	z-index: 501;
-	padding: 0.4rem;
 }
-#pageSrcInput {
+.pageSrcBtn:hover {
-	width: 12.3rem;
+	background-color: var(--selected);
+}
+.srcQ {
+	margin-top: 0.4rem;
+	padding-left: 0.5rem;
+	padding-right: 0.5rem;
+	border-bottom: 1px solid;
+}
+.lastPSB {
+	margin-bottom: 0.4rem;
+}
+.pageSrcBtn {
+	padding-left: 0.5rem;
+	padding-right: 0.5rem;
 }
 .voice {
 	clip: rect(1px, 1px, 1px, 1px);
@@ -696,3 +752,12 @@ button {
 	position: relative;
 	top: -4px;
 }
+#fonts {
+	overflow-y: scroll;
+	width: 22rem;
+	height: 40rem;
+	position: absolute;
+	background-color: var(--bg);
+	z-index: 2;
+	padding: 5px;
+}

app/css/post.css

@@ -69,6 +69,20 @@ textarea {
 	overflow-y: scroll;
 	overflow-x: hidden;
 }
+#suggest {
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: var(--bg);
+	z-index: 2;
+	border-radius: 0.5rem;
+	display: none;
+	max-height: 10rem;
+}
+#suggest a {
+	margin-left: 0.5rem;
+	margin-right: 0.5rem;
+}
 #emoji-list {
 	width: 100%;
 	height: 15.4rem;

app/css/tl.css

@@ -359,8 +359,8 @@ iframe,
 	grid-area: actions;
 }
 .area-actions .btn-flat {
-	height: 1rem;
+	height: 1.3rem;
-	line-height: 1rem;
+	line-height: 1.3rem;
 }
 .area-actions .btn-flat,
 .area-vis i,
@@ -384,7 +384,16 @@ iframe,
 	margin: 0.15rem;
 	grid-area: side;
 }
-
+.notf-udg-text {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	word-break: break-word;
+	overflow: hidden;
+	max-width: calc(100% - 150px);
+	display: inline-block;
+	position: relative;
+	top: 0.2rem;
+}
 .cusr {
 	user-select: text;
 	padding-left: 0.4rem;
@@ -409,6 +418,12 @@ iframe,
 	margin-top: 0.46rem;
 	margin-left: 0.46rem;
 }
+.landing {
+	text-align: center;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
 
 .quote-inline {
 	display: none;
@@ -442,6 +457,12 @@ iframe,
 .btn-flat {
 	color: var(--text);
 }
+.sublink {
+	font-size: 1.4rem !important;
+	position: relative;
+	top: 0.4rem;
+	cursor: pointer;
+}
 .area-side i {
 	margin-left: 0.75rem;
 }
@@ -452,6 +473,9 @@ iframe,
 	font-size: 1.2rem;
 	margin-right: 0.15rem;
 }
+.action li i {
+	margin-right: 0.5rem;
+}
 .action .fa-quote-right {
 	margin-top: 0.15rem;
 }
@@ -561,7 +585,9 @@ p:not(:last-child) {
 	font-weight: bold;
 	text-decoration: underline;
 }
-
+.rotate-90 {
+	transform: rotate(90deg);
+}
 .area-notice {
 	grid-area: notice;
 }
@@ -578,13 +604,32 @@ p:not(:last-child) {
 	width: 8rem;
 	display: flex;
 }
-.area-sta .hide {
-	display: inline-block !important;
-}
 .small-header .area-sta::-webkit-scrollbar {
 	height: 5px;
 }
-
+#tagContextMenu {
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: var(--subcolor);
+	z-index: 2;
+	border-radius: 0.4rem;
+}
+#tagContextMenu a {
+	display: block;
+	color: var(--text);
+	padding-left: 0.5rem;
+	padding-right: 0.5rem;
+}
+#tagContextMenu a:hover {
+	background-color: var(--selected);
+}
+.firstTCM {
+	margin-top: 0.4rem;
+}
+.lastTCM {
+	margin-bottom: 0.4rem;
+}
 .area-notice_name {
 	grid-area: notice_name;
 	overflow: hidden;
@@ -676,13 +721,24 @@ p:not(:last-child) {
 	padding-left: 23px !important;
 	margin-right: 5px;
 }
+.columnSettings {
+	display: flex;
+	flex-wrap: wrap;
+}
 .notf-indv-box .setting {
 	font-size: 1rem;
-	width: calc(25% - 3px);
+	width: calc(25% - 6px);
-	text-align: left;
+	margin: 3px;
-	padding: 5px;
+	height: 100px;
-	height: 70px;
 	text-align: center;
+	display: flex;
+	flex-direction: column;
+	padding-top: 17px;
+	border: 1px solid;
+	border-radius: 5px;
+}
+.notf-indv-box .setting:hover {
+	color: var(--text);
 }
 .notf-exclude-btn {
 	border: 1px solid;
@@ -721,6 +777,14 @@ p:not(:last-child) {
 	overflow: hidden;
 	position: relative;
 }
+.dropdown-content li {
+	padding-top: 0.4rem;
+}
+.dropdown-content li > a, .dropdown-content li > span {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
 .fa-2x > .emoji-img {
 	width: 2.3rem !important;
 	height: 2.3rem !important;

app/css/userdata.css

@@ -1,54 +1,66 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
+
 #his-data {
     background-repeat: no-repeat;
     background-image: url('../img/loading.svg');
     overflow-y: hidden;
 }
+
 #his-data .btn .material-icons {
     float: left;
 }
+
 #his-data-content {
     display: flex;
     justify-content: center;
 }
+
 #his-name {
     font-size: 1.5rem;
 }
+
 #his-prof {
     width: 7.7rem;
     margin-right: 0.4rem;
 }
+
 .his-float {
     overflow-y: scroll;
     padding: 0.4rem;
 }
+
 #his-float-data {
     height: 100%;
     overflow-y: hidden;
-  
 }
+
 #his-leftside {
     width: 28.4rem;
     max-width: 30vw;
 }
+
 #his-float-timeline {
     max-width: 47.5rem;
-  min-width: calc(100% - 29.4rem);
+    width: calc(100% - 28.4rem);
     height: 100%;
     overflow-y: hidden;
 }
+
 #his-basic-prof {
     display: flex;
     min-height: 10rem;
 }
+
 #his-field {
     vertical-align: baseline;
     text-align: center;
     padding: 0;
 }
+
 #his-field tr {
     height: 1.5rem;
 }
+
 .his-field-title {
     height: 1.5rem;
     padding: 0;
@@ -58,22 +70,27 @@
     margin-bottom: 1px;
     width: 30%;
 }
+
 .his-field-content {
     height: 1.5rem;
     padding: 0;
     padding-left: 0.4rem;
 }
+
 .his-var-content a span.ellipsis:after {
     content: '...';
 }
+
 .his-var-content a:not(.mention) span:last-of-type {
     display: none;
 }
+
 #his-data a .rep_ct,
 #his-data a .rt_ct,
 #his-data a .fav_ct {
     display: inline !important;
 }
+
 #his-data-show {
     margin: 1.5rem;
     margin-left: 3.8rem;
@@ -83,39 +100,51 @@
     margin-bottom: 0;
     padding: 0.4rem;
 }
+
 #his-data-wrap {
     display: flex;
 }
+
 .his-var-content {
     overflow-y: scroll;
     overflow-x: hidden;
     height: calc(100% - 3.4rem);
     padding-bottom: 60px;
 }
+
 #my-data-nav .btn {
     width: 10.6rem;
 }
+
 #my-data-nav .active-back {
     display: none;
 }
+
 #his-name .emojione,
 #his-name .emoji-img {
     width: 1.538rem;
 }
+
 #his-plus-action .btn {
     padding-right: 0.4rem;
     padding-left: 0.4rem;
 }
+
 .tabs {
     display: flex;
 }
+
 .tabs .tab a {
     padding: 0.6rem 0.9rem;
 }
+
 #his-des {
     max-height: 17.7rem;
     overflow-y: scroll;
+    user-select: text;
+    cursor: text;
 }
+
 #his-sign-action {
     border: 1px solid;
     border-radius: 0.4rem;
@@ -125,20 +154,31 @@
     padding-right: 0.75rem;
     flex-wrap: wrap;
 }
-#his-sign-action .btn {
+
-	flex-basis: calc(50% - 10.6px);
+#his-sign-action .shrinker {
+    margin-right: 0.5rem;
+    flex-basis: calc(50% - 1rem);
 }
+
+#his-sign-action .shrinker.btn {
+    width: 100%;
+}
+
 #his-sign-action .dropdown-trigger {
     flex-basis: 100%;
 }
+
 #his-des .mention {
     color: #039be5;
     cursor: pointer;
 }
+
 #his-table {
-	max-height: 11.538rem;
+    max-height: 9.2rem;
     overflow-y: scroll;
+    user-select: text;
 }
+
 #his-float-blocked {
     display: flex;
     justify-content: center;
@@ -146,17 +186,34 @@
     font-size: 2rem;
     height: 100%;
 }
+
 #hisdropdown {
     background-color: var(--bg);
 }
+
 #hisdropdown li a {
-	color: white;
+    color: var(--text);
 }
+
 #hisdropdown li:hover {
     background-color: var(--active);
 }
-#his-data-title {
+
+#his-data-title-wrap {
     width: 100%;
     text-align: center;
     font-size: 1.5rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+#his-data-title .material-icons {
+    position: relative;
+    top: 5px;
+    margin-right: 3px;
+}
+
+#his-data-title a {
+    color: white;
 }

app/js/common/version.js

@@ -5,20 +5,6 @@ function verck(ver, jp) {
 	$('body').addClass(localStorage.getItem('platform'))
 	var date = new Date()
 	var showVer = false
-	//Spotify
-	if (localStorage.getItem('spotify')) {
-		localStorage.removeItem('spotify')
-		localStorage.removeItem('spotify-refresh')
-		var spDc = 'Spotify NowPlaying sysytem was changed, please re-login to Spotify'
-		if(lang.language == 'ja') {
-			spDc = 'Spotify NowPlayingの機能が変更されたため、もう一度ログインしてください'
-		}
-		Swal.fire({
-			type: 'info',
-			title: spDc,
-		})
-	}
-	//Spotify(e)
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
 		showVer = true
 		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
@@ -44,9 +30,18 @@ function verck(ver, jp) {
 	localStorage.setItem('ver', ver)
 	if (!showVer) {
 		console.log(showVer)
+		if (!localStorage.getItem('showSupportMe')) {
+			if (date.getMonth() == 11) {
+				var yrs = date.getFullYear() + 1
+				var nextmonth = yrs * 100 + 1
+			} else {
+				var yrs = date.getFullYear() 
+				var nextmonth = yrs * 100 + date.getMonth() + 2
+			}
+			localStorage.setItem('showSupportMe', nextmonth)
+		} else {
 			if (
-			date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
+				date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe')
-			!localStorage.getItem('showSupportMe')
 			) {
 				if (date.getMonth() == 11) {
 					var yrs = date.getFullYear() + 1
@@ -55,11 +50,11 @@ function verck(ver, jp) {
 					var yrs = date.getFullYear() 
 					var nextmonth = yrs * 100 + date.getMonth() + 2
 				}
+				localStorage.setItem('showSupportMe', nextmonth)
 				if (lang.language != 'ja') {
 					$('#support-btm-ja').addClass('hide')
 					$('#support-btm-en').removeClass('hide')
 				}
-			localStorage.setItem('showSupportMe', nextmonth)
 				$('#support-btm').removeClass('hide')
 				$('#support-btm').animate(
 					{
@@ -71,6 +66,8 @@ function verck(ver, jp) {
 				)
 			}
 		}
+		
+	}
 	var platform = localStorage.getItem('platform')
 	console.log('Your platform:' + platform)
 	//if (!localStorage.getItem('winstore') && !pwa) {
@@ -114,11 +111,6 @@ function verck(ver, jp) {
 		.then(function(mess) {
 			console.table(mess)
 			if (mess) {
-				//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
-				if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
-					localStorage.setItem('askjp_jp_ua', true)
-					$('#askjp_jp_ua').removeClass('hide')
-				}
 				var platform = localStorage.getItem('platform')
 				if (platform == 'darwin') {
 					var newest = mess.desk_mac

app/js/login/manager.js

@@ -423,10 +423,6 @@ function login(url) {
 			versionChecker(url)
 			$('#add').hide()
 			postMessage(['openUrl', auth], '*')
-			if ($('#linux:checked').val() == 'on') {
-			} else {
-				postMessage(['sendSinmpleIpc', 'quit'], '*')
-			}
 		}
 	}
 }
@@ -625,7 +621,7 @@ function misskeyAuth(url, mkc) {
 
 //テキストボックスにURL入れた
 function instance() {
-	var url = $('#url').val()
+	var url = $('#autocomplete-input').val()
 	if (url.indexOf('@') != -1 || url.indexOf('https') != -1) {
 		alert('入力形式が違います。(Cutls@mstdn.jpにログインする場合、入力するのは"mstdn.jp"です。)')
 		return false
@@ -634,6 +630,7 @@ function instance() {
 }
 //コード入れてAccessTokenゲット
 function code(code) {
+	var red = localStorage.getItem('redirect')
 	localStorage.removeItem('redirect')
 	if (!code) {
 		var code = $('#code').val()
@@ -696,7 +693,7 @@ function code(code) {
 		}
 		return
 	} else {
-		var red = 'urn:ietf:wg:oauth:2.0:oob'
+		if (!red) red = 'urn:ietf:wg:oauth:2.0:oob'
 		if (~url.indexOf('pixelfed')) {
 			red = 'https://thedesk.top/hello.html'
 		}
@@ -720,6 +717,7 @@ function code(code) {
 			if (httpreq.readyState === 4) {
 				var json = httpreq.response
 				if (this.status !== 200) {
+					M.toast({ html: lang.lang_fatalerroroccured + 'Error: cannot complete', displayLength: 5000 })
 					setLog(start, this.status, json)
 				}
 				if (json['access_token']) {
@@ -1089,15 +1087,14 @@ function coloradd(key, bg, txt) {
 //入力時にハッシュタグと@をサジェスト
 var timer = null
 
-var input = document.getElementById('url')
+var input = document.getElementById('autocomplete-input')
-
 var prev_val = input.value
 var oldSuggest
 var suggest
 input.addEventListener(
 	'focus',
 	function () {
-		$('#ins-suggest').html('')
+		const instance = M.Autocomplete.getInstance(input)
 		window.clearInterval(timer)
 		timer = window.setInterval(function () {
 			var new_val = input.value
@@ -1125,21 +1122,20 @@ input.addEventListener(
 						})
 						.then(function (json) {
 							if (!json.error) {
-								var urls = 'Suggest:'
+								let data = {}
 								Object.keys(json.data).forEach(function (key) {
 									var url = json.data[key]
-									urls =
+									data[url.uri] = escapeHTML(url.title ? url.title : url.uri)
-										urls +
-										`<a onclick="login('${url.uri}')" class="pointer" title="${url.uri}">${escapeHTML(url.title ? url.title : url.uri)}</a>, `
 								})
-								$('#ins-suggest').html(urls)
+								instance.updateData(data)
+								instance.open()
 							} else {
 								console.error(json.error)
 							}
 						})
 				}
 				oldSuggest = suggest
-				prev_value = new_val
+				prev_val = new_val
 			}
 		}, 1000)
 	},
@@ -1157,3 +1153,12 @@ input.addEventListener(
 function asReadEnd() {
 	postMessage(['asReadComp', ''], '*')
 }
+
+// Or with jQuery
+
+$(document).ready(function(){
+    $('input.autocomplete').autocomplete({
+      data: {},
+    });
+  });
+        

app/js/platform/end.js

@@ -29,7 +29,7 @@ $(document).on('click', 'a', e => {
 					acct_id = 0
 				}
 				$a.parent().addClass('loadp')
-				$a.parent().text('Loading...')
+				
 				detEx(url, acct_id)
 			}
 		} else if (tags) {
@@ -186,7 +186,7 @@ onmessage = function (e) {
 	} else if (e.data[0] == 'asReadEnd') {
 		asReadEnd()
 	} else if (e.data[0] == 'accessibility') {
-		console.log('atrue')
+		console.log('accessibility mode')
 		$('body').addClass('accessibility')
 		$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
 	} else if (e.data[0] == 'logData') {
@@ -200,6 +200,22 @@ onmessage = function (e) {
 		})
 	} else if (e.data[0] == 'twitterLoginComplete') {
 		location.reload()
+	} else if (e.data[0] == 'customUrl') {
+		const mode = e.data[1][0]
+		const codex = e.data[1][1]
+		if (mode === 'share') {
+			$('textarea').focus()
+			$('#textarea').val(decodeURI(codex))
+			show()
+			$('body').removeClass('mini-post')
+			$('.mini-btn').text('expand_less')
+		} else if (mode === 'manager' || mode === 'login') {
+			code(codex)
+		} else if (mode === 'spotify') {
+			var coder = codex.split(':')
+			localStorage.setItem('spotify', coder[0])
+			localStorage.setItem('spotify-refresh', coder[1])
+		}
 	}
 }
 /* PWA */
@@ -236,3 +252,34 @@ const connection = function (event) {
 }
 window.onoffline = connection
 window.ononline = connection
+
+let lastSelection = null
+let isSame = true
+$(document).on('keyup mouseup', function (e) {
+	lastSelection = (window.getSelection().toString() !== '') ? window.getSelection().getRangeAt(0) : null
+	if (!isSame) $('#pageSrc').addClass('hide')
+})
+
+// カスタム右クリックメニュー
+$(document).on('contextmenu', function (e) {
+	// テキスト選択中であれば何もしない
+	if (lastSelection !== null) {
+		const currentSelection = window.getSelection().getRangeAt(0)
+		for (let key in currentSelection) {
+			if (currentSelection[key] != lastSelection[key]) {
+				isSame = false
+				break
+			}
+		}
+
+		if (isSame && currentSelection != '') {
+			$('#pageSrc').removeClass('hide')
+			$('#pageSrc').css('left', e.pageX)
+			$('#pageSrc').css('top', e.pageY)
+			$('.srcQ').text(currentSelection)
+		}
+	}
+})
+$('textarea, input').on('contextmenu', function (e) {
+	postMessage(['textareaContextMenu', { x: e.pageX, y: e.pageY }], '*')
+})

app/js/platform/first.js

@@ -1,21 +1,22 @@
-window.onload = function () {
+window.onload = function() {
     console.log('loaded')
     initPostbox()
     connection()
     initPlugin(plugins)
     if (localStorage.getItem('control-center-np')) $('#ccnp').removeClass('hide')
 }
-$.strip_tags = function (str, allowed) {
+$.strip_tags = function(str, allowed) {
     if (!str) {
         return ''
     }
     allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join('')
     var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
         commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
-	return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
+    return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
         return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
     })
 }
+
 function escapeHTML(str) {
     if (!str) {
         return ''
@@ -36,6 +37,7 @@ function nl2br(str) {
     str = str.replace(/(\n|\r)/g, '<br />')
     return str
 }
+
 function br2nl(str) {
     if (!str) {
         return ''
@@ -43,6 +45,7 @@ function br2nl(str) {
     str = str.replace(/<br \/>/g, '\r\n')
     return str
 }
+
 function formattime(date) {
     var str = date.getFullYear() + '-'
     if (date.getMonth() + 1 < 10) {
@@ -68,6 +71,7 @@ function formattime(date) {
     }
     return escapeHTML(str)
 }
+
 function formattimeutc(date) {
     var str = date.getUTCFullYear() + '-'
     if (date.getUTCMonth() + 1 < 10) {
@@ -94,30 +98,13 @@ function formattimeutc(date) {
     return escapeHTML(str)
 }
 postMessage(['sendSinmpleIpc', 'custom-css-request'], '*')
-function makeCID() {
+
-	let chars = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split("")
+incrementid=0
-	for (let i = 0, len = chars.length; i < len; i++) {
+function makeCID()
-		switch (chars[i]) {
+{
-			case "x":
+	return incrementid++
-				chars[i] = Math.floor(Math.random() * 16).toString(16)
-				break
-			case "y":
-				chars[i] = (Math.floor(Math.random() * 4) + 8).toString(16)
-				break
-		}
-	}
-	return chars.join("")
-}
-function randomStr(l) {
-	// 生成する文字列に含める文字セット
-	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
-	var cl = c.length
-	var r = ''
-	for (var i = 0; i < l; i++) {
-		r += c[Math.floor(Math.random() * cl)]
-	}
-	return r
 }
+
 function rgbToHex(color) {
     // HEXに変換したものを代入する変数
     var hex = ''
@@ -155,15 +142,15 @@ function rgbToHex(color) {
     console.error(color + ':第1引数はRGB形式で入力')
 }
 /*マルチバイト用切り出し*/
-$.isSurrogatePear = function (upper, lower) {
+$.isSurrogatePear = function(upper, lower) {
     return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
 }
-$.mb_strlen = function (str) {
+$.mb_strlen = function(str) {
     var splitter = new GraphemeSplitter()
     var arr = splitter.splitGraphemes(str)
     return arr.length
 }
-$.mb_substr = function (str, begin, end) {
+$.mb_substr = function(str, begin, end) {
         //配列にする
         var splitter = new GraphemeSplitter()
         var arr = splitter.splitGraphemes(str)
@@ -174,8 +161,8 @@ $.mb_substr = function (str, begin, end) {
             }
         }
         return newarr.join('')
-}
+    }
-//ソートするやつ
+    //ソートするやつ
 function object_array_sort(data, key, order, fn) {
     var num_a = -1
     var num_b = 1
@@ -183,7 +170,7 @@ function object_array_sort(data, key, order, fn) {
         num_a = 1
         num_b = -1
     }
-	data = data.sort(function (a, b) {
+    data = data.sort(function(a, b) {
         var x = a[key]
         var y = b[key]
         if (x > y) return num_a
@@ -200,6 +187,7 @@ function object_array_sort(data, key, order, fn) {
     }
     fn(data)
 }
+
 function setLog(txt1, txt2, txt3) {
     //url,statuscode,responsetext
     var text = new Date().toUTCString()
@@ -207,6 +195,7 @@ function setLog(txt1, txt2, txt3) {
     console.error(text)
     postMessage(['log', text], '*')
 }
+
 function escapeCsv(str) {
     if (!str) {
         return str
@@ -218,6 +207,7 @@ function escapeCsv(str) {
     }
     return result
 }
+
 function evalAttr(json, attr, lenCk) {
     if (json[attr]) {
         if (lenCk) {
@@ -233,6 +223,7 @@ function evalAttr(json, attr, lenCk) {
         return false
     }
 }
+
 function statusModel(now) {
     if (!now) {
         var now = new Date().toString()
@@ -290,6 +281,7 @@ function statusModel(now) {
         poll: null
     }
 }
+
 function webviewFinder() {
     const webview = document.querySelector('webview')
     webview.addEventListener('did-navigate', (e) => {
@@ -301,12 +293,13 @@ function webviewFinder() {
         }
     })
 }
+
 function initWebviewEvent() {
     if (document.querySelector('webview')) { webviewFinder() } else {
-		const timerWV = setInterval(function () {
+        const timerWV = setInterval(function() {
-			document.querySelector('webview')
+            document.querySelector('webview') ?
-				? (webviewFinder(), clearInterval(timerWV))
+                (webviewFinder(), clearInterval(timerWV)) :
-				: console.log('まだロード中')
+                console.log('まだロード中')
         }, 500)
     }
 }

app/js/platform/preload.js

@@ -83,6 +83,8 @@ onmessage = function(e) {
 		ipc.send('log', e.data[1])
 	} else if (e.data[0] == 'twitterLogin') {
 		ipc.send('twitterLogin', e.data[1])
+	} else if (e.data[0] == 'textareaContextMenu') {
+		ipc.send('textareaContextMenu', e.data[1])
 	}
 }
 //version.js
@@ -236,3 +238,9 @@ ipc.on('accessibility', function(event, arg) {
 ipc.on('twitterLoginComplete', function(event, arg) {
 	postMessage(['twitterLoginComplete', ''], '*')
 })
+ipc.on('alert', function(event, arg) {
+	postMessage(['alert', arg], '*')
+})
+ipc.on('customUrl', function(event, args) {
+	postMessage(['customUrl', args], '*')
+})

app/js/post/emoji.js

@@ -19,7 +19,7 @@ function emojiToggle(reaction) {
 		if (width) {
 			width = width.replace('px', '') * 1 + 300
 		} else {
-			width = 600
+			width = reaction ? 300 : 600
 		}
 		$('#post-box').css('width', width + 'px')
 		$('#suggest').html('')
@@ -126,8 +126,10 @@ function emojiGet(parse, started) {
 
 					md['if_categorized'] = if_categorized
 					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
+					localStorage.setItem(`emojis_raw_${acct_id}`, JSON.stringify(json))
 				} else {
 					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
+					localStorage.setItem(`emojis_raw_${acct_id}`, JSON.stringify(json))
 				}
 				localStorage.setItem('emojiseek', 0)
 				if (!started) {

app/js/post/status.js

@@ -15,7 +15,7 @@ function fav(id, acct_id, remote) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -75,7 +75,7 @@ function rt(id, acct_id, remote, vis) {
     } else {
         httpreq.send()
     }
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -110,6 +110,7 @@ function rt(id, acct_id, remote, vis) {
         }
     }
 }
+
 function boostWith(vis) {
     var id = $('#tootmodal').attr('data-id')
     var acct_id = $('#tootmodal').attr('data-acct')
@@ -131,7 +132,7 @@ function bkm(id, acct_id, tlid) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -167,7 +168,6 @@ async function follow(acct_id, resolve) {
     }
     if (!acct_id && acct_id != 'selector') {
         var acct_id = $('#his-data').attr('use-acct')
-
     } else if (acct_id == 'selector') {
         var acct_id = $('#user-acct-sel').val()
     }
@@ -182,7 +182,8 @@ async function follow(acct_id, resolve) {
     var id = $('#his-data').attr('user-id')
     if (resolve == 'selector') {
         var fullacct = $('#his-acct').attr('fullname')
-		var id = await acctResolve(acct_id, fullacct)
+        var data = await acctResolve(acct_id, fullacct)
+        var { id } = data
         console.log(id)
     }
     var domain = localStorage.getItem('domain_' + acct_id)
@@ -200,7 +201,7 @@ async function follow(acct_id, resolve) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send(JSON.stringify(ent))
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -223,28 +224,47 @@ async function follow(acct_id, resolve) {
 }
 async function acctResolve(acct_id, user) {
     console.log('Get user data of ' + user)
-	var domain = localStorage.getItem('domain_' + acct_id)
+    const domain = localStorage.getItem('domain_' + acct_id)
     if (localStorage.getItem('mode_' + domain) == 'misskey') {
         return false
     }
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
+    const at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + user
+    const options = {
-	let promise = await fetch(start, {
         method: 'GET',
         headers: {
             'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+            Authorization: 'Bearer ' + at,
+        },
     }
-	})
+    try {
-	var idJson = await promise.json()
+        const start = `https://${domain}/api/v1/accounts/lookup?acct=${user}`
+        const promise = fetch(start, options)
+
+        const idJson = await promise.json()
+        if (idJson) {
+            return idJson
+        } else {
+            return await acctResolveLegacy(domain, user, options)
+        }
+    } catch {
+        return await acctResolveLegacy(domain, user, options)
+    }
+}
+async function acctResolveLegacy(domain, user, options) {
+    console.log(`Get user data of ${user} with legacy method`)
+    try {
+        const start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + user
+        const promise = fetch(start, options)
+        const idJson = await promise.json()
         if (idJson.accounts[0]) {
-		var id = idJson.accounts[0].id
+            return idJson.accounts[0]
         } else {
             M.toast({ html: lang.lang_fatalerroroccured, displayLength: 2000 })
         }
-	return id
+    } catch {
+        console.log('Error occured on searching and fetching with resolve')
+    }
 }
-
 //ブロック
 function block(acct_id) {
     if ($('#his-data').hasClass('blocking')) {
@@ -260,8 +280,8 @@ function block(acct_id) {
         type: 'warning',
         showCancelButton: true,
         confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+        cancelButtonText: lang.lang_no,
-	}).then(result => {
+    }).then((result) => {
         if (result.value) {
             if (!acct_id) {
                 var acct_id = $('#his-data').attr('use-acct')
@@ -276,7 +296,7 @@ function block(acct_id) {
             httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
             httpreq.responseType = 'json'
             httpreq.send()
-			httpreq.onreadystatechange = function () {
+            httpreq.onreadystatechange = function() {
                 if (httpreq.readyState === 4) {
                     if (this.status !== 200) {
                         setLog(start, this.status, this.response)
@@ -311,8 +331,8 @@ function muteDo(acct_id) {
         type: 'warning',
         showCancelButton: true,
         confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+        cancelButtonText: lang.lang_no,
-	}).then(result => {
+    }).then((result) => {
         if (result.value) {
             if (!acct_id) {
                 var acct_id = $('#his-data').attr('use-acct')
@@ -320,13 +340,23 @@ function muteDo(acct_id) {
             var id = $('#his-data').attr('user-id')
             var domain = localStorage.getItem('domain_' + acct_id)
             var at = localStorage.getItem('acct_' + acct_id + '_at')
+            const days = parseInt($('#days_mute').val(), 10)
+            const hours = parseInt($('#hours_mute').val(), 10)
+            const mins = parseInt($('#mins_mute').val(), 10)
+            const notf = $('#notf_mute:checked').val() === '1'
+            let duration = days * 24 * 60 * 60 + hours * 60 + mins
             if (localStorage.getItem('mode_' + domain) == 'misskey') {
                 var start = 'https://' + domain + '/api/mute/' + flagm
                 var ent = { i: at, userId: id }
                 var rq = JSON.stringify(ent)
             } else {
                 var start = 'https://' + domain + '/api/v1/accounts/' + id + '/' + flag
-				var rq = ''
+                const q = {
+                    notifications: notf
+                }
+                if (duration > 0) q.duration = duration * 60
+                if (days < 0 || hours < 0 || mins < 0) return Swal.fire('Invalid number')
+                var rq = JSON.stringify(q)
             }
             var httpreq = new XMLHttpRequest()
             httpreq.open('POST', start, true)
@@ -334,7 +364,7 @@ function muteDo(acct_id) {
             httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
             httpreq.responseType = 'json'
             httpreq.send(rq)
-			httpreq.onreadystatechange = function () {
+            httpreq.onreadystatechange = function() {
                 if (httpreq.readyState === 4) {
                     if (this.status !== 200) {
                         setLog(start, this.status, this.response)
@@ -351,6 +381,15 @@ function muteDo(acct_id) {
         }
     })
 }
+function muteMenu() {
+    $('#muteDuration').toggleClass('hide')
+    !$('#muteDuration').hasClass('hide') ? $('#his-des').css('max-height', '112px') : $('#his-des').css('max-height', '196px')
+}
+function muteTime(day, hour, min) {
+    $('#days_mute').val(day)
+    $('#hours_mute').val(hour)
+    $('#mins_mute').val(min)
+}
 
 //投稿削除
 function del(id, acct_id) {
@@ -374,7 +413,7 @@ function del(id, acct_id) {
         httpreq.responseType = 'json'
         httpreq.send()
     }
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             if (this.status !== 200) {
                 setLog(start, this.status, this.response)
@@ -390,8 +429,8 @@ function redraft(id, acct_id) {
         type: 'warning',
         showCancelButton: true,
         confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+        cancelButtonText: lang.lang_no,
-	}).then(result => {
+    }).then((result) => {
         if (result.value) {
             show()
             var domain = localStorage.getItem('domain_' + acct_id)
@@ -414,7 +453,7 @@ function redraft(id, acct_id) {
                 httpreq.responseType = 'json'
                 httpreq.send()
             }
-			httpreq.onreadystatechange = function () {
+            httpreq.onreadystatechange = function() {
                 if (httpreq.readyState === 4) {
                     if (this.status !== 200) {
                         setLog(start, this.status, this.response)
@@ -426,24 +465,21 @@ function redraft(id, acct_id) {
         }
     })
 }
+
 function draftToPost(json, acct_id, id) {
     $('#post-acct-sel').prop('disabled', true)
     $('#post-acct-sel').val(acct_id)
     $('select').formSelect()
     mdCheck()
     mediack = null
-	if(json.media_attachments) mediack = json.media_attachments[0]
+    if (json.media_attachments) mediack = json.media_attachments[0]
         //メディアがあれば
     var media_ids = []
     if (mediack) {
         for (var i = 0; i <= 4; i++) {
             if (json.media_attachments[i]) {
                 media_ids.push(json.media_attachments[i].id)
-				$('#preview').append(
+                $('#preview').append('<img src="' + json.media_attachments[i].preview_url + '" style="width:50px; max-height:100px;">')
-					'<img src="' +
-					json.media_attachments[i].preview_url +
-					'" style="width:50px; max-height:100px;">'
-				)
             } else {
                 break
             }
@@ -496,7 +532,7 @@ function pin(id, acct_id) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -527,7 +563,7 @@ function request(id, flag, acct_id) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -553,7 +589,7 @@ function domainblock(add, flag, acct_id) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -580,7 +616,7 @@ function empUser() {
         M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
     } else {
         var can
-		Object.keys(obj).forEach(function (key) {
+        Object.keys(obj).forEach(function(key) {
             var usT = obj[key]
             if (usT != id && !can) {
                 can = false
@@ -612,7 +648,7 @@ function pinUser() {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -645,23 +681,23 @@ function staEx(mode) {
             method: 'GET',
             headers: {
                 'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+                Authorization: 'Bearer ' + at,
-		}
+            },
         })
-		.then(function (response) {
+        .then(function(response) {
             if (!response.ok) {
-				response.text().then(function (text) {
+                response.text().then(function(text) {
                     setLog(response.url, response.status, text)
                 })
             }
             return response.json()
         })
-		.catch(function (error) {
+        .catch(function(error) {
             todo(error)
             setLog(start, 'JSON', error)
             console.error(error)
         })
-		.then(function (json) {
+        .then(function(json) {
             if (json.statuses) {
                 if (json.statuses[0]) {
                     var id = json.statuses[0].id
@@ -677,6 +713,7 @@ function staEx(mode) {
         })
     return
 }
+
 function toggleAction(elm) {
     console.log(elm)
     const instance = M.Dropdown.init(elm)

app/js/post/suggest.js

@@ -9,55 +9,61 @@ var suggest
 
 input.addEventListener(
 	'focus',
-	function() {
+	function () {
 		localStorage.removeItem('cursor')
 		var acct_id = $('#post-acct-sel').val()
 		$('#suggest').html('')
+		$('#suggest').hide()
 		window.clearInterval(timer)
-		timer = window.setInterval(function() {
+		timer = window.setInterval(function () {
 			var new_val = input.value
 			if (new_val == '') {
 				$('#suggest').html('')
-				if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
+				$('#suggest').hide()
-					$('#right-side').hide()
-					$('#right-side').css('width', '300px')
-					$('#left-side').css('width', '100%')
-					var width = localStorage.getItem('postbox-width')
-					if (width) {
-						width = width.replace('px', '') * 1
-					} else {
-						width = 300
-					}
-					$('#post-box').css('width', width + 'px')
-				}
 				return
 			}
 			if (prev_val != new_val) {
-				var tag = new_val.match(/#(\S{3,})/)
+				const pos = input.selectionStart
-				var acct = new_val.match(/@(\S{3,})/)
+				let startI = pos - 1
-				if (tag && tag[1]) {
+				let hasDomain = false
-					var q = tag[1]
+				let hasDomainOnce = false
-				} else if (acct && acct[1]) {
+				for (startI = pos - 1; startI >= 0; startI--) {
-					var q = acct[1]
+					if (new_val[startI].match(/\./)) hasDomain = true
+					if (new_val[startI].match(/#|@|:/) && !hasDomain) break
+					if (new_val[startI].match(/@/) && hasDomainOnce) break
+					if (new_val[startI].match(/@/) && !hasDomainOnce) hasDomainOnce = true
+				}
+				const target = new_val.substr(startI, pos - startI)
+				var tag = target.match(/#(\S{3,})/g)
+				var acct = target.match(/@(\S{3,})(@(\S{3,}))?/g)
+				var emoji = target.match(/:(\S{1,})/g)
+				if (emoji && emoji[0]) {
+					const l = emoji[0]
+					const emojis = localStorage.getItem('emojis_raw_' + acct_id)
+					const json = emojis ? JSON.parse(emojis) : []
+					const reg = new RegExp(`${emoji[0]}`)
+					let listHtml = ''
+					for (const emoji of json) {
+						const { shortcode, url } = emoji
+						if (`:${shortcode}`.match(reg)) {
+							listHtml = listHtml + `${listHtml ? `<br>` : ``}<a onclick="tagInsert(':${shortcode}:','${l}')" class="pointer"><img src="${url}" width="15">:${shortcode}:</a>`
+						}
+					}
+					$('#suggest').html(listHtml)
+					$('#suggest').show()
+				} else if (tag && tag[0]) {
+					var q = tag[0]
+				} else if (acct && acct[0]) {
+					var q = acct[0]
 				} else {
 					$('#suggest').html('')
-					if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
+					$('#suggest').hide()
-						$('#right-side').hide()
-						$('#right-side').css('width', '300px')
-						$('#left-side').css('width', '100%')
-						var width = localStorage.getItem('postbox-width')
-						if (width) {
-							width = width.replace('px', '') * 1
-						} else {
-							width = 300
-						}
-						$('#post-box').css('width', width + 'px')
-					}
 					return
 				}
+				if (q) {
 					var domain = localStorage.getItem('domain_' + acct_id)
 					var at = localStorage.getItem('acct_' + acct_id + '_at')
-				suggest = 'https://' + domain + '/api/v2/search?q=' + q
+					suggest = 'https://' + domain + '/api/v2/search?q=' + encodeURIComponent(q)
 					if (suggest != oldSuggest) {
 						console.log('Try to get suggest at ' + suggest)
 						fetch(suggest, {
@@ -67,26 +73,26 @@ input.addEventListener(
 								Authorization: 'Bearer ' + at
 							}
 						})
-						.then(function(response) {
+							.then(function (response) {
 								if (!response.ok) {
-								response.text().then(function(text) {
+									response.text().then(function (text) {
 										setLog(response.url, response.status, text)
 									})
 								}
 								return response.json()
 							})
-						.catch(function(error) {
+							.catch(function (error) {
 								todo(error)
 								setLog(start, 'JSON', error)
 								console.error(error)
 							})
-						.then(function(json) {
+							.then(function (json) {
 								console.log(['Search', json])
 								//ハッシュタグ
 								if (json.hashtags[0] && tag) {
-								if (tag[1]) {
+									if (tag[0]) {
 										var tags = []
-									Object.keys(json.hashtags).forEach(function(key4) {
+										Object.keys(json.hashtags).forEach(function (key4) {
 											var tag = json.hashtags[key4]
 											var his = tag.history
 											var uses =
@@ -99,7 +105,7 @@ input.addEventListener(
 												his[6].uses * 1
 											tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
 												tag.name
-										)}','#${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
+											)}','${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
 
 											var item = {
 												uses: uses,
@@ -109,7 +115,7 @@ input.addEventListener(
 										})
 										var num_a = -1
 										var num_b = 1
-									tags = tags.sort(function(a, b) {
+										tags = tags.sort(function (a, b) {
 											var x = a['uses']
 											var y = b['uses']
 											if (x > y) return num_a
@@ -118,74 +124,47 @@ input.addEventListener(
 										})
 										var ins = ''
 										var nev = false
-									Object.keys(tags).forEach(function(key7) {
+										Object.keys(tags).forEach(function (key7) {
 											ins = ins + tags[key7].html
 											if (key7 <= 0 && !nev) {
-											ins = ins + '<br>'
+												//ins = ins + '<br>'
 												nev = true
 											}
 										})
 										$('#suggest').html(ins)
-									$('#right-side').show()
+										$('#suggest').show()
-									$('#right-side').css('width', '200px')
-									$('#left-side').css('width', 'calc(100% - 200px)')
-									var width = localStorage.getItem('postbox-width')
-									if (width) {
-										width = width.replace('px', '') * 1 + 200
-									} else {
-										width = 500
 									}
-									$('#post-box').css('width', width + 'px')
+								} else if (json.accounts[0] && acct[0]) {
-									$('#poll').addClass('hide')
-									$('#emoji').addClass('hide')
-									$('#draft').addClass('hide')
-								}
-							} else if (json.accounts[0] && acct[1]) {
 									var accts = ''
-								Object.keys(json.accounts).forEach(function(key3) {
+									Object.keys(json.accounts).forEach(function (key3) {
 										var acct = json.accounts[key3]
 										if (acct.acct != q) {
 											//Instance Actorって…
 											if (acct.username.indexOf('.') < 0) {
 												accts =
 													accts +
-												`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
+													`<a onclick="tagInsert('@${acct.acct}','${q}')" class="pointer">@${acct.acct}</a><br>`
 											}
 										}
 									})
-								$('#right-side').show()
-								$('#right-side').css('width', '200px')
-								$('#left-side').css('width', 'calc(100% - 200px)')
-								var width = localStorage.getItem('postbox-width')
-								if (width) {
-									width = width.replace('px', '') * 1 + 200
-								} else {
-									width = 500
-								}
-								$('#post-box').css('width', width + 'px')
 									$('#suggest').html(accts)
-								$('#poll').addClass('hide')
+									$('#suggest').show()
-								$('#emoji').addClass('hide')
-								$('#draft').addClass('hide')
 								} else {
-								if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
+
-									$('#right-side').hide()
-									$('#right-side').css('width', '300px')
-									$('#left-side').css('width', '100%')
-									var width = localStorage.getItem('postbox-width')
-									if (width) {
-										width = width.replace('px', '') * 1
-									} else {
-										width = 300
-									}
-									$('#post-box').css('width', width + 'px')
-								}
 								}
 							})
 					}
 				}
+			}
 			oldSuggest = suggest
-			prev_value = new_val
+			prev_val = new_val
+
+			const rectTextarea = document.querySelector('#textarea')
+			const rect = rectTextarea.getBoundingClientRect()
+			const caret = getCaretCoordinates(rectTextarea, rectTextarea.selectionEnd)
+			$('#suggest').css('top', `calc(${caret.top}px + 1rem)`)
+			const left = rect.width / 2 < caret.left ? rect.width / 2 : caret.left
+			$('#suggest').css('left', left)
 		}, 1000)
 	},
 	false
@@ -193,15 +172,20 @@ input.addEventListener(
 
 input.addEventListener(
 	'blur',
-	function() {
+	function () {
 		window.clearInterval(timer)
 		favTag()
 	},
 	false
 )
-function tagInsert(code, del) {
+function tagInsert(code, del, emoji) {
+	if (localStorage.getItem('emoji-zero-width') == 'yes' && emoji) {
+		var blankBefore = '​'
+		var blankAfter = '​'
+	} else {
 		var blankBefore = ' '
 		var blankAfter = ' '
+	}
 	var textarea = document.querySelector('#textarea')
 	var sentence = textarea.value
 	var len = sentence.length
@@ -217,10 +201,10 @@ function tagInsert(code, del) {
 	var after = sentence.substr(pos, len)
 	var start = after.substr(0, 1)
 	if (start == ' ') blankAfter = ''
-	if (len == 0) {
+	if (len === delLen) {
-		var word = code
+		var word = code + blankAfter
 	} else if (len == pos) {
-		var word = blankBefore + code
+		var word = blankBefore + code + blankAfter
 	} else if (pos == 0) {
 		var word = code + blankAfter
 	} else {
@@ -228,17 +212,9 @@ function tagInsert(code, del) {
 	}
 	sentence = before + word + after
 	textarea.value = sentence
-	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
-		$('#right-side').hide()
-		$('#right-side').css('width', '300px')
-		$('#left-side').css('width', '50%')
-		var width = localStorage.getItem('postbox-width').replace('px', '') * 1
-		if (!width) {
-			width = 300
-		}
-		$('#post-box').css('width', width + 'px')
-	}
 	$('#suggest').html('')
+	$('#suggest').hide()
+	$('#textarea').focus()
 }
 function cgNPs(q) {
 	suggest = 'https://cg.toot.app/api/v1/search/light?q=' + q
@@ -250,23 +226,23 @@ function cgNPs(q) {
 				'content-type': 'application/json'
 			}
 		})
-			.then(function(response) {
+			.then(function (response) {
 				if (!response.ok) {
-					response.text().then(function(text) {
+					response.text().then(function (text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function(error) {
+			.catch(function (error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(function (json) {
 				if (json[0]) {
 					var tags = ''
-					Object.keys(json).forEach(function(key4) {
+					Object.keys(json).forEach(function (key4) {
 						var tag = json[key4]
 						tags =
 							tags +

app/js/tl/card.js

@@ -17,7 +17,8 @@ function additional(acct_id, tlid) {
 		}
 
 		if (tagThis) {
-			$(this).attr('href', "javascript:tagShow('" + tagThis + "')")
+			$(this).attr('href', "#")
+			$(this).attr('onclick', "tagShow('" + tagThis + "', this)")
 			
 		}
 	})
@@ -334,7 +335,17 @@ function cardCheck(tlid) {
 	}
 }
 
-function mov(id, tlid, type, rand, target) {
+function mov(id, tlid, type, rand, target)
+{
+	mouseover=localStorage.getItem('mouseover')
+	switch (mouseover)
+	{
+		case 'yes': if (type=='mv') $(target).removeClass('hide-actions'); break;
+		case 'click': if (type=='cl') $(target).toggleClass('hide-actions'); break;
+		case 'no': break;
+	}
+}
+/*function mov(id, tlid, type, rand, target) {
 	const dropdownTrigger = `dropdown_${rand}`
 	let elm = document.querySelector(`#timeline_${tlid} #${dropdownTrigger}`)
 	if(tlid == 'notf') {
@@ -382,7 +393,7 @@ function mov(id, tlid, type, rand, target) {
 		//$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
 		//$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
 	}
-}
+}*/
 
 function resetmv(type) {
 	var mouseover = localStorage.getItem('mouseover')

app/js/tl/datails.js

@@ -637,34 +637,22 @@ function brws() {
 	postMessage(['openUrl', url], '*')
 }
 //外部からトゥート開く
-function detEx(url, acct_id) {
+async function detEx(url, acct_id) {
 	if (acct_id == 'main') {
 		acct_id = localStorage.getItem('main')
 	}
-	var domain = localStorage.getItem('domain_' + acct_id)
+	Swal.fire({
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
+		title: 'Loading...',
-	var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url)
+		html: lang.lang_details_fetch,
-	fetch(start, {
+		showConfirmButton: false,
-		method: 'GET',
+		showCloseButton: true,
-		headers: {
+		onBeforeOpen: () => {
-			'content-type': 'application/json',
+			Swal.showLoading()
-			Authorization: 'Bearer ' + at
+		},
-		}
+		onClose: () => { },
-	})
+	}).then((result) => { })
-		.then(function(response) {
+	const json = await detExCore(url, acct_id)
-			if (!response.ok) {
+	Swal.close()
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
 	if (!json.statuses) {
 		postMessage(['openUrl', url], '*')
 	} else {
@@ -673,6 +661,24 @@ function detEx(url, acct_id) {
 		$('.loadp').removeClass('loadp')
 		details(id, acct_id, 0)
 	}
-		})
 	return
 }
+async function detExCore(url, acct_id) {
+	const domain = localStorage.getItem('domain_' + acct_id)
+	const start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url)
+	const at = localStorage.getItem('acct_' + acct_id + '_at')
+	let promise = await fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
+		}
+	})
+
+	const json = await promise.json()
+	if (json) {
+		return json
+	} else {
+		return false
+	}
+}

app/js/tl/directory.js

@@ -1,58 +1,71 @@
 //ディレクトリ
 //ディレクトリトグル
 function dirMenu() {
-	$("#dir-contents").html("")
+    $('#dir-contents').html('')
-	directory()
+    directory('directory')
-	$("#left-menu a").removeClass("active")
+    $('#left-menu a').removeClass('active')
-	$("#dirMenu").addClass("active")
+    $('#dirMenu').addClass('active')
-	$(".menu-content").addClass("hide")
+    $('.menu-content').addClass('hide')
-	$("#dir-box").removeClass("hide")
+    $('#dir-box').removeClass('hide')
 }
+
 function dirselCk() {
-	var acct = $("#dir-acct-sel").val()
+    var acct = $('#dir-acct-sel').val()
-	if (acct == "noauth") {
+    if (acct == 'noauth') {
-		$("#dirNoAuth").removeClass("hide")
+        $('#dirNoAuth').removeClass('hide')
     } else {
-		$("#dirNoAuth").addClass("hide")
+        $('#dirNoAuth').addClass('hide')
-		directory()
+        directory('check')
     }
 }
-function directory(isMore) {
+
-	var order = $("[name=sort]:checked").val()
+function dirChange(mode) {
+    if (mode === 'directory') $('#directoryConfig').removeClass('hide')
+    if (mode === 'suggest') $('#directoryConfig').addClass('hide')
+    directory(mode)
+}
+
+function directory(modeRaw, isMore) {
+    const mode = modeRaw === 'check' ? $('[name=dirsug]:checked').val() : modeRaw
+    var order = $('[name=sort]:checked').val()
     if (!order) {
-		order = "active"
+        order = 'active'
     }
-	var local_only = $("#local_only:checked").val()
+    var local_only = $('#local_only:checked').val()
     if (local_only) {
-		local_only = "true"
+        local_only = 'true'
     } else {
-		local_only = "false"
+        local_only = 'false'
     }
-	var acct_id = $("#dir-acct-sel").val()
+    var acct_id = $('#dir-acct-sel').val()
-	if (acct_id == "noauth") {
+    if (acct_id == 'noauth') {
-		var domain = $("#dirNoAuth-url").val()
+        var domain = $('#dirNoAuth-url').val()
-		var at = ""
+        var at = ''
     } else {
-		var domain = localStorage.getItem("domain_" + acct_id)
+        var domain = localStorage.getItem('domain_' + acct_id)
-		var at = localStorage.getItem("acct_" + acct_id + "_at")
+        var at = localStorage.getItem('acct_' + acct_id + '_at')
     }
     if (isMore) {
-		var addOffset = $("#dir-contents .cvo").length
+        var addOffset = $('#dir-contents .cvo').length
+        $('#dir-contents').append(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
     } else {
         var addOffset = 0
-		$("#dir-contents").html("")
+        $('#dir-contents').html(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
     }
-	var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset
+    let start = `https://${domain}/api/v1/directory?order=${order}&local=${local_only}&offset=${addOffset}`
+    if (mode === 'suggest') start = `https://${domain}/api/v2/suggestions`
     console.log(start)
     fetch(start, {
-		method: "GET",
+            method: 'GET',
             headers: {
-			"content-type": "application/json",
+                'content-type': 'application/json',
-			Authorization: "Bearer " + at
+                Authorization: 'Bearer ' + at,
-		}
+            },
         })
         .then(function(response) {
+            $('#dir-contents .progress').remove()
             if (!response.ok) {
+                $('#dir-contents').html(`v2 follow suggestion is supported by Mastodon 3.4.0 or above.`)
                 response.text().then(function(text) {
                     setLog(response.url, response.status, text)
                 })
@@ -60,17 +73,24 @@ function directory(isMore) {
             return response.json()
         })
         .catch(function(error) {
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
             console.error(error)
         })
         .then(function(json) {
             if (json) {
-				$("#moreDir").removeClass("disabled")
+                $('#moreDir').removeClass('disabled')
-				var html = userparse(json, null, acct_id, "dir", null)
+                let obj = []
-				$("#dir-contents").append(html)
+                if (mode === 'suggest') {
-				jQuery("time.timeago").timeago()
+                    $('#moreDir').addClass('disabled')
+                    for (const suggest of json) obj.push(suggest.account)
                 } else {
-				$("#moreDir").addClass("disabled")
+                    obj = json
+                }
+                var html = userparse(obj, null, acct_id, 'dir', null)
+                $('#dir-contents').append(html)
+                jQuery('time.timeago').timeago()
+            } else {
+                $('#moreDir').addClass('disabled')
             }
         })
 }

app/js/tl/filter.js

@@ -42,6 +42,7 @@ function remoteOnly(tlid, type) {
     }
     columnReload(tlid, type)
 }
+
 function remoteOnlyCk(tlid) {
     var multi = localStorage.getItem('column')
     var obj = JSON.parse(multi)
@@ -125,6 +126,7 @@ function catchToggle(tlid) {
         parseColumn(tlid)
     }
 }
+
 function catchCheck(tlid) {
     var catchck = localStorage.getItem('catch_' + tlid)
     if (catchck) {
@@ -135,6 +137,7 @@ function catchCheck(tlid) {
         $('#sta-del-' + tlid).css('color', 'red')
     }
 }
+
 function delreset(tlid) {
     $('[tlid=' + tlid + '] .by_delcatch').hide()
     $('[tlid=' + tlid + '] .by_delcatch').remove()
@@ -146,6 +149,7 @@ function filterMenu() {
     $('.menu-content').addClass('hide')
     $('#filter-box').removeClass('hide')
 }
+
 function filter() {
     $('#filtered-words').html('')
     $('#filter-edit-id').val('')
@@ -160,23 +164,23 @@ function filter() {
                 Authorization: 'Bearer ' + at,
             },
         })
-		.then(function (response) {
+        .then(function(response) {
             if (!response.ok) {
-				response.text().then(function (text) {
+                response.text().then(function(text) {
                     setLog(response.url, response.status, text)
                 })
             }
             return response.json()
         })
-		.catch(function (error) {
+        .catch(function(error) {
             todo(error)
             setLog(start, 'JSON', error)
             console.error(error)
         })
-		.then(function (json) {
+        .then(function(json) {
             if (json) {
                 var filters = ''
-				Object.keys(json).forEach(function (key) {
+                Object.keys(json).forEach(function(key) {
                     var filterword = json[key]
                     var context = filterword.context.join(',')
                     filters =
@@ -199,11 +203,13 @@ function filter() {
             }
         })
 }
+
 function filterTime(day, hour, min) {
     $('#days_filter').val(day)
     $('#hours_filter').val(hour)
     $('#mins_filter').val(min)
 }
+
 function makeNewFilter() {
     var acct_id = $('#filter-acct-sel').val()
     var phr = $('#filter-add-word').val()
@@ -256,7 +262,7 @@ function makeNewFilter() {
             expires_in: time,
         })
     )
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -280,6 +286,7 @@ function makeNewFilter() {
         }
     }
 }
+
 function filterEdit(id, acct_id) {
     $('#filter-add-word').val('')
     $('#home_filter').prop('checked', false)
@@ -303,26 +310,26 @@ function filterEdit(id, acct_id) {
                 Authorization: 'Bearer ' + at,
             },
         })
-		.then(function (response) {
+        .then(function(response) {
             if (!response.ok) {
-				response.text().then(function (text) {
+                response.text().then(function(text) {
                     setLog(response.url, response.status, text)
                 })
             }
             return response.json()
         })
-		.catch(function (error) {
+        .catch(function(error) {
             todo(error)
             setLog(start, 'JSON', error)
             console.error(error)
         })
-		.then(function (json) {
+        .then(function(json) {
             if (json) {
                 var now = new Date()
                 now = now.getTime()
                 var now = Math.floor(now / 1000)
                 $('#filter-add-word').val(json.phrase)
-				Object.keys(json.context).forEach(function (key) {
+                Object.keys(json.context).forEach(function(key) {
                     var context = json.context[key]
                     $('[value=' + context + ']').prop('checked', true)
                 })
@@ -342,6 +349,7 @@ function filterEdit(id, acct_id) {
             }
         })
 }
+
 function filterDel(id, acct_id) {
     var domain = localStorage.getItem('domain_' + acct_id)
     var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -352,7 +360,7 @@ function filterDel(id, acct_id) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -363,6 +371,7 @@ function filterDel(id, acct_id) {
         }
     }
 }
+
 function getFilter(acct_id) {
     var domain = localStorage.getItem('domain_' + acct_id)
     var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -375,26 +384,27 @@ function getFilter(acct_id) {
                     Authorization: 'Bearer ' + at,
                 },
             })
-			.then(function (response) {
+            .then(function(response) {
                 if (!response.ok) {
-					response.text().then(function (text) {
+                    response.text().then(function(text) {
                         setLog(response.url, response.status, text)
                     })
                 }
                 return response.json()
             })
-			.catch(function (error) {
+            .catch(function(error) {
                 todo(error)
                 setLog(start, 'JSON', error)
                 console.error(error)
             })
-			.then(function (json) {
+            .then(function(json) {
                 localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
             })
     } else {
         localStorage.setItem('filter_' + acct_id, JSON.stringify({}))
     }
 }
+
 function getFilterType(json, type) {
     if (!json) {
         return []
@@ -407,7 +417,7 @@ function getFilterType(json, type) {
         type = 'notifi'
     }
     var mutedfilters = []
-	Object.keys(json).forEach(function (key) {
+    Object.keys(json).forEach(function(key) {
         var filterword = json[key]
         var phrases = filterword.phrase
         var arr = filterword.context
@@ -421,6 +431,7 @@ function getFilterType(json, type) {
     })
     return mutedfilters
 }
+
 function getFilterTypeByAcct(acct_id, type) {
     if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
         var mute = getFilterType(JSON.parse(localStorage.getItem('filter_' + acct_id)), type)
@@ -429,6 +440,7 @@ function getFilterTypeByAcct(acct_id, type) {
     }
     return mute
 }
+
 function filterUpdate(acct_id) {
     var domain = localStorage.getItem('domain_' + acct_id)
     var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -440,20 +452,20 @@ function filterUpdate(acct_id) {
                 Authorization: 'Bearer ' + at,
             },
         })
-		.then(function (response) {
+        .then(function(response) {
             if (!response.ok) {
-				response.text().then(function (text) {
+                response.text().then(function(text) {
                     setLog(response.url, response.status, text)
                 })
             }
             return response.json()
         })
-		.catch(function (error) {
+        .catch(function(error) {
             todo(error)
             setLog(start, 'JSON', error)
             console.error(error)
         })
-		.then(function (json) {
+        .then(function(json) {
             localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
             filterUpdateInternal(json, 'home')
             filterUpdateInternal(json, 'local')
@@ -461,6 +473,7 @@ function filterUpdate(acct_id) {
             filterUpdateInternal(json, 'pub')
         })
 }
+
 function filterUpdateInternal(json, type) {
     var home = getFilterType(json, type)
     var wordmute = localStorage.getItem('word_mute')
@@ -469,11 +482,11 @@ function filterUpdateInternal(json, type) {
         home = home.concat(wordmute)
     }
     if (home) {
-		$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function (i, elem) {
+        $('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function(i, elem) {
             var id = $(elem).attr('toot-id')
             $('[toot-id=' + id + ']').removeClass('hide')
             var text = $(elem).find('.toot').html()
-			Object.keys(home).forEach(function (key8) {
+            Object.keys(home).forEach(function(key8) {
                 var word = home[key8]
                 var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g')
                 if ($.strip_tags(text).match(regExp)) {
@@ -523,11 +536,11 @@ function exclude(key) {
         } else {
             excludetxt = '?exclude_types[]=poll'
         }
-	} else {
+    } else {}
-	}
     localStorage.setItem('exclude-' + key, excludetxt)
     parseColumn(key)
 }
+
 function excludeCk(key, target) {
     var exc = localStorage.getItem('exclude-' + key)
     if (!exc) {
@@ -539,6 +552,7 @@ function excludeCk(key, target) {
         return ''
     }
 }
+
 function checkNotfFilter(tlid) {
     var excludetxt = localStorage.getItem('exclude-' + tlid)
     if (!excludetxt || excludetxt != '') {
@@ -547,10 +561,12 @@ function checkNotfFilter(tlid) {
         return false
     }
 }
+
 function resetNotfFilter(tlid) {
     localStorage.setItem('exclude-' + tlid, '')
     parseColumn(tlid)
 }
+
 function notfFilter(id, tlid, acct_id) {
     var excludetxt = localStorage.getItem('exclude-' + tlid)
     if (excludetxt || excludetxt != '') {

app/js/tl/list.js

@@ -89,7 +89,7 @@ function list() {
 							</a>/
 							<a onclick="listUser('${list.id}','${acct_id}')" class="pointer">
 								${lang.lang_list_users}
-							'</a><br>`
+							</a><br>`
 					})
 					$('#lists').html(lists)
 				} else {

app/js/tl/misskeyparse.js

@@ -8,7 +8,7 @@ function escapeHTMLtemp(str) {
         .replace(/"/g, '"')
         .replace(/'/g, ''')
 }
-$.strip_tagstemp = function (str, allowed) {
+$.strip_tagstemp = function(str, allowed) {
         if (!str) {
             return ""
         }
@@ -16,11 +16,11 @@ $.strip_tagstemp = function (str, allowed) {
             .join('')
         var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
             commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
-	return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
+        return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
             return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
         })
-}
+    }
-//オブジェクトパーサー(トゥート)
+    //オブジェクトパーサー(トゥート)
 function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
     var templete = ''
     localStorage.setItem("lastunix_" + tlid, date(obj[0].createdAt, 'unix'))
@@ -158,7 +158,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
     }
     var local = []
     var times = []
-	Object.keys(obj).forEach(function (key) {
+    Object.keys(obj).forEach(function(key) {
         var toot = obj[key]
         var dis_name = toot.user.name
         if (dis_name) {
@@ -168,7 +168,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         }
         //絵文字があれば
         if (toot.user.emojis) {
-			Object.keys(toot.user.emojis).forEach(function (key5) {
+            Object.keys(toot.user.emojis).forEach(function(key5) {
                 var emoji = toot.user.emojis[key5]
                 var shortcode = emoji.name
                 var emoji_url = '<img draggable="false" src="' + emoji.url +
@@ -306,7 +306,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
                     var fullname = toot.user.username + "@" + domain
                 }
                 if (useremp) {
-					Object.keys(useremp).forEach(function (key10) {
+                    Object.keys(useremp).forEach(function(key10) {
                         var user = useremp[key10]
                         if (user == fullname) {
                             boostback = "emphasized"
@@ -343,14 +343,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
                 viashow = "via-hide"
             }
             //強調チェック
-			Object.keys(empCli).forEach(function (key6) {
+            Object.keys(empCli).forEach(function(key6) {
                     var empCliList = empCli[key6]
                     if (empCliList == via) {
                         boostback = "emphasized"
                     }
                 })
                 //ミュートチェック
-			Object.keys(muteCli).forEach(function (key7) {
+            Object.keys(muteCli).forEach(function(key7) {
                 var muteCliList = muteCli[key7]
                 if (muteCliList == via) {
                     boostback = "hide"
@@ -430,7 +430,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         }
         //絵文字があれば
         if (emojick) {
-			Object.keys(toot.emojis).forEach(function (key5) {
+            Object.keys(toot.emojis).forEach(function(key5) {
                 var emoji = toot.emojis[key5]
                 var shortcode = emoji.name
                 var emoji_url = '<img draggable="false" src="' + emoji.url +
@@ -471,7 +471,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         if (mediack) {
             hasmedia = "hasmedia"
             var cwdt = 100 / toot[useparam].length
-			Object.keys(toot[useparam]).forEach(function (key2) {
+            Object.keys(toot[useparam]).forEach(function(key2) {
                 var media = toot[useparam][key2]
                 var purl = media.url
                 media_ids = media_ids + media.id + ","
@@ -516,9 +516,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         var tags = ""
             //タグであれば
         if (tagck) {
-			Object.keys(toot.tags).forEach(function (key4) {
+            Object.keys(toot.tags).forEach(function(key4) {
                     var tag = toot.tags[key4]
-				var tags = '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '" data-regTag="'+tag.toLowerCase()+'">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
+                    var tags = '<a onclick="tagShow(\'' + tag + '\', this)" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '" data-regTag="' + tag.toLowerCase() + '">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
                         ',\'add\')" class="pointer parsed" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a>　' +
                         '<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag) + '">Pin</a></span> '
                     content = content.replace("#" + tag, tags)
@@ -578,7 +578,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         var avatar = toot.user.avatarUrl
             //ワードミュート
         if (wordmuteList) {
-			Object.keys(wordmuteList).forEach(function (key8) {
+            Object.keys(wordmuteList).forEach(function(key8) {
                 var worde = wordmuteList[key8]
                 if (worde) {
                     if (worde.tag) {
@@ -595,7 +595,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         }
         //ワード強調
         if (wordempList) {
-			Object.keys(wordempList).forEach(function (key9) {
+            Object.keys(wordempList).forEach(function(key9) {
                 var wordList = wordempList[key9]
                 if (wordList) {
                     var wordList = wordList.tag
@@ -625,7 +625,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         var poll = ""
         if (toot.poll) {
             var choices = toot.poll.choices
-			Object.keys(choices).forEach(function (keyc) {
+            Object.keys(choices).forEach(function(keyc) {
                 var choice = choices[keyc]
                 if (choice.isVoted) {
                     var myvote = twemoji.parse("✅")
@@ -649,18 +649,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         //Reactions
         var addReact = ""
         if (toot.reactions) {
-			Object.keys(toot.reactions).forEach(function (keye) {
+            Object.keys(toot.reactions).forEach(function(keye) {
                 var thisReact = toot.reactions[keye]
-				if (keye == "like") { var defaultEmoji = true }
+                if (keye == "like") { var defaultEmoji = true } else if (keye == "love") { var defaultEmoji = true } else if (keye == "laugh") { var defaultEmoji = true } else if (keye == "hmm") { var defaultEmoji = true } else if (keye == "surprise") { var defaultEmoji = true } else if (keye == "congrats") { var defaultEmoji = true } else if (keye == "angry") { var defaultEmoji = true } else if (keye == "confused") { var defaultEmoji = true } else if (keye == "star") { var defaultEmoji = true } else {
-				else if (keye == "love") { var defaultEmoji = true }
-				else if (keye == "laugh") { var defaultEmoji = true }
-				else if (keye == "hmm") { var defaultEmoji = true }
-				else if (keye == "surprise") { var defaultEmoji = true }
-				else if (keye == "congrats") { var defaultEmoji = true }
-				else if (keye == "angry") { var defaultEmoji = true }
-				else if (keye == "confused") { var defaultEmoji = true }
-				else if (keye == "star") { var defaultEmoji = true }
-				else {
                     var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id))
                     if (obj) {
                         var num = obj.length
@@ -743,8 +734,24 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
             }
             var fullhide = ""
         } else {
-			var like = 0; var love = 0; var laugh = 0; var hmm = 0; var surprise = 0; var congrats = 0; var angry = 0; var confused = 0; var pudding = 0
+            var like = 0;
-			var likehide = "hide"; var lovehide = "hide"; var laughhide = "hide"; var hmmhide = "hide"; var suphide = "hide"; var conghide = "hide"; var anghide = "hide"; var confhide = "hide"; var riphide = "hide"
+            var love = 0;
+            var laugh = 0;
+            var hmm = 0;
+            var surprise = 0;
+            var congrats = 0;
+            var angry = 0;
+            var confused = 0;
+            var pudding = 0
+            var likehide = "hide";
+            var lovehide = "hide";
+            var laughhide = "hide";
+            var hmmhide = "hide";
+            var suphide = "hide";
+            var conghide = "hide";
+            var anghide = "hide";
+            var confhide = "hide";
+            var riphide = "hide"
             var fullhide = "hide"
         }
         if (!addReact && likehide == "hide" && lovehide == "hide" && laughhide == "hide" && hmmhide == "hide" && suphide == "hide" && conghide == "hide" && anghide == "hide" && confhide == "hide" && riphide == "hide") {
@@ -765,10 +772,10 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         } else {
             var actemojick = false
         }
-		var rand = randomStr(8)
+        var rand = uuid()
         templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
             boostback + ' ' + fav_app + ' ' + rt_app + '  ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[
-				key].created_at, 'unix') + '" ' + if_notf + ' onmouseover="mov(\'' + toot.id + '\',\'' + tlid + '\',\'mv\', \''+rand+'\')" onclick="mov(\'' + toot.id + '\',\'' + tlid + '\',\'cl\', \''+rand+'\')" onmouseout="resetmv(\'mv\')" reacted="' + reacted + '">' +
+                key].created_at, 'unix') + '" ' + if_notf + ' onmouseover="mov(\'' + toot.id + '\',\'' + tlid + '\',\'mv\', \'' + rand + '\')" onclick="mov(\'' + toot.id + '\',\'' + tlid + '\',\'cl\', \'' + rand + '\')" onmouseout="resetmv(\'mv\')" reacted="' + reacted + '">' +
             '<div class="area-notice"><span class="gray sharesta">' + notice + home +
             '</span></div>' +
             '<div class="area-icon"><a onclick="udg(\'' + toot.user.id +
@@ -810,8 +817,8 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
             '</span></span><span class="' + riphide + ' reaction re-confused"><a onclick="reaction(\'confused\',\'' + toot.id + '\',' + acct_id +
             ',\'' + tlid + '\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">' + twemoji.parse("😇") + '</a><span class="re-confusedct">' + rip +
             '</span></span>' + addReact +
-			'<i class="material-icons pointer hide freeReact ' + freeReact + '" style="font-size:1.0rem; padding-left:5px;position: relative;top: 3px;" onclick="reactioncustom(\'' + acct_id + '\',\'' + id + '\')">add_box</i></div>'
+            '<i class="material-icons pointer hide freeReact ' + freeReact + '" style="font-size:1.0rem; padding-left:5px;position: relative;top: 3px;" onclick="reactioncustom(\'' + acct_id + '\',\'' + id + '\')">add_box</i></div>' +
-			+ poll + mentions + tags + '</div>' +
+            poll + mentions + tags + '</div>' +
             '<div class="area-vis"></div>' +
             '<div class="area-actions ' + mouseover + '">' +
             '<div class="action">' + vis + '</div>' +
@@ -835,8 +842,8 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
             ')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_del + '"><i class="fas fa-trash"></i></a></div>' +
             '<div class="' + if_mine + ' action pin ' + disp["pin"] + ' ' + noauth + '"><a onclick="pin(\'' + toot.id + '\',' +
             acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_pin + '"><i class="fas fa-map-pin pin_' + toot.id + '"></i></a></div>'
+            ')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_pin + '"><i class="fas fa-map-pin pin_' + toot.id + '"></i></a></div>' +
-			+ '<div class="' + if_mine + ' action ' + disp["red"] + ' ' + noauth + '"><a onclick="redraft(\'' + toot.id + '\',' +
+            '<div class="' + if_mine + ' action ' + disp["red"] + ' ' + noauth + '"><a onclick="redraft(\'' + toot.id + '\',' +
             acct_id +
             ')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_redraft + '"><i class="material-icons">redo</i></a></div>' + trans +
             '<span class="cbadge viabadge waves-effect ' + viashow + ' ' + mine_via + '" onclick="client(\'' + $.strip_tagstemp(via) + '\')" title="via ' + $.strip_tagstemp(via) + '">via ' +
@@ -863,7 +870,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
     }
     var templete = ''
     var datetype = localStorage.getItem("datetype")
-	Object.keys(obj).forEach(function (key) {
+    Object.keys(obj).forEach(function(key) {
         var toot = obj[key]
         if (toot.followee) {
             toot = toot.followee
@@ -947,6 +954,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
     })
     return templete
 }
+
 function goGoogle(id) {
     var val = $("#srcbox_" + id).val()
     var url = "https://google.com/search?q=" + val
@@ -954,6 +962,7 @@ function goGoogle(id) {
 }
 var misskeyws = []
 var misskeywsstate = []
+
 function connectMisskey(acct_id, re) {
     var domain = localStorage.getItem("domain_" + acct_id)
     var at = localStorage.getItem("acct_" + acct_id + "_at")
@@ -962,14 +971,14 @@ function connectMisskey(acct_id, re) {
     var wsid = misskeyws.length
     localStorage.setItem("misskey_wss_" + acct_id, wsid)
     misskeyws[wsid] = new WebSocket(start)
-	misskeyws[wsid].onopen = function (mess) {
+    misskeyws[wsid].onopen = function(mess) {
         console.table({ "tlid": tlid, "type": "Connect Streaming API", "domain": domain, "message": [mess] })
         misskeywsstate[wsid] = true
             //$("#notice_icon_" + tlid).removeClass("red-text");
         var send = '{"type":"connect","body":{"channel":"main","id":"notf:' + acct_id + '"}}'
         misskeyws[wsid].send(send)
     }
-	misskeyws[wsid].onmessage = function (mess) {
+    misskeyws[wsid].onmessage = function(mess) {
         console.log([domain + ":Receive Streaming API:", data])
         var data = JSON.parse(mess.data)
         var obj = data.body.body
@@ -1033,19 +1042,19 @@ function connectMisskey(acct_id, re) {
 
         }
     }
-	misskeyws[wsid].onerror = function (error) {
+    misskeyws[wsid].onerror = function(error) {
         console.error("Error closing " + tlid)
         console.error(error)
         misskeywsstate[wsid] = false
-		if(!re){
+        if (!re) {
             connectMisskey(acct_id, true)
         }
         return false
     }
-	misskeyws[wsid].onclose = function () {
+    misskeyws[wsid].onclose = function() {
         console.warn("Closing " + tlid)
         misskeywsstate[wsid] = false
-		if(!re){
+        if (!re) {
             connectMisskey(acct_id, true)
         }
         return false

app/js/tl/notification.js

@@ -7,6 +7,7 @@ function notf(acct_id, tlid, sys) {
         notfCommon(acct_id, tlid, sys)
     }
 }
+
 function notfColumn(acct_id, tlid, sys) {
     todo('Notifications Loading...')
     var native = localStorage.getItem('nativenotf')
@@ -22,7 +23,7 @@ function notfColumn(acct_id, tlid, sys) {
         httpreq.open('POST', start, true)
         httpreq.setRequestHeader('Content-Type', 'application/json')
         var body = JSON.stringify({
-			i: at
+            i: at,
         })
     } else {
         var misskey = false
@@ -44,6 +45,7 @@ function notfColumn(acct_id, tlid, sys) {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
+                $('#landing_' + tlid).append(`<div>${this.status}</div><div>${escapeHTML(this.response)}`)
                 setLog(start, this.status, this.response)
             }
             var max_id = httpreq.getResponseHeader('link')
@@ -64,7 +66,7 @@ function notfColumn(acct_id, tlid, sys) {
                         var os = localStorage.getItem('platform')
                         var options = {
                             body: ct + lang.lang_notf_new,
-							icon: localStorage.getItem('prof_' + acct_id)
+                            icon: localStorage.getItem('prof_' + acct_id),
                         }
                         var n = new Notification('TheDesk:' + domain, options)
                     }
@@ -88,7 +90,7 @@ function notfColumn(acct_id, tlid, sys) {
                 })
                 templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
                 $('#timeline_' + tlid).html(templete)
-				$('#landing_' + tlid).hide()
+                    // $('#landing_' + tlid).hide()
                 jQuery('time.timeago').timeago()
             }
             $('#notf-box').addClass('fetched')
@@ -116,6 +118,7 @@ function notfColumn(acct_id, tlid, sys) {
         var start = 'wss://' + domain + '/?i=' + at
     }
 }
+
 function notfCommon(acct_id, tlid, sys, stream) {
     todo('Notifications Loading...')
     var native = localStorage.getItem('nativenotf')
@@ -130,11 +133,11 @@ function notfCommon(acct_id, tlid, sys, stream) {
         var i = {
             method: 'POST',
             headers: {
-				'content-type': 'application/json'
+                'content-type': 'application/json',
             },
             body: JSON.stringify({
-				i: at
+                i: at,
-			})
+            }),
         }
     } else {
         var misskey = false
@@ -143,11 +146,11 @@ function notfCommon(acct_id, tlid, sys, stream) {
             method: 'GET',
             headers: {
                 'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+                Authorization: 'Bearer ' + at,
+            },
         }
     }
-	}
+    if (stream == 'only') {
-	if(stream == 'only') {
         notfWS(misskey, acct_id, tlid, domain, at)
         return false
     }
@@ -156,6 +159,8 @@ function notfCommon(acct_id, tlid, sys, stream) {
             console.log('header to get param:' + response.headers.get('link'))
             if (!response.ok) {
                 response.text().then(function(text) {
+                    console.log('notf error', 'div[data-notf=' + acct_id + '] .landing')
+                    $('div[data-notf=' + acct_id + '] .landing').append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
                     setLog(response.url, response.status, text)
                 })
             }
@@ -181,7 +186,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
                         var os = localStorage.getItem('platform')
                         var options = {
                             body: ct + lang.lang_notf_new,
-							icon: localStorage.getItem('prof_' + acct_id)
+                            icon: localStorage.getItem('prof_' + acct_id),
                         }
                         var n = new Notification('TheDesk:' + domain, options)
                     }
@@ -202,16 +207,17 @@ function notfCommon(acct_id, tlid, sys, stream) {
                     }
                 })
                 $('div[data-notf=' + acct_id + ']').html(templete)
-				$('#landing_' + tlid).hide()
+                    // $('#landing_' + tlid).hide()
                 jQuery('time.timeago').timeago()
             }
             $('#notf-box').addClass('fetched')
             todc()
-			if(stream != 'no') notfWS(misskey, acct_id, tlid, domain, at)
+            if (stream != 'no') notfWS(misskey, acct_id, tlid, domain, at)
         })
 }
+
 function notfWS(misskey, acct_id, tlid, domain, at) {
-	if(mastodonBaseWsStatus[domain] == 'available') return false
+    if (mastodonBaseWsStatus[domain] == 'available') return false
     if (!misskey) {
         if (localStorage.getItem('streaming_' + acct_id)) {
             var wss = localStorage.getItem('streaming_' + acct_id)
@@ -227,11 +233,12 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
                 acct_id: acct_id,
                 type: 'Connect Streaming API(Notf)',
                 domain: domain,
-				message: [mess]
+                message: [mess],
             })
             $('i[data-notf=' + acct_id + ']').removeClass('red-text')
         }
         websocketNotf[acct_id].onmessage = function(mess) {
+            $('#landing_' + tlid).hide()
                 //console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
             var popup = localStorage.getItem('popup')
             if (!popup) {
@@ -306,7 +313,7 @@ function notfmore(tlid) {
             httpreq.setRequestHeader('Content-Type', 'application/json')
             var body = JSON.stringify({
                 i: at,
-				untilID: sid
+                untilID: sid,
             })
         } else {
             var misskey = false
@@ -356,7 +363,7 @@ function notfmore(tlid) {
                     moreloading = false
                     templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
                     $('#timeline_' + tlid).append(templete)
-					$('#landing_' + tlid).hide()
+                        // $('#landing_' + tlid).hide()
                     jQuery('time.timeago').timeago()
                 }
                 $('#notf-box').addClass('fetched')
@@ -370,35 +377,30 @@ function notfmore(tlid) {
 function notfToggle(acct, tlid) {
     if ($('#notf-box_' + tlid).hasClass('column-hide')) {
         $('#notf-box_' + tlid).css('display', 'block')
-		$('#notf-box_' + tlid).animate(
+        $('#notf-box_' + tlid).animate({
-			{
+            height: '400px',
-				height: '400px'
+        }, {
-			},
-			{
             duration: 300,
             complete: function() {
                 $('#notf-box_' + tlid).css('overflow-y', 'scroll')
                 $('#notf-box_' + tlid).removeClass('column-hide')
-				}
+            },
-			}
+        })
-		)
     } else {
         $('#notf-box_' + tlid).css('overflow-y', 'hidden')
-		$('#notf-box_' + tlid).animate(
+        $('#notf-box_' + tlid).animate({
-			{
+            height: '0',
-				height: '0'
+        }, {
-			},
-			{
             duration: 300,
             complete: function() {
                 $('#notf-box_' + tlid).addClass('column-hide')
                 $('#notf-box_' + tlid).css('display', 'none')
-				}
+            },
-			}
+        })
-		)
     }
     notfCanceler(acct)
 }
+
 function notfCanceler(acct) {
     $('.notf-reply_' + acct).text(0)
     localStorage.removeItem('notf-reply_' + acct)
@@ -413,13 +415,16 @@ 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')
+    var id = $('#announce_' + acct + ' .announcement')
-	$('.notf-announ_' + acct + '_ct').text("")
+        .first()
+        .attr('data-id')
+    $('.notf-announ_' + acct + '_ct').text('')
     $(`.boxIn[data-acct=${acct}] .notice-box`).removeClass('has-notf')
-	if(id) {
+    if (id) {
         localStorage.setItem('announ_' + acct, id)
     }
 }
+
 function allNotfRead() {
     var multi = localStorage.getItem('multi')
     if (multi) {

app/js/tl/parse.js

@@ -3,8 +3,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
     var splitter = new GraphemeSplitter()
     var templete = ''
     if (obj[0]) {
-		if (tlid === 1) {
+        if (tlid === 1) {}
-		}
         localStorage.setItem('lastunix_' + tlid, date(obj[0].created_at, 'unix'))
     }
 
@@ -215,7 +214,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
         }
         //絵文字があれば
         if (actemojick) {
-			Object.keys(toot.account.emojis).forEach(function (key5) {
+            Object.keys(toot.account.emojis).forEach(function(key5) {
                 var emoji = toot.account.emojis[key5]
                 var shortcode = emoji.shortcode
                 if (gif == 'yes') {
@@ -278,7 +277,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 				</span>
 				<span class="voice">${date(toot.created_at, 'absolute')}(${lang.lang_parse_notftime})</span>
 				<i class="big-text fas ${icon}"></i>
-				<a onclick="udg('${toot.account.id}','${acct_id}')" class="pointer grey-text">
+				<a onclick="udg('${toot.account.id}','${acct_id}')" class="pointer grey-text notf-udg-text">
 					${dis_name}(@${toot.account.acct})
 				</a>`
             var notice = noticetext
@@ -343,8 +342,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
                 if (native == 'yes') {
                     var os = localStorage.getItem('platform')
                     var options = {
-						body:
+                        body: toot.account.display_name +
-							toot.account.display_name +
                             '(' +
                             toot.account.acct +
                             ')' +
@@ -372,7 +370,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
             }
             //絵文字があれば
             if (actemojick) {
-				Object.keys(toot.account.emojis).forEach(function (key5) {
+                Object.keys(toot.account.emojis).forEach(function(key5) {
                     var emoji = toot.account.emojis[key5]
                     var shortcode = emoji.shortcode
                     if (gif == 'yes') {
@@ -429,7 +427,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
                 }
                 //絵文字があれば
                 if (actemojick) {
-					Object.keys(toot.account.emojis).forEach(function (key5) {
+                    Object.keys(toot.account.emojis).forEach(function(key5) {
                         var emoji = toot.account.emojis[key5]
                         var shortcode = emoji.shortcode
                         if (gif == 'yes') {
@@ -457,7 +455,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
                     var fullname = toot.account.acct + '@' + domain
                 }
                 if (useremp) {
-					Object.keys(useremp).forEach(function (key10) {
+                    Object.keys(useremp).forEach(function(key10) {
                         var user = useremp[key10]
                         if (user == fullname) {
                             boostback = 'emphasized'
@@ -497,7 +495,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
                 var via = escapeHTML(toot.application.name)
                 if (empCli) {
                     //強調チェック
-					Object.keys(empCli).forEach(function (key6) {
+                    Object.keys(empCli).forEach(function(key6) {
                         var empCliList = empCli[key6]
                         if (empCliList == via) {
                             boostback = 'emphasized'
@@ -506,7 +504,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
                 }
                 if (muteCli) {
                     //ミュートチェック
-					Object.keys(muteCli).forEach(function (key7) {
+                    Object.keys(muteCli).forEach(function(key7) {
                         var muteCliList = muteCli[key7]
                         if (muteCliList == via) {
                             boostback = 'hide'
@@ -600,7 +598,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
             if (mediack) {
                 hasmedia = 'hasmedia'
                 var cwdt = 100 / toot.media_attachments.length
-				Object.keys(toot.media_attachments).forEach(function (key2) {
+                Object.keys(toot.media_attachments).forEach(function(key2) {
                             var media = toot.media_attachments[key2]
                             var purl = media.preview_url
                             media_ids = media_ids + media.id + ','
@@ -622,7 +620,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
                             if (media.pleroma && media.pleroma.mime_type.indexOf('video') !== -1) {
                                 viewer =
                                     viewer +
-							`<a onclick="imgv('${id}','${key2}','${acct_id}')" id="${id}'-image-${key2}" 
+                                    `<a onclick="imgv('${id}','${key2}','${acct_id}')" id="${id}-image-${key2}" 
 								data-url="${url}" data-type="video" class="img-parsed">
 									<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true" alt="attached media">
 							</a></span>`
@@ -631,7 +629,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
                                     var mty = media.remote_url.match(/.+(\..+)$/)[1]
                                     viewer =
                                         viewer +
-								`<a href="${media.url ? media.url : media.remote_url}" title="${media.remote_url} from ${media.url}">[${lang.lang_parse_unknown}(${mty})]</a> `
+                                        `<a href="${media.url ? media.url : media.remote_url}" title="${media.url ? media.url : media.remote_url}">[${lang.lang_parse_unknown}(${mty})]</a>${media.url ? `<a href="${media.remote_url}"><i class="material-icons sublink" title="${media.remote_url}">open_in_new</i></a>` : ''} `
 						} else if (media.type == 'audio') {
 							viewer =
 								viewer +
@@ -703,31 +701,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 							${lang.lang_parse_thread}
 						</a></div>`
 			}
-			var tagck = toot.tags[0]
-			var tags = ''
-			//タグであれば
-			if (tagck) {
-				Object.keys(toot.tags).forEach(function (key4) {
-					var tag = toot.tags[key4]
-					var featured = `　<a onclick="tagFeature('${tag.name}','${acct_id}')" class="pointer" title="add it to Featured tags">Feature</a>　`
-					tags =
-						tags +
-						`<span class="hide" data-tag="${tag.name}" data-regTag="${tag.name.toLowerCase()}">#${tag.name
-						}:
-							<a onclick="tl('tag','${tag.name}','${acct_id}','add')" class="pointer"
-							 title="${lang.lang_parse_tagTL.replace(
-							'{{tag}}',
-							'#' + tag.name
-						)}">TL</a>　<a onclick="brInsert('#${tag.name}')" 
-							 class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag.name)}">Toot</a>　
-						<a onclick="tagPin('${tag.name}')" class="pointer" title="${lang.lang_parse_tagpin.replace(
-							'{{tag}}',
-							'#' + tag.name
-						)}
-						">Pin</a>${featured}</span> `
-				})
-				tags = '<div style="float:right" aria-hidden="true">' + tags + '</div>'
-			}
 			//リプ数
 			if (toot.replies_count || toot.replies_count === 0) {
 				var replyct = toot.replies_count
@@ -904,7 +877,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 			//日本語じゃない
 			if (toot.language != lang.language && toot.language) {
 				var trans = `<li onclick="trans('${toot.language}','${lang.language}', $(this))" 
-							 style="padding:0">
+							 style="padding:0; padding-top: 5px;">
 								<i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
 					</li>`
 			} else {
@@ -1021,7 +994,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 				menuct++
 			}
 			//このトゥート内のアクションを完了させるために、適当にIDを振る
-			var rand = randomStr(8)
+			var rand = makeCID()
 			//プラグイン機構
 			var pluginBOT = plugins.buttonOnToot
 			var pluginHtml = ''
@@ -1077,7 +1050,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 				</div>
 				<div class="area-additional grid">
 					<span class="additional">${analyze}</span>
-					${mentions}${tags}
+					${mentions}
 				</div>
 				<div class="area-vis grid">${vis}</div>
 				<div class="area-actions grid">
@@ -1157,23 +1130,23 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 					</li>
 					<div>
 					<li onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
-						class="bkm-btn bkmStr_${uniqueid}" style="padding:0">
+						class="bkm-btn bkmStr_${uniqueid}" style="padding:0; padding-top: 5px;">
 						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>${bkmStr}
 					</li>
 					<li class="${if_mine}" onclick="del('${uniqueid}','${acct_id}')"
-							style="padding:0">
+							style="padding:0; padding-top: 5px;">
 							<i class="fas fa-trash"></i>${lang.lang_parse_del}
 					</li>
-					<li class="${if_mine}" onclick="pin('${uniqueid}','${acct_id}')" style="padding:0" class="pinStr_${uniqueid}">
+					<li class="${if_mine}" onclick="pin('${uniqueid}','${acct_id}')" style="padding:0; padding-top: 5px;" class="pinStr_${uniqueid}">
 							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>${pinStr}
 					</li>
 					<li class="${if_mine}"  onclick="redraft('${uniqueid}','${acct_id}')"
-							style="padding:0">
+							style="padding:0; padding-top: 5px;">
 							<i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
 					</li>
 					${trans}
 					<li onclick="postMessage(['openUrl', '${toot.url}'], '*')"
-						 style="padding:0">
+						 style="padding:0; padding-top: 5px;">
 						<i class="fas text-darken-3 fa-globe"></i>${lang.lang_parse_link}
 					</li>
 					${pluginHtml}
@@ -1342,7 +1315,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 								class="sml gray"
 								style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"
 							>
-								@ ${toot.acct}${locked}</span>
+								@${toot.acct}${locked}</span>
 						</div>
 					</div>
 					<div class="area-status">
@@ -1425,7 +1398,7 @@ function client(name) {
 }
 //Poll Parser
 function pollParse(poll, acct_id, emojis) {
-	var rand = randomStr(8)
+	var rand = uuid()
 	var datetype = localStorage.getItem('datetype')
 	var anime = localStorage.getItem('animation')
 	if (anime == 'yes' || !anime) {
@@ -1577,6 +1550,7 @@ function mastodonBaseStreaming(acct_id) {
 		$('.notice_icon_acct_' + acct_id).removeClass('red-text')
 	}
 	mastodonBaseWs[domain].onmessage = function (mess) {
+		$(`div[data-acct=${acct_id}] .landing`).hide()
 		const typeA = JSON.parse(mess.data).event
 		if (typeA == 'delete') {
 			$(`[unique-id=${JSON.parse(mess.data).payload}]`).hide()

app/js/tl/src.js

@@ -13,7 +13,21 @@ function searchMenu() {
 //検索取得
 function src(mode, offset) {
 	if (!offset) {
-		$('#src-contents').html('')
+		$('#src-contents').html(`
+		<div class="preloader-wrapper small active" style="margin-left: calc(50% - 36px);">
+			<div class="spinner-layer spinner-blue-only">
+				<div class="circle-clipper left">
+					<div class="circle"></div>
+				</div>
+				<div class="gap-patch">
+					<div class="circle"></div>
+				</div>
+				<div class="circle-clipper right">
+					<div class="circle"></div>
+				</div>
+			</div>
+		</div>
+		`)
 		var add = ''
 	} else {
 		var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
@@ -48,24 +62,27 @@ function src(mode, offset) {
 			Authorization: 'Bearer ' + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
+			if (!offset) {
+				$('#src-contents').html(``)
+			}
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			src('v1')
 			return false
 		})
-		.then(function(json) {
+		.then(function (json) {
 			console.log(['Search', json])
 			//ハッシュタグ
 			if (json.hashtags[0]) {
 				var tags = ''
-				Object.keys(json.hashtags).forEach(function(key4) {
+				Object.keys(json.hashtags).forEach(function (key4) {
 					var tag = json.hashtags[key4]
 					if (mode) {
 						tags =
@@ -116,7 +133,7 @@ function tsAdd(q) {
 	parseColumn('add')
 }
 function tootsearch(tlid, q) {
-	if(!q || q=='undefined') {
+	if (!q || q == 'undefined') {
 		return false
 	}
 	var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
@@ -129,20 +146,20 @@ function tootsearch(tlid, q) {
 			'content-type': 'application/json'
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(raw) {
+		.then(function (raw) {
 			var templete = ''
 			var json = raw.hits.hits
 			var max_id = raw['hits'].length
@@ -180,20 +197,20 @@ function moreTs(tlid, q) {
 			'content-type': 'application/json'
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(raw) {
+		.then(function (raw) {
 			var templete = ''
 			var json = raw.hits.hits
 			var max_id = raw['hits'].length
@@ -290,21 +307,21 @@ function trend() {
 			Authorization: 'Bearer ' + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			var tags = ''
-			Object.keys(json).forEach(function(keye) {
+			Object.keys(json).forEach(function (keye) {
 				var tag = json[keye]
 				var his = tag.history
 				tags = graphDrawCore(his, tag, acct_id)
@@ -314,47 +331,31 @@ 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()
+	var q = $('.srcQ').text()
-	if(type == 'web') {
+	if (type == 'web') {
 		var start = localStorage.getItem('srcUrl')
-		if(!start) {
+		if (!start) {
 			start = 'https://google.com/search?q={q}'
 		}
 		start = start.replace(/{q}/, q)
 		postMessage(["openUrl", start], "*")
-	} else if(type == 'ts') {
+	} else if (type == 'ts') {
 		tsAdd(q)
+	} else if (type == 'copy') {
+		execCopy(q)
+	} else if (type == 'toot') {
+		brInsert(q)
 	}
 }

app/js/tl/tag.js

@@ -9,9 +9,47 @@ if (location.search) {
 	}
 }
 //よく使うタグ
-function tagShow(tag) {
+function tagShow(tag, elm) {
-	console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']')
+	tag = decodeURIComponent(tag)
-	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
+	const tagTL = lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)
+	const tagPin = lang.lang_parse_tagpin.replace('{{tag}}', '#' + tag)
+	const tagToot = lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)
+	$('#tagCMTL').text(tagTL)
+	$('#tagCMPin').text(tagPin)
+	$('#tagCMToot').text(tagToot)
+	const acct_id = $(elm).parents('.tl').attr('data-acct')
+	const rect = elm.getBoundingClientRect()
+	$('#tagContextMenu').css('top', `calc(${rect.top}px + 1rem)`)
+	$('#tagContextMenu').css('left', `${rect.left}px`)
+	$('#tagContextMenu').attr('data-tag', tag)
+	$('#tagContextMenu').attr('data-acct', acct_id)
+	$('#tagContextMenu').removeClass('hide')
+	setTimeout(() => tShowBox('open'), 500)
+}
+function tShowBox(mode) {
+	if (mode == 'open') {
+		$('#tagContextMenu').removeClass('hide')
+	} else if (mode == 'close') {
+		if (!$('#tagContextMenu').hasClass('hide')) $('#tagContextMenu').addClass('hide')
+		$('#tagContextMenu').removeClass('keep')
+	} else {
+		$('#tagContextMenu').toggleClass('hide')
+	}
+}
+function doTShowBox(type) {
+	$('#tagContextMenu').addClass('hide')
+	$('#tagContextMenu').removeClass('keep')
+	const q = $('#tagContextMenu').attr('data-tag')
+	const acct_id = $('#tagContextMenu').attr('data-acct')
+	if (type == 'tl') {
+		tl('tag', q, acct_id, 'add')
+	} else if (type == 'toot') {
+		brInsert(`#${q}`)
+	} else if (type == 'pin') {
+		tagPin(q)
+	} else if (type == 'f') {
+		tagFeature(q, acct_id)
+	}
 }
 //タグ追加
 function tagPin(tag) {
@@ -22,7 +60,7 @@ function tagPin(tag) {
 		var obj = JSON.parse(tags)
 	}
 	var can
-	Object.keys(obj).forEach(function(key) {
+	Object.keys(obj).forEach(function (key) {
 		var tagT = obj[key]
 		if (tagT == tag) {
 			can = true
@@ -56,7 +94,7 @@ function favTag() {
 	}
 	var tags = ''
 	var nowPT = localStorage.getItem('stable')
-	Object.keys(obj).forEach(function(key) {
+	Object.keys(obj).forEach(function (key) {
 		var tag = obj[key]
 		if (nowPT != tag) {
 			console.log('stable tags:' + nowPT + '/' + tag)
@@ -69,28 +107,31 @@ function favTag() {
 		tag = escapeHTML(tag)
 		tags =
 			tags +
-			`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
+			`<a onclick="tagShowHorizon('${tag}')" class="pointer">#${tag}</a>
 			${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 			<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}">
 				TL
-			</a>　
+			</a>
 			<a onclick="brInsert('#${tag}')" class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
 				Toot
-			</a>　
+			</a>
 			<a onclick="autoToot('${tag}');" class="pointer" title="${lang.lang_tags_always}${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
 				${ptt}
-			</a>　
+			</a>
 			<a onclick="tagRemove('${key}')" class="pointer" title="${lang.lang_tags_tagunpin.replace('{{tag}}', '#' + tag)}">
 				${lang.lang_del}
 			</a>
 			</span> `
 	})
 	if (obj.length > 0) {
-		$('#taglist').append('My Tags:' + tags)
+		$('#taglist').append('My Tags: ' + tags)
 	} else {
 		$('#taglist').append('')
 	}
 }
+function tagShowHorizon(tag) {
+	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
+}
 function trendTag() {
 	$('.trendtag').remove()
 	var domain = 'imastodon.net'
@@ -103,28 +144,28 @@ function trendTag() {
 			Authorization: 'Bearer ' + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json) {
 				var tags = ''
 				json = json.score
-				Object.keys(json).forEach(function(tag) {
+				Object.keys(json).forEach(function (tag) {
 					tag = escapeHTML(tag)
 					tags =
 						tags +
-						`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
+						`<a onclick="tagShow('${tag}', this)" class="pointer">#${tag}</a>
 						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 						<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
 						<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">
@@ -182,18 +223,18 @@ function tagFeature(name, acct_id) {
 			name: name
 		})
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			return false
 		})
-		.then(function(json) {
+		.then(function (json) {
 			console.log(json)
 			M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
 		})
@@ -202,7 +243,7 @@ function tagFeature(name, acct_id) {
 function addTag(id) {
 	var columns = JSON.parse(localStorage.getItem('column'))
 	var column = columns[id]
-	if(!column.data.name) {
+	if (!column.data.name) {
 		var name = column.data
 	} else {
 		var name = column.data.name
@@ -219,7 +260,7 @@ function addTag(id) {
 	o[id] = obj
 	var json = JSON.stringify(o)
 	console.log(json)
-	localStorage.setItem('column',json)
+	localStorage.setItem('column', json)
 	columnReload(id, 'tag')
 }
 

app/js/tl/tl.js

@@ -1,6 +1,7 @@
 //TL取得
 moreloading = false
 var errorct = 0
+
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
     scrollevent()
     $('#unread_' + tlid + ' .material-icons').removeClass('teal-text')
@@ -179,20 +180,22 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 
     console.log(['Try to get timeline of ' + tlid, start])
     fetch(start, i)
-		.then(function (response) {
+        .then(function(response) {
             if (!response.ok) {
-				response.text().then(function (text) {
+                response.text().then(function(text) {
+                    $('#landing_' + tlid).append(`<div>${response.status}</div><div>${$.strip_tags(text)}`)
                     setLog(response.url, response.status, text)
                 })
             }
             return response.json()
         })
-		.catch(function (error) {
+        .catch(function(error) {
             todo(error)
             setLog(start, 'JSON', error)
             console.error(error)
         })
-		.then(function (json) {
+        .then(function(json) {
+            if (!json) return true
             console.log(['Result of getting timeline of ' + tlid, json])
             $('#landing_' + tlid).hide()
             var mute = getFilterTypeByAcct(acct_id, type)
@@ -240,7 +243,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
             '","id":"' +
             tlid +
             '"}}'
-		var mskyset = setInterval(function () {
+        var mskyset = setInterval(function() {
             if (misskeywsstate[key]) {
                 misskeyws[key].send(send)
                 clearInterval(mskyset)
@@ -251,7 +254,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
         if (mastodonBaseWsStatus[domain] == 'cannotuse') {
             oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode)
         } else if (mastodonBaseWsStatus[domain] == 'undetected' || mastodonBaseWsStatus[domain] == 'connecting') {
-			const mbws = setInterval(function () {
+            const mbws = setInterval(function() {
                 if (mastodonBaseWsStatus[domain] == 'cannotuse') {
                     oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode)
                     clearInterval(mbws)
@@ -267,18 +270,15 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
         }
     }
 }
+
 function stremaingSubscribe(type, acct_id, data, unsubscribe) {
     let command = 'subscribe'
     if (unsubscribe) command = 'unsubscribe'
     let stream
     const domain = localStorage.getItem('domain_' + acct_id)
-	if(type == 'home') return false
+    if (type == 'home') return false
-	if (type === 'local' || type === 'mix') { stream = 'public:local' }
+    if (type === 'local' || type === 'mix') { stream = 'public:local' } else if (type === 'local-media') { stream = 'public:local:media' } else if (type === 'pub') { stream = 'public' } else if (type === 'pub-media') { stream = 'public:media' } else if (type === 'list') {
-	else if (type === 'local-media') { stream = 'public:local:media' }
+        mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: 'list', list: data }))
-	else if (type === 'pub') { stream = 'public' }
-	else if (type === 'pub-media') { stream = 'public:media' }
-	else if (type === 'list') {
-		mastodonBaseWs[domain].send(JSON.stringify({type: command, stream: 'list', list: data}))
         return true
     } else if (type === 'tag') {
         let arr = []
@@ -288,12 +288,13 @@ function stremaingSubscribe(type, acct_id, data, unsubscribe) {
         if (data.any) arr = arr.concat(data.any.split(','))
         if (data.all) arr = arr.concat(data.all.split(','))
         for (const tag of arr) {
-			mastodonBaseWs[domain].send(JSON.stringify({type: command, stream: 'hashtag', tag: tag}))
+            mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: 'hashtag', tag: tag }))
         }
         return true
     }
-	mastodonBaseWs[domain].send(JSON.stringify({type: command, stream: stream}))
+    mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: stream }))
 }
+
 function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
     var misskey = false
     const domain = localStorage.getItem(`domain_${acct_id}`)
@@ -315,7 +316,8 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
         var add = ''
         if (remoteOnlyCk(tlid)) {
             add = '&remote=true'
-		} var start =
+        }
+        var start =
             wss + '/api/v1/streaming/?stream=public:media&access_token=' + at + add
     } else if (type == 'local') {
         var start =
@@ -354,7 +356,7 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
     var wsid = websocket.length
     localStorage.setItem('wss_' + tlid, wsid)
     websocket[wsid] = new WebSocket(start)
-	websocket[wsid].onopen = function (mess) {
+    websocket[wsid].onopen = function(mess) {
         console.table({
             tlid: tlid,
             type: 'Connect Streaming API' + type,
@@ -364,7 +366,7 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
         errorct = 0
         $('#notice_icon_' + tlid).removeClass('red-text')
     }
-	websocket[wsid].onmessage = function (mess) {
+    websocket[wsid].onmessage = function(mess) {
         console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)])
         if (misskey) {
             if (JSON.parse(mess.data).type == 'note') {
@@ -413,9 +415,7 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
                     $('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
                 }
             } else if (typeA == 'update' || typeA == 'conversation') {
-				if (
+                if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
-					!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')
-				) {
                     //markers show中はダメ
                     var obj = JSON.parse(JSON.parse(mess.data).payload)
                     if (
@@ -454,7 +454,7 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
             }
         }
     }
-	websocket[wsid].onerror = function (error) {
+    websocket[wsid].onerror = function(error) {
         console.error('Error closing')
         console.error(error)
         if (mode == 'error') {
@@ -469,7 +469,7 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
         }
         return false
     }
-	websocket[wsid].onclose = function () {
+    websocket[wsid].onclose = function() {
         console.warn('Closing ' + tlid)
         if (mode == 'error') {
             $('#notice_icon_' + tlid).addClass('red-text')
@@ -602,20 +602,20 @@ function moreload(type, tlid) {
             }
         }
         fetch(start, i)
-			.then(function (response) {
+            .then(function(response) {
                 if (!response.ok) {
-					response.text().then(function (text) {
+                    response.text().then(function(text) {
                         setLog(response.url, response.status, text)
                     })
                 }
                 return response.json()
             })
-			.catch(function (error) {
+            .catch(function(error) {
                 todo(error)
                 setLog(start, 'JSON', error)
                 console.error(error)
             })
-			.then(function (json) {
+            .then(function(json) {
                 var mute = getFilterTypeByAcct(acct_id, type)
                 if (misskey) {
                     var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -736,20 +736,20 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
         }
 
         fetch(start, i)
-			.then(function (response) {
+            .then(function(response) {
                 if (!response.ok) {
-					response.text().then(function (text) {
+                    response.text().then(function(text) {
                         setLog(response.url, response.status, text)
                     })
                 }
                 return response.json()
             })
-			.catch(function (error) {
+            .catch(function(error) {
                 todo(error)
                 setLog(start, 'JSON', error)
                 console.error(error)
             })
-			.then(function (json) {
+            .then(function(json) {
                 console.log(['Result diff of TL' + tlid, json])
                 if (misskey) {
                     var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -771,7 +771,7 @@ function reloadTL(type, data, acct_id, key, delc, voice) {
 
 //WebSocket切断
 function tlCloser() {
-	Object.keys(websocket).forEach(function (tlid) {
+    Object.keys(websocket).forEach(function(tlid) {
         if (websocketOld[tlid]) {
             websocketOld[tlid].close()
             console.log('%c Close Streaming API: Old' + tlid, 'color:blue')
@@ -783,14 +783,14 @@ function tlCloser() {
         }
     })
     websocket = []
-	Object.keys(wsHome).forEach(function (tlid) {
+    Object.keys(wsHome).forEach(function(tlid) {
         if (wsHome[tlid]) {
             wsHome[tlid].close()
             console.log('%c Close Streaming API:Integrated Home' + tlid, 'color:blue')
         }
     })
     wsHome = []
-	Object.keys(wsLocal).forEach(function (tlid) {
+    Object.keys(wsLocal).forEach(function(tlid) {
         if (wsLocal[tlid]) {
             wsLocal[tlid].close()
             console.log(
@@ -800,13 +800,13 @@ function tlCloser() {
         }
     })
     wsLocal = []
-	Object.keys(websocketNotf).forEach(function (tlid) {
+    Object.keys(websocketNotf).forEach(function(tlid) {
         if (websocketNotf[tlid]) {
             websocketNotf[tlid].close()
             console.log('%c Close Streaming API:Notf' + tlid, 'color:blue')
         }
     })
-	Object.keys(misskeyws).forEach(function (tlid) {
+    Object.keys(misskeyws).forEach(function(tlid) {
         if (misskeyws[tlid]) {
             misskeyws[tlid].close()
             console.log('%c Close Streaming API:Misskey' + tlid, 'color:blue')
@@ -967,6 +967,7 @@ function typePs(type) {
         return 'userList'
     }
 }
+
 function misskeycom(type, data) {
     if (type == 'home') {
         return 'timeline'
@@ -1022,6 +1023,7 @@ function icon(type) {
     }
     return response
 }
+
 function reconnector(tlid, type, acct_id, data, mode) {
     console.log('%c Reconnector:' + mode + '(timeline' + tlid + ')', 'color:pink')
     if (type == 'mix' || type == 'integrated' || type == 'plus') {
@@ -1051,6 +1053,7 @@ function reconnector(tlid, type, acct_id, data, mode) {
     }
     M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
 }
+
 function columnReload(tlid, type) {
     $('#notice_icon_' + tlid).addClass('red-text')
     $('#unread_' + tlid + ' .material-icons').removeClass('teal-text')
@@ -1105,15 +1108,15 @@ function getMarker(tlid, type, acct_id) {
                 Authorization: 'Bearer ' + at,
             },
         })
-		.then(function (response) {
+        .then(function(response) {
             if (!response.ok) {
-				response.text().then(function (text) {
+                response.text().then(function(text) {
                     setLog(response.url, response.status, text)
                 })
             }
             return response.json()
         })
-		.catch(function (error) {
+        .catch(function(error) {
             $('#unread_' + tlid).attr(
                 'title',
                 lang.lang_layout_unread + ':' + lang.lang_nothing
@@ -1121,7 +1124,7 @@ function getMarker(tlid, type, acct_id) {
             $('#unread_' + tlid).attr('data-id', '')
             return false
         })
-		.then(function (json) {
+        .then(function(json) {
             if (json) {
                 if (json[add]) {
                     json = json[add]
@@ -1150,6 +1153,7 @@ function getMarker(tlid, type, acct_id) {
             }
         })
 }
+
 function showUnread(tlid, type, acct_id) {
     if ($('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
         goTop(tlid)
@@ -1172,20 +1176,20 @@ function showUnread(tlid, type, acct_id) {
                 Authorization: 'Bearer ' + at,
             },
         })
-		.then(function (response) {
+        .then(function(response) {
             if (!response.ok) {
-				response.text().then(function (text) {
+                response.text().then(function(text) {
                     setLog(response.url, response.status, text)
                 })
             }
             return response.json()
         })
-		.catch(function (error) {
+        .catch(function(error) {
             todo(error)
             setLog(start, 'JSON', error)
             console.error(error)
         })
-		.then(function (json) {
+        .then(function(json) {
             if (!json || !json.length) {
                 columnReload(tlid, type)
             }
@@ -1203,6 +1207,7 @@ function showUnread(tlid, type, acct_id) {
         })
 }
 var ueloadlock = false
+
 function ueload(tlid) {
     if (ueloadlock) {
         return false
@@ -1228,20 +1233,20 @@ function ueload(tlid) {
                 Authorization: 'Bearer ' + at,
             },
         })
-		.then(function (response) {
+        .then(function(response) {
             if (!response.ok) {
-				response.text().then(function (text) {
+                response.text().then(function(text) {
                     setLog(response.url, response.status, text)
                 })
             }
             return response.json()
         })
-		.catch(function (error) {
+        .catch(function(error) {
             todo(error)
             setLog(start, 'JSON', error)
             console.error(error)
         })
-		.then(function (json) {
+        .then(function(json) {
             if (!json) {
                 columnReload(tlid, type)
             }
@@ -1259,6 +1264,7 @@ function ueload(tlid) {
             ueloadlock = false
         })
 }
+
 function asRead(callback) {
     //Markers
     var markers = localStorage.getItem('markers')
@@ -1301,7 +1307,7 @@ function asRead(callback) {
                 httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
                 httpreq.responseType = 'json'
                 httpreq.send(JSON.stringify(poster))
-				httpreq.onreadystatechange = function () {
+                httpreq.onreadystatechange = function() {
                     if (httpreq.readyState === 4) {
                         var json = httpreq.response
                         if (this.status !== 200) {
@@ -1318,6 +1324,7 @@ function asRead(callback) {
         }
     }
 }
+
 function asReadEnd() {
     //Markers
     var markers = localStorage.getItem('markers')
@@ -1336,8 +1343,8 @@ function asReadEnd() {
             onBeforeOpen: () => {
                 Swal.showLoading()
             },
-			onClose: () => { },
+            onClose: () => {},
-		}).then((result) => { })
+        }).then((result) => {})
     } else {
         postMessage(['asReadComp', ''], '*')
     }
@@ -1363,7 +1370,7 @@ function getBookmark(acct_id, tlid, more) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -1395,6 +1402,7 @@ function getBookmark(acct_id, tlid, more) {
         }
     }
 }
+
 function getUtl(acct_id, tlid, data, more) {
 
     moreloading = true
@@ -1415,7 +1423,7 @@ function getUtl(acct_id, tlid, data, more) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {
@@ -1447,7 +1455,7 @@ function announ(acct_id, tlid) {
     httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
     httpreq.responseType = 'json'
     httpreq.send()
-	httpreq.onreadystatechange = function () {
+    httpreq.onreadystatechange = function() {
         if (httpreq.readyState === 4) {
             var json = httpreq.response
             if (this.status !== 200) {

app/js/ui/img.js

@@ -21,7 +21,7 @@ function imgv(id, key, acct_id) {
 	if (remote_img == 'yes') {
 		murl = ourl
 	}
-	$(document).ready(function() {
+	$(document).ready(function () {
 		if (type == 'image') {
 			$('#imagemodal').modal('open')
 			imageXhr(id, key, murl)
@@ -47,6 +47,9 @@ function imgCont(type) {
 	}
 	var murl = $('#' + id + '-image-' + key).attr('data-url')
 	var ourl = $('#' + id + '-image-' + key).attr('data-original')
+	if (!ourl || ourl == 'null') {
+		ourl = murl
+	}
 	var type = $('#' + id + '-image-' + key).attr('data-type')
 	$('#imagemodal').attr('data-id', id)
 	$('#imagemodal').attr('data-acct', acct_id)
@@ -54,7 +57,7 @@ function imgCont(type) {
 	$('#imagemodal').attr('data-image', murl)
 	//表示はリモートを使うか(どちらにしろコピーはオリジナル)
 	var remote_img = localStorage.getItem('remote_img')
-	if (remote_img == 'yes' && ourl != 'null') {
+	if (remote_img == 'yes') {
 		murl = ourl
 	}
 	if (murl) {
@@ -62,7 +65,7 @@ function imgCont(type) {
 		$('#imgsec').text(0)
 		$('#imgmodal').attr('src', '../../img/loading.svg')
 		var type = $('#' + id + '-image-' + key).attr('data-type')
-		$(document).ready(function() {
+		$(document).ready(function () {
 			if (type == 'image') {
 				imageXhr(id, key, murl)
 				$('#imagewrap').dragScroll() // ドラッグスクロール設定
@@ -76,17 +79,29 @@ function imgCont(type) {
 	}
 }
 function imageXhr(id, key, murl) {
+	let time = 0
 	var startTime = new Date()
+	const timer = setInterval(function() {
+		time = time + 1
+		$('#imgsec').text(time)
+	}, 10)
+	$('#imgmodal-progress div').removeClass('determinate')
+	$('#imgmodal-progress div').addClass('indeterminate')
+	$('#imgmodal-progress').removeClass('hide')
 	xhr = new XMLHttpRequest()
 	xhr.open('GET', murl, true)
 	xhr.responseType = 'arraybuffer'
 	xhr.addEventListener(
 		'progress',
-		function(event) {
+		function (event) {
 			if (event.lengthComputable) {
 				var total = event.total
 				var now = event.loaded
+				$('#imgbyte').text(`${Math.floor(now / 1024)}KB/${Math.floor(total / 1024)}`)
 				var per = (now / total) * 100
+				$('#imgmodal-progress div').removeClass('indeterminate')
+				$('#imgmodal-progress div').addClass('determinate')
+				$('#imgmodal-progress div').css('width', `${per}%`)
 				$('#imgprog').text(Math.floor(per))
 			}
 		},
@@ -94,31 +109,35 @@ function imageXhr(id, key, murl) {
 	)
 	xhr.addEventListener(
 		'loadend',
-		function(event) {
+		function (event) {
 			var total = event.total
 			$('#imgbyte').text(Math.floor(total / 1024))
 			var now = event.loaded
 			var per = (now / total) * 100
 			$('#imgprog').text(Math.floor(per))
+			$('#imgmodal-progress').addClass('hide')
+			$('#imgmodal-progress div').css('width', '0%')
+			$('#imgmodal-progress div').removeClass('determinate')
+			$('#imgmodal-progress div').addClass('indeterminate')
 		},
 		false
 	)
 	xhr.addEventListener(
 		'error',
-		function(event) {
+		function (event) {
 			$('#imgmodal').attr('src', murl)
 		},
 		false
 	)
-	xhr.onreadystatechange = function() {
+	xhr.onreadystatechange = function () {
 		if (this.readyState == 4 && this.status == 200) {
 			r = new FileReader()
 			r.readAsDataURL(this.response)
-			r.onload = function() {
+			r.onload = function () {
 				var b64 = r.result
 				var element = new Image()
 				var width
-				element.onload = function() {
+				element.onload = function () {
 					var width = element.naturalWidth
 					var height = element.naturalHeight
 					calcNiceAspect(width, height)
@@ -137,6 +156,7 @@ function imageXhr(id, key, murl) {
 				}
 				element.src = b64
 				var endTime = new Date()
+				clearInterval(timer)
 				var proctime = endTime.getTime() - startTime.getTime()
 				$('#imgsec').text(proctime)
 				$('#imgmodal').attr('src', b64)
@@ -146,8 +166,8 @@ function imageXhr(id, key, murl) {
 	xhr.responseType = 'blob'
 	xhr.send()
 }
-function calcNiceAspect( width, height ) {
+function calcNiceAspect(width, height) {
-	if(width < 650) {
+	if (width < 650) {
 		width = 650
 	}
 	var windowH = $(window).height()
@@ -188,11 +208,11 @@ function zoom(z) {
 	$('#imagewrap img').css('height', hgt + 'px')
 }
 //スマホ対応ドラッグ移動システム
-(function() {
+(function () {
-	$.fn.dragScroll = function() {
+	$.fn.dragScroll = function () {
 		var target = this
 		$(this)
-			.mousedown(function(event) {
+			.mousedown(function (event) {
 				$(this)
 					.data('down', true)
 					.data('x', event.clientX)
@@ -207,7 +227,7 @@ function zoom(z) {
 			})
 		// ウィンドウから外れてもイベント実行
 		$(document)
-			.mousemove(function(event) {
+			.mousemove(function (event) {
 				if ($(target).data('down') == true) {
 					// スクロール
 					target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - event.clientX)
@@ -215,11 +235,11 @@ function zoom(z) {
 					return false // 文字列選択を抑止
 				}
 			})
-			.mouseup(function(event) {
+			.mouseup(function (event) {
 				$(target).data('down', false)
 			})
 		$(this)
-			.on('touchstart', function(event) {
+			.on('touchstart', function (event) {
 				$(this)
 					.data('down', true)
 					.data('x', getX(event))
@@ -232,7 +252,7 @@ function zoom(z) {
 				overflow: 'hidden', // スクロールバー非表示
 				cursor: 'move'
 			}) //指が触れたか検知
-		$(this).on('touchmove', function(event) {
+		$(this).on('touchmove', function (event) {
 			if ($(target).data('down') === true) {
 				// スクロール
 				target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - getX(event))
@@ -241,7 +261,7 @@ function zoom(z) {
 			} else {
 			}
 		}) //指が動いたか検知
-		$(this).on('touchend', function(event) {
+		$(this).on('touchend', function (event) {
 			$(target).data('down', false)
 		})
 
@@ -258,7 +278,7 @@ function getY(event) {
 }
 //マウスホイールで拡大
 var element = document.getElementById('imagemodal')
-element.onmousewheel = function(e) {
+element.onmousewheel = function (e) {
 	var delta = e.wheelDelta
 	if (delta > 0) {
 		zoom(1.1)

app/js/ui/layout.js

@@ -52,7 +52,7 @@ function parseColumn(target, dontclose) {
 			localStorage.setItem('domain_' + key, acct.domain)
 			localStorage.setItem('acct_' + key + '_at', acct.at)
 			localStorage.setItem('acct_' + key + '_rt', acct.rt ? acct.rt : null)
-			if(!target) mastodonBaseStreaming(key)
+			if (!target) mastodonBaseStreaming(key)
 			ckdb(key)
 			//フィルターデータ読もう
 			getFilter(key)
@@ -167,11 +167,11 @@ function parseColumn(target, dontclose) {
 		}
 		var maxWidth = localStorage.getItem('max-width')
 		if (maxWidth) {
-			css = css +'max-width:' + maxWidth + 'px;'
+			css = css + 'max-width:' + maxWidth + 'px;'
 		}
 		var margin = localStorage.getItem('margin')
 		if (margin) {
-			css = css +'margin-right:' + margin + 'px;'
+			css = css + 'margin-right:' + margin + 'px;'
 		}
 		if (acct.width) {
 			css = css + ' min-width:' + acct.width + 'px !important;max-width:' + acct.width + 'px !important;'
@@ -231,14 +231,14 @@ function parseColumn(target, dontclose) {
 			}
 			var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
 					 class="setting nex waves-effect" title="${lang.lang_layout_unread}">
-					<i class="material-icons waves-effect nex">more</i><br />${lang.lang_layout_unread}
+					<i class="material-icons waves-effect nex">more</i><span>${lang.lang_layout_unread}</span>
 				</a>`
 			var notfDomain = acct.domain
 			var notfKey = key
 			var if_tag = ''
 			var if_tag_btn = ''
 			if (acct.type == 'notf') {
-				var exclude =
+				var excludeNotf =
 					`<div style="border: 1px solid; padding: 5px; margin-top: 5px; margin-bottom: 5px;">${lang.lang_layout_excluded}:<br>
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-reply-${key}" ${excludeCk(key, 'mention')} />
@@ -272,20 +272,21 @@ function parseColumn(target, dontclose) {
 					</label> <br />
 					<button class="btn btn-flat waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="exclude('${key}')">Filter</button>`
 				if (checkNotfFilter(key)) {
-					exclude =
+					excludeNotf =
-						exclude +
+						excludeNotf +
 						`<button class="btn btn-flat red-text waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="resetNotfFilter('${key}')">
 							Clear all
 						</button>`
 				}
-				exclude = exclude + '</div>'
+				excludeNotf = excludeNotf + '</div>'
 				notfDomain = 'dummy'
 				notfKey = 'dummy'
+				var excludeHome = ''
 			} else if (acct.type == 'home') {
-				var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
+				var excludeNotf = ''
+				var excludeHome = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
 						<i class="fas fa-retweet nex" title="${lang.lang_layout_excludingbt}" style="font-size: 24px"></i>
-						<span id="sta-bt-${key}">Off</span><br />
+						<span>${lang.lang_layout_excludingbt}</span><span id="sta-bt-${key}">Off</span>
-					${lang.lang_layout_excludingbt}
 					</a>`
 			} else if (acct.type == 'tag') {
 				if (acct.data.name) {
@@ -313,10 +314,12 @@ function parseColumn(target, dontclose) {
 				<i class="material-icons waves-effect nex">note_add</i>
 				</a>`
 				unread = ''
-				var exclude = ''
+				var excludeNotf = ''
+				var excludeHome = ''
 				var if_notf = 'hide'
 			} else {
-				var exclude = ''
+				var excludeNotf = ''
+				var excludeHome = ''
 				unread = ''
 			}
 
@@ -337,12 +340,12 @@ function parseColumn(target, dontclose) {
 					$('#timeline-container').append(basehtml)
 				}
 				var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i><br />
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
-					${lang.lang_layout_leftFold}</a>`
+					<span>${lang.lang_layout_leftFold}</span></a>`
 			} else {
 				var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i><br />
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
-					${lang.lang_layout_leftUnfold}</a>`
+					<span>${lang.lang_layout_leftUnfold}</span></a>`
 			}
 			if (key === 0) {
 				left_hold = ''
@@ -363,8 +366,7 @@ function parseColumn(target, dontclose) {
 			if (acct.type != 'pub' && acct.type != 'pub-media') {
 				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex waves-effect">
 					<i class="material-icons nex" title="${lang.lang_layout_mediafil}">perm_media</i>
-					<span id="sta-media-${key}">On</span><br />
+				<span>${lang.lang_layout_mediafil}</span/><span id="sta-media-${key}">On</span></a>`
-				${lang.lang_layout_mediafil}</a>`
 			} else {
 				var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex waves-effect">
 					<i class="material-icons nex" title="${lang.lang_layout_remoteOnly}">perm_media</i><br />
@@ -422,39 +424,48 @@ function parseColumn(target, dontclose) {
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
-					${exclude}
+					${excludeNotf}
+					<div class="columnSettings">
+					${excludeHome}
 					${unread}
 					${left_hold}
 					${mediaFil}
 					<a onclick="cardToggle('${key}')" class="setting nex waves-effect">
 						<i class="material-icons nex" title="${lang.lang_layout_linkanades}">link</i>
-						<span id="sta-card-${key}">On</span><br />
+					<span>${lang.lang_layout_linkana}</span><span id="sta-card-${key}">On</span>
-					${lang.lang_layout_linkana}
 					</a>
 					<a onclick="voiceToggle('${key}')" class="setting nex waves-effect">
 						<i class="material-icons nex" title="${lang.lang_layout_tts}">hearing</i>
-						<span id="sta-voice-${key}">On</span><br />
+					<span>${lang.lang_layout_tts}TL</span/><span id="sta-voice-${key}">On</span>
-					${lang.lang_layout_tts}
+					</a>
-					TL</a>
 					<a onclick="columnReload('${key}','${acct.type}')" class="setting nex ${if_misskey_hide} waves-effect">
 						<i class="material-icons nex" title="${lang.lang_layout_reconnect}">refresh</i>
-					<br />
+						<span>${lang.lang_layout_reconnect}</span>
-						${lang.lang_layout_reconnect}
 					</a>
 					<a onclick="resetWidth('${key}')" class="setting nex waves-effect">
-						<i class="material-icons nex" title="${lang.lang_layout_resetWidth}">refresh</i>
+						<i class="material-icons nex rotate-90" title="${lang.lang_layout_resetWidth}">height</i>
-					<br />
+						<span>${lang.lang_layout_resetWidth}</span>
-						${lang.lang_layout_resetWidth}
+					</a></div>
-					</a><br />
+					<p>${lang.lang_layout_headercolor}</p>
-					${lang.lang_layout_headercolor}
-					<br>
 					<div id="picker_${key}" class="color-picker"></div>
 				</div>${if_tag}
 				<div class="tl-box" tlid="${key}">
 					<div id="timeline_${key}" class="tl ${acct.type}-timeline " tlid="${key}" 
 						data-type="${acct.type}" data-acct="${acct.domain}" data-const="${acct.type}_${acct.domain}">
-						<div id="landing_${key}" style="text-align:center">
+						<div id="landing_${key}" class="landing">
-						${lang.lang_layout_nodata}
+						<div class="preloader-wrapper small active " style="margin-top: calc(50vh - 15px)">
+							<div class="spinner-layer spinner-blue-only">
+								<div class="circle-clipper left">
+									<div class="circle"></div>
+								</div>
+								<div class="gap-patch">
+									<div class="circle"></div>
+								</div>
+								<div class="circle-clipper right">
+									<div class="circle"></div>
+								</div>
+							</div>
+					  </div>
 					</div>
 				</div>
 			</div>`
@@ -660,8 +671,6 @@ function removeColumn(tlid) {
 				$('#timeline_box_' + tlid + '_parentBox').remove()
 			}
 		}
-		$('#sort-box').removeClass('hide')
-		$('#sort-box').addClass('show')
 	})
 }
 

app/js/ui/post-box.js

@@ -101,6 +101,7 @@ if (location.search) {
 		$('.mini-btn').text('expand_less')
 	}
 }
+
 function initPostbox() {
 	$('#posttgl').click(function (e) {
 		if (!$('#post-box').hasClass('appear')) {
@@ -124,6 +125,7 @@ function initPostbox() {
 		selectedToot = 0
 		localStorage.removeItem('nohide')
 		srcBox('close')
+		tShowBox('close')
 	})
 	$('#textarea,#cw-text').focusout(function (e) {
 		localStorage.setItem('nohide', true)

app/js/ui/settings.js

@@ -3,7 +3,7 @@ var envView = new Vue({
     el: '#envView',
     data: { config: envConstruction },
     methods: {
-		complete: function (i, val) {
+        complete: function(i, val) {
             var ls = envView.config[i]
             let header = ls.text.head
             if (!ls.data) {
@@ -11,9 +11,11 @@ var envView = new Vue({
             } else {
                 ls = ls.data
             }
+            console.log(ls)
             for (var j = 0; j < ls.length; j++) {
-				var id = ls[j].id
+                var lsi = ls[j]
-				localStorage.setItem(ls[j].storage, val)
+                if (!val || j > 0) val = lsi.setValue
+                localStorage.setItem(lsi.storage, val)
             }
             if (ls[0].id == 'ha') {
                 hardwareAcceleration(val)
@@ -36,7 +38,7 @@ var tlView = new Vue({
     el: '#tlView',
     data: { config: tlConstruction },
     methods: {
-		complete: function (i, val) {
+        complete: function(i, val) {
             var ls = tlView.config[i]
             let header = ls.text.head
             if (val) {
@@ -66,7 +68,7 @@ var postView = new Vue({
             quoters: localStorage.getItem('quoters'),
         },
         methods: {
-		complete: function (i, val) {
+            complete: function(i, val) {
                 var ls = postView.config[i]
                 let header = ls.text.head
                 if (val) {
@@ -88,8 +90,8 @@ var postView = new Vue({
                 return true
             },
         },
-})
+    })
-//設定ボタン押した。
+    //設定ボタン押した。
 function settings() {
     var fontd = $('#font').val()
     if (fontd) {
@@ -185,6 +187,7 @@ function load() {
     //$("#log").val(localStorage.getItem("errors"))
     $('#lastFmUser').val(localStorage.getItem('lastFmUser'))
 }
+
 function customVol() {
     var cvol = $('#soundvol').val()
     $('#soundVolVal').text(cvol)
@@ -222,7 +225,7 @@ function climute() {
             return
         }
         var templete
-		Object.keys(obj).forEach(function (key) {
+        Object.keys(obj).forEach(function(key) {
             var cli = obj[key]
             var list = key * 1 + 1
             templete =
@@ -241,6 +244,7 @@ function climute() {
         })
     }
 }
+
 function cliMuteDel(key) {
     var cli = localStorage.getItem('client_mute')
     var obj = JSON.parse(cli)
@@ -260,6 +264,7 @@ function wordmute() {
         data: obj,
     })
 }
+
 function wordmuteSave() {
     var word = M.Chips.getInstance($('#wordmute')).chipsData
     var json = JSON.stringify(word)
@@ -276,11 +281,13 @@ function wordemp() {
         data: obj,
     })
 }
+
 function wordempSave() {
     var word = M.Chips.getInstance($('#wordemp')).chipsData
     var json = JSON.stringify(word)
     localStorage.setItem('word_emp', json)
 }
+
 function notftest() {
     var os = localStorage.getItem('platform')
     var options = {
@@ -289,11 +296,13 @@ function notftest() {
     }
     var n = new Notification('TheDesk' + lang.lang_setting_notftest, options)
 }
+
 function oks(no) {
     var txt = $('#oks-' + no).val()
     localStorage.setItem('oks-' + no, txt)
     M.toast({ html: lang.lang_setting_ksref, displayLength: 3000 })
 }
+
 function oksload() {
     if (localStorage.getItem('oks-1')) {
         $('#oks-1').val(localStorage.getItem('oks-1'))
@@ -305,11 +314,13 @@ function oksload() {
         $('#oks-3').val(localStorage.getItem('oks-3'))
     }
 }
+
 function changeLang() {
     const lang = $('#langsel-sel').val()
     console.log(lang)
     if (lang) postMessage(['lang', lang], '*')
 }
+
 function exportSettings() {
     var exp = exportSettingsCore()
     $('#imp-exp').val(JSON5.stringify(exp))
@@ -326,6 +337,7 @@ function exportSettings() {
         }
     })
 }
+
 function exportSettingsCore() {
     var exp = {}
         //Accounts
@@ -391,6 +403,7 @@ function exportSettingsCore() {
     exp.meta.platform = localStorage.getItem('platform')
     return exp
 }
+
 function importSettings() {
     Swal.fire({
         title: 'Warning',
@@ -409,6 +422,7 @@ function importSettings() {
         }
     })
 }
+
 function importSettingsCore(obj) {
     if (obj) {
         localStorage.clear()
@@ -502,13 +516,20 @@ function importSettingsCore(obj) {
         })
     }
 }
+
 function savefolder() {
     postMessage(['sendSinmpleIpc', 'savefolder'], '*')
 }
 
 function font() {
+    if ($('#fonts').hasClass('hide')) {
         postMessage(['sendSinmpleIpc', 'fonts'], '*')
+        $('#fonts').removeClass('hide')
+    } else {
+        $('#fonts').addClass('hide')
+    }
 }
+
 function fontList(arg) {
     $('#fonts').removeClass('hide')
     for (var i = 0; i < arg.length; i++) {
@@ -516,16 +537,14 @@ function fontList(arg) {
         $('#fonts').append('<div class="font pointer" style="font-family:' + font + '" onclick="insertFont(\'' + font + '\')">' + font + '</div>')
     }
 }
+
 function insertFont(name) {
+    $('#fonts').addClass('hide')
     $('#font').val(name)
 }
+
 function copyColor(from, to) {
-	let props = [
+    let props = ['background', 'subcolor', 'text', 'accent', 'modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
-		'background', 'subcolor', 'text', 'accent',
-		'modal', 'modalFooter', 'third', 'forth',
-		'bottom', 'emphasized', 'postbox', 'active',
-		'selected', 'selectedWithShared'
-	]
     let i = 0
     let color
     for (tag of props) {
@@ -553,6 +572,7 @@ function copyColor(from, to) {
         i++
     }
 }
+
 function customComp(preview) {
     var nameC = $('#custom_name').val()
     if (!nameC && !preview) {
@@ -564,11 +584,7 @@ function customComp(preview) {
     var textC = $('#color-picker1_value').val()
     var accentC = $('#color-picker3_value').val()
     var multi = localStorage.getItem('multi')
-	let advanced = [
+    let advanced = ['modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
-		'modal', 'modalFooter', 'third', 'forth',
-		'bottom', 'emphasized', 'postbox', 'active',
-		'selected', 'selectedWithShared'
-	]
     var advanceTheme = {}
     let i = 4
     for (tag of advanced) {
@@ -581,9 +597,7 @@ function customComp(preview) {
 
     var my = JSON.parse(multi)[0].name
     var id = $('#custom-edit-sel').val()
-	const defaults = [
+    const defaults = ['black', 'blue', 'brown', 'green', 'indigo', 'polar', 'snow', 'white']
-		'black', 'blue', 'brown', 'green', 'indigo', 'polar', 'snow', 'white'
-	]
     if (id == 'add_new' || defaults.includes(id)) {
         id = makeCID()
     }
@@ -597,11 +611,11 @@ function customComp(preview) {
             background: bgC,
             subcolor: subcolorC,
             text: textC,
-			accent: accentC
+            accent: accentC,
         },
         advanced: advanceTheme,
         id: id,
-		version: '2'
+        version: '2',
     }
     $('#custom_json').val(JSON.stringify(json))
     if (preview) {
@@ -615,8 +629,8 @@ function customComp(preview) {
         })
         postMessage(['themeJsonCreate', JSON.stringify(json)], '*')
     }
-
 }
+
 function deleteIt() {
     var id = $('#custom-sel-sel').val()
     $('#custom_name').val('')
@@ -629,13 +643,15 @@ function deleteIt() {
     }
     postMessage(['themeJsonDelete', id + '.thedesktheme'], '*')
 }
+
 function ctLoad() {
     postMessage(['sendSinmpleIpc', 'theme-json-list'], '*')
 }
+
 function ctLoadCore(args) {
     var template = ''
     var editTemplate = ''
-	Object.keys(args).forEach(function (key) {
+    Object.keys(args).forEach(function(key) {
                 var theme = args[key]
                 var themeid = theme.id
                 template = template + `<option value="${themeid}">${theme.name}${theme.compatible ? `(${lang.lang_setting_compat})` : ''}</option>`
@@ -682,16 +698,11 @@ function customConnect(raw) {
 	$('#color-picker2_value').val(args.primary.subcolor)
 	//Accent
 	$('#color-picker3_value').val(args.primary.accent)
-	let advanced = [
+	let advanced = ['modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
-		'modal', 'modalFooter', 'third', 'forth',
-		'bottom', 'emphasized', 'postbox', 'active',
-		'selected', 'selectedWithShared'
-	]
 	let i = 4
 	for (tag of advanced) {
 		if (args.advanced[tag]) {
 			$(`#color-picker${i}_value`).val(args.advanced[tag])
-
 		}
 		$(`#use-color_${i}`).prop('checked', true)
 		i++
@@ -737,7 +748,7 @@ function customSoundSave(key, file) {
 }
 function pluginLoad() {
 	$('#plugin-edit-sel').val('add_new')
-	$(".plugin_delete").addClass('disabled')
+	$('.plugin_delete').addClass('disabled')
 	var template = ''
 	var pgns = localStorage.getItem('plugins')
 	var args = JSON.parse(pgns ? pgns : '[]')
@@ -755,9 +766,9 @@ function pluginEdit() {
 	$('#plugin').attr('data-id', id)
 	if (id == 'add_new') {
 		editor.setValue('', -1)
-		$(".plugin_delete").addClass('disabled')
+		$('.plugin_delete').addClass('disabled')
 	} else {
-		$(".plugin_delete").removeClass('disabled')
+		$('.plugin_delete').removeClass('disabled')
 		var pgns = localStorage.getItem('plugins')
 		var args = JSON.parse(pgns ? pgns : '[]')
 		Object.keys(args).forEach(function (key) {
@@ -795,7 +806,7 @@ function completePlugin(comp) {
 		id = makeCID()
 		args.push({
 			id: id,
-			content: inputPlugin
+			content: inputPlugin,
 		})
 	} else {
 		Object.keys(args).forEach(function (key) {
@@ -829,7 +840,7 @@ async function deletePlugin() {
 	const alert = await Swal.fire({
 		title: 'delete',
 		icon: 'warning',
-		showCancelButton: true
+		showCancelButton: true,
 	})
 	if (!alert) return false
 	editor.setValue('', -1)
@@ -931,4 +942,6 @@ function lastFmSet() {
 	M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
 }
 
-function stopVideo() { return false }
+function stopVideo() {
+	return false
+}

app/js/ui/tips.js

@@ -117,7 +117,7 @@ function trendTagonTip() {
 				Object.keys(json).forEach(function(tag) {
 					tags =
 						tags +
-						`<a onclick="tagShow('${tag}')" class="pointer">
+						`<a onclick="tagShow('${tag}', this)" class="pointer">
 							#${escapeHTML(tag)}
 						</a>
 						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　

app/js/userdata/showOnTL.js

@@ -1,40 +1,62 @@
 //ユーザーデータ表示
-localStorage.removeItem("history")
+localStorage.removeItem('history')
-//コード受信
+    //コード受信
 if (location.search) {
     var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
     var mode = m[1]
     var codex = m[2]
-	if (mode == "user") {
+    if (mode == 'user') {
-		udgEx(codex, "main")
+        udgEx(codex, 'main')
     }
 }
-function udgEx(user, acct_id) {
+
-	if (user == "selector") {
+async function udgEx(user, acct_id) {
-		user = $("#his-acct").attr("fullname")
+    if (user == 'selector') {
+        user = $('#his-acct').attr('fullname')
     }
-	if (acct_id == "selector") {
+    if (acct_id == 'selector') {
-		acct_id = $("#user-acct-sel").val()
+        acct_id = $('#user-acct-sel').val()
     }
-	if (acct_id == "main") {
+    if (acct_id == 'main') {
-		acct_id = localStorage.getItem("main")
+        acct_id = localStorage.getItem('main')
     }
-	console.log("Get user data of " + user)
+    console.log('Get user data of ' + user)
-	var domain = localStorage.getItem("domain_" + acct_id)
+    var domain = localStorage.getItem('domain_' + acct_id)
-	if (localStorage.getItem("mode_" + domain) == "misskey") {
+    if (localStorage.getItem('mode_' + domain) == 'misskey') {
         return false
     }
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
+    var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user)
+    var data = await acctResolve(acct_id, user)
-	fetch(start, {
+    if (data.id) {
-		method: "GET",
+        var { id } = data
-		headers: {
+        udg(id, acct_id, true)
-			"content-type": "application/json",
+    } else {
-			Authorization: "Bearer " + at
+        Swal.close()
+        postMessage(['openUrl', user], '*')
     }
+
+    return true
+    var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(user)
+    Swal.fire({
+        title: 'Loading...',
+        html: lang.lang_details_fetch,
+        showConfirmButton: false,
+        showCloseButton: true,
+        onBeforeOpen: () => {
+            Swal.showLoading()
+        },
+        onClose: () => {},
+    }).then((result) => {})
+    fetch(start, {
+            method: 'GET',
+            headers: {
+                'content-type': 'application/json',
+                Authorization: 'Bearer ' + at,
+            },
         })
         .then(function(response) {
             if (!response.ok) {
+                Swal.close()
                 response.text().then(function(text) {
                     setLog(response.url, response.status, text)
                 })
@@ -43,40 +65,43 @@ function udgEx(user, acct_id) {
         })
         .catch(function(error) {
             todo(error)
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
             console.error(error)
         })
         .then(function(json) {
             if (json.accounts[0]) {
                 var id = json.accounts[0].id
-				udg(id, acct_id)
+                udg(id, acct_id, true)
             } else {
-				postMessage(["openUrl", user], "*")
+                Swal.close()
+                postMessage(['openUrl', user], '*')
             }
         })
     return true
 }
-function udg(user, acct_id) {
+
+function udg(user, acct_id, isSwal) {
     reset()
     if (!user) {
-		user = localStorage.getItem("user-id_" + acct_id)
+        user = localStorage.getItem('user-id_' + acct_id)
     }
-	todo("User Data Loading...")
+    todo('User Data Loading...')
-	var domain = localStorage.getItem("domain_" + acct_id)
+    var domain = localStorage.getItem('domain_' + acct_id)
-	if (localStorage.getItem("mode_" + domain) == "misskey") {
+    if (localStorage.getItem('mode_' + domain) == 'misskey') {
         misskeyUdg(user, acct_id)
         return
     }
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
+    var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = "https://" + domain + "/api/v1/accounts/" + user
+    var start = 'https://' + domain + '/api/v1/accounts/' + user
     fetch(start, {
-		method: "GET",
+            method: 'GET',
             headers: {
-			"content-type": "application/json",
+                'content-type': 'application/json',
-			Authorization: "Bearer " + at
+                Authorization: 'Bearer ' + at,
-		}
+            },
         })
         .then(function(response) {
+            if (isSwal) Swal.close()
             if (!response.ok) {
                 response.text().then(function(text) {
                     setLog(response.url, response.status, text)
@@ -86,38 +111,38 @@ function udg(user, acct_id) {
         })
         .catch(function(error) {
             todo(error)
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
             console.error(error)
         })
         .then(function(json) {
             //一つ前のユーザーデータ
-			if (!localStorage.getItem("history")) {
+            if (!localStorage.getItem('history')) {
-				$("#his-history-btn").prop("disabled", true)
+                $('#his-history-btn').prop('disabled', true)
             } else {
-				$("#his-history-btn").prop("disabled", false)
+                $('#his-history-btn').prop('disabled', false)
-				$("#his-data").attr("history", localStorage.getItem("history"))
+                $('#his-data').attr('history', localStorage.getItem('history'))
             }
             //moved設定時
             if (json.moved) {
                 M.toast({
-					html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + "')\">" + lang.lang_showontl_movebtn + "</button>",
+                    html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>',
-					displayLength: 4000
+                    displayLength: 4000,
                 })
             }
-			$("#his-data").modal("open")
+            $('#his-data').modal('open')
-			$("#his-data").attr("user-id", user)
+            $('#his-data').attr('user-id', user)
-			$("#his-data").attr("use-acct", acct_id)
+            $('#his-data').attr('use-acct', acct_id)
             if (json.username != json.acct) {
                 //Remote
-				$("#his-data").attr("remote", "true")
+                $('#his-data').attr('remote', 'true')
                 var fullname = json.acct
             } else {
-				$("#his-data").attr("remote", "false")
+                $('#his-data').attr('remote', 'false')
-				var fullname = json.acct + "@" + domain
+                var fullname = json.acct + '@' + domain
             }
-			utlShow(json.id, "", acct_id)
+            utlShow(json.id, '', acct_id)
-			flw(json.id, "", acct_id)
+            flw(json.id, '', acct_id)
-			fer(json.id, "", acct_id)
+            fer(json.id, '', acct_id)
             var dis_name = escapeHTML(json.display_name)
             dis_name = twemoji.parse(dis_name)
 
@@ -133,7 +158,7 @@ function udg(user, acct_id) {
                     var emoji = json.emojis[key5]
                     var shortcode = emoji.shortcode
                     var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">'
-					var regExp = new RegExp(":" + shortcode + ":", "g")
+                    var regExp = new RegExp(':' + shortcode + ':', 'g')
                     dis_name = dis_name.replace(regExp, emoji_url)
                     note = note.replace(regExp, emoji_url)
                 })
@@ -143,103 +168,119 @@ function udg(user, acct_id) {
             //var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
             //note=note.replace(/#(\S+)/gi, tags)
             //note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
-			$("#his-name").html(dis_name)
+            $('#his-name').html(dis_name)
-			$("#his-acct").text(json.acct)
+            $('#his-acct').text(json.acct)
-			$("#his-acct").attr("fullname", fullname)
+            $('#his-acct').attr('fullname', fullname)
-			$("#his-prof").attr("src", json.avatar)
+            $('#his-prof').attr('src', json.avatar)
-			$("#his-data").css("background-image", "url(" + json.header + ")")
+            $('#util-add').removeClass('hide')
-			$("#his-sta").text(json.statuses_count)
+            const title = $('.column-first').html()
-			$("#his-follow").text(json.following_count)
+            $('#my-data-nav .anc-link').removeClass('active-back')
+            $('.column-first').addClass('active-back')
+            $('#his-data-title').html(title)
+            $('#his-data').css('background-image', 'url(' + json.header + ')')
+            $('#his-sta').text(json.statuses_count)
+            $('#his-follow').text(json.following_count)
             var flerc = json.followers_count
             if (flerc < 0) {
-				flerc = "-"
+                flerc = '-'
             }
-			$("#his-follower").text(flerc)
+            $('#his-follower').text(flerc)
-			$("#his-since").text(crat(json.created_at))
+            $('#his-since').text(crat(json.created_at))
-			$("#his-openin").attr("data-href", json.url)
+            $('#his-openin').attr('data-href', json.url)
             if (json.fields) {
-				var table = ""
+                var table = ''
                 if (json.fields.length > 0) {
-					$("#his-des").css("max-height", "250px")
+                    $('#his-des').css('max-height', '196px')
                     table = '<table id="his-field">'
                     for (var i = 0; i < json.fields.length; i++) {
                         var fname = json.fields[i].name
                         var fval = json.fields[i].value
                         if (json.fields[i].verified_at) {
-							var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at)
+                            var when = lang.lang_showontl_verified + ':' + crat(json.fields[i].verified_at)
-							var color = "rgba(121,189,154,.25);"
+                            var color = 'rgba(121,189,154,.25);'
                         } else {
-							var when = ""
+                            var when = ''
-							var color = "inherit"
+                            var color = 'inherit'
                         }
-						table = table + '<tr><td class="his-field-title">' + escapeHTML(fname) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + fval + "</td></tr>"
+                        table =
+                            table +
+                            '<tr><td class="his-field-title">' +
+                            escapeHTML(fname) +
+                            '</td><td class="his-field-content" title="' +
+                            when +
+                            '" style="background-color:' +
+                            color +
+                            '">' +
+                            fval +
+                            '</td></tr>'
                     }
-					table = table + "</table>"
+                    table = table + '</table>'
-					$("#his-des").html(twemoji.parse(note))
+                    $('#his-des').html(twemoji.parse(note))
                 } else {
-					$("#his-des").css("max-height", "400px")
+                    $('#his-des').css('max-height', '400px')
                 }
-				$("#his-table").html(twemoji.parse(table))
+                $('#his-table').html(twemoji.parse(table))
             } else {
-				$("#his-des").css("max-height", "400px")
+                $('#his-des').css('max-height', '400px')
             }
-			$("#his-des").html(twemoji.parse(note))
+            $('#his-des').html(twemoji.parse(note))
             if (json.bot) {
-				$("#his-bot").html(lang.lang_showontl_botacct)
+                $('#his-bot').html(lang.lang_showontl_botacct)
+                $('#his-bot').removeClass('hide')
             }
-			$("#his-des").attr("data-acct", acct_id)
+            $('#his-des').attr('data-acct', acct_id)
-			$("#his-data").css("background-size", "cover")
+            $('#his-data').css('background-size', 'cover')
-			$("#his-float-timeline").css("height", $("#his-data-show").height() + "px")
+            $('#his-float-timeline').css('height', $('#his-data-show').height() + 'px')
-			localStorage.setItem("history", user)
+            localStorage.setItem('history', user)
                 //自分の時
-			if (json.acct == localStorage.getItem("user_" + acct_id)) {
+            if (json.acct == localStorage.getItem('user_' + acct_id)) {
-				showFav("", acct_id)
+                showFav('', acct_id)
-				showBlo("", acct_id)
+                showBlo('', acct_id)
-				showMut("", acct_id)
+                showMut('', acct_id)
-				showDom("", acct_id)
+                showDom('', acct_id)
-				showReq("", acct_id)
+                showReq('', acct_id)
-				showFrl("", acct_id)
+                showFrl('', acct_id)
-				$("#his-name-val").val(json.display_name)
+                $('#his-name-val').val(json.display_name)
                 if (json.fields.length > 0) {
                     if (json.fields[0]) {
-						$("#his-f1-name").val(json.fields[0].name)
+                        $('#his-f1-name').val(json.fields[0].name)
-						$("#his-f1-val").val($.strip_tags(json.fields[0].value))
+                        $('#his-f1-val').val($.strip_tags(json.fields[0].value))
                     }
                     if (json.fields[1]) {
-						$("#his-f2-name").val(json.fields[1].name)
+                        $('#his-f2-name').val(json.fields[1].name)
-						$("#his-f2-val").val($.strip_tags(json.fields[1].value))
+                        $('#his-f2-val').val($.strip_tags(json.fields[1].value))
                     }
                     if (json.fields[2]) {
-						$("#his-f3-name").val(json.fields[2].name)
+                        $('#his-f3-name').val(json.fields[2].name)
-						$("#his-f3-val").val($.strip_tags(json.fields[2].value))
+                        $('#his-f3-val').val($.strip_tags(json.fields[2].value))
                     }
                     if (json.fields[3]) {
-						$("#his-f4-name").val(json.fields[3].name)
+                        $('#his-f4-name').val(json.fields[3].name)
-						$("#his-f4-val").val($.strip_tags(json.fields[3].value))
+                        $('#his-f4-val').val($.strip_tags(json.fields[3].value))
                     }
                 }
                 var des = json.note
-				des = des.replace(/<br \/>/g, "\n")
+                des = des.replace(/<br \/>/g, '\n')
                 des = $.strip_tags(des)
-				$("#his-des-val").val(des)
+                $('#his-des-val').val(des)
-				$("#his-follow-btn").hide()
+                $('#his-follow-btn').hide()
-				$("#his-block-btn").hide()
+                $('#his-block-btn').hide()
-				$("#his-mute-btn").hide()
+                $('#his-mute-btn').hide()
-				$("#his-notf-btn").hide()
+                $('#his-notf-btn').hide()
-				$("#his-domain-btn").hide()
+                $('#his-domain-btn').hide()
-				$("#his-emp-btn").hide()
+                $('#his-emp-btn').hide()
-				$(".only-my-data").show()
+                $('.only-my-data').show()
-				$(".only-his-data").hide()
+                $('.only-his-data').hide()
-				if (localStorage.getItem("main") == acct_id) {
+                if (localStorage.getItem('main') == acct_id) {
-					$("#his-main-acct").hide()
+                    $('#his-main-acct').hide()
                 }
             } else {
                 relations(user, acct_id)
-				$(".only-my-data").hide()
+                $('.only-my-data').hide()
-				$(".only-his-data").show()
+                $('.only-his-data').show()
             }
             todc()
-			if(json.locked) {
+            if (json.locked) {
                 $('#his-data').addClass('locked')
             } else {
                 $('#his-data').removeClass('locked')
@@ -248,28 +289,29 @@ function udg(user, acct_id) {
             udAdd(acct_id, user, json.url)
         })
 }
+
 function misskeyUdg(user, acct_id) {
     reset()
     if (!user) {
-		user = localStorage.getItem("user-id_" + acct_id)
+        user = localStorage.getItem('user-id_' + acct_id)
     }
-	todo("User Data Loading...")
+    todo('User Data Loading...')
-	var domain = localStorage.getItem("domain_" + acct_id)
+    var domain = localStorage.getItem('domain_' + acct_id)
-	if (localStorage.getItem("mode_" + domain) != "misskey") {
+    if (localStorage.getItem('mode_' + domain) != 'misskey') {
         udg(user, acct_id)
         return
     }
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
+    var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = "https://" + domain + "/api/users/show"
+    var start = 'https://' + domain + '/api/users/show'
     fetch(start, {
-		method: "POST",
+            method: 'POST',
             headers: {
-			"content-type": "application/json"
+                'content-type': 'application/json',
             },
             body: JSON.stringify({
                 i: at,
-			userId: user
+                userId: user,
-		})
+            }),
         })
         .then(function(response) {
             if (!response.ok) {
@@ -281,126 +323,126 @@ function misskeyUdg(user, acct_id) {
         })
         .catch(function(error) {
             todo(error)
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
             console.error(error)
         })
         .then(function(json) {
             //一つ前のユーザーデータ
-			if (!localStorage.getItem("history")) {
+            if (!localStorage.getItem('history')) {
-				$("#his-history-btn").prop("disabled", true)
+                $('#his-history-btn').prop('disabled', true)
             } else {
-				$("#his-history-btn").prop("disabled", false)
+                $('#his-history-btn').prop('disabled', false)
-				$("#his-data").attr("history", localStorage.getItem("history"))
+                $('#his-data').attr('history', localStorage.getItem('history'))
             }
-			$("#his-data").modal("open")
+            $('#his-data').modal('open')
-			$("#his-data").attr("user-id", user)
+            $('#his-data').attr('user-id', user)
-			$("#his-data").attr("use-acct", acct_id)
+            $('#his-data').attr('use-acct', acct_id)
             if (json.host) {
                 //Remote
-				$("#his-data").attr("remote", "false")
+                $('#his-data').attr('remote', 'false')
-				var fullname = json.username + "@" + json.host
+                var fullname = json.username + '@' + json.host
             } else {
-				$("#his-data").attr("remote", "false")
+                $('#his-data').attr('remote', 'false')
-				var fullname = json.acct + "@" + domain
+                var fullname = json.acct + '@' + domain
             }
-			utlShow(json.id, "", acct_id)
+            utlShow(json.id, '', acct_id)
-			flw(json.id, "", acct_id)
+            flw(json.id, '', acct_id)
-			fer(json.id, "", acct_id)
+            fer(json.id, '', acct_id)
             if (json.name) {
                 var dis_name = escapeHTML(json.name)
                 dis_name = twemoji.parse(dis_name)
             } else {
                 var dis_name = json.name
             }
-			$("#his-name").html(dis_name)
+            $('#his-name').html(dis_name)
-			$("#his-acct").text(json.username)
+            $('#his-acct').text(json.username)
-			$("#his-acct").attr("fullname", fullname)
+            $('#his-acct').attr('fullname', fullname)
-			$("#his-prof").attr("src", json.avatarUrl)
+            $('#his-prof').attr('src', json.avatarUrl)
-			$("#his-data").css("background-image", "url(" + json.bannerUrl + ")")
+            $('#his-data').css('background-image', 'url(' + json.bannerUrl + ')')
-			$("#his-sta").text(json.notesCount)
+            $('#his-sta').text(json.notesCount)
-			$("#his-follow").text(json.followingCount)
+            $('#his-follow').text(json.followingCount)
-			$("#his-follower").text(json.followersCount)
+            $('#his-follower').text(json.followersCount)
-			$("#his-since").text(crat(json.createdAt))
+            $('#his-since').text(crat(json.createdAt))
             var note = escapeHTML(json.description)
-			$("#his-des").html(twemoji.parse(note))
+            $('#his-des').html(twemoji.parse(note))
             if (json.isCat) {
-				$("#his-bot").html("Cat" + twemoji.parse("😺"))
+                $('#his-bot').html('Cat' + twemoji.parse('😺'))
             }
-			$("#his-data").css("background-size", "cover")
+            $('#his-data').css('background-size', 'cover')
-			localStorage.setItem("history", user)
+            localStorage.setItem('history', user)
                 //自分の時
-			if (json.username == localStorage.getItem("user_" + acct_id) && !json.host) {
+            if (json.username == localStorage.getItem('user_' + acct_id) && !json.host) {
                 //showFav('', acct_id);
                 //showMut('', acct_id);
                 //showReq('', acct_id);
-				showFrl("", acct_id)
+                showFrl('', acct_id)
-				$("#his-name-val").val(json.name)
+                $('#his-name-val').val(json.name)
                 var des = json.note
                 des = nl2br(des)
                 des = $.strip_tags(des)
-				$("#his-des-val").val(des)
+                $('#his-des-val').val(des)
-				$("#his-follow-btn").hide()
+                $('#his-follow-btn').hide()
-				$("#his-block-btn").hide()
+                $('#his-block-btn').hide()
-				$("#his-mute-btn").hide()
+                $('#his-mute-btn').hide()
-				$("#his-notf-btn").hide()
+                $('#his-notf-btn').hide()
-				$("#his-domain-btn").hide()
+                $('#his-domain-btn').hide()
-				$("#his-emp-btn").hide()
+                $('#his-emp-btn').hide()
-				$(".only-my-data").show()
+                $('.only-my-data').show()
-				$(".only-his-data").hide()
+                $('.only-his-data').hide()
-				if (localStorage.getItem("main") == acct_id) {
+                if (localStorage.getItem('main') == acct_id) {
-					$("#his-main-acct").hide()
+                    $('#his-main-acct').hide()
                 }
             } else {
                 if (json.isFollowing) {
                     //自分がフォローしている
-					$("#his-data").addClass("following")
+                    $('#his-data').addClass('following')
-					$("#his-follow-btn-text").text(lang.lang_status_unfollow)
+                    $('#his-follow-btn-text').text(lang.lang_status_unfollow)
                     hisList(user, acct_id)
                 } else {
-					$("#his-follow-btn-text").text(lang.lang_status_follow)
+                    $('#his-follow-btn-text').text(lang.lang_status_follow)
                 }
                 if (json.isFollowed) {
                     //フォローされてる
-					$("#his-relation").text(lang.lang_showontl_followed)
+                    $('#his-relation').text(lang.lang_showontl_followed)
                 }
-				$("#his-block-btn").hide()
+                $('#his-block-btn').hide()
                 if (json.isMuted) {
-					$("#his-data").addClass("muting")
+                    $('#his-data').addClass('muting')
-					$("#his-mute-btn-text").text(lang.lang_status_unmute)
+                    $('#his-mute-btn-text').text(lang.lang_status_unmute)
                 } else {
-					$("#his-mute-btn-text").text(lang.lang_status_mute)
+                    $('#his-mute-btn-text').text(lang.lang_status_mute)
                 }
-				$(".only-my-data").hide()
+                $('.only-my-data').hide()
-				$(".only-his-data").show()
+                $('.only-his-data').show()
             }
             todc()
         })
 }
 //一つ前のユーザーデータ表示
 function historyShow() {
-	var acct_id = $("#his-data").attr("use-acct")
+    var acct_id = $('#his-data').attr('use-acct')
-	var user = $("#his-data").attr("history")
+    var user = $('#his-data').attr('history')
-	udg(user, acct_id, "true")
+    udg(user, acct_id, 'true')
 }
 //選択アカウントのプロフ
 function profShow() {
-	var acct_id = $("#post-acct-sel").val()
+    var acct_id = $('#post-acct-sel').val()
-	var user = localStorage.getItem("user-id_" + acct_id)
+    var user = localStorage.getItem('user-id_' + acct_id)
     udg(user, acct_id)
     hide()
 }
 
 //FF関係取得
 function relations(user, acct_id) {
-	var domain = localStorage.getItem("domain_" + acct_id)
+    var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
+    var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = "https://" + domain + "/api/v1/accounts/relationships?id=" + user
+    var start = 'https://' + domain + '/api/v1/accounts/relationships?id=' + user
     fetch(start, {
-		method: "GET",
+            method: 'GET',
             headers: {
-			"content-type": "application/json",
+                'content-type': 'application/json',
-			Authorization: "Bearer " + at
+                Authorization: 'Bearer ' + at,
-		}
+            },
         })
         .then(function(response) {
             if (!response.ok) {
@@ -412,153 +454,159 @@ function relations(user, acct_id) {
         })
         .catch(function(error) {
             todo(error)
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
             console.error(error)
         })
         .then(function(json) {
             var json = json[0]
-			if(json.requested) {
+            if (json.requested) {
                 //フォロリク中
                 $('#his-data').addClass('following')
-				$("#his-follow-btn-text").text(lang.lang_status_requesting)
+                $('#his-follow-btn-text').text(lang.lang_status_requesting)
             }
             if (json.following) {
                 //自分がフォローしている
-				$("#his-data").addClass("following")
+                $('#his-data').addClass('following')
-				$("#his-follow-btn-text").text(lang.lang_status_unfollow)
+                $('#his-follow-btn-text').text(lang.lang_status_unfollow)
                 hisList(user, acct_id)
             } else {
-				$("#his-follow-btn-text").text(lang.lang_status_follow)
+                $('#his-follow-btn-text').text(lang.lang_status_follow)
             }
             if (json.followed_by) {
                 //フォローされてる
-				$("#his-relation").text(lang.lang_showontl_followed)
+                $('#his-relation').text(lang.lang_showontl_followed)
             }
             if (json.blocking) {
-				$("#his-data").addClass("blocking")
+                $('#his-data').addClass('blocking')
-				$("#his-block-btn-text").text(lang.lang_status_unblock)
+                $('#his-block-btn-text').text(lang.lang_status_unblock)
             } else {
-				$("#his-block-btn-text").text(lang.lang_status_block)
+                $('#his-block-btn-text').text(lang.lang_status_block)
             }
             if (json.muting) {
-				$("#his-data").addClass("muting")
+                $('#his-data').addClass('muting')
-				$("#his-mute-btn-text").text(lang.lang_status_unmute)
+                $('#his-mute-btn-text').text(lang.lang_status_unmute)
             } else {
-				$("#his-mute-btn-text").text(lang.lang_status_mute)
+                $('#his-mute-btn-text').text(lang.lang_status_mute)
             }
             if (json.muting_notifications) {
-				$("#his-data").addClass("mutingNotf")
+                $('#his-data').addClass('mutingNotf')
-				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute)
+                $('#his-notf-btn-text').text(lang.lang_showontl_notf + lang.lang_status_unmute)
             } else {
-				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_mute)
+                $('#his-notf-btn-text').text(lang.lang_showontl_notf + lang.lang_status_mute)
             }
             if (json.domain_blocking) {
-				$("#his-data").addClass("blockingDom")
+                $('#his-data').addClass('blockingDom')
-				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock)
+                $('#his-domain-btn-text').text(lang.lang_showontl_domain + lang.lang_status_unblock)
             } else {
-				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_block)
+                $('#his-domain-btn-text').text(lang.lang_showontl_domain + lang.lang_status_block)
             }
             //Endorsed
             if (json.endorsed) {
-				$("#his-end-btn").addClass("endorsed")
+                $('#his-end-btn').addClass('endorsed')
-				$("#his-end-btn-text").text(lang.lang_status_unendorse)
+                $('#his-end-btn-text').text(lang.lang_status_unendorse)
             } else {
-				$("#his-end-btn").removeClass("endorsed")
+                $('#his-end-btn').removeClass('endorsed')
-				$("#his-end-btn-text").text(lang.lang_status_endorse)
+                $('#his-end-btn-text').text(lang.lang_status_endorse)
             }
             //Blocked
             if (json.blocked_by) {
-				$("#my-data-nav .btn").addClass("disabled")
+                $('#my-data-nav .btn').addClass('disabled')
-				$(".his-var-content").hide()
+                $('.his-var-content').hide()
-				$("#his-float-blocked").show()
+                $('#his-float-blocked').show()
-				$("#his-follow-btn").hide()
+                $('#his-follow-btn').hide()
             }
         })
 }
+
 function profbrws() {
-	var url = $("#his-openin").attr("data-href")
+    var url = $('#his-openin').attr('data-href')
-	postMessage(["openUrl", url], "*")
+    postMessage(['openUrl', url], '*')
 }
+
 function setMain() {
-	var acct_id = $("#his-data").attr("use-acct")
+    var acct_id = $('#his-data').attr('use-acct')
-	localStorage.setItem("main", acct_id)
+    localStorage.setItem('main', acct_id)
     multiSelector(true)
     M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
 }
 //オールリセット
 function hisclose() {
-	$("#his-data").modal("close")
+    $('#his-data').modal('close')
     reset()
-	$("#his-data").attr("history", "")
+    $('#his-data').attr('history', '')
-	localStorage.removeItem("history")
+    localStorage.removeItem('history')
 }
+
 function reset() {
-	$(".his-var-content:eq(0)").show()
+    $('.his-var-content:eq(0)').show()
-	$(".his-var-content:gt(0)").hide()
+    $('.his-var-content:gt(0)').hide()
-	$("#my-data-nav .btn").removeClass("disabled")
+    $('#my-data-nav .btn').removeClass('disabled')
-	$(".active-back").removeClass("active-back")
+    $('.active-back').removeClass('active-back')
-	$(".column-first").addClass("active-back")
+    $('.column-first').addClass('active-back')
-	$("#his-name").text("Loading")
+    $('#his-name').text('Loading')
-	$("#his-acct").text("")
+    $('#his-acct').text('')
-	$("#his-prof").attr("src", "../../img/loading.svg")
+    $('#his-prof').attr('src', '../../img/loading.svg')
-	$("#his-data").css("background-image", "url(../../img/loading.svg)")
+    $('#his-data').css('background-image', 'url(../../img/loading.svg)')
-	$("#his-sta").text("")
+    $('#his-sta').text('')
-	$("#his-follow").text("")
+    $('#his-follow').text('')
-	$("#his-follower").text("")
+    $('#his-follower').text('')
-	$("#his-des").html("")
+    $('#his-des').html('')
-	$("#his-data").css("background-size", "cover")
+    $('#his-data').css('background-size', 'cover')
-	$("#his-since").text("")
+    $('#his-since').text('')
-	$("#his-data").removeClass("following")
+    $('#his-data').removeClass('following')
-	$("#his-data").removeClass("muting")
+    $('#his-data').removeClass('muting')
-	$("#his-data").removeClass("blocking")
+    $('#his-data').removeClass('blocking')
-	$("#his-data").removeClass("mutingNotf")
+    $('#his-data').removeClass('mutingNotf')
-	$("#his-data").removeClass("blockingDom")
+    $('#his-data').removeClass('blockingDom')
-	$("#his-end-btn").removeClass("endorsed")
+    $('#his-end-btn').removeClass('endorsed')
-	$("#his-des").css("max-height", "250px")
+    $('#his-des').css('max-height', '250px')
-	$("#his-bot").html("")
+    $('#his-bot').html('')
-	$("#his-follow-btn").show()
+    $('#his-bot').addClass('hide')
-	$("#his-block-btn").show()
+    $('#his-follow-btn').show()
-	$("#his-mute-btn").show()
+    $('#his-block-btn').show()
-	$("#his-notf-btn").show()
+    $('#his-mute-btn').show()
-	$("#his-domain-btn").show()
+    $('#his-notf-btn').show()
-	$("#his-emp-btn").show()
+    $('#his-domain-btn').show()
-	$("#his-follow-btn-text").text(lang.lang_status_follow)
+    $('#his-emp-btn').show()
-	$("#his-mute-btn-text").text(lang.lang_status_mute)
+    $('#his-follow-btn-text').text(lang.lang_status_follow)
-	$("#his-block-btn-text").text(lang.lang_status_block)
+    $('#his-mute-btn-text').text(lang.lang_status_mute)
-	$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute)
+    $('#his-block-btn-text').text(lang.lang_status_block)
-	$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block)
+    $('#his-notf-btn').text(lang.lang_showontl_notf + lang.lang_status_mute)
-	$("#his-relation").text("")
+    $('#his-domain-btn').text(lang.lang_showontl_domain + lang.lang_status_block)
-	$(".cont-series").html("")
+    $('#his-relation').text('')
-	$("#domainblock").val("")
+    $('.cont-series').html('')
-	$("#his-lists-a").html(lang.lang_showontl_listwarn)
+    $('#domainblock').val('')
-	$("#his-lists-b").html("")
+    $('#his-lists-a').html(lang.lang_showontl_listwarn)
-	$("#his-name-val").val("")
+    $('#his-lists-b').html('')
-	$("#his-des-val").val("")
+    $('#his-name-val').val('')
-	$("#his-f1-name").val("")
+    $('#his-des-val').val('')
-	$("#his-f1-val").val("")
+    $('#his-f1-name').val('')
-	$("#his-f2-name").val("")
+    $('#his-f1-val').val('')
-	$("#his-f2-val").val("")
+    $('#his-f2-name').val('')
-	$("#his-f3-name").val("")
+    $('#his-f2-val').val('')
-	$("#his-f3-val").val("")
+    $('#his-f3-name').val('')
-	$("#his-f4-name").val("")
+    $('#his-f3-val').val('')
-	$("#his-f4-val").val("")
+    $('#his-f4-name').val('')
-	$("#his-endorse").html("")
+    $('#his-f4-val').val('')
-	$("#his-openin").attr("data-href", "")
+    $('#his-endorse').html('')
-	$("#his-float-timeline").show()
+    $('#his-openin').attr('data-href', '')
-	$("#his-float-blocked").hide()
+    $('#his-float-timeline').show()
-	$("#his-main-acct").show()
+    $('#his-float-blocked').hide()
-	$("#his-proof-prof").html("")
+    $('#his-main-acct').show()
+    $('#his-proof-prof').html('')
     $('#his-data').removeClass('locked')
     $('#his-data').removeClass('requesting')
 }
-$("#my-data-nav .anc-link").on("click", function() {
+$('#my-data-nav .anc-link').on('click', function() {
-	var target = $(this).attr("go")
+    var target = $(this).attr('go')
     if (target) {
-		const title = $(this).html()
+        let title = $(this).html()
+        if (target === '#his-tl') $('#util-add').removeClass('hide')
+        if (target != '#his-tl') $('#util-add').addClass('hide')
         $('#his-data-title').html(title)
-		$("#my-data-nav .anc-link").removeClass("active-back")
+        $('#my-data-nav .anc-link').removeClass('active-back')
-		$(this).addClass("active-back")
+        $(this).addClass('active-back')
         $(target).show()
-		$(".his-var-content:not(" + target + ")").hide()
+        $('.his-var-content:not(' + target + ')').hide()
     }
 })

app/main.js

@@ -14,12 +14,12 @@ const dl = require('./main/dl.js')
 const img = require('./main/img.js')
 const np = require('./main/np.js')
 const systemFunc = require('./main/system.js')
-const Menu = electron.Menu
+const { Menu, MenuItem, BrowserWindow, ipcMain } = electron
 const join = require('path').join
 // ウィンドウを作成するモジュール
-const BrowserWindow = electron.BrowserWindow
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow
+let opening = true
 
 // アプリが多重起動しないようにする
 const gotTheLock = app.requestSingleInstanceLock()
@@ -27,9 +27,12 @@ const gotTheLock = app.requestSingleInstanceLock()
 if (!gotTheLock) {
 	app.quit()
 } else {
-	app.on('second-instance', () => {
+	app.on('second-instance', (event, commandLine, workingDirector) => {
-		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
+		opening = false
-		// Someone tried to run a second instance, we should focus our window.
+		const m = commandLine[2].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
+		if (m) {
+			mainWindow.send('customUrl', [m[1], m[2]])
+		}
 		if (mainWindow) {
 			if (mainWindow.isMinimized()) mainWindow.restore()
 			mainWindow.focus()
@@ -39,7 +42,7 @@ if (!gotTheLock) {
 
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function () {
-	electron.session.defaultSession.clearCache(() => {})
+	electron.session.defaultSession.clearCache(() => { })
 	app.quit()
 })
 function isFile(file) {
@@ -76,25 +79,26 @@ function createWindow() {
 	if (!packaged) console.log('launch:' + lang)
 	//Opening
 	const package = fs.readFileSync(__dirname + '/package.json')
-	if(lang == 'ja') {
+	if (lang == 'ja') {
 		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
 		var show = maxims[Math.floor(Math.random() * maxims.length)]
-	} else if(lang == 'ja-KS') {
+	} else if (lang == 'ja-KS') {
 		//ja-KSも作れたらいいね
 		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
 		var show = maxims[Math.floor(Math.random() * maxims.length)]
-	} else{
+	} else {
 		var show = 'TheDesk 2018'
 	}
 	const data = JSON.parse(package)
 	const version = data.version
 	const codename = data.codename
-	var openingWindow = new BrowserWindow({
+	const openingWindow = new BrowserWindow({
 		width: 300,
 		height: 400,
 		transparent: false,
 		frame: false,
 		resizable: false,
+		show: opening
 	})
 	openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`)
 
@@ -133,7 +137,7 @@ function createWindow() {
 		if (!packaged) console.log('enabled: Hardware Acceleration')
 	}
 	let webviewEnabled = false
-	if(fs.existsSync(wv_path, 'utf8')) webviewEnabled = true
+	if (fs.existsSync(wv_path, 'utf8')) webviewEnabled = true
 	var window_size
 	try {
 		window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
@@ -190,13 +194,13 @@ function createWindow() {
 	})
 	mainWindow.webContents.on('page-title-updated', () => {
 		const url = mainWindow.webContents.getURL()
-		if(url.match(/https:\/\/crowdin.com\/profile/)) {
+		if (url.match(/https:\/\/crowdin.com\/profile/)) {
 			app.relaunch()
 			app.exit()
 		}
 	})
 	if (!packaged) mainWindow.toggleDevTools()
-	electron.session.defaultSession.clearCache(() => {})
+	electron.session.defaultSession.clearCache(() => { })
 	if (process.argv) {
 		if (process.argv[1]) {
 			var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
@@ -229,7 +233,7 @@ function createWindow() {
 	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function () {
-		electron.ipcMain.removeAllListeners()
+		ipcMain.removeAllListeners()
 		mainWindow = null
 	})
 	closeArg = false
@@ -242,7 +246,7 @@ function createWindow() {
 			mainWindow.send('asReadEnd', '')
 			let wait = 3000
 			const url = mainWindow.webContents.getURL()
-			if(!url.match(/index.html/)) wait = 0
+			if (!url.match(/index.html/)) wait = 0
 			setTimeout(function () {
 				resolve()
 			}, wait)
@@ -252,7 +256,7 @@ function createWindow() {
 			mainWindow.close()
 		})
 	})
-	electron.ipcMain.on('sendMarkersComplete', function (e, arg) {
+	ipcMain.on('sendMarkersComplete', function (e, arg) {
 		closeArg = true
 		mainWindow.close()
 	})

app/main/language.js

@@ -1,13 +1,11 @@
 // Create the Application's main menu
 function templete(lang, mainWindow, packaged, dir, dirname) {
     //フレーム
-    if(lang !="ja" && lang != "en"){
+    if (lang != "ja" && lang != "en") {
         lang = "en"
     }
-    const electron = require("electron");
+    const electron = require("electron")
-    const ipc = electron.ipcMain;
+    const { Menu, MenuItem, ipcMain, BrowserWindow, app } = electron
-    const app = electron.app;
-    const BrowserWindow = electron.BrowserWindow;
     const join = require('path').join;
     const dict = {
         "application": {
@@ -71,7 +69,7 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
             "en": "Close"
         }
     }
-    if(packaged){
+    if (packaged) {
         var ifDev = [
             {
                 label: dict.reload[lang],
@@ -79,12 +77,12 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
                 click: function () { mainWindow.reload(); }
             }
         ]
-    }else{
+    } else {
         var ifDev = [
             {
                 label: 'Toggle Developer Tools',
                 accelerator: 'Alt+Command+I',
-                click: function () { if (!packaged) { mainWindow.toggleDevTools(); } }
+                click: function () { mainWindow.toggleDevTools(); }
             },
             {
                 label: dict.reload[lang],
@@ -104,7 +102,7 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
                             webviewTag: false,
                             nodeIntegration: false,
                             contextIsolation: true,
-                            preload: join(dirname , "js", "platform", "preload.js")
+                            preload: join(dirname, "js", "platform", "preload.js")
                         },
                         width: 300, height: 500,
                         "transparent": false,    // ウィンドウの背景を透過
@@ -150,6 +148,28 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
         ]
     }
     ];
+    // コピペメニュー
+    const ctxMenu = new Menu()
+    ctxMenu.append(new MenuItem({
+        label: dict.cut[lang],
+        role: 'cut',
+        click: () => { console.log('Cut clicked!') }
+    }))
+    ctxMenu.append(new MenuItem({
+        label: dict.copy[lang],
+        role: 'copy',
+        click: () => { console.log('Copy clicked!') }
+    }))
+    ctxMenu.append(new MenuItem({
+        label: dict.paste[lang],
+        role: 'paste',
+        click: () => { console.log('Paste clicked!') }
+    }))
+
+
+    ipcMain.on('textareaContextMenu', function (e, params) {
+        ctxMenu.popup(mainWindow, params.x, params.y)
+    })
     return menu;
 }
 

app/native.js

@@ -1,4 +1,8 @@
 const { AiScript, parse, values, utils } = require('@syuilo/aiscript')
+const gcc = require('textarea-caret')
+const { v4: uuidv4 } = require('uuid')
+global.uuid = uuidv4
+global.getCaretCoordinates = gcc
 global.sanitizeHtml = require('sanitize-html')
 global.asValue = values
 global.AiScript = AiScript

app/package.json

@@ -1,6 +1,6 @@
 {
     "name": "thedesk",
-    "version": "22.2.0",
+    "version": "22.3.1",
     "codename": "Koume",
     "description": "TheDesk is a Mastodon client for PC.",
     "repository": "https://github.com/cutls/TheDesk",
@@ -9,7 +9,7 @@
         "test": "echo \"Error: no test specified\" && exit 1",
         "postinstall": "run-s util:*",
         "util:hash": "node gitHash.js",
-        "util:browserify": "browserify aiscript.js -o js/platform/aiscript.js",
+        "util:browserify": "browserify native.js -o js/platform/native.js",
         "construct": "node view/make/makeCli.js",
         "construct:store": "node view/make/makeCli.js --store",
         "dev": "run-p dev:*",
@@ -57,7 +57,7 @@
     ],
     "license": "GPL-3.0",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.15.2",
+        "@fortawesome/fontawesome-free": "^5.15.4",
         "@syuilo/aiscript": "^0.11.1",
         "electron-dl": "^3.2.1",
         "itunes-nowplaying-mac": "https://github.com/cutls/itunes-nowplaying-mac/releases/download/v0.4.0/itunes-nowplaying-mac-0.4.0.tgz",
@@ -67,25 +67,28 @@
         "json5": "^2.2.0",
         "lodash": "^4.17.21",
         "materialize-css": "git://github.com/cutls/materialize#v1-dev",
-        "sanitize-html": "^2.3.2",
+        "sanitize-html": "^2.4.0",
         "sumchecker": "^3.0.1",
-        "sweetalert2": "^10.15.7",
+        "sweetalert2": "^11.1.4",
         "system-font-families": "^0.4.1",
-        "vue": "^2.6.12"
+        "textarea-caret": "^3.1.0",
+        "uuid": "^8.3.2",
+        "vue": "^2.6.14"
     },
     "devDependencies": {
         "browserify": "^17.0.0",
-        "chokidar": "^3.5.1",
+        "chokidar": "^3.5.2",
-        "dotenv": "^8.2.0",
+        "dotenv": "^10.0.0",
-        "electron": "^12.0.2",
+        "electron": "^13.2.2",
-        "electron-builder": "^22.10.5",
+        "electron-builder": "^22.11.7",
-        "electron-notarize": "^1.0.0",
+        "electron-notarize": "^1.1.0",
-        "electron-rebuild": "^2.3.5",
+        "electron-rebuild": "^3.2.0",
-        "eslint": "^7.23.0",
+        "eslint": "^7.32.0",
         "npm-run-all": "^4.1.5",
         "readline-sync": "1.4.10"
     },
     "resolutions": {
-        "@types/fs-extra": "9.0.11"
+        "@types/fs-extra": "9.0.11",
+        "plist": "3.0.2"
     }
 }

app/source/themes/white.thedesktheme

@@ -17,7 +17,7 @@
 		bottom: '#eeeeee',
 		emphasized: '#81c784',
 		postbox: '#fff',
-		active: '#009688',
+		active: '#66dacf',
 		selected: '#c0c0c0',
 		selectedWithShared: '#b2babd',
 	},

app/view/make/acct.sample.html

@@ -11,17 +11,15 @@
     <link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
     <link href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-	<link href="../../css/sweetalert2-material.min.css" type="text/css" rel="stylesheet">
+    <link href="../../css/sweetalert2-material.css" type="text/css" rel="stylesheet">
     <link href="../../css/acct.css" rel="stylesheet" type="text/css" />
-	<meta charset="utf-8" />
+    <meta charset="utf-8" /> @@comment-start@@
-	@@comment-start@@
     <script type="text/javascript">
         var _jipt = []
         _jipt.push(['project', 'thedesk'])
     </script>
     <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-	@@comment-end@@
+    @@comment-end@@ @@pwa@@ @@store@@
-	@@pwa@@ @@store@@
 </head>
 
 <body id="mainView" class="@@pwaClass@@">
@@ -40,19 +38,28 @@
         <div id="acct-list"></div>
         <div class="divider"></div>
     </div>
+    <div>
+        <h5>@@add@@</h5>
+
         <div class="hide-second">
             <a href="setting.html">@@haveExported@@</a>
         </div>
-	<div>
-		<h5>@@add@@</h5>
         <br />
         <div id="add">
             <div class="row">
                 <div class="col s8">
-					@@addAcct@@<br />
+                    @@addAcct@@
-					<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
+                    <div class="row">
-					<div id="ins-suggest"></div>
+                        <div class="input-field col s6">
-					<button class="btn waves-effect" onclick="instance()">Login</button><br />
+                            <input type="text" id="autocomplete-input" class="autocomplete" placeholder="eg) mstdn.jp">
+                            <label for="autocomplete-input">URL</label>
+                        </div>
+                        <div class="col s4 loginBtnWrap">
+                            <button class="btn waves-effect" onclick="instance()"><i
+									class="material-icons left">login</i>Login</button>
+                        </div>
+                    </div>
+
                     <div class="pwa">
                         @@codesetupwarn@@<br />
                         <label>
@@ -80,8 +87,7 @@
             <div id="compt" style="display:none" class="scr">
                 <h5>ログイン前に必ずご確認ください</h5>
                 <span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span>のため以下の機能がご利用いただけません。
-				<span id="compt-warn"
+                <span id="compt-warn" style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span>
-					style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span>
                 <ul id="compt-list"></ul>
             </div>
         </div>
@@ -108,16 +114,17 @@
             Some instance data by
             <a href="https://instances.social" target="_blank">instances.social API</a><br />
             <h5 id="ins-title"></h5>
-			Administered by:<a id="ins-admin"></a><br />
+            Administered by:
+            <a id="ins-admin"></a><br />
             <span id="ins-desc"></span><br />
             <img src="../../img/loading.svg" id="ins-prof" width="200" /><br />
-			<br />
+            <br /> @@domain@@:
-			@@domain@@:<span id="ins-name"></span><br />
+            <span id="ins-name"></span><br /> @@connect@@:
-			@@connect@@:<span id="ins-connect"></span>@@ko@@<br />
+            <span id="ins-connect"></span>@@ko@@<br /> @@toots@@:
-			@@toots@@:<span id="ins-toot"></span>@@ko@@<br />
+            <span id="ins-toot"></span>@@ko@@<br /> @@users@@:
-			@@users@@:<span id="ins-user"></span>@@users@@<br />
+            <span id="ins-user"></span>@@users@@<br /> @@safety@@:
-			@@safety@@:<span id="ins-per"></span>%<br />
+            <span id="ins-per"></span>%<br /> @@ver@@:
-			@@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br />
+            <span id="ins-ver"></span>@<span id="ins-upd"></span><br />
         </div>
     </div>
     <script type="text/javascript" src="../../js/ui/theme.js"></script>
@@ -128,7 +135,10 @@
     <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>
-	<script>$('body').addClass(localStorage.getItem('platform'))</script>
+    <script>
+        $('body').addClass(localStorage.getItem('platform'))
+    </script>
+
 </body>
 
 </html>

app/view/make/components/bottomBarHtml.html

@@ -0,0 +1,56 @@
+<!--bottom-->
+<div id="bottom" class="reverse hide">
+    <div class="leftside reverse">
+        <div id="dambox">
+            <button id="posttgl" class="btn waves-effect" style="width: 100%; height: 2.5rem; line-height: 0; margin: 0">
+                    <i class="material-icons" style="position: relative; top: 0.38rem; font-size: 1.5rem; text-align: center; margin-right: 0.76rem">edit</i>@@toot@@
+                </button>
+        </div>
+        <div class="leftside reverse" id="group">
+            <div class="btnsgroup">
+                <a href="acct.html" class="nex waves-effect">
+                    <i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)">account_circle</i>
+                </a>
+                <a href="setting.html" class="nex waves-effect">
+                    <i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
+                </a>
+                <a onclick="nano()" class="nex waves-effect pwa">
+                    <i class="material-icons" title="@@nanoDes@@TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
+                </a>
+                <a onclick="menu()" class="nex waves-effect">
+                    <i class="material-icons" title="@@menu@@">apps</i>
+                </a>
+                <span id="fukidashi">@@hereAddColumns@@</span>
+            </div>
+            <a href="https://thedesk.top/bugs/?lang=@@lang@@" target="_blank" class="waves-effect bgReport" draggable="false" title="Feeling unlucky"> @@foundBug@@ </a>
+        </div>
+    </div>
+    <div>
+        <div id="tips-menu">
+            <div class="btnsgroup" style="height: 2.61rem">
+                <span class="grouptitle">Tips:</span>
+                <a onclick="tips('ver')" class="nex waves-effect">
+                    <i class="material-icons nex" title="@@verTips@@" data-trans-title="ver">info</i>
+                </a>
+                <a onclick="tips('clock')" class="nex waves-effect">
+                    <i class="material-icons nex" title="@@clockTips@@" data-trans-title="clock">access_time</i>
+                </a>
+                <a onclick="tips('memory')" class="nex waves-effect pwa">
+                    <i class="material-icons nex" title="@@ramTips@@" data-trans-title="memory">memory</i>
+                </a>
+                <a onclick="tips('trend')" class="nex waves-effect imasonly" style="display: none">
+                    <i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
+                </a>
+                <a onclick="tips('spotify')" class="nex waves-effect">
+                    <i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+                </a>
+            </div>
+        </div>
+        <div id="tips" class="hide">
+            <a onclick="tipsToggle()" class="nex waves-effect">
+                <i class="material-icons nex" title="@@changeTips@@" data-trans-title="tips">bubble_chart</i>
+            </a>
+            <div id="tips-text" style="width: 23rem; line-height: 1rem"></div>
+        </div>
+    </div>
+</div>

app/view/make/components/index.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html lang="@@lang@@">
+	<head>
+		<script type="text/javascript" src="../../js/ui/theme.js"></script>
+		<link href="../../css/themes.css" type="text/css" rel="stylesheet" />
+		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<link href="../../@@node_base@@/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
+		<link href="../../@@node_base@@/jquery-ui-dist/jquery-ui.min.css" type="text/css" rel="stylesheet" />
+		<link href="../../css/tl.css" rel="stylesheet" type="text/css" />
+		<link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
+		<link href="../../css/post.css" rel="stylesheet" type="text/css" />
+		<link href="../../css/master.css" type="text/css" rel="stylesheet" />
+		<link href="../../css/sort.css" rel="stylesheet" type="text/css" />
+		<link href="../../css/sweetalert2-material.css" type="text/css" rel="stylesheet" />
+		<link href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet" />
+		<meta charset="utf-8" />
+		@@comment-start@@
+		<script type="text/javascript">
+			var _jipt = []
+			_jipt.push(['project', 'thedesk'])
+		</script>
+		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+		@@comment-end@@ @@pwa@@ @@store@@
+	</head>
+
+	<body class="@@pwaClass@@">
+		<script>
+			var ver = '@@versionLetter@@'
+			var gitHash = '@@gitHash@@'
+			//betaを入れるとバージョンチェックしない
+			//var ver="beta";
+			var acct_id = 0
+			var tlid = 0
+		</script>
+		@@preTL@@ @@starterAndDragHandler@@ @@postBox@@ @@tootModal@@ @@userDataModal@@ @@mediaModal@@ @@releaseNote@@
+		<!--PiP-->
+		<div id="pip" class="hide pip-bottom pip-left">
+			<i class="material-icons pip-horiz pointer" onclick="pipHoriz()">chevron_right</i>
+			<i class="material-icons pip-vert pointer" onclick="pipVert()">expand_less</i>
+			<i class="material-icons pointer" onclick="endPip()">close</i>
+			<div id="pip-content"></div>
+		</div>
+		@@menuHtml@@
+		<div id="main">
+			<!--TLのTL-->
+			<div id="timeline-container">
+				<div id="something-wrong">
+					<img src="../../img/thinking.svg" style="width: 150px; margin: 5px; display: none" draggable="false" />
+					<div class="stw" style="display: none">@@helloTheDesk@@</div>
+				</div>
+			</div>
+		</div>
+		@@bottomBarHtml@@ @@supportMe@@
+		<!--左下メッセージ-->
+		<div id="message"></div>
+		<!--Radio Happy(Yui) Taku Inoue-->
+		<audio src="" id="radio"></audio>
+		<!--JS-->
+		<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="../../js/platform/native.js"></script>
+		<script type="text/javascript" src="../../js/platform/plugin.js"></script>
+		<script type="text/javascript" src="../../@@node_base@@/materialize-css/dist/js/materialize.js"></script>
+		<script type="text/javascript" src="../../@@node_base@@/grapheme-splitter/index.js"></script>
+		<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
+		<script type="text/javascript" src="main.js"></script>
+		<script type="text/javascript" src="../../js/common/time.js"></script>
+		<script type="text/javascript" src="../../js/common/blurhash.js"></script>
+		<script type="text/javascript" src="../../js/common/version.js"></script>
+		<script type="text/javascript" src="../../js/common/keyshortcut.js"></script>
+		<script type="text/javascript" src="../../js/common/modal.js"></script>
+		<script type="text/javascript" src="../../@@node_base@@/jquery-ui-dist/jquery-ui.min.js"></script>
+		<script type="text/javascript" src="../../@@node_base@@/sweetalert2/dist/sweetalert2.min.js"></script>
+		<script type="text/javascript" src="../../js/platform/punycode.js"></script>
+		<script type="text/javascript" src="../../js/ui/tips.js"></script>
+		<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
+		<script type="text/javascript" src="../../js/common/about.js"></script>
+		<script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
+		<script type="text/javascript" src="../../js/tl/dm.js"></script>
+		<script type="text/javascript" src="../../js/ui/scroll.js"></script>
+		<script type="text/javascript" src="../../js/tl/announParse.js"></script>
+		<script type="text/javascript" src="../../js/tl/tl.js"></script>
+		<script type="text/javascript" src="../../js/tl/card.js"></script>
+		<script type="text/javascript" src="../../js/tl/parse.js"></script>
+		<script type="text/javascript" src="../../js/tl/poll.js"></script>
+		<script type="text/javascript" src="../../js/tl/date.js"></script>
+		<script type="text/javascript" src="../../js/tl/notification.js"></script>
+		<script type="text/javascript" src="../../js/tl/datails.js"></script>
+		<script type="text/javascript" src="../../js/tl/mix.js"></script>
+		<script type="text/javascript" src="../../js/tl/src.js"></script>
+		<script type="text/javascript" src="../../js/tl/directory.js"></script>
+		<script type="text/javascript" src="../../js/tl/filter.js"></script>
+		<script type="text/javascript" src="../../js/tl/tag.js"></script>
+		<script type="text/javascript" src="../../js/tl/list.js"></script>
+		<script type="text/javascript" src="../../js/tl/speech.js"></script>
+		<script type="text/javascript" src="../../js/ui/post-box.js"></script>
+		<script type="text/javascript" src="../../js/ui/layout.js"></script>
+		<script type="text/javascript" src="../../js/post/emoji.js"></script>
+		<script type="text/javascript" src="../../js/login/instance.js"></script>
+		<script type="text/javascript" src="../../js/login/login.js"></script>
+		<script type="text/javascript" src="../../js/ui/img.js"></script>
+		<script type="text/javascript" src="../../js/ui/pip.js"></script>
+		<script type="text/javascript" src="../../js/ui/sort.js"></script>
+		<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+		<script type="text/javascript" src="../../js/post/post.js"></script>
+		<script type="text/javascript" src="../../js/post/use-txtbox.js"></script>
+		<script type="text/javascript" src="../../js/post/secure.js"></script>
+		<script type="text/javascript" src="../../js/post/img.js"></script>
+		<script type="text/javascript" src="../../js/post/status.js"></script>
+		<script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
+		<script type="text/javascript" src="../../js/post/suggest.js"></script>
+		<script type="text/javascript" src="../../js/post/bb-md.js"></script>
+		<script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>
+		<script type="text/javascript" src="../../js/userdata/his-data.js"></script>
+		<script type="text/javascript" src="../../js/userdata/prof-edit.js"></script>
+		<script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
+		<script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
+		<script type="text/javascript" src="../../js/platform/end.js"></script>
+		<script type="text/javascript" src="../../js/ui/menu.js"></script>
+	</body>
+</html>

app/view/make/components/index.json

@@ -0,0 +1,12 @@
+[
+    "bottomBarHtml",
+    "mediaModal",
+    "menuHtml",
+    "postBox",
+    "preTL",
+    "releaseNote",
+    "starterAndDragHandler",
+    "supportMe",
+    "tootModal",
+    "userDataModal"
+]

app/view/make/components/mediaModal.html

@@ -0,0 +1,54 @@
+<!-- Modal Structure Image-->
+<div id="imagemodal" class="modal modal-fixed-footer">
+    <div class="modal-content">
+        <div id="imagewrap">
+            <img src="" id="imgmodal" />
+        </div>
+        <div class="progress nomargin hide transparent" id="imgmodal-progress">
+            <div class="indeterminate"></div>
+        </div>
+        <br />
+    </div>
+    <div class="modal-footer">
+        <div id="imginfo">
+            <span id="imgprog"></span>% <br />
+            <span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB
+        </div>
+        <a class="waves-effect white-text" onclick="zoom(2)">
+            <i class="material-icons">zoom_in</i>
+        </a>
+        <a class="waves-effect white-text" onclick="zoom(0.5)">
+            <i class="material-icons">zoom_out</i>
+        </a>
+        <a class="waves-effect white-text" onclick="rotate(false)">
+            <i class="material-icons">rotate_90_degrees_ccw</i>
+        </a>
+        <button class="btn waves-effect blue" onclick="copyImgUrl()" title="@@copyURL@@">
+                <i class="material-icons">link</i>
+            </button>
+        <button class="btn waves-effect purple" onclick="dlImg()">
+                <i class="material-icons">file_download</i>
+            </button>
+        <button class="btn waves-effect brown" onclick="detFromImg()" title="@@thisToot@@">
+                <i class="material-icons">pageview</i>
+            </button>
+        <button class="btn waves-effect orange" onclick="imgCont('prev')" id="image-prev">
+                <i class="material-icons">keyboard_arrow_left</i>
+            </button>
+        <button class="btn waves-effect orange" onclick="imgCont('next')" id="image-next">
+                <i class="material-icons">keyboard_arrow_right</i>
+            </button>
+        <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">
+            <i class="material-icons">close</i>
+        </a>
+    </div>
+</div>
+<!-- Modal Structure Video-->
+<div id="videomodal" class="modal modal-fixed-footer">
+    <div class="modal-content">
+        <video src="" id="video" style="max-width: 100%; max-height: 100%" controls loop="true" autoplay="true" />
+    </div>
+    <div class="modal-footer">
+        <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
+    </div>
+</div>

app/view/make/components/menuHtml.html

@@ -0,0 +1,229 @@
+<!--menu-->
+<div id="menu" class="z-depth-5" style="display: none">
+    <div id="menu-bar" class="drag-bar"></div>
+    <span class="cancel">
+            <i class="material-icons waves-effect" onclick="menu()" title="@@closeThisBox@@(X)">cancel</i>
+        </span>
+    <div id="menu-wrapper">
+        <div id="left-menu">
+            <a class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"> <i class="material-icons" aria-hidden="true">add</i><span>@@addColumn@@</span> </a>
+            <a class="waves-effect" onclick="sortMenu()" id="sortMenu"> <i class="material-icons" aria-hidden="true">sort</i><span>@@sortColumns@@</span> </a>
+            <a class="waves-effect" onclick="searchMenu()" id="searchMenu"> <i class="material-icons" aria-hidden="true">search</i><span>@@search@@</span> </a>
+            <a class="waves-effect" onclick="listMenu()" id="listMenu"> <i class="material-icons" aria-hidden="true">view_headline</i><span>@@list@@</span> </a>
+            <a class="waves-effect" onclick="dirMenu()" id="dirMenu"> <i class="material-icons" aria-hidden="true">recent_actors</i><span>@@discover@@</span> </a>
+            <a class="waves-effect" onclick="filterMenu()" id="filterMenu"> <i class="material-icons" aria-hidden="true">filter_list</i><span>@@filter@@</span> </a>
+            <a class="waves-effect" onclick="help()" id="helpMenu"> <i class="material-icons" aria-hidden="true">help_outline</i><span>@@helpAndLogs@@</span> </a>
+            <a class="waves-effect" onclick="location.href='index.html'"> <i class="material-icons" aria-hidden="true">refresh</i><span>@@f5@@</span> </a>
+        </div>
+        <div id="right-menu">
+            <!--カラム追加-->
+            <div id="add-box" class="hide menu-content">
+                <div class="input-field">
+                    <span data-trans="your_acct">@@selectAcct@@</span>
+                    <br />
+                    <select id="add-acct-sel" class="acct-sel" style="color: black" onchange="addselCk()"></select>
+                    <label></label>
+                </div>
+                <div class="input-field">
+                    <div id="auth">
+                        <input type="hidden" value="local" id="type-sel" /> @@showThisTL@@
+                        <div id="tltype">
+                            <a class="type waves-effect active" data-type="local" title="@@local@@">
+                                <div><i class="material-icons" aria-hidden="true">people_outline</i></div>
+                                <span>@@local@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="local-media" title="@@localMedia@@">
+                                <div><i class="material-icons" aria-hidden="true">perm_media</i></div>
+                                <span>@@localMedia@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="home" title="@@home@@">
+                                <div><i class="material-icons" aria-hidden="true">home</i></div>
+                                <span>@@home@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="pub" title="@@fed@@">
+                                <div><i class="material-icons" aria-hidden="true">language</i></div>
+                                <span>@@fed@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="pub-media" title="@@fedMedia@@">
+                                <div><i class="material-icons" aria-hidden="true">perm_media</i></div>
+                                <span>@@fedMedia@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="dm" title="@@dm@@">
+                                <div><i class="material-icons" aria-hidden="true">mail_outline</i></div>
+                                <span>@@dm@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="mix" title="@@integratedTLDes@@">
+                                <div><i class="material-icons" aria-hidden="true">merge_type</i></div>
+                                <span>@@integratedTLDes@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="plus" title="@@localPlusDes@@">
+                                <div><i class="material-icons" aria-hidden="true">reply</i></div>
+                                <span>@@localPlusDes@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="notf" title="@@notf@@">
+                                <div><i class="material-icons" aria-hidden="true">notifications</i></div>
+                                <span>@@notf@@</span>
+                            </a>
+                            <a class="type waves-effect" data-type="bookmark" title="@@bookmark@@">
+                                <div><i class="material-icons" aria-hidden="true">bookmark</i></div>
+                                <span>@@bookmark@@</span>
+                            </a>
+                        </div>
+                    </div>
+                    <div id="noauth" class="hide">
+                        @@showThisTL@@
+                        <input id="noauth-url" type="text" class="validate" style="width: calc(70% - 3rem)" placeholder="e.g:mstdn.jp" />
+                    </div>
+                    <div id="webview-add" class="hide">@@webviewWarn@@</div>
+                </div>
+                <button class="btn waves-effect blue" style="width: calc(100% - 0.7rem)" onclick="addColumn()" data-trans-i="add"><i class="material-icons left">add</i>@@add@@</button>
+                <br />
+                <br />
+            </div>
+            <!--検索-->
+            <div id="src-box" class="hide menu-content">
+                <div class="input-field">
+                    <select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
+                </div>
+                <div class="input-field">
+                    <input id="src" type="text" class="validate" style="width: calc(100% - 150px)" />
+                    <label for="src" data-trans="src">@@search@@</label>
+                    <button class="btn waves-effect indigo" style="width: 36%; padding: 0; padding-left: 1.15rem" onclick="src()" data-trans-i="src">
+                            <i class="material-icons left" style="margin: 0">search</i>@@search@@
+                        </button>
+                    <br />
+                    <br />
+                </div>
+                <div id="search">
+                    <div id="src-contents"></div>
+                </div>
+            </div>
+            <!--ディレクトリ-->
+            <div id="dir-box" class="hide menu-content">
+                <label>
+                        <input class="with-gap" onchange="dirChange('directory')" name="dirsug" type="radio" value="directory" checked />
+                        <span>@@directory@@</span>
+                    </label>
+                <label>
+                        <input class="with-gap" onchange="dirChange('suggest')" name="dirsug" type="radio" value="suggest" />
+                        <span>@@frc@@</span>
+                    </label>
+                <div class="input-field">
+                    <select id="dir-acct-sel" class="acct-sel" onchange="dirselCk()"></select>
+                </div>
+                <div id="dirNoAuth" class="hide">
+                    <input id="dirNoAuth-url" type="text" class="validate" style="width: calc(70% - 3rem)" placeholder="e.g:mastodon.social" />
+                    <button class="btn waves-effect indigo" style="width: 9.23rem; padding: 0; padding-left: 1.15rem" onclick="directory('directory')">
+                            <i class="material-icons left" style="margin: 0">search</i>@@show@@
+                        </button>
+                </div>
+                <div id="directoryConfig">
+                    <label>
+                            <input class="with-gap" onchange="directory('directory')" name="sort" type="radio" value="active" checked />
+                            <span>@@active@@</span>
+                        </label>
+                    <label>
+                            <input class="with-gap" onchange="directory('directory')" name="sort" type="radio" value="new" />
+                            <span>@@newcomer@@</span> </label
+                        ><br />
+                        <label>
+                            <input type="checkbox" class="filled-in" id="local_only" value="true" onchange="directory('directory')" />
+                            <span>@@local_only@@</span>
+                        </label>
+                </div>
+
+                <div id="dir-contents"></div>
+                <button class="btn waves-effect teal disabled" style="width: 100%" id="moreDir" onclick="directory('check', 'more')">@@more@@</button>
+            </div>
+            <!--並べ替え-->
+            <div id="sort-box" class="hide menu-content">
+                <ul id="sort"></ul>
+                <div>
+                    <button onclick="sort()" class="btn waves-effect nex" style="width: 97.5%" data-trans-i="sort"><i class="material-icons left">sort</i>@@sortSet@@</button>
+                </div>
+            </div>
+            <!--リスト-->
+            <div id="list-box" class="hide menu-content">
+                <div class="input-field" style="width: calc(100% - 100px); float: left">
+                    <select id="list-acct-sel" class="acct-sel"></select>
+                    <label>@@selectAcct@@</label>
+                </div>
+                <div style="float: left; padding-top: 8px; padding-bottom: 28px">
+                    <button class="btn waves-effect indigo" style="width: 80px" onclick="list()" data-trans-i="lists">@@listLocale@@</button>
+                </div>
+                <br /><br />
+                <div id="lists"></div>
+                <div id="lists-user"></div>
+                <input type="text" style="width: calc(100% - 143px)" id="list-add" placeholder="@@name@@" />
+                <button class="btn waves-effect" style="width: 120px" onclick="makeNewList()">@@makeNew@@</button>
+            </div>
+            <!--フィルター-->
+            <div id="filter-box" class="hide menu-content">
+                <div class="input-field" style="width: calc(100% - 100px); float: left">
+                    <select id="filter-acct-sel" class="acct-sel"></select>
+                    <label>@@selectAcct@@</label>
+                </div>
+                <div style="float: left; padding-top: 8px; padding-bottom: 28px">
+                    <button class="btn waves-effect indigo" style="width: 80px" onclick="filter()" data-trans-i="filters">@@listLocale@@</button>
+                </div>
+                <div id="filtered-words"></div>
+                <input type="hidden" id="filter-edit-id" />
+                <input type="text" style="width: 150px" id="filter-add-word" placeholder="@@filterWord@@" /><br /> @@degree@@
+                <br />
+                <label>
+                        <input type="checkbox" class="filled-in" id="home_filter" value="home" />
+                        <span>@@home@@</span>
+                    </label>
+                <label>
+                        <input type="checkbox" class="filled-in" id="local_filter" value="public" />
+                        <span>@@local@@</span>
+                    </label>
+                <label>
+                        <input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
+                        <span>@@notf@@</span>
+                    </label>
+                <label>
+                        <input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
+                        <span>@@conver@@</span>
+                    </label>
+                <label>
+                        <input type="checkbox" class="filled-in" id="prof_filter" value="profiles" />
+                        <span>@@prof@@</span> </label
+                    ><br />
+                    @@option@@
+                    <br />
+                    <label>
+                        <input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
+                        <span>@@matchWord@@</span>
+                    </label>
+                <br />
+                <span class="sml">@@warnMatchWord@@</span><br />
+                <label>
+                        <input type="checkbox" class="filled-in" id="except_filter" value="1" />
+                        <span>@@except@@</span>
+                    </label>
+                <br />
+                <span class="sml">@@exceptWorn@@</span><br /> @@avalableBefore@@ <span class="sml">@@warnAvBefore@@<b>@@warnAvBefore2@@</b></span
+                    ><br /><br />
+                    <input type="number" style="width: 50px" id="days_filter" placeholder="d" value="0" />@@days@@
+                    <input type="number" style="width: 50px" id="hours_filter" placeholder="h" value="0" />@@hours@@
+                    <input type="number" style="width: 50px" id="mins_filter" placeholder="m" value="0" />@@mins@@<br />
+                    Quick: <a onclick="filterTime(0,0,30)" class="pointer">30@@mins@@</a>/ <a onclick="filterTime(0,1,0)" class="pointer">1@@hours@@</a>/
+                    <a onclick="filterTime(0,6,0)" class="pointer">6@@hours@@</a>/ <a onclick="filterTime(0,12,0)" class="pointer">12@@hours@@</a>/
+                    <a onclick="filterTime(1,0,0)" class="pointer">1@@days@@</a>/ <a onclick="filterTime(7,0,0)" class="pointer">7@@days@@</a>/
+                    <a onclick="filterTime(0,0,0)" class="pointer">@@unlimited@@</a><br />
+                    <button class="btn waves-effect" style="width: 120px" onclick="makeNewFilter()" id="add-filter-btn">@@add@@</button><br />
+                    <span class="sml">@@warnOnIntegratedTL@@</span>
+            </div>
+            <!--ヘルプとログ-->
+            <div id="help-box" class="hide menu-content">
+                <a href="https://docs.thedesk.top" class="btn waves-effect" style="width: 97.5%">@@help@@</a><br /> @@contactwithlog@@
+                <br />
+                <textarea id="logs" style="height: 250px"></textarea><br />
+            </div>
+        </div>
+    </div>
+    <a onclick="about()" class="nex waves-effect pwa"> <i class="material-icons menu-icon">info</i>@@about@@ </a>&nbsp;|&nbsp;
+    <a onclick="bottomReverse()" class="nex waves-effect"> <i class="material-icons menu-icon">swap_horiz</i>@@reverse@@ </a>&nbsp;|&nbsp;
+    <a onclick="openRN()" class="nex waves-effect"> <i class="material-icons menu-icon">new_releases</i>Release Note </a>
+</div>

app/view/make/components/postBox.html

@@ -0,0 +1,247 @@
+<div id="post-box" class="z-depth-5">
+	<div id="post-bar" class="drag-bar"><span id="unreact">@@post-new@@</span><span id="addreact" class="hide">Reaction</span></div>
+	<!--トゥートボックス-->
+	<div id="left-side">
+		<div class="row" style="margin-bottom: 0">
+			<div class="" style="float: left">
+				<a onclick="profShow()" style="vertical-align: -1.7rem" class="pointer mize">
+					<img src="../../img/missing.svg" id="acct-sel-prof" title="@@showSelectProf@@(Ctrl+Shift+P)" data-trans-title="post_box_prof" style="width: 1.8rem" />
+				</a>
+			</div>
+			<div class="input-field mize" style="float: left; width: calc(100% - 1.8rem); margin-top: 0">
+				<select id="post-acct-sel" class="acct-sel" onchange="mdCheck()"></select>
+			</div>
+			<span class="cancel">
+				<i class="material-icons waves-effect" onclick="hide()" title="@@closeThisBox@@(X)" data-trans-title="post_box_close">cancel</i>
+			</span>
+			<!--Markdown-->
+			<div class="row" style="margin-bottom: 0">
+				<div class="markdown mize hide">
+					<div class="col s12">
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('b')" title="太字(Ctrl+B)テキストボックス内を選択してから押すと囲みます。">format_bold</i>
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('i')" title="斜字(Ctrl+I)テキストボックス内を選択してから押すと囲みます。">format_italic</i>
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('u')" title="下線(Ctrl+U)テキストボックス内を選択してから押すと囲みます。">format_underlined</i>
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('s')" title="取り消し(Ctrl+S)テキストボックス内を選択してから押すと囲みます。">strikethrough_s</i>
+						<i class="material-icons pointer setting waves-effect" onclick="markdown('>','no','yes')" title="引用">format_quote</i>
+						<i class="material-icons pointer setting waves-effect" onclick="markdown('#','no','yes')" title="見出し">short_text</i>
+						<i class="material-icons pointer setting waves-effect" onclick="markdown('`','yes','no')" title="コード挿入　テキストボックス内を選択してから押すと囲みます。">code</i>
+						<i class="material-icons pointer setting waves-effect" onclick="markdown('- ','yes','yes')" title="箇条書きリスト">format_list_bulleted</i>
+						<i class="material-icons pointer setting waves-effect" onclick="markdown('1. ','yes','yes')" title="番号付きリスト">format_list_numbered</i>
+						<i
+							class="pointer setting fa fa-subscript waves-effect"
+							onclick="markdown('__','yes','no','before')"
+							title="下付き文字　テキストボックス内を選択してから押すと囲みます。"
+							style="font-size: 1.5rem"
+						></i>
+						<i
+							class="pointer setting fa fa-superscript waves-effect"
+							onclick="markdown('_','yes','no','before')"
+							title="上付き文字　テキストボックス内を選択してから押すと囲みます。"
+							style="font-size: 1.5rem"
+						></i>
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('spin')" title="回転　テキストボックス内を選択してから押すと囲みます。">autorenew</i>
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('pulse')" title="点滅　テキストボックス内を選択してから押すと囲みます。">flare</i>
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=vertical')" title="上下反転　テキストボックス内を選択してから押すと囲みます。">swap_vert</i>
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('flip=horizontal')" title="左右反転　テキストボックス内を選択してから押すと囲みます。">swap_horiz</i>
+						<span class="sml gray pointer waves-effect">
+							<a onclick="mdToggle()">Markdownエディタを隠す</a>
+						</span>
+						<br />
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('size')" title="文字サイズ変更　テキストボックス内を選択してから押すと囲みます。">format_size</i>
+						<input id="size" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" value="12" />px
+						<i class="material-icons pointer setting waves-effect" onclick="tagsel('colorhex')" title="文字色変更　テキストボックス内を選択してから押すと囲みます。">color_lens</i>
+						<input id="colorhex" style="width: calc(50% - 3.8rem); margin: 0; height: 1.8rem" type="color" />
+						<br />
+						<i class="material-icons pointer setting waves-effect" onclick="markdownLink()" title="リンク挿入">link</i>
+						<input id="linkt" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="リンクテキスト" />&nbsp;
+						<input id="link2" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="リンクアドレス" />
+						<br />
+						<i class="material-icons pointer setting waves-effect" onclick="markdownImage()" title="インライン画像挿入">image</i>
+						<input id="image" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="代替テキスト" />&nbsp;
+						<input id="image2" style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem" placeholder="画像アドレス" />
+					</div>
+				</div>
+				<div class="input-field col s12" id="preview-field" style="margin-top: 0">
+					<div id="md-preview"></div>
+					<span class="sml gray pointer">
+						<a onclick="previewEdit()">Edit</a>
+					</span>
+				</div>
+				<div class="input-field col s12" id="toot-field" style="margin-top: 0; margin-bottom: 0">
+					<textarea id="textarea" class="materialize-textarea unmize" style="margin-bottom: 0" data-length="500"></textarea>
+
+					<div id="suggest"></div>
+					<label for="textarea" data-trans="toot">@@toot@@</label>
+					<br />
+					<span class="sml gray pointer markdown mize" id="preview-btn">
+						<a onclick="preview()">Preview</a>
+					</span>
+					<span class="sml gray pointer anti-markdown mize">
+						<a onclick="mdToggle()">Markdownエディタを表示</a>
+					</span>
+				</div>
+				<div class="col s12 mize" style="margin-top: 0; display: flex; justify-content: space-between">
+					<i class="waves-effect gray material-icons" id="nsfw" title="@@nsfwDes@@" onclick="nsfw()">visibility_off</i>
+					<i class="waves-effect gray material-icons purple-text dropdown-trigger" data-target="dropdown1" id="vis-icon">public</i>
+					<a class="waves-effect gray" id="cw" onclick="cw()" title="@@cwDes@@">CW</a>
+					<span
+						><span id="imgup"></span><span id="imgsel" class="pwa"><i class="waves-effect material-icons gray" onclick="fileselect()" title="@@selfile@@">photo_library</i></span></span
+					>
+					<i class="waves-effect gray material-icons" onclick="emojiToggle()" id="emojibtn" title="@@insertEmoji@@">tag_faces</i>
+					<i class="waves-effect gray material-icons dropdown-trigger" data-target="dropdown2">more_vert</i>
+					<i class="material-icons nex gray waves-effect" title="@@clearToot@@(Ctrl+Shit+C)" data-trans-title="post_box_clear" id="clear">clear</i>
+				</div>
+				<div class="col s12 mize" style="margin-bottom: 0.4rem; padding: 0">
+					<div id="taglist"></div>
+					<div id="preview" class="mize"></div>
+					<span class="sml mize"
+						><span>@@replyMode@@</span>: <span id="rec">@@no@@</span>/<span>@@temp@@</span>:
+						<span id="mec">@@nothing@@</span>
+						<a onclick="stamp()" class="pointer pwa" title="@@stampWarn@@">@@stamp@@: <span id="stamp">Off</span></a> /@@poll@@:
+						<span id="pollsta">@@no@@</span>
+						<span id="vis" class="hide">public</span>
+					</span>
+					<br />
+					<input type="text" id="cw-text" placeholder="@@cwtext@@" class="mize" style="margin: 0" />
+					<div id="sch-box">
+						@@postat@@<br /><span class="sml">@@scheduleWarn@@</span><a onclick="expPostMode()">Expire mode(beta)</a><br />
+						<input type="datetime-local" id="sch-date" placeholder="@@schedule@@" class="datepicker" style="margin: 0" />
+					</div>
+				</div>
+			</div>
+			<!-- 公開範囲 Dropdown Structure -->
+			<ul id="dropdown1" class="dropdown-content">
+				<li>
+					<a onclick="vis('public')">@@publicJP@@(Public)</a>
+				</li>
+				<li>
+					<a onclick="vis('unlisted')">@@unlistedJP@@(Unlisted)</a>
+				</li>
+				<li>
+					<a onclick="vis('private')" id="private-button">@@privateJP@@(Private)</a>
+				</li>
+				<li id="limited-button" class="hide">
+					<a onclick="vis('limited')">限定公開(Limited)</a>
+				</li>
+				<li id="local-button" class="hide">
+					<a onclick="vis('local')">@@localJP@@(Local)</a>
+				</li>
+				<li>
+					<a onclick="vis('direct')" class="disabled direct">@@directJP@@(Direct)</a>
+				</li>
+			</ul>
+			<!-- その他 Dropdown Structure -->
+			<ul id="dropdown2" class="dropdown-content">
+				<li>
+					<a onclick="nowplaying('spotify');">NowPlaying (Spotify)</a>
+				</li>
+				<li class="mac">
+					<a onclick="nowplaying('itunes');">NowPlaying (iTunes macOS)</a>
+				</li>
+				<li class="mac hide" id="ccnp">
+					<a onclick="nowplaying('anynp');">NowPlaying (コントロールセンター)</a>
+				</li>
+				<li>
+					<a onclick="nowplaying('lastFm');">NowPlaying (Last.fm)</a>
+				</li>
+				<li>
+					<a onclick="schedule();">@@schedule@@</a>
+				</li>
+				<li>
+					<a onclick="pollToggle();">@@poll@@</a>
+				</li>
+				<li>
+					<a onclick="draftToggle();">@@draft@@</a>
+				</li>
+			</ul>
+			<!--hidden area-->
+			<input type="hidden" id="reply" />
+			<input type="hidden" id="ideKey" />
+			<input type="hidden" id="quote" />
+			<input type="hidden" id="media" />
+			<!--END hidden area-->
+		</div>
+		<div id="toot-btn-field">
+			<button class="btn waves-effect unmize toot-btn-group" onclick="post()" id="toot-post-btn">@@toot@@</button>
+			<button class="btn waves-effect darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn">
+				<i class="material-icons" id="toot-sec-icon" title="@@sectoot@@">lock_open</i>
+			</button>
+		</div>
+	</div>
+	<div id="right-side">
+		<div id="draft" class="hide right-side-content"></div>
+		<!--絵文字ピッカー-->
+		<div id="emoji" class="hide right-side-content">
+			<span class="gray sml"
+				>@@emojiWarn@@
+				<a onclick="emojiGet('true')" class="pointer">@@refreshEmoji@@</a>
+				<br />
+			</span>
+			<div id="emoji-list" class="" style=""></div>
+			<div class="emoji-control center">
+				<button class="btn waves-effect blue" style="width: 30%; padding: 0" onclick="emojiList('before')" id="emoji-before">
+					<i class="material-icons">navigate_before</i>
+				</button>
+				<span id="emoji-count"></span>/
+				<span id="emoji-sum"></span>
+				<button class="btn waves-effect blue" style="width: 30%; padding: 0" onclick="emojiList('next')" id="emoji-next">
+					<i class="material-icons">navigate_next</i>
+				</button>
+			</div>
+			<div id="default-emoji">
+				<span id="now-emoji"></span>@@showThisEmoji@@<br /><span class="gray sml">@@emojiInsertWarn@@</span>
+				<br />
+				<a onclick="customEmoji()" class="pointer waves-effect" title="@@customEmoji@@">
+					<i class="material-icons">add</i>
+				</a>
+				<a onclick="defaultEmoji('people')" class="pointer waves-effect" title="@@peopleEmoji@@">
+					<i class="material-icons">people</i>
+				</a>
+				<a onclick="defaultEmoji('nature')" class="pointer waves-effect" title="@@natureEmoji@@">
+					<i class="material-icons">local_florist</i>
+				</a>
+				<a onclick="defaultEmoji('food')" class="pointer waves-effect" title="@@foodEmoji@@">
+					<i class="material-icons">restaurant</i>
+				</a>
+				<a onclick="defaultEmoji('activity')" class="pointer waves-effect" title="@@activityEmoji@@">
+					<i class="material-icons">directions_run</i>
+				</a>
+				<a onclick="defaultEmoji('place')" class="pointer waves-effect" title="@@placeEmoji@@">
+					<i class="material-icons">directions_car</i>
+				</a>
+				<a onclick="defaultEmoji('object')" class="pointer waves-effect" title="@@thingsEmoji@@">
+					<i class="material-icons">attach_file</i>
+				</a>
+				<a onclick="defaultEmoji('symbol')" class="pointer waves-effect" title="@@symbolEmoji@@">
+					<i class="material-icons">gesture</i>
+				</a>
+				<a onclick="defaultEmoji('flag')" class="pointer waves-effect" title="@@flagsEmoji@@">
+					<i class="material-icons">flag</i>
+				</a>
+				<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
+					<i class="fab fa-fort-awesome"></i>
+				</a>
+			</div>
+		</div>
+		<!--Poll UI-->
+		<div id="poll" class="hide right-side-content">
+			<div id="mastodon-poll" class="poll-provider">
+				<input type="text" class="mastodon-choice" placeholder="@@choice@@1" />
+				<input type="text" class="mastodon-choice" placeholder="@@choice@@2" />
+				<input type="text" class="mastodon-choice" placeholder="@@choice@@3" />
+				<input type="text" class="mastodon-choice" placeholder="@@choice@@4" />
+				<label>
+					<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+					<span>@@pollmulti@@</span>
+				</label>
+				<label>
+					<input type="checkbox" class="filled-in" id="poll-until" value="1" />
+					<span>@@polluntil@@</span>
+				</label>
+				<input type="number" style="width: 50px" id="days_poll" placeholder="d" value="0" />@@days@@
+				<input type="number" style="width: 50px" id="hours_poll" placeholder="h" value="0" />@@hours@@
+				<input type="number" style="width: 50px" id="mins_poll" placeholder="m" value="6" />@@mins@@
+			</div>
+		</div>
+	</div>
+</div>

app/view/make/components/preTL.html

@@ -0,0 +1,17 @@
+<textarea id="copy" style="top: -100px; position: fixed"></textarea>
+<canvas id="canvas" style="top: -100px; position: fixed; width: 32px; height: 32px" width="32" height="32"></canvas>
+<div id="pageSrc" class="hide z-depth-2">
+    <div class="srcQ"></div>
+    <div class="pageSrcBtn pointer" onclick="doSrc('web')">@@webSrc@@</div>
+    <div class="pageSrcBtn pointer" onclick="doSrc('ts')">@@tsSrc@@</div>
+    <div class="pageSrcBtn pointer" onclick="doSrc('copy')">@@copy@@</div>
+    <div class="pageSrcBtn pointer lastPSB" onclick="doSrc('toot')">@@toot@@</div>
+</div>
+<div class="hide z-depth-2" id="tagContextMenu">
+    <a onclick="doTShowBox('tl')" class="pointer firstTCM" id="tagCMTL"></a>
+    <a onclick="doTShowBox('toot')" class="pointer" id="tagCMToot"></a>
+    <a onclick="doTShowBox('pin')" class="pointer" id="tagCMPin"></a>
+    <a onclick="doTShowBox('f')" class="pointer lastTCM" title="add it to Featured tags" id="tagCMFeature">Feature</a>
+</div>
+<div id="offline" class="hide">@@nowOffline@@</div>
+<div id="re-online" class="hide">@@reOnline@@</div>

app/view/make/components/releaseNote.html

@@ -0,0 +1,34 @@
+<!-- Modal Structure Release Note-->
+<div id="releasenote" class="modal modal-fixed-footer scr">
+    <div class="modal-content">
+        <h3>TheDesk</h3>
+        <a href="https://thedesk.top" target="_blank">HP</a><br />
+        <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
+        <br />
+        <div id="release-22-3-1_Koume" class="release-do" style="display: none">
+            Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br /> 困ったときは、 <a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
+            <h5>Release Note 22.3.1 (Koume)</h5>
+            <!--上のdivのidや1行上のところも変えてね-->
+            ・時限ミュートに対応した
+            <a onclick="udgEx('Cutls@1m.cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png" />cutls</a><br /> ・軽微なバグの修正
+            <a onclick="udgEx('Cutls@1m.cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png" />cutls</a><br />
+        </div>
+        <div id="release-en" style="display: none">
+            <h5>Let's make it native!</h5>
+            <a href="https://translate.thedesk.top">Crowdin translation project</a>
+        </div>
+        <br /><br />
+        <h3>@@supportme@@</h3>
+        @@TheDeskDes@@<br />
+        <a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank"> @@PixivSupport@@ </a>
+        <a class="btn-share btn waves-effect waves-light red darken-2" href="https://www.patreon.com/cutls" target="_blank"> @@PatreonSupport@@ </a>
+        <a class="btn-share btn waves-effect waves-light black-text" href="https://liberapay.com/cutls" target="_blank" style="background-color: #f6c915"> Liberapay </a>
+        <a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank"> @@AWLSupport@@ </a>
+        <br /> @@SendAmazonGift1@@ <a href="mailto:web-pro@cutls.com" target="_blank">web-pro@cutls.com</a>@@SendAmazonGift2@@<br /> Kyash
+        <br />
+        <img src="../../img/kyash.png" width="100" /><br />
+    </div>
+    <div class="modal-footer">
+        <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
+    </div>
+</div>

app/view/make/components/starterAndDragHandler.html

@@ -0,0 +1,50 @@
+<div id="tl">
+    <!--TL-->
+    <!--スターター-->
+    <div id="start" class="scr">
+        <div id="start-content">
+            <h3 class="center">@@demoBottomBtns@@</h3>
+            @@lookAtBottom@@
+            <div id="demobottom">
+                <button class="btn waves-effect" style="width: 23rem; height: 2.5rem; line-height: 0; margin: 0; background-color: var(--active)">
+                        <i class="material-icons" style="position: relative; top: 0.4rem; font-size: 1.5rem; text-align: center; margin-right: 0.7rem">edit</i>@@toot@@
+                    </button>
+                <div class="leftside reverse" id="demogroup">
+                    <div class="btnsgroup" style="margin-left: 0.4rem">
+                        <a href="#" class="nex waves-effect">
+                            <i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)">account_circle</i>
+                        </a>
+                        <a href="#" class="nex waves-effect">
+                            <i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
+                        </a>
+                        <a class="nex waves-effect">
+                            <i class="material-icons" title="@@nanoDes@@TheDesk Nano">remove_from_queue</i>
+                        </a>
+                        <a class="nex waves-effect" id="list-tgl">
+                            <i class="material-icons" title="@@menu@@">apps</i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <br />
+            <i class="material-icons nex big-icon">account_circle</i>: @@acctMan@@<br /> @@acctManDesc@@
+            <hr />
+            <i class="material-icons nex">settings</i>: @@setting@@<br /> @@settingDesc@@
+            <hr />
+            <i class="material-icons nex">remove_from_queue</i>: TheDesk Nano @@nanoDes@@<br /> @@nanoDescPlus@@
+            <hr />
+            <i class="material-icons nex">apps</i>: @@menu@@<br /> @@menuDesc@@
+            <br />
+            <br />
+            <button class="btn waves-effect" onclick="closeStart()" style="width: 300px">@@close@@</button>
+        </div>
+    </div>
+    <!--ドラッグハンドラ-->
+    <div id="drag">
+        <div id="drag-content">
+            @@draghere@@
+            <br />
+            <button class="btn waves-effect" onclick="closedrop()">@@close@@</button>
+        </div>
+    </div>
+</div>

app/view/make/components/supportMe.html

@@ -0,0 +1,33 @@
+<!--Support me-->
+<div id="support-btm" class="z-depth-4 hide scr">
+    <div id="support-btm-ja">
+        <h5>ご支援いただけませんか？</h5>
+        (これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br /> あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。<br /> 乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。
+        <br />
+        <br /> TheDeskになぜ金銭が発生するかについて: 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。
+        <br />
+        <b>全てのユーザーが安心してTheDeskを使っていただける環境のため</b>にも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。<br />
+        <b>@@TheDeskDes@@</b>
+    </div>
+    <div id="support-btm-en" class="hide">
+        <h5>Support me</h5>
+        It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!<br />
+        <b>@@TheDeskDes@@</b>
+    </div>
+    <div id="support-btm-middle">
+        <h5>@@monthly@@</h5>
+        <a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank"> @@PixivSupport@@ </a>
+        <a class="btn-share btn waves-effect waves-light red darken-2" href="https://www.patreon.com/cutls" target="_blank"> @@PatreonSupport@@ </a>
+        <a class="btn-share btn waves-effect waves-light black-text" href="https://liberapay.com/cutls" target="_blank" style="background-color: #f6c915"> Liberapay </a>
+    </div>
+    <div id="support-btm-right">
+        <h5>@@once@@</h5>
+        <a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank"> @@AWLSupport@@ </a>
+        <br /> @@SendAmazonGift1@@ <a href="mailto:web-pro@cutls.com" target="_blank">web-pro@cutls.com</a>@@SendAmazonGift2@@<br /> Kyash
+        <br />
+        <img src="../../img/kyash.png" width="100" /><br />
+    </div>
+    <div id="support-btm-close">
+        <button class="btn waves-effect" style="width: 100%" onclick="closeSupport()" id="add-filter-btn">@@close@@</button>
+    </div>
+</div>

app/view/make/components/tootModal.html

@@ -0,0 +1,96 @@
+<!-- Modal Structure Tootdata-->
+<div id="tootmodal" class="modal modal-fixed-footer">
+    <div class="modal-content">
+        <ul class="collapsible" id="det-col">
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">people_outline</i>@@afterLTL@@</div>
+                <div class="collapsible-body toot-reset" id="ltl-after"></div>
+            </li>
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">person_outline</i>@@afterUTL@@</div>
+                <div class="collapsible-body toot-reset" id="user-after"></div>
+            </li>
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">language</i>@@afterFTL@@</div>
+                <div class="collapsible-body toot-reset" id="ftl-after"></div>
+            </li>
+            <li>
+                <div class="collapsible-header">
+                    <i class="material-icons">arrow_upward</i>@@contextBefore@@
+                    <i class="material-icons red-text hide" id="toot-reply-new">new_releases</i>
+                </div>
+                <div class="collapsible-body toot-reset" id="toot-reply"></div>
+            </li>
+            <li>
+                <div class="collapsible-header" id="activator"><i class="material-icons">more_horiz</i>@@thisToot@@</div>
+                <div class="collapsible-body">
+                    <div class="toot-reset" id="toot-this"></div>
+                </div>
+            </li>
+            <li>
+                <div class="collapsible-header">
+                    <i class="material-icons">arrow_downward</i>@@contextAfter@@
+                    <i class="material-icons red-text hide" id="toot-after-new">new_releases</i>
+                </div>
+                <div class="collapsible-body toot-reset" id="toot-after"></div>
+            </li>
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">people_outline</i>@@beforeLTL@@</div>
+                <div class="collapsible-body toot-reset" id="toot-before"></div>
+            </li>
+            <li class="dm-hide contextTool">
+                <div class="collapsible-header"><i class="material-icons">person_outline</i>@@beforeUTL@@</div>
+                <div class="collapsible-body toot-reset" id="user-before"></div>
+            </li>
+            <li>
+                <div class="collapsible-header"><i class="material-icons">star</i>@@favedPeople@@</div>
+                <div class="collapsible-body toot-reset" id="toot-fav"></div>
+            </li>
+            <li class="dm-hide">
+                <div class="collapsible-header"><i class="text-darken-3 false fas fa-retweet"></i>@@btedPeople@@</div>
+                <div class="collapsible-body toot-reset" id="toot-rt"></div>
+            </li>
+        </ul>
+        <div class="dm-hide" style="max-width: 450px">
+            @@useOtherAcct1@@(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>@@useOtherAcct2@@)<br />
+            <div class="row">
+                <div class="col s6">
+                    <select id="status-acct-sel" class="acct-sel"></select>
+                </div>
+                <div class="col s2">
+                    <button class="dropdown-button btn waves-effect" style="width: 100%" onclick="staEx('reply')">
+                            <i class="fas fa-share"></i>
+                        </button>
+                </div>
+                <div class="col s2">
+                    <button class="dropdown-button btn waves-effect indigo" style="width: 100%" onclick="staEx('rt')">
+                            <i class="fas fa-retweet"></i>
+                        </button>
+                </div>
+                <div class="col s2">
+                    <button class="dropdown-button btn waves-effect orange" style="width: 100%" onclick="staEx('fav')">
+                            <i class="fas fa-star"></i>
+                        </button>
+                </div>
+            </div>
+            @@btWithVis@@<br />
+            <button class="btn waves-effect darken-3 toot-btn-group purple" onclick="boostWith('public')">
+                    <i class="material-icons">public</i>
+                </button>
+            <button class="btn waves-effect darken-3 toot-btn-group blue" onclick="boostWith('unlisted')">
+                    <i class="material-icons">lock_open</i>
+                </button>
+            <button class="btn waves-effect darken-3 toot-btn-group orange" onclick="boostWith('private')">
+                    <i class="material-icons">lock</i>
+                </button>
+            <div id="toot-tools"></div>
+            <div id="toot-after"></div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">@@openBrowser@@</a>
+        <a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">@@copyURL@@</a>
+        <a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">@@embed@@</a>
+        <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
+    </div>
+</div>

app/view/make/components/userDataModal.html

@@ -0,0 +1,210 @@
+<!-- Modal Structure Userdata -->
+<div id="his-data" class="modal bottom-sheet modal-fixed-footer" style="max-height: 750px; height: 90%">
+	<div id="his-data-content" class="modal-content" style="padding-bottom: 0; overflow-y: hidden">
+		<div id="his-data-show">
+			<div id="his-data-wrap">
+				<div class="his-float" id="his-float-data">
+					<div id="his-leftside">
+						<div id="his-basic-prof">
+							<div>
+								<img src="../../img/loading.svg" id="his-prof" draggable="false" />
+							</div>
+							<div>
+								<span id="his-name">Loading...</span>
+								<span class="gray">@</span><span id="his-acct" class="gray"></span><br />
+								<span class="gray" id="his-relation"></span>
+								<br />
+								<span class="cbadge"> <span id="his-sta"></span>@@toots@@ </span>
+								<span class="cbadge"
+									>@@follow@@:
+									<span id="his-follow"></span>
+								</span>
+								<span class="cbadge">@@follower@@: <span id="his-follower"></span> </span><br />
+								<span class="cbadge" style="max-width: 11.5rem; width: 11.5rem"
+									>Since:
+									<span id="his-since"></span>
+								</span>
+								<span class="cbadge" id="his-bot">[bot]</span>
+							</div>
+						</div>
+						<div id="his-proof-prof"></div>
+						<div id="his-des" data-acct=""></div>
+						<br />
+						<div id="his-table"></div>
+						<br />
+						<div id="his-sign-action">
+							<a href="#!" class="waves-effect waves-green btn" onclick="follow()" style="flex-basis: 100%" id="his-follow-btn"
+								><i class="material-icons">people</i><span id="his-follow-btn-text">@@follow@@</span></a
+							>
+							<a href="#!" class="waves-effect waves-green btn blue shrinker" onclick="muteMenu()" id="his-mute-btn"
+								><i class="material-icons">voice_over_off</i><span id="his-mute-btn-text">@@mute@@</span>
+							</a>
+							<a href="#!" class="waves-effect waves-green btn red shrinker" onclick="block()" id="his-block-btn"
+								><i class="material-icons">block</i><span id="his-block-btn-text">@@block@@</span></a
+							>
+							<a class="dropdown-trigger btn waves-effect grey" href="#" data-target="actiondropdown"> <i class="material-icons">more_vert</i>@@more@@</a>
+						</div>
+						<div id="muteDuration" class="hide">
+							<label>
+								<input type="checkbox" class="filled-in" id="notf_mute" value="1" />
+								<span>@@notfMute@@</span>
+							</label>
+							<br />
+							@@zeroSetToInfinity@@<br />
+							Quick: <a onclick="muteTime(0,0,5)" class="pointer">5@@mins@@</a>/ <a onclick="muteTime(0,0,30)" class="pointer">30@@mins@@</a>/ <a onclick="muteTime(0,1,0)" class="pointer">1@@hours@@</a>/
+							<a onclick="muteTime(0,6,0)" class="pointer">6@@hours@@</a>/ <a onclick="muteTime(1,0,0)" class="pointer">1@@days@@</a>/ 
+                            <a onclick="muteTime(3,0,0)" class="pointer">3@@days@@</a>/ <a onclick="muteTime(7,0,0)" class="pointer">7@@days@@</a>
+							<a onclick="muteTime(0,0,0)" class="pointer">@@unlimited@@</a><br />
+							<input type="number" style="width: 62px" id="days_mute" placeholder="d" value="0" />@@days@@
+							<input type="number" style="width: 62px" id="hours_mute" placeholder="h" value="0" />@@hours@@
+							<input type="number" style="width: 62px" id="mins_mute" placeholder="m" value="0" />@@mins@@
+							<a href="#!" class="waves-effect waves-green btn blue" onclick="muteDo()" id="his-mute-btn"
+								><i class="material-icons">voice_over_off</i><span id="his-mute-btn-text">@@mute@@</span>
+							</a>
+						</div>
+						<!-- Dropdown Structure -->
+						<ul id="actiondropdown" class="dropdown-content">
+							<li onclick="empUser()">
+								<a title="@@empUser@@"><i class="material-icons">highlight</i>@@empUser@@</a>
+							</li>
+							<li onclick="pinUser()" class="only-his-data">
+								<a title="@@endorse@@"><i class="material-icons">thumb_up</i>@@endorse@@</a>
+							</li>
+							<li onclick="profbrws()" id="his-openin">
+								<a title="@@openinbrowser@@"><i class="material-icons">open_in_browser</i>@@openinbrowser@@</a>
+							</li>
+							<li onclick="setMain()" class="only-my-data" id="his-main-acct">
+								<a title="@@mainacct@@"><i class="material-icons">grade</i>@@mainacct@@</a>
+							</li>
+						</ul>
+					</div>
+				</div>
+				<div class="his-float" id="his-float-timeline">
+					<div id="my-data-nav">
+						<a go="#his-tl" title="@@timeline@@" class="btn active-back column-first anc-link waves-effect"><i class="material-icons">timeline</i>@@timeline@@</a>
+						<a go="#his-follow-list" title="@@follow@@" class="btn anc-link waves-effect"><i class="material-icons">people</i>→@@follow@@</a>
+						<a go="#his-follower-list" title="@@follower@@" class="btn anc-link waves-effect"><i class="material-icons">people</i>←@@follower@@</a>
+						<a go="#his-fav-list" title="@@favRegist@@" class="btn only-my-data anc-link waves-effect"> <i class="material-icons">star</i>@@favRegist@@</a>
+						<a class="dropdown-trigger btn waves-effect" href="#" data-target="hisdropdown"><i class="material-icons">more_vert</i>@@more@@</a>
+						<div id="his-data-title-wrap">
+							<span id="his-data-title"><i class="material-icons">timeline</i>@@timeline@@</span>
+							<button class="btn waves-effect grey darken-2" style="width: 180px" id="util-add" onclick="utlAdd()">
+								<i class="material-icons">add</i>
+								@@utlColumn@@
+							</button>
+						</div>
+						<!-- Dropdown Structure -->
+						<ul id="hisdropdown" class="dropdown-content">
+							<li class="anc-link only-his-data" go="#his-list">
+								<a href="#" title="@@list@@"> <i class="material-icons">list</i>@@list@@ </a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-blocking-list">
+								<a href="#" title="@@blocks@@"><i class="material-icons">block</i>@@blocks@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-muting-list">
+								<a href="#" title="@@mute@@"><i class="material-icons">voice_over_off</i>@@mute@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-domain-list">
+								<a href="#" title="@@domainBlock@@"><i class="material-icons">cancel_schedule_send</i>@@domainBlock@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-prof-list">
+								<a href="#" title="@@editProf@@"><i class="material-icons">create</i>@@editProf@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-request-list">
+								<a href="#" title="@@followReq@@"><i class="material-icons">how_to_reg</i>@@followReq@@</a>
+							</li>
+							<li class="anc-link only-my-data" go="#his-follow-recom-list">
+								<a href="#" title="@@frc@@"><i class="material-icons">recent_actors</i>@@frc@@</a>
+							</li>
+							<li class="anc-link only-his-data" go="#his-action">
+								<a href="#" title="@@operateOtherAcct@@"><i class="material-icons">account_box</i>@@operateOtherAcct@@</a>
+							</li>
+						</ul>
+					</div>
+					<div id="his-tl" class="his-var-content">
+						<div id="his-tl-contents" class="cont-series"></div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="utlShow('--now','more')">@@more@@</button>
+					</div>
+					<div id="his-follow-list" class="his-var-content">
+						<div id="his-follow-list-contents" class="cont-series"></div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="flw('--now','more')">@@more@@</button>
+					</div>
+					<div id="his-follower-list" class="his-var-content">
+						<div id="his-follower-list-contents" class="cont-series"></div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="fer('--now','more')">@@more@@</button>
+					</div>
+					<div id="his-action" class="his-var-content">
+						@@useOtherAcct1@@@@revoverJP@@@@follow@@(@@warnUseOtherAcct@@)<br />
+						<div style="max-width: 500px">
+							<select id="user-acct-sel" class="acct-sel"></select>
+						</div>
+						@@revoverJPde@@
+						<a href="#!" class="waves-effect btn" onclick="follow('selector','selector')">@@follow@@</a><br />
+						@@or@@
+						<br />
+						<a href="#!" class="waves-effect btn" onclick="udgEx('selector', 'selector')">@@openProf@@</a><br />
+					</div>
+					<div id="his-list" class="his-var-content">
+						<div id="his-lists-a">@@warnListRegist@@</div>
+
+						<div id="his-lists-b"></div>
+					</div>
+					<div id="his-fav-list" class="his-var-content">
+						<div id="his-fav-list-contents" class="cont-series"></div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showFav('more')">@@more@@</button>
+					</div>
+					<div id="his-blocking-list" class="his-var-content">
+						<div id="his-blocking-list-contents" class="cont-series"></div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showBlo('more')">@@more@@</button>
+					</div>
+					<div id="his-muting-list" class="his-var-content">
+						<div id="his-muting-list-contents" class="cont-series"></div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showMut('more')">@@more@@</button>
+					</div>
+					<div id="his-domain-list" class="his-var-content">
+						<div id="his-domain-list-contents" class="cont-series"></div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showDom('more')">@@more@@</button>@@blockDomain@@
+						<br />
+						<input type="text" placeholder="example.com" id="domainblock" />
+						<button class="btn waves-effect" onclick="addDomainblock()">@@add@@</button>
+						<br />
+					</div>
+					<div id="his-prof-list" class="his-var-content">
+						@@name@@
+						<br />
+						<input type="text" placeholder="@@name@@" id="his-name-val" style="max-width: 250px" />
+						<br />@@note@@
+						<br />
+						<div class="input-field col s12">
+							<textarea placeholder="@@note@@" id="his-des-val" class="materialize-textarea"></textarea>
+							<label for="his-des-val">@@note@@</label>
+						</div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="profedit()">@@change@@</button>
+						<br />@@editProfImg@@:
+						<span id="prof-change">
+							<input type="file" onchange="imgChange(this,'avatar')" />
+						</span>
+						<br />@@editHeader@@:
+						<span id="header-change">
+							<input type="file" onchange="imgChange(this,'header')" />
+						</span>
+					</div>
+					<div id="his-request-list" class="his-var-content">
+						<div id="his-request-list-contents" class="cont-series"></div>
+						<button class="btn waves-effect" style="width: 100%; padding: 0" onclick="showReq('more')">@@more@@</button>
+					</div>
+					<div id="his-follow-recom-list" class="his-var-content">
+						<div id="his-follow-recom-contents" class="cont-series"></div>
+					</div>
+					<div id="his-float-blocked">
+						<div>@@blocked@@</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="modal-footer">
+		<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn" onclick="historyShow()">@@historyBack@@</button>
+		<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">@@close@@</a>
+	</div>
+</div>

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

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

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

@@ -72,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

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

@@ -72,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Отваряне в браузъра",
     "screenshot": "Направете снимка на екрана",
     "copyURL": "Копирай URL адреса на този тоот",
+    "copy": "Copy",
     "embed": "Закрепи",
     "toots": "Тоот",
     "follow": "Следвам",
@@ -178,6 +179,7 @@
     "foundBug": "Намерена е грешка",
     "show": "Покажи",
     "directory": "Директория",
+    "discover": "Discover",
     "active": "Наскоро активен",
     "newcomer": "Новодошли",
     "local_only": "Само местно",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Вграденият HTML е изрязан.",
     "lang_details_url": "URL адресът на този toot е изрязан.",
     "lang_details_txt": "Съдържанието на този toot е изрязано.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "Няма данни",
     "lang_filter_errordegree": "Моля, проверете контекстта",
     "lang_list_nodata": "Няма данни",

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

@@ -72,6 +72,7 @@
   "desc": "Относно тази тема",
   "customImport": "Импортиране на персонализирани теми",
   "delete": "Изтрий",
+  "preview": "Preview",
   "timeline": "Предпочитания за времевата линия",
   "timemode": "Времеви формат",
   "relativetime": "Относителен формат: „преди 1 минута“, „преди 3 дни“",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Звук (Отговор)",
   "favSound": "Звук(Фаворит)",
   "btSound": "Звук(Подсилване)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

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

@@ -72,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Otevřít v prohlížeči",
     "screenshot": "Vytvořit snímek obrazovky",
     "copyURL": "Kopírovat URL tohoto tootu",
+    "copy": "Copy",
     "embed": "Vložit",
     "toots": "Tooty",
     "follow": "Sledovat",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "HTML pro vložení je zkopírován.",
     "lang_details_url": "URL adresa tohoto tootu je zkopírována.",
     "lang_details_txt": "Obsah tohoto tootu je zkopírován.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "Žádná data",
     "lang_filter_errordegree": "Prosím zkontrolujte kontext",
     "lang_list_nodata": "Žádná data",

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

@@ -72,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Časový formát",
   "relativetime": "Relativní formát: „před 1 minutou“, „před 3 dny“",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

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

@@ -72,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

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

@@ -1,7 +1,7 @@
 {
     "draghere": "Zum Hochladen hier her ziehen",
-    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "nowOffline": "OFFLINE: Ihr gesamter Beiträge befinden sich in Entwürfen und du solltest nach einer erneuten Internetverbindung neu laden",
-    "reOnline": "Now we are in the Internet, you should reload...",
+    "reOnline": "Jetzt haben wir wieder Internet. Du solltest neuladen...",
     "close": "Schließen",
     "webSrc": "Suche im Internet",
     "tsSrc": "Bei Tootsearch suchen",
@@ -74,6 +74,7 @@
     "openBrowser": "Im Browser öffnen",
     "screenshot": "Bildschirmfoto aufnehmen",
     "copyURL": "URL dieses Tröts kopieren",
+    "copy": "Kopieren",
     "embed": "Einbinden",
     "toots": "Tröts",
     "follow": "Folgen",
@@ -178,6 +179,7 @@
     "foundBug": "Ich habe einen Fehler gefunden",
     "show": "Zeige",
     "directory": "Verzeichnis",
+    "discover": "Entdecken",
     "active": "Kürzlich aktiv",
     "newcomer": "Neu eingetroffen",
     "local_only": "Nur lokal",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Eingefügtes HTML wurde entfernt.",
     "lang_details_url": "URL dieses Tröts wurde entfernt.",
     "lang_details_txt": "Inhalt dieses Tröts wurde entfernt.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "Keine Daten",
     "lang_filter_errordegree": "Bitte überprüfen Sie den Kontext",
     "lang_list_nodata": "Keine Daten",

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

@@ -72,6 +72,7 @@
   "desc": "Über dieses Design",
   "customImport": "Import von eigenen Designs",
   "delete": "Löschen",
+  "preview": "Preview",
   "timeline": "Verlaufseinstellungen",
   "timemode": "Zeitformat",
   "relativetime": "Relatives Format:\"vor 1 Minuten\",\"vor 3 Tagen\"",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Ton bei Antwort",
   "favSound": "Ton bei Favorit",
   "btSound": "Ton bei Verstärkung",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

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

@@ -72,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "crwdns3190:0crwdne3190:0",
     "screenshot": "crwdns3192:0crwdne3192:0",
     "copyURL": "crwdns3194:0crwdne3194:0",
+    "copy": "crwdns4586:0crwdne4586:0",
     "embed": "crwdns3196:0crwdne3196:0",
     "toots": "crwdns3198:0crwdne3198:0",
     "follow": "crwdns3200:0crwdne3200:0",
@@ -178,6 +179,7 @@
     "foundBug": "crwdns4431:0crwdne4431:0",
     "show": "crwdns3388:0crwdne3388:0",
     "directory": "crwdns3390:0crwdne3390:0",
+    "discover": "crwdns4590:0crwdne4590:0",
     "active": "crwdns3392:0crwdne3392:0",
     "newcomer": "crwdns3394:0crwdne3394:0",
     "local_only": "crwdns3396:0crwdne3396:0",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "crwdns3584:0crwdne3584:0",
     "lang_details_url": "crwdns3586:0crwdne3586:0",
     "lang_details_txt": "crwdns3588:0crwdne3588:0",
+    "lang_details_fetch": "crwdns4588:0crwdne4588:0",
     "lang_filter_nodata": "crwdns3590:0crwdne3590:0",
     "lang_filter_errordegree": "crwdns3592:0crwdne3592:0",
     "lang_list_nodata": "crwdns3594:0crwdne3594:0",

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

@@ -72,6 +72,7 @@
   "desc": "crwdns3992:0crwdne3992:0",
   "customImport": "crwdns3996:0crwdne3996:0",
   "delete": "crwdns3998:0crwdne3998:0",
+  "preview": "crwdns4584:0crwdne4584:0",
   "timeline": "crwdns4002:0crwdne4002:0",
   "timemode": "crwdns4004:0crwdne4004:0",
   "relativetime": "crwdns4006:0crwdne4006:0",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "crwdns4384:0crwdne4384:0",
   "moreContextMode": "crwdns4572:0crwdne4572:0",
   "moreContextModeWarn": "crwdns4574:0crwdne4574:0",
+  "smallHeader": "crwdns4582:0crwdne4582:0",
   "replySound": "crwdns4088:0crwdne4088:0",
   "favSound": "crwdns4090:0crwdne4090:0",
   "btSound": "crwdns4092:0crwdne4092:0",

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

@@ -1,183 +1,187 @@
 {
-    "draghere":"Drag here to upload",
+    "draghere": "Drag here to upload",
-    "nowOffline":"OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
-    "reOnline":"Now we are in the Internet, you should reload...",
+    "reOnline": "Now we are in the Internet, you should reload...",
-    "close":"Close",
+    "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
-    "showSelectProf":"Show profile of the selecting account",
+    "showSelectProf": "Show profile of the selecting account",
-    "closethisbox":"Close this box",
+    "closethisbox": "Close this box",
-    "toot":"Toot",
+    "toot": "Toot",
-    "post-new":"Post new",
+    "post-new": "Post new",
-    "nsfwDes":"Mark media as sensitive",
+    "nsfwDes": "Mark media as sensitive",
-    "cwDes":"Hide text behind warning",
+    "cwDes": "Hide text behind warning",
-    "selfile":"Attach..",
+    "selfile": "Attach..",
-    "insertEmoji":"Emojis",
+    "insertEmoji": "Emojis",
-    "schedule":"Scheduled toot",
+    "schedule": "Scheduled toot",
-    "postat":"Post at",
+    "postat": "Post at",
-    "scheduleWarn":"2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
+    "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
-    "clearToot":"Clear toot box",
+    "clearToot": "Clear toot box",
-    "replyMode":"Reply",
+    "replyMode": "Reply",
-    "no":"No",
+    "no": "No",
-    "yes":"Yes",
+    "yes": "Yes",
-    "temp":"Attaching files",
+    "temp": "Attaching files",
-    "nothing":"None",
+    "nothing": "None",
     "stamp": "Stamp",
     "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
-    "vis":"Adjust status privacy",
+    "vis": "Adjust status privacy",
-    "cwtext":"Warning text",
+    "cwtext": "Warning text",
-    "selectVis":"Adjust status privacy",
+    "selectVis": "Adjust status privacy",
-    "publicJP":"",
+    "publicJP": "",
-    "unlistedJP":"",
+    "unlistedJP": "",
-    "privateJP":"",
+    "privateJP": "",
-    "localJP":"Local only",
+    "localJP": "Local only",
-    "sectoot":"Secondary Toot",
+    "sectoot": "Secondary Toot",
-    "directJP":"",
+    "directJP": "",
-    "emojiWarn":"",
+    "emojiWarn": "",
-    "emojiInsertWarn":"Some emojis are not able to be inserted.",
+    "emojiInsertWarn": "Some emojis are not able to be inserted.",
-    "refreshEmoji":"Refresh emojis list",
+    "refreshEmoji": "Refresh emojis list",
-    "closeThisBox":"Close this box",
+    "closeThisBox": "Close this box",
-    "showThisEmoji":" are shown.",
+    "showThisEmoji": " are shown.",
-    "customEmoji":"Custom emojis",
+    "customEmoji": "Custom emojis",
-    "peopleEmoji":"Emojis of people",
+    "peopleEmoji": "Emojis of people",
-    "natureEmoji":"Emojis of nature",
+    "natureEmoji": "Emojis of nature",
-    "foodEmoji":"Emojis of foods",
+    "foodEmoji": "Emojis of foods",
-    "activityEmoji":"Emojis of activities",
+    "activityEmoji": "Emojis of activities",
-    "placeEmoji":"Emojis of places",
+    "placeEmoji": "Emojis of places",
-    "thingsEmoji":"Emojis of tools",
+    "thingsEmoji": "Emojis of tools",
-    "symbolEmoji":"Emojis of symbols",
+    "symbolEmoji": "Emojis of symbols",
-    "flagsEmoji":"Emojis of flags",
+    "flagsEmoji": "Emojis of flags",
     "draft": "Draft",
-    "poll":"Poll",
+    "poll": "Poll",
-    "pollDdisabled":"Polls: Disabled",
+    "pollDdisabled": "Polls: Disabled",
-    "pollProvider":"Provider of Poll",
+    "pollProvider": "Provider of Poll",
-    "polluntil":"Hide 'votes' count until people vote it.",
+    "polluntil": "Hide 'votes' count until people vote it.",
-    "choice":"Choice",
+    "choice": "Choice",
-    "pollmulti":"Multiple select",
+    "pollmulti": "Multiple select",
-    "expires_in":"Expires in...(sec)",
+    "expires_in": "Expires in...(sec)",
-    "contextBefore":"Context before this toot",
+    "contextBefore": "Context before this toot",
-    "thisToot":"This toot",
+    "thisToot": "This toot",
-    "contextAfter":"Context after this toot",
+    "contextAfter": "Context after this toot",
-    "beforeLTL":"Local TL before this toot",
+    "beforeLTL": "Local TL before this toot",
-    "beforeUTL":"User TL before this toot",
+    "beforeUTL": "User TL before this toot",
-    "afterLTL":"Local TL after this toot)",
+    "afterLTL": "Local TL after this toot)",
-    "afterUTL":"User TL before this toot",
+    "afterUTL": "User TL before this toot",
-    "afterFTL":"Federated TL after this toot",
+    "afterFTL": "Federated TL after this toot",
-    "favedPeople":"People who favourited it",
+    "favedPeople": "People who favourited it",
-    "btedPeople":"People who boosted it",
+    "btedPeople": "People who boosted it",
-    "useOtherAcct1":"Use other account",
+    "useOtherAcct1": "Use other account",
-    "useOtherAcct2":":unfav and unBT are disabled.",
+    "useOtherAcct2": ":unfav and unBT are disabled.",
     "btWithVis": "Boost with visibility",
-    "reply":"Reply",
+    "reply": "Reply",
-    "bt":"Boost",
+    "bt": "Boost",
-    "favRegist":"Favourite",
+    "favRegist": "Favourite",
-    "openBrowser":"Open in browser",
+    "openBrowser": "Open in browser",
-    "screenshot":"Take a screenshot",
+    "screenshot": "Take a screenshot",
-    "copyURL":"Copy the URL",
+    "copyURL": "Copy the URL",
-    "embed":"Embed",
+    "copy": "Copy",
-    "toots":"Toots",
+    "embed": "Embed",
-    "follow":"Follow",
+    "toots": "Toots",
-    "follower":"Follower",
+    "follow": "Follow",
-    "utlColumn":"Show as a column",
+    "follower": "Follower",
-    "timeline":"Timeline",
+    "utlColumn": "Show as a column",
-    "operateOtherAcct":"Cross-account",
+    "timeline": "Timeline",
-    "list":"List",
+    "operateOtherAcct": "Cross-account",
-    "makeNew":"Save",
+    "list": "List",
-    "blocks":"Blocks",
+    "makeNew": "Save",
-    "mutes":"Mutes",
+    "blocks": "Blocks",
-    "block":"Block",
+    "mutes": "Mutes",
-    "mute":"Mute",
+    "notfMute": "Mute their notifications too",
-    "domainBlock":"Domain block",
+    "zeroSetToInfinity": "Mute duration: 0 min to set Infinity",
-    "editProf":"Edit profile",
+    "block": "Block",
-    "change":"Save",
+    "mute": "Mute",
-    "followReq":"Follow requests",
+    "domainBlock": "Domain block",
-    "likeHimOrHer":"Resembling",
+    "editProf": "Edit profile",
-    "endorse":"Feature on profile",
+    "change": "Save",
-    "openinbrowser":"Open in browser",
+    "followReq": "Follow requests",
-    "mainacct":"Set it an main account",
+    "likeHimOrHer": "Resembling",
-    "frc":"Suggest",
+    "endorse": "Feature on profile",
-    "more":"More",
+    "openinbrowser": "Open in browser",
-    "revoverJP":" to ",
+    "mainacct": "Set it an main account",
-    "warnUseOtherAcct":"(Unable to unfollow)",
+    "frc": "Suggest",
-    "revoverJPde":"",
+    "more": "More",
-    "or":"or",
+    "revoverJP": " to ",
-    "openProf":"Show profile",
+    "warnUseOtherAcct": "(Unable to unfollow)",
-    "warnListRegist":"Follow to add this user to lists.",
+    "revoverJPde": "",
-    "blockDomain":"Add blocking domain",
+    "or": "or",
-    "name":"Display name",
+    "openProf": "Show profile",
-    "note":"Note",
+    "warnListRegist": "Follow to add this user to lists.",
-    "editProfImg":"Change avataor",
+    "blockDomain": "Add blocking domain",
-    "editHeader":"Change header image",
+    "name": "Display name",
-    "blocked":"You are blocked. Why?",
+    "note": "Note",
-    "likeUserDes":"Get people resembling this user.",
+    "editProfImg": "Change avataor",
-    "get":"Get",
+    "editHeader": "Change header image",
-    "historyBack":"Back",
+    "blocked": "You are blocked. Why?",
-    "empUser":"Emphasize this user",
+    "likeUserDes": "Get people resembling this user.",
-    "supportme":"Support TheDesk!",
+    "get": "Get",
-    "TheDeskDes":"TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!",
+    "historyBack": "Back",
-    "PatreonSupport":"Support on Patreon",
+    "empUser": "Emphasize this user",
-    "PixivSupport":"Support on Pixiv FANBOX",
+    "supportme": "Support TheDesk!",
-    "AWLSupport":"Amazon Wish List",
+    "TheDeskDes": "TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!",
-    "SendAmazonGift1":"Give me Amazon Gift Card:",
+    "PatreonSupport": "Support on Patreon",
-    "SendAmazonGift2":"",
+    "PixivSupport": "Support on Pixiv FANBOX",
-    "monthly":"Monthly",
+    "AWLSupport": "Amazon Wish List",
-    "once":"Once",
+    "SendAmazonGift1": "Give me Amazon Gift Card:",
-    "local":"Local",
+    "SendAmazonGift2": "",
-    "localMedia":"Local(Media)",
+    "monthly": "Monthly",
-    "home":"Home",
+    "once": "Once",
-    "fed":"Federated",
+    "local": "Local",
-    "fedMedia":"Federated(Media)",
+    "localMedia": "Local(Media)",
-    "dm":"Direct Message",
+    "home": "Home",
-    "integratedTLDes":"Integrated(Local/Home)",
+    "fed": "Federated",
-    "localPlusDes":"LTL+Reply+BT",
+    "fedMedia": "Federated(Media)",
-    "notf":"Notifications",
+    "dm": "Direct Message",
+    "integratedTLDes": "Integrated(Local/Home)",
+    "localPlusDes": "LTL+Reply+BT",
+    "notf": "Notifications",
     "bookmark": "Bookmarks",
-    "showThisTL":"Show this TL:",
+    "showThisTL": "Show this TL:",
-    "webviewWarn":"TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
-    "add":"Add",
+    "add": "Add",
-    "search":"Search",
+    "search": "Search",
-    "sortSet":"Sort",
+    "sortSet": "Sort",
-    "selectAcct":"Account(Scroll to show all)",
+    "selectAcct": "Account(Scroll to show all)",
-    "listLocale":"List",
+    "listLocale": "List",
-    "filterWord":"Filtering words",
+    "filterWord": "Filtering words",
-    "degree":"Filter contexts",
+    "degree": "Filter contexts",
-    "conver":"Conversations",
+    "conver": "Conversations",
-    "prof":"Profiles",
+    "prof": "Profiles",
-    "option":"Options",
+    "option": "Options",
-    "matchWord":"Whole word",
+    "matchWord": "Whole word",
-    "warnMatchWord":"Nice for Latin language",
+    "warnMatchWord": "Nice for Latin language",
-    "except":"Drop instead of hide",
+    "except": "Drop instead of hide",
-    "exceptWorn":"Filtered toots will disappear irreversibly, even if filter is later removed",
+    "exceptWorn": "Filtered toots will disappear irreversibly, even if filter is later removed",
-    "avalableBefore":"Expire after",
+    "avalableBefore": "Expire after",
-    "warnAvBefore":"Unset or \"0\" means \"Never\"",
+    "warnAvBefore": "Unset or \"0\" means \"Never\"",
-    "warnAvBefore2":"This value may contain some error",
+    "warnAvBefore2": "This value may contain some error",
-    "unlimited":"Never",
+    "unlimited": "Never",
-    "days":"day(s)",
+    "days": "day(s)",
-    "hours":"hour(s)",
+    "hours": "hour(s)",
-    "mins":"minute(s)",
+    "mins": "minute(s)",
-    "secs":"second(s)",
+    "secs": "second(s)",
-    "warnOnIntegratedTL":"Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
+    "warnOnIntegratedTL": "Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
-    "helloTheDesk":"Internal error: please clear all data(at setting page) <b>All data will be deleted.</b>",
+    "helloTheDesk": "Internal error: please clear all data(at setting page) <b>All data will be deleted.</b>",
-    "addColumn":"Add a column",
+    "addColumn": "Add a column",
-    "sortColumns":"Sort",
+    "sortColumns": "Sort",
-    "acctMan":"Account Manager",
+    "acctMan": "Account Manager",
-    "filter":"Filter",
+    "filter": "Filter",
-    "setting":"Preferences",
+    "setting": "Preferences",
-    "reverse":"Toot button layout reverse",
+    "reverse": "Toot button layout reverse",
-    "f5":"Reload TL",
+    "f5": "Reload TL",
-    "nanoDes":"The smallest Mastodon,",
+    "nanoDes": "The smallest Mastodon,",
-    "verTips":"Version",
+    "verTips": "Version",
-    "clockTips":"Clock",
+    "clockTips": "Clock",
-    "ramTips":"RAM status",
+    "ramTips": "RAM status",
-    "changeTips":"Change Tips",
+    "changeTips": "Change Tips",
-    "helpAndLogs":"Help & Log",
+    "helpAndLogs": "Help & Log",
-    "help":"Help",
+    "help": "Help",
-    "contactwithlog":"If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
+    "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
-    "about":"About TheDesk",
+    "about": "About TheDesk",
-    "hereAddColumns":"<- Add TL",
+    "hereAddColumns": "<- Add TL",
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

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

@@ -13,13 +13,13 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
-  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
+  "backupWarn": "If you get an 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",
   "webview": "Webview Integration",
-  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
+  "webviewWarn": "To use TweetDeck Integration, please turn it on. Please be aware that it may lessen the security level.",
   "theme": "Themes",
   "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
@@ -28,7 +28,7 @@
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
   "width": "Width of columns",
-  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than amounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
   "margin": "Margin between timelines",
@@ -37,7 +37,7 @@
   "fontwarn": "Select your favorite font to 'Select'(On Linux, it may not work.)",
   "fontsize": "Font size",
   "savefolder": "Folder to save",
-  "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "savefolderwarn": "TheDesk uses this value when it tries to save pictures or take screenshots.",
   "useragent":"User agent",
   "useragentWarn":"Restart when changed",
   "frame": "Window frame",
@@ -61,7 +61,7 @@
   "modalFooter": "Background of modal window's footer",
   "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
   "forthColor": "Title bar(same scheme to Background)",
-  "bottom":"Background of menu-bar at bottom of window",
+  "bottom":"Background of menu-bar at the bottom of the window",
   "emphasized": "Emphasized toot's background",
   "postbox":"Background of post-box and menu",
   "active": "Background of 'active' elements",
@@ -163,7 +163,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. Notice: if you post an animated picture like GIF, it will be converted static one.",
+  "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. Note: if you post an animated picture like a GIF, it will be converted to a static picture.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",
@@ -230,7 +230,7 @@
   "reply": "Reply to this toot",
   "keyselecttop": "Select the top & left(No.1 column) toot",
   "reset": "Reset(Danger)",
-  "resetconfirm": "Delete all data. You cannot undo. Continue?",
+  "resetconfirm": "Delete all data. You cannot undo this operation. Continue?",
   "about": "About TheDesk",
   "hp": "Website",
   "support": "Support",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Abrir en navegador web",
     "screenshot": "Tomar captura de pantalla",
     "copyURL": "Copiar dirección web de este toot",
+    "copy": "Copiar",
     "embed": "Insertar",
     "toots": "Toots",
     "follow": "Seguir",
@@ -178,6 +179,7 @@
     "foundBug": "Encontré un error",
     "show": "Mostrar",
     "directory": "Directorio",
+    "discover": "Descubrí",
     "active": "Recientemente activo",
     "newcomer": "Recién llegados",
     "local_only": "Sólo local",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "El código HTML de inserción se copió al portapapeles.",
     "lang_details_url": "La dirección web de este toot se copió al portapapeles.",
     "lang_details_txt": "El contenido de este toot se copió al portapapeles.",
+    "lang_details_fetch": "Obteniendo datos del mensaje…",
     "lang_filter_nodata": "Sin datos",
     "lang_filter_errordegree": "Por favor, comprobá un contexto",
     "lang_list_nodata": "Sin datos",

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

@@ -9,7 +9,7 @@
   "default": "Predeterminado",
   "change": "Cambiar",
   "select": "Seleccionar",
-  "exec": "Exec",
+  "exec": "Ejec",
   "env": "Configuración del sistema",
   "setlang": "Idiomas",
   "backup": "Importación y exportación de la configuración",
@@ -18,8 +18,8 @@
   "export": "Exportar",
   "hardwareAcceleration": "Deshabilitar la aceleración por hardware",
   "hardwareAccelerationWarn": "Inicio automático",
-  "webview": "Webview Integration",
+  "webview": "Integración de Webview",
-  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
+  "webviewWarn": "Para usar Integración de TweetDeck, por favor activalo. Tené en cuenta que puede reducir el nivel de seguridad.",
   "theme": "Temas",
   "popup": "Ventana emergente de notificaciones (en Windows)",
   "popupwarn": "Establecer \"0\" para ocultar",
@@ -72,6 +72,7 @@
   "desc": "Acerca de este tema",
   "customImport": "Importación de temas personalizados",
   "delete": "Eliminar",
+  "preview": "Previsualización",
   "timeline": "Configuración de la línea temporal",
   "timemode": "Formato del tiempo",
   "relativetime": "Formato relativo: \"hace 1 minuto\", \"hace 3 días\"",
@@ -117,8 +118,9 @@
   "markerswarn": "Mastodon 3.0~. Compartido en interface web y clientes de terceros soportados.",
   "remote_img": "Obtener imágenes del servidor remoto",
   "remote_imgWarn": "Todas las previsualizaciones se obtienen de tu servidor de caché conectado.",
-  "moreContextMode": "Context Tool",
+  "moreContextMode": "Herramienta de contexto",
-  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "moreContextModeWarn": "En detalle de la modal de toot, mostrar toots antes / después del toot en LTL, FTL, UTL",
+  "smallHeader": "Minimizar cabeceras de columna",
   "replySound": "Sonido (respuesta)",
   "favSound": "Sonido (marcado como favorito)",
   "btSound": "Sonido (retoot)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "Sin datos",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "Sin datos",

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

@@ -72,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Open in browser",
     "screenshot": "Take a screenshot",
     "copyURL": "Copy the URL",
+    "copy": "Copy",
     "embed": "Embed",
     "toots": "Toots",
     "follow": "Follow",
@@ -178,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "No data",
     "lang_filter_errordegree": "Please check a context",
     "lang_list_nodata": "No data",

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

@@ -72,6 +72,7 @@
   "desc": "About this theme",
   "customImport": "Import of custom themes",
   "delete": "Delete",
+  "preview": "Preview",
   "timeline": "Timeline Preferences",
   "timemode": "Time format",
   "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "All previews are got from your loginned cache server.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Sound(Reply)",
   "favSound": "Sound(Fav)",
   "btSound": "Sound(Boost)",

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

@@ -74,6 +74,7 @@
     "openBrowser": "Ouvrir dans un navigateur",
     "screenshot": "Prendre une capture d'écran",
     "copyURL": "Copier l'URL",
+    "copy": "Copy",
     "embed": "Embarquer",
     "toots": "Pouets",
     "follow": "Suivre",
@@ -178,6 +179,7 @@
     "foundBug": "J'ai trouvé un bug",
     "show": "Afficher",
     "directory": "Répertoire",
+    "discover": "Discover",
     "active": "Actif récemment",
     "newcomer": "Nouveautés",
     "local_only": "Local uniquement",

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

@@ -103,6 +103,7 @@
     "lang_details_embed": "Le code HTML intégré est tronqué.",
     "lang_details_url": "L'URL de ce pouet est tronqué.",
     "lang_details_txt": "Le contenu de ce pouet est tronqué.",
+    "lang_details_fetch": "Fetcging toot data...",
     "lang_filter_nodata": "Aucune donnée",
     "lang_filter_errordegree": "Veuillez vérifier le contexte",
     "lang_list_nodata": "Aucune donnée",

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

@@ -72,6 +72,7 @@
   "desc": "À propos de ce thème",
   "customImport": "Importer des thèmes personnalisés",
   "delete": "Supprimer",
+  "preview": "Preview",
   "timeline": "Préférence de la TimeLine",
   "timemode": "Format de l’heure",
   "relativetime": "Format relatif:\"Il y a 1 minutes\",\"3 jours\"",
@@ -119,6 +120,7 @@
   "remote_imgWarn": "Toutes les prévisualisations sont obtenues depuis le serveur où vous êtes connecté.",
   "moreContextMode": "Context Tool",
   "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "smallHeader": "Minimize column headers",
   "replySound": "Son (Réponse)",
   "favSound": "Son (Fav)",
   "btSound": "Son (Boost)",