TheDesk 20.3.3

Bump electron from 8.0.0 to 8.2.3 in /app

app/css/master.css

@@ -24,8 +24,17 @@ body {
 .markdown {
 	display: none;
 }
-help {
+.accessMark {
-	display: none;
+    font-size: 12px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+	background-color: var(--emphasized);
+	padding-left: 5px;
+	padding-right: 5px;
+}
+.accessibility .scr {
+	display: none !important;
 }
 .show-help {
 	display: inline;
@@ -342,21 +351,22 @@ blockquote:before,
 #left-menu {
 	width: 230px;
 }
-#left-menu div {
+#left-menu a {
 	padding-left: 5px;
 	width: 100%;
 	height: 50px;
 	display: flex;
 	align-items: center;
 	cursor: pointer;
+	color: var(--color);
 }
-#left-menu div:hover {
+#left-menu a:hover {
 	background-color: var(--beforehover);
 }
 #left-menu span {
 	margin-left: 5px;
 }
-#left-menu div.active {
+#left-menu a.active {
 	background-color: var(--emphasized);
 }
 #right-menu {
@@ -376,6 +386,7 @@ blockquote:before,
 	width: 170px;
 	height: 40px;
 	cursor: pointer;
+	color: var(--color);
 }
 #tltype .type span {
 	width: calc(100% - 30px);
@@ -514,6 +525,13 @@ textarea {
 #pageSrcInput {
   width: 160px;
 }
+.voice {
+	clip: rect(1px, 1px, 1px, 1px);
+    position: absolute !important;
+    height: 1px;
+    width: 1px;
+    overflow: hidden;
+}
 
 @media (max-width: 500px) {
 	#pageSrc {

app/css/tl.css

@@ -559,7 +559,7 @@ p:not(:last-child) {
 	z-index: 500;
 	padding: 5px;
 	display: grid;
-	grid-template-columns: 40px 60px 1fr 24px;
+	grid-template-columns: 40px 65px 1fr 24px;
 	grid-template-rows: 30px 30px;
 	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }

app/img/desk.svg

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

app/img/desk_full.svg

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

app/img/thinking.svg

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

app/js/common/keyshortcut.js

@@ -115,6 +115,13 @@ $(function($) {
 					return false
 				}
 			}
+			//Ctrl+K:メニュー開閉
+			if (event.metaKey || event.ctrlKey) {
+				if (e.keyCode === 75) {
+					menu()
+					return false
+				}
+			}
 			//Ctrl+Space:読み込み
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 32) {

app/js/common/version.js

@@ -1,6 +1,6 @@
 //バージョンチェッカー
 function verck(ver, jp) {
-	console.log('%c Welcome😊', 'color: red;font-size:200%;')
+	console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
 	var date = new Date()
 	var show = false
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
@@ -323,6 +323,7 @@ function closeSupport() {
 	)
 }
 function storeDialog(platform, ver) {
+	if($('body').hasClass('accessibility')) return false
 	if (platform == 'win32') {
 		var mes = lang.lang_version_platform
 	} else if (platform == 'linux') {

app/js/login/login.js

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

app/js/login/manager.js

@@ -506,7 +506,7 @@ function misskeyLogin(url) {
 	if (!url) {
 		var url = $('#misskey-url').val()
 	}
-	var start = 'http://' + url + '/api/app/create'
+	var start = 'https://' + url + '/api/app/create'
 	var httpreq = new XMLHttpRequest()
 	httpreq.open('POST', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')

app/js/platform/end.js

@@ -140,6 +140,7 @@ function nano() {
 	postMessage(['nano', null], '*')
 }
 onmessage = function(e) {
+	console.log(e)
 	if (e.data[0] == 'details') {
 		details(e.data[1][0], e.data[1][1])
 	} else if (e.data[0] == 'udg') {
@@ -186,6 +187,10 @@ onmessage = function(e) {
 		asRead()
 	} else if (e.data[0] == 'asReadEnd') {
 		asReadEnd()
+	} else if (e.data[0] == 'accessibility') {
+		console.log('atrue')
+		$('body').addClass('accessibility')
+		$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
 	} else if (e.data[0] == 'logData') {
 		$('#logs').val(e.data[1])
 		var obj = document.getElementById('logs')

app/js/platform/preload.js

@@ -4,6 +4,7 @@ var ipc = electron.ipcRenderer
 //title bar
 const customTitlebar = require('custom-electron-titlebar')
 window.addEventListener('DOMContentLoaded', () => {
+	ipc.send('acsCheck', '')
 	ipc.send('frameCheck', '')
 	ipc.on('frame', function(event, args) {
 		const file = location.href.substr(-10)
@@ -230,12 +231,16 @@ ipc.on('prog', function(event, arg) {
 ipc.on('mess', function(event, arg) {
 	postMessage(['updateMess', arg], '*')
 })
+//misc
 ipc.on('asRead', function(event, arg) {
 	postMessage(['asRead', ''], '*')
 })
 ipc.on('asReadEnd', function(event, arg) {
 	postMessage(['asReadEnd', ''], '*')
 })
+ipc.on('accessibility', function(event, arg) {
+	postMessage(['accessibility', 'true'], '*')
+})
 var webviewDom = document.getElementById('webview')
 if (webviewDom) {
 	webviewDom.addEventListener('new-window', function(e) {

app/js/post/img.js

@@ -133,25 +133,34 @@ async function media(b64, type, no, stamped) {
 		//v2/media
 		try {
 			var id = await v2MediaUpload(domain, at, fd)
-			var mediav = $('#media').val()
+			if(!id) {
-			var regExp = new RegExp('tmp_' + r, 'g')
+				var start = 'https://' + domain + '/api/v1/media'
-			mediav = mediav.replace(regExp, id)
+				httpreq.open('POST', start, true)
-			$('#media').val(mediav)
+				httpreq.upload.addEventListener('progress', progshow, false)
-			var html = `<img src="../../img/picture.svg" class="preview-img pointer unknown" data-media="${id}" oncontextmenu="deleteImage('${id}')" onclick="altImage('${acct_id}','${id}')" title="${lang.lang_postimg_delete}">`
+				httpreq.responseType = 'json'
-			$('#preview').append(html)
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-			todc()
+				httpreq.send(fd)
-			if (localStorage.getItem('nsfw_' + acct_id)) {
+			} else {
-				$('#nsfw').addClass('yellow-text')
+				var mediav = $('#media').val()
-				$('#nsfw').html('visibility')
+				var regExp = new RegExp('tmp_' + r, 'g')
-				$('#nsfw').addClass('nsfw-avail')
+				mediav = mediav.replace(regExp, id)
-			}
+				$('#media').val(mediav)
-			$('.toot-btn-group').prop('disabled', false)
+				var html = `<img src="../../img/picture.svg" class="preview-img pointer unknown" data-media="${id}" oncontextmenu="deleteImage('${id}')" onclick="altImage('${acct_id}','${id}')" title="${lang.lang_postimg_delete}">`
-			$('select').formSelect()
+				$('#preview').append(html)
-			$('#mec').text(lang.lang_there)
+				todc()
-			M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
+				if (localStorage.getItem('nsfw_' + acct_id)) {
-			$('#imgup').text('')
+					$('#nsfw').addClass('yellow-text')
-			$('#imgsel').show()
+					$('#nsfw').html('visibility')
-			localStorage.removeItem('image')
+					$('#nsfw').addClass('nsfw-avail')
+				}
+				$('.toot-btn-group').prop('disabled', false)
+				$('select').formSelect()
+				$('#mec').text(lang.lang_there)
+				M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
+				$('#imgup').text('')
+				$('#imgsel').show()
+				localStorage.removeItem('image')
+			} 
 		} catch {
 			var start = 'https://' + domain + '/api/v1/media'
 			httpreq.open('POST', start, true)
@@ -183,6 +192,10 @@ async function media(b64, type, no, stamped) {
 				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
 				return false
 			}
+			$('#imgup').text('')
+			$('.toot-btn-group').prop('disabled', false)
+			$('select').formSelect()
+			$('#imgsel').show()
 			var img = localStorage.getItem('img')
 			if (json.type.indexOf('image') != -1) {
 				var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${json['id']}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${json['id']}')" title="${lang.lang_postimg_delete}">`

app/js/tl/directory.js

@@ -3,7 +3,7 @@
 function dirMenu() {
 	$("#dir-contents").html("");
 	directory();
-	$("#left-menu div").removeClass("active");
+	$("#left-menu a").removeClass("active");
 	$("#dirMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#dir-box").removeClass("hide");

app/js/tl/filter.js

@@ -101,7 +101,7 @@ function delreset(tlid) {
 }
 /*ワードフィルター機能*/
 function filterMenu() {
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#filterMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#filter-box').removeClass('hide')
@@ -180,6 +180,9 @@ function makeNewFilter() {
 	if ($('#conv_filter:checked').val()) {
 		cont.push('thread')
 	}
+	if ($('#prof_filter:checked').val()) {
+		cont.push('profiles')
+	}
 	if (!cont.length) {
 		$('#filtered-words').html('Error:' + lang.lang_filter_errordegree)
 	}
@@ -229,6 +232,7 @@ function makeNewFilter() {
 			$('#local_filter').prop('checked', false)
 			$('#notf_filter').prop('checked', false)
 			$('#conv_filter').prop('checked', false)
+			$('#prof_filter').prop('checked', false)
 			$('#except_filter').prop('checked', false)
 			$('#wholeword_filter').prop('checked', false)
 			$('#days_filter').val('0')

app/js/tl/list.js

@@ -1,5 +1,5 @@
 function listMenu() {
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#listMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#list-box').removeClass('hide')

app/js/tl/parse.js

@@ -241,7 +241,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				noticeavatar = toot.account.avatar_static
 			}
 			noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
-					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}">
+					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}" alt="">
 				</a>`
 			if (toot.type == 'mention') {
 				var what = lang.lang_parse_mentioned
@@ -268,15 +268,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			} else {
 				var notfFilHide = ''
 			}
-			var noticetext = `<i class="fas fa-filter pointer big-text ${notfFilHide}" 
+			var noticetext = `<span onclick="notfFilter('${toot.account.id}','${tlid}');" class=" pointer big-text ${notfFilHide}"><i class="fas fa-filter" 
-					onclick="notfFilter('${toot.account.id}','${tlid}');" title="${lang.lang_parse_notffilter}">
+					 title="${lang.lang_parse_notffilter}">
-				</i>
+				</i><span class="voice">${lang.lang_parse_notffilter}</span></span>
 				<span class="cbadge cbadge-hover" title="${date(toot.created_at, 'absolute')}(${
 				lang.lang_parse_notftime
-			})">
+			})" aria-hidden="true"><i class="far fa-clock"></i>
-					<i class="far fa-clock"></i>
 					${date(toot.created_at, datetype)}
 				</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">
 					${dis_name}(@${toot.account.acct})
@@ -393,7 +393,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				} else {
 					noticeavatar = toot.account.avatar_static
 				}
-				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg">
+				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg" aria-hidden="true">
 						<img draggable="false" src="${noticeavatar}" width="20" class="prof-img" 
 							user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'">
 					</a>`
@@ -518,7 +518,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var spoil = escapeHTML(toot.spoiler_text)
 				var spoiler = 'cw cw_hide'
 				var api_spoil = 'gray'
-				var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
+				var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}<span class="voice">${lang.lang_parse_cwshow_acc}</span></a><br>`
 			} else {
 				if (content) {
 					var ct1 = content.split('</p>').length + content.split('<br />').length - 2
@@ -576,7 +576,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 
 			if (urls) {
-				var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer">
+				var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer" aria-hidden="true">
 						${lang.lang_parse_url}
 					</a><br>`
 			} else {
@@ -621,7 +621,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							viewer +
 							`<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">
+									<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true" alt="attached media">
 							</a></span>`
 					} else {
 						if (media.type == 'unknown') {
@@ -634,7 +634,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 								viewer +
 								'<audio src="' +
 								url +
-								'" class="pointer" style="width:100%;" controls></span>'
+								'" class="pointer" style="width:100%;" controls alt="attached media"></span>'
 						} else {
 							if (media.description) {
 								var desc = media.description
@@ -652,7 +652,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 										id="${id}-image-${key2}" data-url="${url}" data-original="${remote_url}" data-type="${media.type}" 
 										class="img-parsed img-link" style="width:calc(${cwdt}% - 1px); height:${imh};">
 									<img draggable="false" src="${purl}" class="${sense} toot-img pointer" 
-										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}">
+										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}" alt="${escapeHTML(desc)}">
 									${nsfwmes}
 								</a>`
 						}
@@ -683,7 +683,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						if (toot.account.acct != mention.acct) {
 							mentions =
 								mentions +
-								`<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer">@${mention.acct}</a> `
+								`<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer" aria-hidden="true">@${mention.acct}</a> `
 							to_mention.push(mention.acct)
 						}
 					}
@@ -724,7 +724,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						)}
 						">Pin</a>${featured}</span> `
 				})
-				tags = '<div style="float:right">' + tags + '</div>'
+				tags = '<div style="float:right" aria-hidden="true">' + tags + '</div>'
 			}
 			//リプ数
 			if (toot.replies_count || toot.replies_count === 0) {
@@ -739,29 +739,29 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var vis = ''
 			var visen = toot.visibility
 			if (visen == 'public') {
-				var vis = `<i class="text-darken-3 material-icons gray sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons gray sml vis-data pointer" 
-						title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						public
-					</i>`
+					</i><span class="voice">${lang.lang_parse_public} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = ''
 			} else if (visen == 'unlisted') {
-				var vis = `<i class="text-darken-3 material-icons blue-text sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons blue-text sml vis-data pointer" 
-						title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						lock_open
-					</i>`
+					</i><span class="voice">${lang.lang_parse_unlisted} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = ''
 			} else if (visen == 'private') {
-				var vis = `<i class="text-darken-3 material-icons orange-text sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons orange-text sml vis-data pointer" 
-						title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						lock
-					</i>`
+					</i><span class="voice">${lang.lang_parse_private} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 
 				var can_rt = 'unvisible'
 			} else if (visen == 'direct') {
-				var vis = `<i class="text-darken-3 material-icons red-text sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons red-text sml vis-data pointer" 
-						title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						mail
-					</i>`
+					</i><span class="voice">${lang.lang_parse_direct} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = 'unvisible'
 			}
 			if (toot.account.acct == localStorage.getItem('user_' + acct_id)) {
@@ -904,7 +904,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var trans = `<div class="">
 						<a onclick="trans('${toot.language}','${lang.language}', $(this))" 
 							class="waves-effect waves-dark btn-flat actct" style="padding:0">
-								<i class="material-icons">g_translate</i>${lang.lang_parse_trans}
+								<i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
 						</a>
 					</div>`
 			} else {
@@ -929,7 +929,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					for (var i = 0; i < tickerdata.length; i++) {
 						var value = tickerdata[i]
 						if (value.domain == thisdomain) {
-							var tickerdom = `<div style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
+							var tickerdom = `<div aria-hidden="true" style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
 								value.bg
 							}, transparent 96%) !important; color:${
 								value.text
@@ -1007,7 +1007,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				<div class="area-icon grid">
 					<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
 						<img draggable="false" src="${avatar}" width="40" class="prof-img"
-							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'"/>
+							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'" alt="" />
 					</a>
 					${noticeavatar}
 				</div>
@@ -1021,7 +1021,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="flex-time">
 						<span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy('${toot.url}');"
 							title="${date(toot.created_at, 'absolute')}(${lang.lang_parse_clickcopyurl})">
-							<i class="far fa-clock"></i>${date(toot.created_at, datetype)}
+							<i class="far fa-clock"></i><span class="voice">posted at </span>${date(toot.created_at, datetype)}
 						</span>
 					</div>
 				</div>
@@ -1056,6 +1056,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							class="waves-effect waves-dark btn-flat actct rep-btn"
 							data-men="${to_mention}" data-visen="${visen}" style="padding:0" title="${lang.lang_parse_replyto}">
 								<i class="fas fa-share"></i>
+								<span class="voice">${lang.lang_parse_replyto} </span>
 								<span class="rep_ct">${replyct}</span>
 						</a>
 					</div>
@@ -1065,6 +1066,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
 							style="padding:0" title="${lang.lang_parse_bt}">
 							<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
+							<span class="voice">${lang.lang_parse_bt} </span>
 							<span class="rt_ct">${toot.reblogs_count}</span>
 						</a>
 					</div>
@@ -1072,6 +1074,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<a onclick="qt('${toot.id}','${acct_id}','${toot.account.acct}','${toot.url}')" 
 							class="waves-effect waves-dark btn-flat actct" style="padding:0" title="${lang.lang_parse_quote}">
 							<i class="text-darken-3 fas fa-quote-right"></i>
+							<span class="voice">${lang.lang_parse_quote} </span>
 						</a>
 					</div>
 					<div class="action ${disp['bkm']} ${noauth} ${bkmClass}">
@@ -1079,6 +1082,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0"
 							title="${lang.lang_parse_bookmark}">
 							<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
+							<span class="voice">${lang.lang_parse_bookmark} </span>
 					</a>
 					</div>
 					<div class="action ${disp['fav']} ${noauth}">
@@ -1087,6 +1091,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							title="${lang.lang_parse_fav}">
 							<i class="fas text-darken-3 fa-star${if_fav} fav_${uniqueid}"></i>
 							<span class="fav_ct">${toot.favourites_count}</span>
+							<span class="voice">${lang.lang_parse_fav} </span>
 						</a>
 					</div>
 				</div>
@@ -1094,14 +1099,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="action ${noauth}">
 						<a onclick="toggleAction($(this), ${menuct * 39 + 6})" 
 							class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0">
-							<i class="text-darken-3 material-icons act-icon">expand_more</i>
+							<i class="text-darken-3 material-icons act-icon" aria-hidden="true">expand_more</i>
+							<span class="voice">Other actions</span>
 						</a>
 					</div>
 					<div class="action ${noauth}">
 						<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
 							class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0"
 							title="${lang.lang_parse_detail}">
-						<i class="text-darken-3 material-icons">menu_open</i></a>
+						<i class="text-darken-3 material-icons" aria-hidden="true">menu_open</i></a>
+						<span class="voice">${lang.lang_parse_detail}</span>
 					</div>
 				</div>
 				<div class="contextMenu hide z-depth-4">
@@ -1131,7 +1138,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="${if_mine}">
 						<button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
-							<i class="material-icons">redo</i>${lang.lang_parse_redraft}
+							<i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
 						</button>
 					</div>
 					${trans}
@@ -1185,10 +1192,10 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					var locked = ''
 				}
 				if (auth == 'request') {
-					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept">
+					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept" aria-hidden="true">
 							person_add
-						</i>　
+						</i>
-						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject">
+						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject" aria-hidden="true">
 							person_add_disabled
 						</i>`
 				} else {
@@ -1279,7 +1286,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				var latest = date(toot.last_status_at, 'relative')
 				if (toot.last_status_at) {
-					var latesthtml = `<div class="cbadge" style="width:100px;">Last:${latest}</div>`
+					var latesthtml = `<div class="cbadge" style="width:100px;">Last <span class="voice">toot</span>: ${latest}</div>`
 				} else {
 					var latesthtml = ''
 				}
@@ -1296,6 +1303,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 							class="prof-img"
 							user="${toot.acct}"
 							onerror="this.src='../../img/loading.svg'"
+							alt=""
 						/>
 					</a></div>
 					<div class="area-display_name">

app/js/tl/src.js

@@ -3,7 +3,7 @@
 function searchMenu() {
 	$('#src-contents').html('')
 	trend()
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#searchMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#src-box').removeClass('hide')
@@ -116,8 +116,11 @@ function tsAdd(q) {
 	parseColumn('add')
 }
 function tootsearch(tlid, q) {
+	if(!q || q=='undefined') {
+		return false
+	}
 	var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
-	console.log('Toot srrach at ' + start)
+	console.log('Toot search at ' + start)
 	$('#notice_' + tlid).text('tootsearch(' + q + ')')
 	$('#notice_icon_' + tlid).text('search')
 	fetch(start, {

app/js/tl/tag.js

@@ -198,3 +198,28 @@ function tagFeature(name, acct_id) {
 			M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
 		})
 }
+//タグのフィルタ
+function addTag(id) {
+	var columns = JSON.parse(localStorage.getItem('column'))
+	var column = columns[id]
+	if(!column.data.name) {
+		var name = column.data
+	} else {
+		var name = column.data.name
+	}
+	var col = localStorage.getItem('column')
+	var o = JSON.parse(col)
+	var obj = o[id]
+	obj.data = {
+		'name': name,
+		'all': $(`#all_tm-${id}`).val(),
+		'any': $(`#any_tm-${id}`).val(),
+		'none': $(`#none_tm-${id}`).val(),
+	}
+	o[id] = obj
+	var json = JSON.stringify(o)
+	console.log(json)
+	localStorage.setItem('column',json)
+	columnReload(id, 'tag')
+}
+

app/js/tl/tl.js

@@ -10,10 +10,18 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (tlid == 'add') {
 		console.log('add new column')
 		var newtab = $('.box').length
+		if (type == 'tag') {
+			data = {
+				name: data,
+				any: [],
+				all: [],
+				none: [],
+			}
+		}
 		var add = {
 			domain: acct_id,
 			type: type,
-			data: data
+			data: data,
 		}
 		var multi = localStorage.getItem('column')
 		var obj = JSON.parse(multi)
@@ -35,7 +43,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (type == 'mix' && localStorage.getItem('mode_' + domain) != 'misskey') {
 		//Integratedなら飛ばす
 		$('#notice_' + tlid).text(
-			'Integrated TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			'Integrated TL(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('merge_type')
 		mixtl(acct_id, tlid, 'integrated', delc, voice)
@@ -43,7 +55,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	} else if (type == 'plus') {
 		//Local+なら飛ばす
 		$('#notice_' + tlid).text(
-			'Local+ TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			'Local+ TL(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('people_outline')
 		mixtl(acct_id, tlid, 'plus', delc, voice)
@@ -52,7 +68,12 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//通知なら飛ばす
 		notf(acct_id, tlid, 'direct')
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			cap(type, data, acct_id) +
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('notifications')
 		return
@@ -60,13 +81,18 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//ブックマークなら飛ばす
 		getBookmark(acct_id, tlid)
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			cap(type, data, acct_id) +
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 		$('#notice_icon_' + tlid).text('bookmark')
 		return
 	} else if (type == 'home') {
 		//ホームならお知らせ「も」取りに行く
-		announ(acct_id, tlid);
+		announ(acct_id, tlid)
 	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
@@ -74,14 +100,19 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (type != 'noauth') {
 		var hdr = {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
 		}
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			cap(type, data, acct_id) +
+				'(' +
+				localStorage.getItem('user_' + acct_id) +
+				'@' +
+				domain +
+				')'
 		)
 	} else {
 		var hdr = {
-			'content-type': 'application/json'
+			'content-type': 'application/json',
 		}
 		domain = acct_id
 		$('#notice_' + tlid).text('Glance TL(' + domain + ')')
@@ -110,7 +141,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var i = {
 			method: method,
 			headers: hdr,
-			body: JSON.stringify(req)
+			body: JSON.stringify(req),
 		}
 	} else {
 		var misskey = false
@@ -129,26 +160,26 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var method = 'GET'
 		var i = {
 			method: method,
-			headers: hdr
+			headers: hdr,
 		}
 	}
 
 	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) {
 					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 of getting timeline of ' + tlid, json])
 			$('#landing_' + tlid).hide()
 			var mute = getFilterTypeByAcct(acct_id, type)
@@ -190,8 +221,13 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 	if (localStorage.getItem('mode_' + domain) == 'misskey') {
 		var misskey = true
 		var key = localStorage.getItem('misskey_wss_' + acct_id)
-		var send = '{"type":"connect","body":{"channel":"' + typePs(type) + '","id":"' + tlid + '"}}'
+		var send =
-		var mskyset = setInterval(function() {
+			'{"type":"connect","body":{"channel":"' +
+			typePs(type) +
+			'","id":"' +
+			tlid +
+			'"}}'
+		var mskyset = setInterval(function () {
 			if (misskeywsstate[key]) {
 				misskeyws[key].send(send)
 				clearInterval(mskyset)
@@ -209,12 +245,16 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		} else if (type == 'pub') {
 			var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at
 		} else if (type == 'pub-media') {
-			var start = wss + '/api/v1/streaming/?stream=public:media&access_token=' + at
+			var start =
+				wss + '/api/v1/streaming/?stream=public:media&access_token=' + at
 		} else if (type == 'local') {
-			var start = wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
+			var start =
+				wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
 		} else if (type == 'local-media') {
 			var start =
-				wss + '/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' + at
+				wss +
+				'/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' +
+				at
 		} else if (type == 'tag') {
 			if (type == 'tag') {
 				var tag = localStorage.getItem('tag-range')
@@ -222,28 +262,38 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					data = data + '&local=true'
 				}
 			}
-			var start = wss + '/api/v1/streaming/?stream=hashtag&tag=' + data + '&access_token=' + at
+			var start =
+				wss +
+				'/api/v1/streaming/?stream=hashtag&tag=' +
+				data +
+				'&access_token=' +
+				at
 		} else if (type == 'noauth') {
 			var start = 'wss://' + acct_id + '/api/v1/streaming/?stream=public:local'
 		} else if (type == 'list') {
-			var start = wss + '/api/v1/streaming/?stream=list&list=' + data + '&access_token=' + at
+			var start =
+				wss +
+				'/api/v1/streaming/?stream=list&list=' +
+				data +
+				'&access_token=' +
+				at
 		} else if (type == 'dm') {
 			var start = wss + '/api/v1/streaming/?stream=direct&access_token=' + at
 		}
 		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,
 				domain: domain,
-				message: [mess]
+				message: [mess],
 			})
 			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') {
@@ -254,7 +304,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					websocketNotf[acct_id].send(
 						JSON.stringify({
 							type: 'capture',
-							id: obj.id
+							id: obj.id,
 						})
 					)
 					var templete = misskeyParse([obj], type, acct_id, tlid, '', mute)
@@ -273,26 +323,40 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				if (typeA == 'delete') {
 					var obj = JSON.parse(mess.data).payload
 					if (delc == 'true') {
-						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+						$(
-							'emphasized'
+							'#timeline_' +
-						)
+								tlid +
-						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+								' [unique-id=' +
-							'by_delcatch'
+								JSON.parse(mess.data).payload +
-						)
+								']'
+						).addClass('emphasized')
+						$(
+							'#timeline_' +
+								tlid +
+								' [unique-id=' +
+								JSON.parse(mess.data).payload +
+								']'
+						).addClass('by_delcatch')
 					} else {
-						$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
-						$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
 					}
 				} else if (typeA == 'update' || typeA == 'conversation') {
-					if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
+					if (
+						!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')
+					) {
 						//markers show中はダメ
 						var obj = JSON.parse(JSON.parse(mess.data).payload)
-						if ($('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1) {
+						if (
+							$('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1
+						) {
 							if (voice) {
 								say(obj.content)
 							}
 							var templete = parse([obj], type, acct_id, tlid, '', mute, type)
-							if ($('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0) {
+							if (
+								$('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0
+							) {
 								$('#timeline_' + tlid).prepend(templete)
 							} else {
 								var pool = localStorage.getItem('pool_' + tlid)
@@ -319,7 +383,7 @@ function reload(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') {
@@ -334,7 +398,7 @@ function reload(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')
@@ -376,13 +440,17 @@ function moreload(type, tlid) {
 	if (sid && !moreloading) {
 		if (
 			type == 'mix' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) != 'misskey'
 		) {
 			mixmore(tlid, 'integrated')
 			return
 		} else if (
 			type == 'plus' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) != 'misskey'
 		) {
 			mixmore(tlid, 'plus')
 			return
@@ -404,19 +472,19 @@ function moreload(type, tlid) {
 			var at = localStorage.getItem('acct_' + acct_id + '_at')
 			var hdr = {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				Authorization: 'Bearer ' + at,
 			}
 			var domain = localStorage.getItem('domain_' + acct_id)
 		} else {
 			var hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			domain = acct_id
 		}
 		if (localStorage.getItem('mode_' + domain) == 'misskey') {
 			var misskey = true
 			hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			var url = misskeycom(type, data)
 			var start = 'https://' + domain + '/api/notes/' + url
@@ -439,35 +507,42 @@ function moreload(type, tlid) {
 			var i = {
 				method: method,
 				headers: hdr,
-				body: JSON.stringify(req)
+				body: JSON.stringify(req),
 			}
 		} else {
 			var misskey = false
-			var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'max_id=' + sid
+			var start =
+				'https://' +
+				domain +
+				'/api/v1/timelines/' +
+				com(type, data) +
+				'max_id=' +
+				sid
 			if (type == 'dm') {
-				var start = 'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid
+				var start =
+					'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid
 			}
 			var method = 'GET'
 			var i = {
 				method: method,
-				headers: hdr
+				headers: hdr,
 			}
 		}
 		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)
@@ -508,12 +583,16 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 	if (sid && !moreloading) {
 		if (
 			type == 'mix' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) != 'misskey'
 		) {
 			return
 		} else if (
 			type == 'plus' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) != 'misskey'
 		) {
 			return
 		} else if (type == 'notf') {
@@ -526,19 +605,19 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 			var at = localStorage.getItem('acct_' + acct_id + '_at')
 			var hdr = {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				Authorization: 'Bearer ' + at,
 			}
 			var domain = localStorage.getItem('domain_' + acct_id)
 		} else {
 			var hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			domain = acct_id
 		}
 		if (localStorage.getItem('mode_' + domain) == 'misskey') {
 			var misskey = true
 			hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			var url = misskeycom(type, data)
 			var start = 'https://' + domain + '/api/notes/' + url
@@ -561,36 +640,43 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 			var i = {
 				method: method,
 				headers: hdr,
-				body: JSON.stringify(req)
+				body: JSON.stringify(req),
 			}
 		} else {
 			var misskey = false
-			var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'since_id=' + sid
+			var start =
+				'https://' +
+				domain +
+				'/api/v1/timelines/' +
+				com(type, data) +
+				'since_id=' +
+				sid
 			if (type == 'dm') {
-				var start = 'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid
+				var start =
+					'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid
 			}
 			var method = 'GET'
 			var i = {
 				method: method,
-				headers: hdr
+				headers: hdr,
 			}
 		}
 
 		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)
@@ -612,7 +698,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')
@@ -624,27 +710,30 @@ 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('%c Close Streaming API:Integrated Local' + tlid, 'color:blue')
+			console.log(
+				'%c Close Streaming API:Integrated Local' + tlid,
+				'color:blue'
+			)
 		}
 	})
 	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')
@@ -674,7 +763,11 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == 'local-media') {
 		if (localStorage.getItem('local_' + acct_id) && !locale) {
-			var response = localStorage.getItem('local_' + acct_id) + '(' + lang.lang_tl_media + ')'
+			var response =
+				localStorage.getItem('local_' + acct_id) +
+				'(' +
+				lang.lang_tl_media +
+				')'
 		} else {
 			var response = 'Local TL(Media)'
 		}
@@ -686,12 +779,22 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == 'pub-media') {
 		if (localStorage.getItem('public_' + acct_id) && !locale) {
-			var response = localStorage.getItem('public_' + acct_id) + '(' + lang.lang_tl_media + ')'
+			var response =
+				localStorage.getItem('public_' + acct_id) +
+				'(' +
+				lang.lang_tl_media +
+				')'
 		} else {
 			var response = 'Federated TL(Media)'
 		}
 	} else if (type == 'tag') {
-		var response = '#' + escapeHTML(data)
+		if (data) {
+			if (data.name) {
+				var response = '#' + escapeHTML(data.name)
+			} else {
+				var response = '#' + escapeHTML(data)
+			}
+		}
 	} else if (type == 'list') {
 		var ltitle = localStorage.getItem('list_' + data + '_' + acct_id)
 		var response = 'List(' + ltitle + ')'
@@ -706,7 +809,11 @@ function cap(type, data, acct_id) {
 	} else if (type == 'dm') {
 		var response = 'DM'
 	} else if (type == 'mix') {
-		if (localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) == 'misskey') {
+		if (
+			localStorage.getItem(
+				'mode_' + localStorage.getItem('domain_' + acct_id)
+			) == 'misskey'
+		) {
 			var response = 'Social TL'
 		} else {
 			var response = 'Integrated'
@@ -736,7 +843,21 @@ function com(type, data) {
 	} else if (type == 'pub-media') {
 		return 'public?only_media=true&'
 	} else if (type == 'tag') {
-		return 'tag/' + data + '?'
+		if (data.name) {
+			var name = data.name
+			var all = data.all
+			var any = data.any
+			var none = data.none
+		} else {
+			var name = data
+			var all = ''
+			var any = ''
+			var none = ''
+		}
+		return `tag/${name}?${buildQuery('all', all)}${buildQuery(
+			'any',
+			any
+		)}${buildQuery('none', none)}`.slice(0, -1)
 	} else if (type == 'list') {
 		return 'list/' + data + '?'
 	} else if (type == 'dm') {
@@ -897,37 +1018,50 @@ function getMarker(tlid, type, acct_id) {
 		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) {
-			$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
+			$('#unread_' + tlid).attr(
+				'title',
+				lang.lang_layout_unread + ':' + lang.lang_nothing
+			)
 			$('#unread_' + tlid).attr('data-id', '')
 			return false
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json) {
 				if (json[add]) {
 					json = json[add]
 					$('#unread_' + tlid).attr(
 						'title',
-						lang.lang_layout_unread + ':' + json.updated_at + ' v' + json.version
+						lang.lang_layout_unread +
+							':' +
+							json.updated_at +
+							' v' +
+							json.version
 					)
 					$('#unread_' + tlid).attr('data-id', json.last_read_id)
 				} else {
-					$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
+					$('#unread_' + tlid).attr(
+						'title',
+						lang.lang_layout_unread + ':' + lang.lang_nothing
+					)
 					$('#unread_' + tlid).attr('data-id', '')
 				}
 			} else {
-				$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
+				$('#unread_' + tlid).attr(
+					'title',
+					lang.lang_layout_unread + ':' + lang.lang_nothing
+				)
 				$('#unread_' + tlid).attr('data-id', '')
 			}
 		})
@@ -951,23 +1085,23 @@ function showUnread(tlid, type, acct_id) {
 		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 || !json.length) {
 				columnReload(tlid, type)
 			}
@@ -1007,23 +1141,23 @@ function ueload(tlid) {
 		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) {
 				columnReload(tlid, type)
 			}
@@ -1062,15 +1196,15 @@ function asRead(callback) {
 					var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('unique-id')
 					var poster = {
 						home: {
-							last_read_id: id
+							last_read_id: id,
-						}
+						},
 					}
 				} else {
 					var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('data-notf')
 					var poster = {
 						notifications: {
-							last_read_id: id
+							last_read_id: id,
-						}
+						},
 					}
 				}
 
@@ -1083,7 +1217,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) {
@@ -1117,8 +1251,8 @@ function asReadEnd() {
 			onBeforeOpen: () => {
 				Swal.showLoading()
 			},
-			onClose: () => {}
+			onClose: () => {},
-		}).then(result => {})
+		}).then((result) => {})
 	} else {
 		postMessage(['asReadComp', ''], '*')
 	}
@@ -1144,7 +1278,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) {
@@ -1159,7 +1293,11 @@ function getBookmark(acct_id, tlid, more) {
 				}
 			}
 			var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
-			templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
+			templete =
+				templete +
+				'<div class="hide notif-marker" data-maxid="' +
+				max_id +
+				'"></div>'
 			if (more) {
 				$('#timeline_' + tlid).append(templete)
 			} else {
@@ -1183,7 +1321,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) {
@@ -1198,7 +1336,7 @@ function announ(acct_id, tlid) {
 					}
 					ct++
 				}
-				if(ct > 0) {
+				if (ct > 0) {
 					$('.notf-announ_' + acct_id + '_ct').text(ct)
 				}
 			} else {
@@ -1210,4 +1348,14 @@ function announ(acct_id, tlid) {
 			todc()
 		}
 	}
-}
+}
+//buildQuery
+function buildQuery(name, data) {
+	if(!data || data == '') return ''
+	var arr = data.split(',')
+	var str = ''
+	for (var i = 0; i < arr.length; i++) {
+		str = str + `${name}[]=${arr[i]}&`
+	}
+	return str
+}

app/js/ui/layout.js

@@ -8,7 +8,7 @@ var websocketNotf = []
 
 //カラム追加ボックストグル
 function addColumnMenu() {
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#addColumnMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#add-box').removeClass('hide')
@@ -292,16 +292,33 @@ function parseColumn(target, dontclose) {
 					${lang.lang_layout_excludingbt}
 					<br>`
 			} else if (acct.type == 'tag') {
+				if(acct.data.name) {
+					var name = acct.data.name
+					var all = acct.data.all
+					var any = acct.data.any
+					var none = acct.data.none
+				} else {
+					var name = acct.data
+					var all = ''
+					var any = ''
+					var none = ''
+				}
 				if_tag = `<div class="column-hide notf-indv-box" id="tag-box_${key}" style="padding:5px;">
-					Base: ${acct.data}<br>
+					Base: ${name}<br>
-					<div id="tagManager-${key}"></div>
+					<div id="tagManager-${key}">
-					<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Add</button>
+						all: <input type="text" id="all_tm-${key}"" value="${all}">
+						any: <input type="text" id="any_tm-${key}" value="${any}">
+						none: <input type="text" id="none_tm-${key}"" value="${none}">
+					</div>
+					<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Refresh</button>
 				</div>`
 				if_tag_btn = `<a onclick="setToggleTag('${key}')" class="setting nex" 
 				title="${lang.lang_layout_tagManager}" style="width:30px">
 				<i class="material-icons waves-effect nex">note_add</i>
 				</a>`
 				unread = ''
+				var exclude = ''
+				var if_notf = 'hide'
 			} else {
 				var exclude = ''
 				unread = ''
@@ -357,7 +374,7 @@ function parseColumn(target, dontclose) {
 							<i class="material-icons waves-effect ${isMisRed}" id="notice_icon_${key}" ${notf_attr}
 								 style="font-size:40px; padding-top:25%;" 
 								 onclick="checkStr('${acct.type}','${data}','${acct.domain}', '${key}', '${delc}','${voice}',null)"
-							 	 title="${lang.lang_layout_gotop}">
+							 	 title="${lang.lang_layout_gotop}" aria-hidden="true">
 							</i>
 						</div>
 					<div class="area-notice_name">
@@ -366,29 +383,33 @@ function parseColumn(target, dontclose) {
 					<div class="area-a1">
 						<a onclick="notfToggle('${acct.domain}','${key}')" class="setting nex ${if_notf}" 
 							title="${unique_notf}" ${icnsert}>
-							<i class="material-icons waves-effect nex notf-icon_${acct.domain}">notifications</i>
+							<i class="material-icons waves-effect nex notf-icon_${acct.domain}" aria-hidden="true">notifications</i>
+							<span class="voice">${unique_notf}</span>
 						</a>
 						<span class="cbadge hide notf-announ_${acct.domain}" style="margin-right:0" 
 							onclick="notfToggle('${acct.domain}','${key}')" title="${lang.lang_layout_announ}">
 							<i class="fas fa-bullhorn"></i>
 							<span class="notf-announ_${acct.domain}_ct"></span>
+							<span class="voice">${lang.lang_layout_announ}</span>
 						</span>
 						${if_tag_btn}
 					</div>
 					<div class="area-sta">
-						<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply">0</span>
+						<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply" aria-hidden="true">0</span>
-						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav">0</span>
+						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav" aria-hidden="true">0</span>
-						<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT">0</span>
+						<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT" aria-hidden="true">0</span>
-						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow">0</span>
+						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow" aria-hidden="true">0</span>
 					</div>
 					<div class="area-a2">
 						<a onclick="removeColumn('${key}')" class="setting nex">
-							<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert}>cancel</i>
+							<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert} aria-hidden="true">cancel</i>
+							<span class="voice">${lang.lang_layout_delthis}</span>
 						</a>
 					</div>
 					<div class="area-a3">
 						<a onclick="setToggle('${key}')" class="setting nex" title="${lang.lang_layout_setthis}" ${icnsert}>
-							<i class="material-icons waves-effect nex">settings</i>
+							<i class="material-icons waves-effect nex" aria-hidden="true">settings</i>
+							<span class="voice">${lang.lang_layout_setthis}</span>
 						</a>
 					</div>
 				</div>

app/js/ui/menu.js

@@ -33,6 +33,7 @@ function menu() {
     $("#add-box").removeClass("hide");
     $("#left-menu div").removeClass("active");
     $("#addColumnMenu").addClass("active");
+    $("#addColumnMenu").click();
   } else {
     $('#menu').fadeOut()
     $("#menu").removeClass("appear")
@@ -69,7 +70,7 @@ $(function () {
   });
 });
 function help() {
-  $("#left-menu div").removeClass("active");
+  $("#left-menu a").removeClass("active");
 	$("#helpMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#help-box").removeClass("hide");

app/js/ui/sort.js

@@ -111,7 +111,7 @@ function sort() {
 }
 //ソートボタントグル
 function sortMenu() {
-	$("#left-menu div").removeClass("active");
+	$("#left-menu a").removeClass("active");
 	$("#sortMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#sort-box").removeClass("hide");

app/js/ui/spotify.js

@@ -1,216 +1,223 @@
 function spotifyConnect() {
-	var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing";
+	var auth = 'https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing'
-	var platform = localStorage.getItem("platform");
+	var platform = localStorage.getItem('platform')
-	if (platform == "win32") {
+	if (platform == 'win32') {
-		postMessage(["openUrl", auth], "*");
+		postMessage(['openUrl', auth], '*')
-		postMessage(["sendSinmpleIpc", "quit"], "*");
+		postMessage(['sendSinmpleIpc', 'quit'], '*')
 	} else {
-		auth = auth + "&state=code";
+		auth = auth + '&state=code'
-		$("#spotify-code-show").removeClass("hide");
+		$('#spotify-code-show').removeClass('hide')
-		postMessage(["openUrl", auth], "*");
+		postMessage(['openUrl', auth], '*')
 	}
 }
 function spotifyAuth() {
-	var code = $("#spotify-code").val();
+	var code = $('#spotify-code').val()
-	localStorage.setItem("spotify", "code");
+	localStorage.setItem('spotify', 'code')
-	localStorage.setItem("spotify-refresh", code);
+	localStorage.setItem('spotify-refresh', code)
-	$("#spotify-code-show").addClass("hide");
+	$('#spotify-code-show').addClass('hide')
-	$("#spotify-enable").addClass("disabled");
+	$('#spotify-enable').addClass('disabled')
-	$("#spotify-disable").removeClass("disabled");
+	$('#spotify-disable').removeClass('disabled')
 }
 function spotifyDisconnect() {
-	localStorage.removeItem("spotify");
+	localStorage.removeItem('spotify')
-	localStorage.removeItem("spotify-refresh");
+	localStorage.removeItem('spotify-refresh')
-	checkSpotify();
+	checkSpotify()
 }
 function checkSpotify() {
-	if (localStorage.getItem("spotify")) {
+	if (localStorage.getItem('spotify')) {
-		$("#spotify-enable").addClass("disabled");
+		$('#spotify-enable').addClass('disabled')
-		$("#spotify-disable").removeClass("disabled");
+		$('#spotify-disable').removeClass('disabled')
 	} else {
-		$("#spotify-enable").removeClass("disabled");
+		$('#spotify-enable').removeClass('disabled')
-		$("#spotify-disable").addClass("disabled");
+		$('#spotify-disable').addClass('disabled')
 	}
-	var content = localStorage.getItem("np-temp");
+	var content = localStorage.getItem('np-temp')
-	if (!content || content == "" || content == "null") {
+	if (!content || content == '' || content == 'null') {
-		var content = "#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
+		var content = '#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk'
 	}
-	$("#np-temp").val(content);
+	$('#np-temp').val(content)
-	var flag = localStorage.getItem("artwork");
+	var flag = localStorage.getItem('artwork')
 	if (flag) {
-		$("#awk_yes").prop("checked", true);
+		$('#awk_yes').prop('checked', true)
 	} else {
-		$("#awk_no").prop("checked", true);
+		$('#awk_no').prop('checked', true)
 	}
-	var flag2 = localStorage.getItem("complete-artwork");
+	var flag2 = localStorage.getItem('complete-artwork')
 	if (flag2) {
-		$("#amw_yes").prop("checked", true);
+		$('#amw_yes').prop('checked', true)
 	} else {
-		$("#amw_no").prop("checked", true);
+		$('#amw_no').prop('checked', true)
 	}
 }
 function spotifyFlagSave() {
-	var awk = $("[name=awk]:checked").val();
+	var awk = $('[name=awk]:checked').val()
-	if (awk == "yes") {
+	if (awk == 'yes') {
-		localStorage.setItem("artwork", "yes");
+		localStorage.setItem('artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
 	} else {
-		localStorage.removeItem("artwork");
+		localStorage.removeItem('artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
 	}
 }
 function aMusicFlagSave() {
-	var awk = $("[name=amw]:checked").val();
+	var awk = $('[name=amw]:checked').val()
-	if (awk == "yes") {
+	if (awk == 'yes') {
-		localStorage.setItem("complete-artwork", "yes");
+		localStorage.setItem('complete-artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
 	} else {
-		localStorage.removeItem("complete-artwork");
+		localStorage.removeItem('complete-artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
 	}
 }
 function nowplaying(mode) {
-	if (mode == "spotify") {
+	if (mode == 'spotify') {
-		var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
+		var start = 'https://thedesk.top/now-playing?at=' + localStorage.getItem('spotify') + '&rt=' + localStorage.getItem('spotify-refresh')
-		var at = localStorage.getItem("spotify");
+		var at = localStorage.getItem('spotify')
 		if (at) {
 			fetch(start, {
-				method: "GET",
+				method: 'GET',
 				headers: {
-					"content-type": "application/json"
+					'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);
+							setLog(response.url, response.status, text)
-						});
+						})
 					}
-					return response.json();
+					return response.json()
 				})
-				.catch(function(error) {
+				.catch(function (error) {
-					todo(error);
+					todo(error)
-					setLog(start, "JSON", error);
+					setLog(start, 'JSON', error)
-					console.error(error);
+					console.error(error)
 				})
-				.then(function(json) {
+				.then(function (json) {
-					console.table(json);
+					console.table(json)
 					if (json.length < 1) {
-						return false;
+						return false
 					}
-					var item = json.item;
+					var item = json.item
-					var img = item.album.images[0].url;
+					var img = item.album.images[0].url
-					var flag = localStorage.getItem("artwork");
+					var flag = localStorage.getItem('artwork')
 					if (flag) {
-						postMessage(["bmpImage", [img, 0]], "*");
+						postMessage(['bmpImage', [img, 0]], '*')
 					}
-					var content = localStorage.getItem("np-temp");
+					var content = localStorage.getItem('np-temp')
-					if (!content || content == "" || content == "null") {
+					if (!content || content == '' || content == 'null') {
-						var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
+						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
 					}
-					var regExp = new RegExp("{song}", "g");
+					var regExp = new RegExp('{song}', 'g')
-					content = content.replace(regExp, item.name);
+					content = content.replace(regExp, item.name)
-					var regExp = new RegExp("{album}", "g");
+					var regExp = new RegExp('{album}', 'g')
-					content = content.replace(regExp, item.album.name);
+					content = content.replace(regExp, item.album.name)
-					var regExp = new RegExp("{artist}", "g");
+					var regExp = new RegExp('{artist}', 'g')
-					content = content.replace(regExp, item.artists[0].name);
+					content = content.replace(regExp, item.artists[0].name)
-					var regExp = new RegExp("{url}", "g");
+					var regExp = new RegExp('{url}', 'g')
-					content = content.replace(regExp, item.external_urls.spotify);
+					content = content.replace(regExp, item.external_urls.spotify)
-					var regExp = new RegExp("{composer}", "g");
+					var regExp = new RegExp('{composer}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{hz}", "g");
+					var regExp = new RegExp('{hz}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{bitRate}", "g");
+					var regExp = new RegExp('{bitRate}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{lyricist}", "g");
+					var regExp = new RegExp('{lyricist}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{bpm}", "g");
+					var regExp = new RegExp('{bpm}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{genre}", "g");
+					var regExp = new RegExp('{genre}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					$("#textarea").val(content);
+					$('#textarea').val(content)
-				});
+				})
 		} else {
 			Swal.fire({
-				type: "info",
+				type: 'info',
-				title: lang.lang_spotify_acct
+				title: lang.lang_spotify_acct,
-			});
+			})
 		}
-	} else if (mode == "itunes") {
+	} else if (mode == 'itunes') {
-		postMessage(["itunes", ""], "*");
+		postMessage(['itunes', ''], '*')
 	}
 }
 async function npCore(arg) {
-	console.table(arg);
+	console.table(arg)
-	var content = localStorage.getItem("np-temp");
+	var content = localStorage.getItem('np-temp')
-	if (!content || content == "" || content == "null") {
+	if (!content || content == '' || content == 'null') {
-		var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
+		var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
 	}
-	var flag = localStorage.getItem("artwork");
+	var flag = localStorage.getItem('artwork')
-	var platform = localStorage.getItem("platform");
+	var platform = localStorage.getItem('platform')
-	if (platform == "win32") {
+	if (platform == 'win32') {
 		if (flag && arg.path) {
-			media(arg.path, "image/png", "new");
+			media(arg.path, 'image/png', 'new')
 		}
-	} else if (platform == "darwin") {
+	} else if (platform == 'darwin') {
 		if (flag && arg.artwork) {
-			media(arg.artwork, "image/png", "new");
+			media(arg.artwork, 'image/png', 'new')
 		} else if (flag && localStorage.getItem('complete-artwork')) {
-			var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name;
+			var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name
-			postMessage(["bmpImage", [await getUnknownAA(q), 0]], "*");
+			var aaw = await getUnknownAA(q)
+			postMessage(['bmpImage', [aaw.aaw, 0]], '*')
 		}
 	}
-	var regExp = new RegExp("{song}", "g");
+	var regExp = new RegExp('{song}', 'g')
-	content = content.replace(regExp, arg.name);
+	content = content.replace(regExp, arg.name)
-	var regExp = new RegExp("{album}", "g");
+	var regExp = new RegExp('{album}', 'g')
 	if (arg.album) {
 		if (arg.album.name) {
-			content = content.replace(regExp, arg.album.name);
+			content = content.replace(regExp, arg.album.name)
+		} else {
+			if(aaw.album) content.replace(regExp, aaw.album)
+			content = content.replace(regExp, '-')
 		}
+	} else {
+		if(aaw.album) content.replace(regExp, aaw.album)
+		content = content.replace(regExp, '-')
 	}
-	var regExp = new RegExp("{artist}", "g");
+	var regExp = new RegExp('{artist}', 'g')
-	content = content.replace(regExp, arg.artist);
+	content = content.replace(regExp, arg.artist)
-	var regExp = new RegExp("{url}", "g");
+	var regExp = new RegExp('{url}', 'g')
-	content = content.replace(regExp, "");
+	content = content.replace(regExp, '')
-	var regExp = new RegExp("{composer}", "g");
+	var regExp = new RegExp('{composer}', 'g')
-	content = content.replace(regExp, arg.composer);
+	content = content.replace(regExp, arg.composer)
-	var regExp = new RegExp("{hz}", "g");
+	var regExp = new RegExp('{hz}', 'g')
-	content = content.replace(regExp, arg.sampleRate / 1000 + "kHz");
+	content = content.replace(regExp, arg.sampleRate / 1000 + 'kHz')
-	var regExp = new RegExp("{lyricist}", "g");
+	var regExp = new RegExp('{lyricist}', 'g')
-	content = content.replace(regExp, "");
+	content = content.replace(regExp, '')
-	var regExp = new RegExp("{bpm}", "g");
+	var regExp = new RegExp('{bpm}', 'g')
-	content = content.replace(regExp, "");
+	content = content.replace(regExp, '')
-	var regExp = new RegExp("{bitRate}", "g");
+	var regExp = new RegExp('{bitRate}', 'g')
-	content = content.replace(regExp, arg.bitRate + "kbps");
+	content = content.replace(regExp, arg.bitRate + 'kbps')
-	var regExp = new RegExp("{genre}", "g");
+	var regExp = new RegExp('{genre}', 'g')
-	content = content.replace(regExp, arg.genre);
+	content = content.replace(regExp, arg.genre)
-	$("#textarea").val(content);
+	$('#textarea').val(content)
 }
 function spotifySave() {
-	var temp = $("#np-temp").val();
+	var temp = $('#np-temp').val()
-	localStorage.setItem("np-temp", temp);
+	localStorage.setItem('np-temp', temp)
-	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 });
+	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
 }
 if (location.search) {
-	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
-	var mode = m[1];
+	var mode = m[1]
-	var codex = m[2];
+	var codex = m[2]
-	if (mode == "spotify") {
+	if (mode == 'spotify') {
-		var coder = codex.split(":");
+		var coder = codex.split(':')
-		localStorage.setItem("spotify", coder[0]);
+		localStorage.setItem('spotify', coder[0])
-		localStorage.setItem("spotify-refresh", coder[1]);
+		localStorage.setItem('spotify-refresh', coder[1])
 	} else {
 	}
 }
 async function getUnknownAA(q) {
 	const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song'
 	let promise = await fetch(start, {
-		method: 'GET'
+		method: 'GET',
 	})
 	const json = await promise.json()
-	if(!json.resultCount) {
+	if (!json.resultCount) {
 		return []
 	}
 	const data = json.results[0].artworkUrl100
-	return data.replace(/100x100/, '512x512')
+	return { aaw: data.replace(/100x100/, '512x512'), album: json.results[0].collectionName }
-}
+}

app/js/ui/tips.js

@@ -159,6 +159,10 @@ function spotifytips() {
 			})
 			.then(function(json) {
 				var ms = json.progress_ms
+				if(!ms) {
+					tips('ver')
+					return false
+				}
 				var last = 1000 - (ms % 1000)
 				var item = json.item
 				var img = item.album.images[0].url
@@ -218,6 +222,8 @@ function spotifytips() {
 			type: 'info',
 			title: lang.lang_spotify_acct
 		})
+		tips('ver')
+		return false
 	}
 }
 function spotStart() {
@@ -288,6 +294,4 @@ function tipsToggle() {
 	$('#tips').toggleClass('hide')
 	$('#tips-menu').toggleClass('hide')
 }
-if (localStorage.getItem('tips')) {
+
-	tips(localStorage.getItem('tips'))
-}

app/main.js

@@ -195,6 +195,7 @@ function createWindow() {
 	mainWindow = new BrowserWindow(arg)
 	mainWindow.once('page-title-updated', () => {
 		mainWindow.show()
+		console.log('Accessibility: ' + app.accessibilitySupportEnabled)
 		if (window_size.max) {
 			mainWindow.maximize()
 		}

app/main/dl.js

@@ -42,7 +42,7 @@ function dl(mainWindow, lang_path, base, dirname) {
 				filename: file,
 				openFolderWhenDone: true,
 				onProgress: function(event) {
-					e.sender.webContents.send('prog', event)
+					e.sender.webContents.send('prog', [event, args[2]])
 				},
 				saveAs: false
 			}

app/main/system.js

@@ -132,7 +132,12 @@ function system(mainWindow, dir, lang, dirname) {
 		app.relaunch();
 		app.exit();
 	});
-
+	//スクリーンリーダー
+	ipc.on("acsCheck", function(e, arg) {
+		if(app.accessibilitySupportEnabled) {
+			mainWindow.webContents.send('accessibility', 'true')
+		}
+	});
 	ipc.on("quit", (e, args) => {
 		app.quit();
 	});

app/package.json

@@ -1,6 +1,7 @@
 {
   "name": "thedesk",
-  "version": "20.3.0",
+  "version": "20.3.3",
+  "codename": "Kawaii",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
@@ -54,24 +55,24 @@
     "@fortawesome/fontawesome-free": "^5.13.0",
     "custom-electron-titlebar": "^3.2.2-hotfix62",
     "electron-dl": "^3.0.0",
-    "jimp": "^0.10.1",
+    "jimp": "^0.10.3",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.0",
     "jquery-ui-dist": "^1.12.1",
     "json5": "^2.1.3",
     "lodash": "^4.17.15",
     "materialize-css": "git://github.com/cutls/materialize#v1-dev",
     "sumchecker": "^3.0.1",
-    "sweetalert2": "^9.10.9",
+    "sweetalert2": "^9.10.12",
     "system-font-families": "^0.4.1",
     "vue": "^2.6.11"
   },
   "optionalDependencies": {
-    "itunes-nowplaying-mac": "git://github.com/cutls/itunes-nowplaying-mac"
+    "itunes-nowplaying-mac": "0.3.1"
   },
   "devDependencies": {
     "chokidar": "^3.3.1",
-    "electron": "^8.0.0",
+    "electron": "^8.2.3",
-    "electron-builder": "^22.4.1",
+    "electron-builder": "^22.5.1",
     "electron-rebuild": "^1.10.1",
     "readline-sync": "1.4.10"
   },

app/source/version.json

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

app/view/make/acct.sample.html

@@ -59,8 +59,10 @@
 			<div id="add">
 				<div class="row">
 					<div class="col s8">
+						@@addAcct@@<br />
 						<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
 						<div id="ins-suggest"></div>
+						<button class="btn waves-effect" onclick="instance()">Login</button><br />
 						@@codesetupwarn@@<br />
 						<label>
 							<input type="checkbox" class="filled-in" id="linux" />
@@ -71,9 +73,8 @@
 							<input type="checkbox" class="filled-in" id="misskey" />
 							<span>@@thisismisskey@@</span> </label
 						><br />
-						<button class="btn waves-effect" onclick="instance()">Login</button><br />
 					</div>
-					<div class="col s4">
+					<div class="col s4 scr" aria-hidden="true">
 						<span style="font-family:Open Sans;">Supports</span>
 						<div id="support" class="collection transparent"></div>
 					</div>
@@ -85,7 +86,7 @@
 				<button class="btn waves-effect" onclick="code()">Auth</button><br />
 				<br />
 				<a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
-				<div id="compt" style="display:none">
+				<div id="compt" style="display:none" class="scr">
 					<h5>ログイン前に必ずご確認ください</h5>
 					<span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span
 					>のため以下の機能がご利用いただけません。

app/view/make/index.sample.html

@@ -62,7 +62,7 @@
 		<div id="tl">
 			<!--TL-->
 			<!--スターター-->
-			<div id="start">
+			<div id="start" class="scr">
 				<div id="start-content">
 					<h3 class="center">@@demoBottomBtns@@</h3>
 					@@lookAtBottom@@
@@ -1183,26 +1183,24 @@
 			<button onclick="$('#askjp_jp_ua').addClass('hide')" class="btn waves-effect">閉じる</button>
 		</div>
 		<!-- Modal Structure Release Note-->
-		<div id="releasenote" class="modal modal-fixed-footer">
+		<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-20-3-0_Kawaii" class="release-do" style="display:none; ">
+				<div id="release-20-3-3_Kawaii" class="release-do" style="display:none; ">
 					<br />
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br />
 					Pixiv
 					FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note 20.3.0 (Kawaii)</h5>
+					<h5>Release Note 20.3.3 (Kawaii)</h5>
-					・フレームレスの時、タイトルバーがmacOSで表示されてなかった  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a><br>
+					・アクセシビリティの改善  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-					・CWのトグル  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a> <a onclick="udgEx('dekisugi@mstdn.maud.io','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/78639574-2f082f00-78e9-11ea-9606-8886176b83cc.png">dekisugi</a><br>
+・アナウンス表示がずれる不具合の修正  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-					・フォントリストが不安定な不具合を修正  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a> <a onclick="udgEx('gralos_5177@mstdn.jp','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/78639293-a5586180-78e8-11ea-84b2-1859d113cd7c.png">gralos_5177</a><br>
+・ハッシュタグタイムラインのタグの編集に対応  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-					・iTunes NowPlayingで、アートワークが無い時自動で取りに行く機能をつけた  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a> <a onclick="udgEx('toneji@minohdon.jp','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/66582029-162df380-ebbc-11e9-8a6f-1832b3a35d89.png">toneji</a><br>
+・ダウンロード時にファイルサイズを表示  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-					・WIndows版ダウンローダでバージョニングオプションを付けた。パーセンテージがNaNになるやつも修正  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a> <a onclick="udgEx('marugen@kirishima.cloud','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/78640052-07659680-78ea-11ea-8953-8f8bfcb2bcda.png">marugen</a><br>
+
-					・Mastodon 3.1.3からの新しいメディアアップローダに対応  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a><br>
-					
 				</div>
 				<div id="release-en" style="display:none">
 					<h5>Let's make it native!</h5>
@@ -1269,30 +1267,30 @@
 			</span>
 			<div id="menu-wrapper">
 				<div id="left-menu">
-					<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu">
+					<a class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu">
-						<i class="material-icons">add</i><span>@@addColumn@@</span>
+						<i class="material-icons" aria-hidden="true">add</i><span>@@addColumn@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="sortMenu()" id="sortMenu">
+					<a class="waves-effect" onclick="sortMenu()" id="sortMenu">
-						<i class="material-icons">sort</i><span>@@sortColumns@@</span>
+						<i class="material-icons" aria-hidden="true">sort</i><span>@@sortColumns@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="searchMenu()" id="searchMenu">
+					<a class="waves-effect" onclick="searchMenu()" id="searchMenu">
-						<i class="material-icons">search</i><span>@@search@@</span>
+						<i class="material-icons" aria-hidden="true">search</i><span>@@search@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="listMenu()" id="listMenu">
+					<a class="waves-effect" onclick="listMenu()" id="listMenu">
-						<i class="material-icons">view_headline</i><span>@@list@@</span>
+						<i class="material-icons" aria-hidden="true">view_headline</i><span>@@list@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="dirMenu()" id="dirMenu">
+					<a class="waves-effect" onclick="dirMenu()" id="dirMenu">
-						<i class="material-icons">recent_actors</i><span>@@directory@@</span>
+						<i class="material-icons" aria-hidden="true">recent_actors</i><span>@@directory@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="filterMenu()" id="filterMenu">
+					<a class="waves-effect" onclick="filterMenu()" id="filterMenu">
-						<i class="material-icons">filter_list</i><span>@@filter@@</span>
+						<i class="material-icons" aria-hidden="true">filter_list</i><span>@@filter@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="help()" id="helpMenu">
+					<a class="waves-effect" onclick="help()" id="helpMenu">
-						<i class="material-icons">help_outline</i><span>@@helpAndLogs@@</span>
+						<i class="material-icons" aria-hidden="true">help_outline</i><span>@@helpAndLogs@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="location.href='index.html'">
+					<a class="waves-effect" onclick="location.href='index.html'">
-						<i class="material-icons">refresh</i><span>@@f5@@</span>
+						<i class="material-icons" aria-hidden="true">refresh</i><span>@@f5@@</span>
-					</div>
+					</a>
 				</div>
 				<div id="right-menu">
 					<!--カラム追加-->
@@ -1313,46 +1311,46 @@
 								<input type="hidden" value="local" id="type-sel" />
 								@@showThisTL@@
 								<div id="tltype">
-									<div class="type waves-effect active" data-type="local">
+									<a class="type waves-effect active" data-type="local">
-										<div><i class="material-icons">people_outline</i></div>
+										<div><i class="material-icons" aria-hidden="true">people_outline</i></div>
 										<span>@@local@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="local-media">
+									<a class="type waves-effect" data-type="local-media">
-										<div><i class="material-icons">perm_media</i></div>
+										<div><i class="material-icons" aria-hidden="true">perm_media</i></div>
 										<span>@@localMedia@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="home">
+									<a class="type waves-effect" data-type="home">
-										<div><i class="material-icons">home</i></div>
+										<div><i class="material-icons" aria-hidden="true">home</i></div>
 										<span>@@home@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="pub">
+									<a class="type waves-effect" data-type="pub">
-										<div><i class="material-icons">language</i></div>
+										<div><i class="material-icons" aria-hidden="true">language</i></div>
 										<span>@@fed@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="pub-media">
+									<a class="type waves-effect" data-type="pub-media">
-										<div><i class="material-icons">perm_media</i></div>
+										<div><i class="material-icons" aria-hidden="true">perm_media</i></div>
 										<span>@@fedMedia@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="dm">
+									<a class="type waves-effect" data-type="dm">
-										<div><i class="material-icons">mail_outline</i></div>
+										<div><i class="material-icons" aria-hidden="true">mail_outline</i></div>
 										<span>@@dm@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="mix">
+									<a class="type waves-effect" data-type="mix">
-										<div><i class="material-icons">merge_type</i></div>
+										<div><i class="material-icons" aria-hidden="true">merge_type</i></div>
 										<span>@@integratedTLDes@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="plus">
+									<a class="type waves-effect" data-type="plus">
-										<div><i class="material-icons">reply</i></div>
+										<div><i class="material-icons" aria-hidden="true">reply</i></div>
 										<span>@@localPlusDes@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="notf">
+									<a class="type waves-effect" data-type="notf">
-										<div><i class="material-icons">notifications</i></div>
+										<div><i class="material-icons" aria-hidden="true">notifications</i></div>
 										<span>@@notf@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="bookmark">
+									<a class="type waves-effect" data-type="bookmark">
-										<div><i class="material-icons">bookmark</i></div>
+										<div><i class="material-icons" aria-hidden="true">bookmark</i></div>
 										<span>@@bookmark@@</span>
-									</div>
+									</a>
 								</div>
 							</div>
 							<div id="noauth" class="hide">
@@ -1536,6 +1534,10 @@
 							<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" />
@@ -1708,7 +1710,7 @@
 			</div>
 		</div>
 		<!--Support me-->
-		<div id="support-btm" class="z-depth-4 hide">
+		<div id="support-btm" class="z-depth-4 hide scr">
 			<div id="support-btm-ja">
 				<h5>ご支援いただけませんか？</h5>
 				(これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br />

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

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "Списък на профилите",
     "back": "Назад",
     "add": "Добавяне на профил",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Премахнете отметката за да пропуснете влизането с код. (Вход в Mastodon от Windows или macOS) (Препоръчително: pcheck)",
     "codesetup": "Настройка на код",
     "mainacct": "Основен профил",

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

@@ -140,6 +140,7 @@
     "filterWord": "Филтриране на думи",
     "degree": "Контекстно филтриране",
     "conver": "Разговори",
+    "prof": "Profiles",
     "option": "Настройки",
     "matchWord": "Цяла дума",
     "warnMatchWord": "Ница на латински език",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Кликнете за да добавите описание, щракнете с десния бутон за да го изтриете",
     "lang_postimg_desc": "Описание",
     "lang_postimg_leadContext": "щракнете с десния бутон върху миниатюрата за да изтриете това",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?",
     "lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.",
     "lang_post_cwtitle": "Авто CW Сигнал",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Отказ (няма да се публикува)",
     "lang_post_btn2": "Текстът да се скрива автоматично",
     "lang_post_btn3": "Продължете към публикуването",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "Ще отнеме минута раздумката отдалечено да стане любима.",
     "lang_status_btWarn": "Ще отнеме минута раздумката отдалечено да бъде подсилена.",
     "lang_status_follow": "Следване",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Покажи",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "Още",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "Seznam účtů",
     "back": "Zpět",
     "add": "Přidat účet",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Nastavení kódu",
     "mainacct": "Hlavní účet",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtrované slova",
     "degree": "Filter contexts",
     "conver": "Konverzace",
+    "prof": "Profiles",
     "option": "Možnosti",
     "matchWord": "Celé slovo",
     "warnMatchWord": "Dobré pro jazyky v latince",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Popis",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "Tento toot neobsahuje výchozí hashtag. Tento toot nebude zobrazen na výchozí časové ose. Pokračovat?",
     "lang_post_tagVis": "Tento toot (ne „veřejný“ toot) není zobrazen na časové ose tohoto hashtagu.",
     "lang_post_cwtitle": "Automatické varování o obsahu",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Zrušit (příspěvek nebude publikován)",
     "lang_post_btn2": "Skrýt text automaticky",
     "lang_post_btn3": "Pokračovat k přispívání",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "Oblíbení vzdáleného tootu bude chvíli trvat.",
     "lang_status_btWarn": "Boostnutí vzdáleného tootu bude chvíli trvat.",
     "lang_status_follow": "Sledovat",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Provedeno",
     "lang_parse_cwshow": "Zobrazit",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Celý text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "Více",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "Accountliste",
     "back": "Zurück",
     "add": "Konto hinzufügen",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.",
     "codesetup": "Code-Setup",
     "mainacct": "Hauptkonto",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filterwörter",
     "degree": "Kontexte filtern",
     "conver": "Gespräche",
+    "prof": "Profiles",
     "option": "Einstellungen",
     "matchWord": "Ganze Wörter",
     "warnMatchWord": "Schön für lateinische Sprachen",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Klicken, um Beschreibung hinzuzufügen, Rechtsklick zum Löschen",
     "lang_postimg_desc": "Beschreibung",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "Dieses Tröt enthält keinen Standard-Tag. Er wird in dem lokalen Verlauf nicht angezeigt. Fortfahren?",
     "lang_post_tagVis": "Dieser Tröt (nicht 'öffentlicher' Tröt) wird nicht in diesem Tag-Verlauf angezeigt.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Abbrechen (wird nicht gesendet)",
     "lang_post_btn2": "Text automatisch ausblenden",
     "lang_post_btn3": "Weiter mit Senden",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "Es braucht einen Moment, um ein entferntes Tröt zu favorisieren.",
     "lang_status_btWarn": "Es braucht einen Moment, um ein entferntes Tröt zu verstärken.",
     "lang_status_follow": "Folgen",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s Umfrage",
     "lang_parse_notftime": "Bearbeitet am",
     "lang_parse_cwshow": "Anzeigen",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Automatisches Zusammenfalten",
     "lang_parse_more": "Mehr",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Das Artwork von Spotify anhängen",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "Einstellungen Vorlesefunktion",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "crwdns3018:0crwdne3018:0",
     "back": "crwdns3020:0crwdne3020:0",
     "add": "crwdns3022:0crwdne3022:0",
+    "addAcct": "crwdns4484:0crwdne4484:0",
     "codesetupwarn": "crwdns3024:0crwdne3024:0",
     "codesetup": "crwdns3026:0crwdne3026:0",
     "mainacct": "crwdns3028:0crwdne3028:0",

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

@@ -140,6 +140,7 @@
     "filterWord": "crwdns3322:0crwdne3322:0",
     "degree": "crwdns3324:0crwdne3324:0",
     "conver": "crwdns3326:0crwdne3326:0",
+    "prof": "crwdns4488:0crwdne4488:0",
     "option": "crwdns3328:0crwdne3328:0",
     "matchWord": "crwdns3330:0crwdne3330:0",
     "warnMatchWord": "crwdns3332:0crwdne3332:0",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "crwdns4350:0crwdne4350:0",
     "lang_postimg_desc": "crwdns4352:0crwdne4352:0",
     "lang_postimg_leadContext": "crwdns4354:0crwdne4354:0",
+    "lang_post_syncDetail": "crwdns4476:0crwdne4476:0",
+    "lang_post_syncDetailText": "crwdns4478:0crwdne4478:0",
     "lang_post_tagTL": "crwdns3526:0crwdne3526:0",
     "lang_post_tagVis": "crwdns3528:0crwdne3528:0",
     "lang_post_cwtitle": "crwdns3530:0crwdne3530:0",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "crwdns3534:0crwdne3534:0",
     "lang_post_btn2": "crwdns3536:0crwdne3536:0",
     "lang_post_btn3": "crwdns3538:0crwdne3538:0",
+    "lang_post_unfinishedMedia": "crwdns4480:0crwdne4480:0",
+    "lang_post_retry": "crwdns4482:0crwdne4482:0",
     "lang_status_favWarn": "crwdns3540:0crwdne3540:0",
     "lang_status_btWarn": "crwdns3542:0crwdne3542:0",
     "lang_status_follow": "crwdns3544:0crwdne3544:0",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "crwdns3724:0crwdne3724:0",
     "lang_parse_notftime": "crwdns3726:0crwdne3726:0",
     "lang_parse_cwshow": "crwdns3728:0crwdne3728:0",
+    "lang_parse_cwshow_acc": "crwdns4486:0crwdne4486:0",
     "lang_parse_fulltext": "crwdns3730:0crwdne3730:0",
     "lang_parse_autofold": "crwdns3732:0crwdne3732:0",
     "lang_parse_more": "crwdns3734:0crwdne3734:0",

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

@@ -173,6 +173,8 @@
   "template2": "crwdns4346:0{song}crwdnd4346:0{album}crwdnd4346:0{artist}crwdnd4346:0{composer}crwdnd4346:0{hz}crwdnd4346:0{bitRate}crwdnd4346:0{genre}crwdne4346:0",
   "template3": "crwdns4348:0crwdne4348:0",
   "postartwork": "crwdns4210:0crwdne4210:0",
+  "searchArtwork": "crwdns4472:0crwdne4472:0",
+  "searchArtworkWarn": "crwdns4474:0crwdne4474:0",
   "tts": "crwdns4212:0crwdne4212:0",
   "bouyomi": "crwdns4214:0crwdne4214:0",
   "bouyomiWarn": "crwdns4216:0crwdne4216:0",

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

@@ -2,6 +2,7 @@
     "list":"List of accounts",
     "back":"Back",
     "add":"Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn":"Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup":"Code setup",
     "mainacct":"Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord":"Filtering words",
     "degree":"Filter contexts",
     "conver":"Conversations",
+    "prof":"Profiles",
     "option":"Options",
     "matchWord":"Whole word",
     "warnMatchWord":"Nice for Latin language",

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

@@ -172,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -2,6 +2,7 @@
     "list": "Lista de cuentas",
     "back": "Volver",
     "add": "Agregar una cuenta",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "No seleccionar para saltar el pegado de código (iniciá sesión de Mastodon en Windows o macOS) (Recomendado: pcheck)",
     "codesetup": "Configuración de código",
     "mainacct": "Establecer una cuenta",

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

@@ -140,6 +140,7 @@
     "filterWord": "Palabras filtradas",
     "degree": "Filtrar contextos",
     "conver": "Conversaciones",
+    "prof": "Profiles",
     "option": "Configuración",
     "matchWord": "Palabra completa",
     "warnMatchWord": "Útil para lenguas romances",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Hacé clic para agregar descripción, o clic secundario para eliminar esto",
     "lang_postimg_desc": "Descripción",
     "lang_postimg_leadContext": "hacé clic secundario sobre la miniatura para eliminar esto",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "Este toot no contiene una etiqueta predeterminada. Este toot no se mostrará en la línea temporal local. ¿Querés continuar?",
     "lang_post_tagVis": "Este toot (toot no público) no se muestra en la línea temporal de esta etiqueta.",
     "lang_post_cwtitle": "Alerta automática de Advertencia de contenido",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancelar (no se enviará)",
     "lang_post_btn2": "Crear el texto oculto automáticamente",
     "lang_post_btn3": "Continuar con el envío",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "Llevará un minuto marcar un toot remoto como favorito.",
     "lang_status_btWarn": "Llevará un minuto retootear un toot remoto.",
     "lang_status_follow": "Seguir",
@@ -168,6 +172,7 @@
     "lang_parse_polled": " hizo una encuesta",
     "lang_parse_notftime": "Enviado el",
     "lang_parse_cwshow": "Mostrar",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Tamaño de texto:",
     "lang_parse_autofold": "Colapsado automáticamente",
     "lang_parse_more": "Más",

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

@@ -173,6 +173,8 @@
   "template2": "macOS: {artist}: nombre del artista // {song}: nombre del tema // {album}: nombre del álbum // {genre}: género // {composer}: compositor // {hz}: frecuencia de muestreo // {bitRate}: tasa de transferencia",
   "template3": "",
   "postartwork": "Adjuntar tapa desde Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "Configuración de TTS (texto hablado)",
   "bouyomi": "Conectar BouyomiChan",
   "bouyomiWarn": "Requiere: Plugin WebSocket de BouyomiChan",

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

@@ -2,6 +2,7 @@
     "list": "Lista de cuentas",
     "back": "Atrás",
     "add": "Agregar una cuenta",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Desmarcarlo para omitir código de pegado. (iniciar sesión en Mastodon en Windows o macOS) (Recomendado: pcheck)",
     "codesetup": "Configuración de código",
     "mainacct": "Cuenta principal",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "Liste des comptes",
     "back": "Retour",
     "add": "Ajouter un compte",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Suivre",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Afficher",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "Plus",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -2,6 +2,7 @@
     "list": "List of accounts",
     "back": "Back",
     "add": "Add an account",
+    "addAcct": "Fill the instance domain (like mastodon.social)",
     "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
     "codesetup": "Code setup",
     "mainacct": "Main an account",

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

@@ -140,6 +140,7 @@
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",
+    "prof": "Profiles",
     "option": "Options",
     "matchWord": "Whole word",
     "warnMatchWord": "Nice for Latin language",

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

@@ -60,6 +60,8 @@
     "lang_postimg_delete": "Click to add description, right-click to delete this",
     "lang_postimg_desc": "Description",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
     "lang_post_btn1": "Cancel (will not post)",
     "lang_post_btn2": "Make text hidden automatically",
     "lang_post_btn3": "Continue to post",
+    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_retry": "Retry",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
     "lang_parse_polled": "'s poll",
     "lang_parse_notftime": "Actioned at",
     "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
     "lang_parse_more": "More",

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

@@ -173,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

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

@@ -138,6 +138,7 @@
     "listLocale":"一覧",
     "degree":"適応範囲",
     "conver":"会話",
+    "prof":"プロフィール",
     "option":"オプション",
     "matchWord":"単語マッチ",
     "warnMatchWord":"非ラテン系の文字列では「単語マッチ」はせん方がええで。(これはフリかも知れん)",

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

@@ -2,6 +2,7 @@
     "list":"アカウント一覧",
     "back":"戻る",
     "add":"アカウントを追加",
+    "addAcct": "次のボックスにログインしたいサーバのドメインを入力してください。",
     "codesetupwarn":"チェックを外すとコード貼り付けをスキップできます。(<u>Mastodon</u>にWindowsやmacOSからログインする場合)失敗する場合はチェックを入れてください。",
     "codesetup":"コードセットアップ",
     "mainacct":"メインアカウント",