Merge branch 'master' into dependabot/npm_and_yarn/app/dotenv-10.0.0

.prettierrc

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

app/js/post/status.js

@@ -110,6 +110,7 @@ function rt(id, acct_id, remote, vis) {
         }
     }
 }
+
 function boostWith(vis) {
     var id = $('#tootmodal').attr('data-id')
     var acct_id = $('#tootmodal').attr('data-acct')
@@ -167,7 +168,6 @@ async function follow(acct_id, resolve) {
     }
     if (!acct_id && acct_id != 'selector') {
         var acct_id = $('#his-data').attr('use-acct')
-
     } else if (acct_id == 'selector') {
         var acct_id = $('#user-acct-sel').val()
     }
@@ -182,7 +182,8 @@ async function follow(acct_id, resolve) {
     var id = $('#his-data').attr('user-id')
     if (resolve == 'selector') {
         var fullacct = $('#his-acct').attr('fullname')
-		var id = await acctResolve(acct_id, fullacct)
+        var data = await acctResolve(acct_id, fullacct)
+        var { id } = data
         console.log(id)
     }
     var domain = localStorage.getItem('domain_' + acct_id)
@@ -223,28 +224,47 @@ async function follow(acct_id, resolve) {
 }
 async function acctResolve(acct_id, user) {
     console.log('Get user data of ' + user)
-	var domain = localStorage.getItem('domain_' + acct_id)
+    const domain = localStorage.getItem('domain_' + acct_id)
     if (localStorage.getItem('mode_' + domain) == 'misskey') {
         return false
     }
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
+    const at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + user
+    const options = {
-	let promise = await fetch(start, {
         method: 'GET',
         headers: {
             'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+            Authorization: 'Bearer ' + at,
+        },
     }
-	})
+    try {
-	var idJson = await promise.json()
+        const start = `https://${domain}/api/v1/accounts/lookup?acct=${user}`
+        const promise = fetch(start, options)
+
+        const idJson = await promise.json()
+        if (idJson) {
+            return idJson
+        } else {
+            return await acctResolveLegacy(domain, user, options)
+        }
+    } catch {
+        return await acctResolveLegacy(domain, user, options)
+    }
+}
+async function acctResolveLegacy(domain, user, options) {
+    console.log(`Get user data of ${user} with legacy method`)
+    try {
+        const start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + user
+        const promise = fetch(start, options)
+        const idJson = await promise.json()
         if (idJson.accounts[0]) {
-		var id = idJson.accounts[0].id
+            return idJson.accounts[0]
         } else {
             M.toast({ html: lang.lang_fatalerroroccured, displayLength: 2000 })
         }
-	return id
+    } catch {
+        console.log('Error occured on searching and fetching with resolve')
+    }
 }
-
 //ブロック
 function block(acct_id) {
     if ($('#his-data').hasClass('blocking')) {
@@ -260,8 +280,8 @@ function block(acct_id) {
         type: 'warning',
         showCancelButton: true,
         confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+        cancelButtonText: lang.lang_no,
-	}).then(result => {
+    }).then((result) => {
         if (result.value) {
             if (!acct_id) {
                 var acct_id = $('#his-data').attr('use-acct')
@@ -311,8 +331,8 @@ function muteDo(acct_id) {
         type: 'warning',
         showCancelButton: true,
         confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+        cancelButtonText: lang.lang_no,
-	}).then(result => {
+    }).then((result) => {
         if (result.value) {
             if (!acct_id) {
                 var acct_id = $('#his-data').attr('use-acct')
@@ -390,8 +410,8 @@ function redraft(id, acct_id) {
         type: 'warning',
         showCancelButton: true,
         confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+        cancelButtonText: lang.lang_no,
-	}).then(result => {
+    }).then((result) => {
         if (result.value) {
             show()
             var domain = localStorage.getItem('domain_' + acct_id)
@@ -426,6 +446,7 @@ function redraft(id, acct_id) {
         }
     })
 }
+
 function draftToPost(json, acct_id, id) {
     $('#post-acct-sel').prop('disabled', true)
     $('#post-acct-sel').val(acct_id)
@@ -439,11 +460,7 @@ function draftToPost(json, acct_id, id) {
         for (var i = 0; i <= 4; i++) {
             if (json.media_attachments[i]) {
                 media_ids.push(json.media_attachments[i].id)
-				$('#preview').append(
+                $('#preview').append('<img src="' + json.media_attachments[i].preview_url + '" style="width:50px; max-height:100px;">')
-					'<img src="' +
-					json.media_attachments[i].preview_url +
-					'" style="width:50px; max-height:100px;">'
-				)
             } else {
                 break
             }
@@ -645,8 +662,8 @@ function staEx(mode) {
             method: 'GET',
             headers: {
                 'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+                Authorization: 'Bearer ' + at,
-		}
+            },
         })
         .then(function(response) {
             if (!response.ok) {
@@ -677,6 +694,7 @@ function staEx(mode) {
         })
     return
 }
+
 function toggleAction(elm) {
     console.log(elm)
     const instance = M.Dropdown.init(elm)

app/js/tl/directory.js

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

app/js/tl/filter.js

@@ -42,6 +42,7 @@ function remoteOnly(tlid, type) {
     }
     columnReload(tlid, type)
 }
+
 function remoteOnlyCk(tlid) {
     var multi = localStorage.getItem('column')
     var obj = JSON.parse(multi)
@@ -125,6 +126,7 @@ function catchToggle(tlid) {
         parseColumn(tlid)
     }
 }
+
 function catchCheck(tlid) {
     var catchck = localStorage.getItem('catch_' + tlid)
     if (catchck) {
@@ -135,6 +137,7 @@ function catchCheck(tlid) {
         $('#sta-del-' + tlid).css('color', 'red')
     }
 }
+
 function delreset(tlid) {
     $('[tlid=' + tlid + '] .by_delcatch').hide()
     $('[tlid=' + tlid + '] .by_delcatch').remove()
@@ -146,6 +149,7 @@ function filterMenu() {
     $('.menu-content').addClass('hide')
     $('#filter-box').removeClass('hide')
 }
+
 function filter() {
     $('#filtered-words').html('')
     $('#filter-edit-id').val('')
@@ -199,11 +203,13 @@ function filter() {
             }
         })
 }
+
 function filterTime(day, hour, min) {
     $('#days_filter').val(day)
     $('#hours_filter').val(hour)
     $('#mins_filter').val(min)
 }
+
 function makeNewFilter() {
     var acct_id = $('#filter-acct-sel').val()
     var phr = $('#filter-add-word').val()
@@ -280,6 +286,7 @@ function makeNewFilter() {
         }
     }
 }
+
 function filterEdit(id, acct_id) {
     $('#filter-add-word').val('')
     $('#home_filter').prop('checked', false)
@@ -342,6 +349,7 @@ function filterEdit(id, acct_id) {
             }
         })
 }
+
 function filterDel(id, acct_id) {
     var domain = localStorage.getItem('domain_' + acct_id)
     var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -363,6 +371,7 @@ function filterDel(id, acct_id) {
         }
     }
 }
+
 function getFilter(acct_id) {
     var domain = localStorage.getItem('domain_' + acct_id)
     var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -395,6 +404,7 @@ function getFilter(acct_id) {
         localStorage.setItem('filter_' + acct_id, JSON.stringify({}))
     }
 }
+
 function getFilterType(json, type) {
     if (!json) {
         return []
@@ -421,6 +431,7 @@ function getFilterType(json, type) {
     })
     return mutedfilters
 }
+
 function getFilterTypeByAcct(acct_id, type) {
     if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
         var mute = getFilterType(JSON.parse(localStorage.getItem('filter_' + acct_id)), type)
@@ -429,6 +440,7 @@ function getFilterTypeByAcct(acct_id, type) {
     }
     return mute
 }
+
 function filterUpdate(acct_id) {
     var domain = localStorage.getItem('domain_' + acct_id)
     var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -461,6 +473,7 @@ function filterUpdate(acct_id) {
             filterUpdateInternal(json, 'pub')
         })
 }
+
 function filterUpdateInternal(json, type) {
     var home = getFilterType(json, type)
     var wordmute = localStorage.getItem('word_mute')
@@ -523,11 +536,11 @@ function exclude(key) {
         } else {
             excludetxt = '?exclude_types[]=poll'
         }
-	} else {
+    } else {}
-	}
     localStorage.setItem('exclude-' + key, excludetxt)
     parseColumn(key)
 }
+
 function excludeCk(key, target) {
     var exc = localStorage.getItem('exclude-' + key)
     if (!exc) {
@@ -539,6 +552,7 @@ function excludeCk(key, target) {
         return ''
     }
 }
+
 function checkNotfFilter(tlid) {
     var excludetxt = localStorage.getItem('exclude-' + tlid)
     if (!excludetxt || excludetxt != '') {
@@ -547,10 +561,12 @@ function checkNotfFilter(tlid) {
         return false
     }
 }
+
 function resetNotfFilter(tlid) {
     localStorage.setItem('exclude-' + tlid, '')
     parseColumn(tlid)
 }
+
 function notfFilter(id, tlid, acct_id) {
     var excludetxt = localStorage.getItem('exclude-' + tlid)
     if (excludetxt || excludetxt != '') {

app/js/tl/notification.js

@@ -7,6 +7,7 @@ function notf(acct_id, tlid, sys) {
         notfCommon(acct_id, tlid, sys)
     }
 }
+
 function notfColumn(acct_id, tlid, sys) {
     todo('Notifications Loading...')
     var native = localStorage.getItem('nativenotf')
@@ -22,7 +23,7 @@ function notfColumn(acct_id, tlid, sys) {
         httpreq.open('POST', start, true)
         httpreq.setRequestHeader('Content-Type', 'application/json')
         var body = JSON.stringify({
-			i: at
+            i: at,
         })
     } else {
         var misskey = false
@@ -65,7 +66,7 @@ function notfColumn(acct_id, tlid, sys) {
                         var os = localStorage.getItem('platform')
                         var options = {
                             body: ct + lang.lang_notf_new,
-							icon: localStorage.getItem('prof_' + acct_id)
+                            icon: localStorage.getItem('prof_' + acct_id),
                         }
                         var n = new Notification('TheDesk:' + domain, options)
                     }
@@ -117,6 +118,7 @@ function notfColumn(acct_id, tlid, sys) {
         var start = 'wss://' + domain + '/?i=' + at
     }
 }
+
 function notfCommon(acct_id, tlid, sys, stream) {
     todo('Notifications Loading...')
     var native = localStorage.getItem('nativenotf')
@@ -131,11 +133,11 @@ function notfCommon(acct_id, tlid, sys, stream) {
         var i = {
             method: 'POST',
             headers: {
-				'content-type': 'application/json'
+                'content-type': 'application/json',
             },
             body: JSON.stringify({
-				i: at
+                i: at,
-			})
+            }),
         }
     } else {
         var misskey = false
@@ -144,8 +146,8 @@ function notfCommon(acct_id, tlid, sys, stream) {
             method: 'GET',
             headers: {
                 'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+                Authorization: 'Bearer ' + at,
-			}
+            },
         }
     }
     if (stream == 'only') {
@@ -184,7 +186,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
                         var os = localStorage.getItem('platform')
                         var options = {
                             body: ct + lang.lang_notf_new,
-							icon: localStorage.getItem('prof_' + acct_id)
+                            icon: localStorage.getItem('prof_' + acct_id),
                         }
                         var n = new Notification('TheDesk:' + domain, options)
                     }
@@ -213,6 +215,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
             if (stream != 'no') notfWS(misskey, acct_id, tlid, domain, at)
         })
 }
+
 function notfWS(misskey, acct_id, tlid, domain, at) {
     if (mastodonBaseWsStatus[domain] == 'available') return false
     if (!misskey) {
@@ -230,7 +233,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
                 acct_id: acct_id,
                 type: 'Connect Streaming API(Notf)',
                 domain: domain,
-				message: [mess]
+                message: [mess],
             })
             $('i[data-notf=' + acct_id + ']').removeClass('red-text')
         }
@@ -310,7 +313,7 @@ function notfmore(tlid) {
             httpreq.setRequestHeader('Content-Type', 'application/json')
             var body = JSON.stringify({
                 i: at,
-				untilID: sid
+                untilID: sid,
             })
         } else {
             var misskey = false
@@ -374,35 +377,30 @@ function notfmore(tlid) {
 function notfToggle(acct, tlid) {
     if ($('#notf-box_' + tlid).hasClass('column-hide')) {
         $('#notf-box_' + tlid).css('display', 'block')
-		$('#notf-box_' + tlid).animate(
+        $('#notf-box_' + tlid).animate({
-			{
+            height: '400px',
-				height: '400px'
+        }, {
-			},
-			{
             duration: 300,
             complete: function() {
                 $('#notf-box_' + tlid).css('overflow-y', 'scroll')
                 $('#notf-box_' + tlid).removeClass('column-hide')
-				}
+            },
-			}
+        })
-		)
     } else {
         $('#notf-box_' + tlid).css('overflow-y', 'hidden')
-		$('#notf-box_' + tlid).animate(
+        $('#notf-box_' + tlid).animate({
-			{
+            height: '0',
-				height: '0'
+        }, {
-			},
-			{
             duration: 300,
             complete: function() {
                 $('#notf-box_' + tlid).addClass('column-hide')
                 $('#notf-box_' + tlid).css('display', 'none')
-				}
+            },
-			}
+        })
-		)
     }
     notfCanceler(acct)
 }
+
 function notfCanceler(acct) {
     $('.notf-reply_' + acct).text(0)
     localStorage.removeItem('notf-reply_' + acct)
@@ -417,13 +415,16 @@ function notfCanceler(acct) {
     localStorage.removeItem('notf-follow_' + acct)
     $('.notf-follow_' + acct).addClass('hide')
     $('.notf-icon_' + acct).removeClass('red-text')
-	var id = $('#announce_' + acct + ' .announcement').first().attr('data-id')
+    var id = $('#announce_' + acct + ' .announcement')
-	$('.notf-announ_' + acct + '_ct').text("")
+        .first()
+        .attr('data-id')
+    $('.notf-announ_' + acct + '_ct').text('')
     $(`.boxIn[data-acct=${acct}] .notice-box`).removeClass('has-notf')
     if (id) {
         localStorage.setItem('announ_' + acct, id)
     }
 }
+
 function allNotfRead() {
     var multi = localStorage.getItem('multi')
     if (multi) {

app/js/tl/tl.js

@@ -1,6 +1,7 @@
 //TL取得
 moreloading = false
 var errorct = 0
+
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
     scrollevent()
     $('#unread_' + tlid + ' .material-icons').removeClass('teal-text')
@@ -182,7 +183,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
         .then(function(response) {
             if (!response.ok) {
                 response.text().then(function(text) {
-					$('#landing_' + tlid).append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
+                    $('#landing_' + tlid).append(`<div>${response.status}</div><div>${$.strip_tags(text)}`)
                     setLog(response.url, response.status, text)
                 })
             }
@@ -269,17 +270,14 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
         }
     }
 }
+
 function stremaingSubscribe(type, acct_id, data, unsubscribe) {
     let command = 'subscribe'
     if (unsubscribe) command = 'unsubscribe'
     let stream
     const domain = localStorage.getItem('domain_' + acct_id)
     if (type == 'home') return false
-	if (type === 'local' || type === 'mix') { stream = 'public:local' }
+    if (type === 'local' || type === 'mix') { stream = 'public:local' } else if (type === 'local-media') { stream = 'public:local:media' } else if (type === 'pub') { stream = 'public' } else if (type === 'pub-media') { stream = 'public:media' } else if (type === 'list') {
-	else if (type === 'local-media') { stream = 'public:local:media' }
-	else if (type === 'pub') { stream = 'public' }
-	else if (type === 'pub-media') { stream = 'public:media' }
-	else if (type === 'list') {
         mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: 'list', list: data }))
         return true
     } else if (type === 'tag') {
@@ -296,6 +294,7 @@ function stremaingSubscribe(type, acct_id, data, unsubscribe) {
     }
     mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: stream }))
 }
+
 function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
     var misskey = false
     const domain = localStorage.getItem(`domain_${acct_id}`)
@@ -317,7 +316,8 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
         var add = ''
         if (remoteOnlyCk(tlid)) {
             add = '&remote=true'
-		} var start =
+        }
+        var start =
             wss + '/api/v1/streaming/?stream=public:media&access_token=' + at + add
     } else if (type == 'local') {
         var start =
@@ -415,9 +415,7 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
                     $('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
                 }
             } else if (typeA == 'update' || typeA == 'conversation') {
-				if (
+                if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
-					!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')
-				) {
                     //markers show中はダメ
                     var obj = JSON.parse(JSON.parse(mess.data).payload)
                     if (
@@ -969,6 +967,7 @@ function typePs(type) {
         return 'userList'
     }
 }
+
 function misskeycom(type, data) {
     if (type == 'home') {
         return 'timeline'
@@ -1024,6 +1023,7 @@ function icon(type) {
     }
     return response
 }
+
 function reconnector(tlid, type, acct_id, data, mode) {
     console.log('%c Reconnector:' + mode + '(timeline' + tlid + ')', 'color:pink')
     if (type == 'mix' || type == 'integrated' || type == 'plus') {
@@ -1053,6 +1053,7 @@ function reconnector(tlid, type, acct_id, data, mode) {
     }
     M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
 }
+
 function columnReload(tlid, type) {
     $('#notice_icon_' + tlid).addClass('red-text')
     $('#unread_' + tlid + ' .material-icons').removeClass('teal-text')
@@ -1152,6 +1153,7 @@ function getMarker(tlid, type, acct_id) {
             }
         })
 }
+
 function showUnread(tlid, type, acct_id) {
     if ($('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
         goTop(tlid)
@@ -1205,6 +1207,7 @@ function showUnread(tlid, type, acct_id) {
         })
 }
 var ueloadlock = false
+
 function ueload(tlid) {
     if (ueloadlock) {
         return false
@@ -1261,6 +1264,7 @@ function ueload(tlid) {
             ueloadlock = false
         })
 }
+
 function asRead(callback) {
     //Markers
     var markers = localStorage.getItem('markers')
@@ -1320,6 +1324,7 @@ function asRead(callback) {
         }
     }
 }
+
 function asReadEnd() {
     //Markers
     var markers = localStorage.getItem('markers')
@@ -1397,6 +1402,7 @@ function getBookmark(acct_id, tlid, more) {
         }
     }
 }
+
 function getUtl(acct_id, tlid, data, more) {
 
     moreloading = true

app/js/ui/settings.js

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

app/js/userdata/showOnTL.js

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

app/package.json

@@ -69,20 +69,20 @@
         "materialize-css": "git://github.com/cutls/materialize#v1-dev",
         "sanitize-html": "^2.4.0",
         "sumchecker": "^3.0.1",
-        "sweetalert2": "^11.0.12",
+        "sweetalert2": "^11.0.17",
         "system-font-families": "^0.4.1",
         "textarea-caret": "^3.1.0",
-        "vue": "^2.6.12"
+        "vue": "^2.6.14"
     },
     "devDependencies": {
         "browserify": "^17.0.0",
-        "chokidar": "^3.5.1",
+        "chokidar": "^3.5.2",
         "dotenv": "^10.0.0",
-        "electron": "^13.0.1",
+        "electron": "^13.1.2",
-        "electron-builder": "^22.11.5",
+        "electron-builder": "^22.11.7",
         "electron-notarize": "^1.0.0",
         "electron-rebuild": "^2.3.5",
-        "eslint": "^7.27.0",
+        "eslint": "^7.28.0",
         "npm-run-all": "^4.1.5",
         "readline-sync": "1.4.10"
     },

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "Намерена е грешка",
     "show": "Покажи",
     "directory": "Директория",
+    "discover": "Discover",
     "active": "Наскоро активен",
     "newcomer": "Новодошли",
     "local_only": "Само местно",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "Ich habe einen Fehler gefunden",
     "show": "Zeige",
     "directory": "Verzeichnis",
+    "discover": "Discover",
     "active": "Kürzlich aktiv",
     "newcomer": "Neu eingetroffen",
     "local_only": "Nur lokal",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "crwdns4431:0crwdne4431:0",
     "show": "crwdns3388:0crwdne3388:0",
     "directory": "crwdns3390:0crwdne3390:0",
+    "discover": "crwdns4590:0crwdne4590:0",
     "active": "crwdns3392:0crwdne3392:0",
     "newcomer": "crwdns3394:0crwdne3394:0",
     "local_only": "crwdns3396:0crwdne3396:0",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "Encontré un error",
     "show": "Mostrar",
     "directory": "Directorio",
+    "discover": "Discover",
     "active": "Recientemente activo",
     "newcomer": "Recién llegados",
     "local_only": "Sólo local",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "J'ai trouvé un bug",
     "show": "Afficher",
     "directory": "Répertoire",
+    "discover": "Discover",
     "active": "Actif récemment",
     "newcomer": "Nouveautés",
     "local_only": "Local uniquement",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

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

@@ -179,6 +179,7 @@
     "foundBug": "Ho trovato un bug",
     "show": "Mostra",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recentemente attivo",
     "newcomer": "Nuovi arrivi",
     "local_only": "Solo locale",

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

@@ -177,6 +177,7 @@
     "foundBug": "バグあるんやけど",
     "show": "表示",
     "directory": "ディレクトリ",
+    "discover": "見つける",
     "active": "最新活動順",
     "newcomer": "新規順",
     "local_only": "ローカルだけ",

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

@@ -93,7 +93,7 @@
     "change": "変更",
     "followReq": "フォローリクエスト",
     "likeHimOrHer": "似てる",
-    "frc":"おすすめ",
+    "frc": "おすすめフォロー",
     "more": "もっと",
     "endorse": "紹介する",
     "openinbrowser": "ブラウザで開く",
@@ -179,6 +179,7 @@
     "foundBug": "バグを見つけた",
     "show": "表示",
     "directory": "ディレクトリ",
+    "discover": "見つける",
     "active": "最新活動順",
     "newcomer": "新規順",
     "local_only": "ローカルのみ",

app/view/make/language/kw-GB/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/nl-NL/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/no-NO/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Vis",
     "directory": "Mapper",
+    "discover": "Discover",
     "active": "Nylig aktive",
     "newcomer": "Nykommere",
     "local_only": "Kun lokalt",

app/view/make/language/pl-PL/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Pokaż",
     "directory": "Katalog",
+    "discover": "Discover",
     "active": "Ostatnio aktywne",
     "newcomer": "New arrivals",
     "local_only": "Tylko lokalne",

app/view/make/language/pt-BR/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Apenas local",

app/view/make/language/pt-PT/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/ro-RO/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/ru-RU/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Показать",
     "directory": "Каталог",
+    "discover": "Discover",
     "active": "Последние активные",
     "newcomer": "Новые прибытия",
     "local_only": "Только локальные",

app/view/make/language/si-LK/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/sr-SP/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/sv-SE/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/tr-TR/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/uk-UA/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/vi-VN/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/zh-CN/index.json

@@ -179,6 +179,7 @@
     "foundBug": "I found a bug",
     "show": "Show",
     "directory": "Directory",
+    "discover": "Discover",
     "active": "Recently active",
     "newcomer": "New arrivals",
     "local_only": "Local only",

app/view/make/language/zh-TW/index.json

@@ -179,6 +179,7 @@
     "foundBug": "我找到程式臭蟲",
     "show": "顯示",
     "directory": "目錄",
+    "discover": "Discover",
     "active": "最近上線",
     "newcomer": "新警察",
     "local_only": "只有本機",

app/view/pl-PL/setting.html

@@ -688,7 +688,7 @@
 		style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Main author: Cutls@1m.cutls.com</a>
 	<br>
-	TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/8acf86d9cb88488a71de6a158f6bdab4b09ae2d9">8acf86d9cb88488a71de6a158f6bdab4b09ae2d9</a> - <a
+	TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/36ad187296f74ae3ed6cb12a4ef26b27d8d13d0f">36ad187296f74ae3ed6cb12a4ef26b27d8d13d0f</a> - <a
 		onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer pwa">Sprawdź aktualizacje</a><br>
 	<br>
@@ -698,7 +698,7 @@
 		<img src="https://status.cutls.com/badge-service?site=thedesk.top">
 	</a><br>
 	<h5>OSS License</h5>
-	<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/8acf86d9cb88488a71de6a158f6bdab4b09ae2d9"
+	<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/36ad187296f74ae3ed6cb12a4ef26b27d8d13d0f"
 		alt="FOSSA Status"><img
 			src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a>
 	<br>

app/yarn.lock

@@ -69,15 +69,15 @@
     dir-compare "^2.4.0"
     fs-extra "^9.0.1"
 
-"@eslint/eslintrc@^0.4.1":
+"@eslint/eslintrc@^0.4.2":
-  version "0.4.1"
+  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"
-  integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==
+  integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
     espree "^7.3.0"
-    globals "^12.1.0"
+    globals "^13.9.0"
     ignore "^4.0.6"
     import-fresh "^3.2.1"
     js-yaml "^3.13.1"
@@ -513,10 +513,10 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
-"@types/yargs@^16.0.1":
+"@types/yargs@^16.0.2":
-  version "16.0.2"
+  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.2.tgz#b860dfa2964425239bba37ab3178b0acd79b8a61"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01"
-  integrity sha512-EkZDJvHXblOE2/iFZb3Ty5c8RHPssmFvrXqj3V/ZLXtOt0f7xJh9Fd7p1pl2ITrNHM7Rl3Db3JJVBT7q/C0wUg==
+  integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -639,10 +639,10 @@ any-base@^1.1.0:
   resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe"
   integrity sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==
 
-anymatch@~3.1.1:
+anymatch@~3.1.2:
-  version "3.1.1"
+  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -652,10 +652,10 @@ app-builder-bin@3.5.13:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e"
   integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==
 
-app-builder-lib@22.11.5:
+app-builder-lib@22.11.7:
-  version "22.11.5"
+  version "22.11.7"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz#d49f49dc2d9fd225249e4ae7e30add2996e7062f"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz#c0ad1119ebfbf4189a8280ad693625f5e684dca6"
-  integrity sha512-lLEDvJuLdc4IVyADJK6t4qEIjRhOUj4p19B1RS/8pN/oAb8X5Qe1t3Einbsi4oFBJBweH2LIygnSAwumjQh9iA==
+  integrity sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@develar/schema-utils" "~2.6.5"
@@ -663,12 +663,12 @@ app-builder-lib@22.11.5:
     "@malept/flatpak-bundler" "^0.4.0"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "22.11.5"
+    builder-util "22.11.7"
-    builder-util-runtime "8.7.6"
+    builder-util-runtime "8.7.7"
     chromium-pickle-js "^0.2.0"
     debug "^4.3.2"
     ejs "^3.1.6"
-    electron-publish "22.11.5"
+    electron-publish "22.11.7"
     fs-extra "^10.0.0"
     hosted-git-info "^4.0.2"
     is-ci "^3.0.0"
@@ -1096,17 +1096,25 @@ builder-util-runtime@8.7.6:
     debug "^4.3.2"
     sax "^1.2.4"
 
-builder-util@22.11.5:
+builder-util-runtime@8.7.7:
-  version "22.11.5"
+  version "8.7.7"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz#08836d00e6bef39bdffd8a66fb07d2d5021b9c3c"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz#6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d"
-  integrity sha512-ur9ksncYOnJg/VuJz3PdsBQHeg9tjdOC2HVj8mQ0WNcn/H3MO4tnwKBOWWikPDiWEjeBSvFUmYBnGFkRiUNkww==
+  integrity sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==
+  dependencies:
+    debug "^4.3.2"
+    sax "^1.2.4"
+
+builder-util@22.11.7:
+  version "22.11.7"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz#ae9707afa6a31feafa13c274ac83b4fe28ef1467"
+  integrity sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@types/debug" "^4.1.5"
     "@types/fs-extra" "^9.0.11"
     app-builder-bin "3.5.13"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "8.7.6"
+    builder-util-runtime "8.7.7"
     chalk "^4.1.1"
     debug "^4.3.2"
     fs-extra "^10.0.0"
@@ -1218,20 +1226,20 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-chokidar@^3.5.1:
+chokidar@^3.5.2:
-  version "3.5.1"
+  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
   dependencies:
-    anymatch "~3.1.1"
+    anymatch "~3.1.2"
     braces "~3.0.2"
-    glob-parent "~5.1.0"
+    glob-parent "~5.1.2"
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.5.0"
+    readdirp "~3.6.0"
   optionalDependencies:
-    fsevents "~2.3.1"
+    fsevents "~2.3.2"
 
 chownr@^1.1.1:
   version "1.1.4"
@@ -1692,13 +1700,13 @@ dir-compare@^2.4.0:
     commander "2.9.0"
     minimatch "3.0.4"
 
-dmg-builder@22.11.5:
+dmg-builder@22.11.7:
-  version "22.11.5"
+  version "22.11.7"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz#0df9843def73a217097956982fa21bb4d6a5836e"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz#5956008c18d40ee72c0ea01ffea9590dbf51df89"
-  integrity sha512-91Shh9+OK9RwBlBURxvhSnQNibEh/JYNAnMOfFguyNbasSfF50Jme4b3dgsQrHTTTfkFijcvzykPPFAZofQs6g==
+  integrity sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ==
   dependencies:
-    app-builder-lib "22.11.5"
+    app-builder-lib "22.11.7"
-    builder-util "22.11.5"
+    builder-util "22.11.7"
     builder-util-runtime "8.7.6"
     fs-extra "^10.0.0"
     iconv-lite "^0.6.2"
@@ -1817,17 +1825,17 @@ ejs@^3.1.6:
   dependencies:
     jake "^10.6.1"
 
-electron-builder@^22.11.5:
+electron-builder@^22.11.7:
-  version "22.11.5"
+  version "22.11.7"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz#914d8183e1bab7cda43ef1d67fc3d17314c7e242"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596"
-  integrity sha512-QIhzrmSLNteItRvmAjwNpsya08oZeOJIrxFww/Alkjcwnrn5Xgog2qf3Xfa3ocuNUQIwb+mMzZrzqnPu0Mamyg==
+  integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw==
   dependencies:
-    "@types/yargs" "^16.0.1"
+    "@types/yargs" "^16.0.2"
-    app-builder-lib "22.11.5"
+    app-builder-lib "22.11.7"
-    builder-util "22.11.5"
+    builder-util "22.11.7"
-    builder-util-runtime "8.7.6"
+    builder-util-runtime "8.7.7"
     chalk "^4.1.1"
-    dmg-builder "22.11.5"
+    dmg-builder "22.11.7"
     fs-extra "^10.0.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
@@ -1852,14 +1860,14 @@ electron-notarize@^1.0.0:
     debug "^4.1.1"
     fs-extra "^9.0.1"
 
-electron-publish@22.11.5:
+electron-publish@22.11.7:
-  version "22.11.5"
+  version "22.11.7"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz#2fcd3280c4267e70e4aa15003c9b7dc34923320e"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz#4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a"
-  integrity sha512-peN4tEP80Kb6reuwKKvSu9p/XUWpx/7x747u5NSg7Kg2axBjzdMtX5ZqBThfPtJWJhSWZ7PEYWmNyUCfdQl2Ag==
+  integrity sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "22.11.5"
+    builder-util "22.11.7"
-    builder-util-runtime "8.7.6"
+    builder-util-runtime "8.7.7"
     chalk "^4.1.1"
     fs-extra "^10.0.0"
     lazy-val "^1.0.5"
@@ -1883,10 +1891,10 @@ electron-rebuild@^2.3.5:
     tar "^6.0.5"
     yargs "^16.0.0"
 
-electron@^13.0.1:
+electron@^13.1.2:
-  version "13.0.1"
+  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-13.0.1.tgz#7dd3666f0f966ab83a1f9868d84add2e6205d43a"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz#8c9abf9015766c9cbc16f10c99282d00d6ae1b90"
-  integrity sha512-ds1cf0m46nStil0jbM2r9W/p+Kprdq22+2MikIUqEu69eGl1c86IinQVrpmJ9bR4RshDSF4j3uD32a0bsHDMnQ==
+  integrity sha512-aNT9t+LgdQaZ7FgN36pN7MjSEoj+EWc2T9yuOqBApbmR4HavGRadSz7u9N2Erw2ojdIXtei2RVIAvVm8mbDZ0g==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^14.6.2"
@@ -2070,13 +2078,13 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@^7.27.0:
+eslint@^7.28.0:
-  version "7.27.0"
+  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz#665a1506d8f95655c9274d84bd78f7166b07e9c7"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820"
-  integrity sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==
+  integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==
   dependencies:
     "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.1"
+    "@eslint/eslintrc" "^0.4.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -2093,7 +2101,7 @@ eslint@^7.27.0:
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
+    glob-parent "^5.1.2"
     globals "^13.6.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
@@ -2360,10 +2368,10 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@~2.3.1:
+fsevents@~2.3.2:
-  version "2.3.1"
+  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -2446,10 +2454,10 @@ gifwrap@^0.9.2:
     image-q "^1.1.1"
     omggif "^1.0.10"
 
-glob-parent@^5.0.0, glob-parent@~5.1.0:
+glob-parent@^5.0.0, glob-parent@~5.1.2:
-  version "5.1.1"
+  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
@@ -2503,17 +2511,10 @@ global@~4.3.0:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^12.1.0:
+globals@^13.6.0, globals@^13.9.0:
-  version "12.4.0"
+  version "13.9.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+  integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==
-  dependencies:
-    type-fest "^0.8.1"
-
-globals@^13.6.0:
-  version "13.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.7.0.tgz#aed3bcefd80ad3ec0f0be2cf0c895110c0591795"
-  integrity sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==
   dependencies:
     type-fest "^0.20.2"
 
@@ -3659,9 +3660,9 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 normalize-url@^4.1.0:
-  version "4.5.0"
+  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
-  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
 npm-bundled@^1.0.1:
   version "1.1.1"
@@ -4246,10 +4247,10 @@ readable-stream@^3.5.0, readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readdirp@~3.5.0:
+readdirp@~3.6.0:
-  version "3.5.0"
+  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
     picomatch "^2.2.1"
 
@@ -4892,10 +4893,10 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-sweetalert2@^11.0.12:
+sweetalert2@^11.0.17:
-  version "11.0.12"
+  version "11.0.17"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.0.12.tgz#7b500fad352def30412798883433b37e48cb14dc"
+  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.0.17.tgz#250b18745acf15344121070d78bcb50d62a21432"
-  integrity sha512-iAn9nB1qu+8z4xjuxeJp+BfBcgReh+NDZ7P/I1r8oDMcukLtYYJxcpEbiaIpBYU4+k698WHe90oCm+UgCCVnqA==
+  integrity sha512-oaCGCNjMU648bDg5+/mdStfFNG9sYEejeEZQY8JpAakUM0pLflB3neNyArAZGcWNUQX1y/jOeRdzcNE05Una4A==
 
 syntax-error@^1.1.1:
   version "1.4.0"
@@ -5076,7 +5077,7 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.8.0, type-fest@^0.8.1:
+type-fest@^0.8.0:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
@@ -5272,10 +5273,10 @@ vm-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-vue@^2.6.12:
+vue@^2.6.14:
-  version "2.6.12"
+  version "2.6.14"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
-  integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==
+  integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
 
 wcwidth@^1.0.1:
   version "1.0.1"