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

This commit is contained in:
Cutls 2021-06-18 16:21:19 +09:00 committed by GitHub
commit a773315bf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 7132 additions and 7374 deletions

8
.prettierrc Normal file
View File

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

View File

@ -15,7 +15,7 @@ function fav(id, acct_id, remote) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@ -75,7 +75,7 @@ function rt(id, acct_id, remote, vis) {
} else { } else {
httpreq.send() httpreq.send()
} }
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@ -110,6 +110,7 @@ function rt(id, acct_id, remote, vis) {
} }
} }
} }
function boostWith(vis) { function boostWith(vis) {
var id = $('#tootmodal').attr('data-id') var id = $('#tootmodal').attr('data-id')
var acct_id = $('#tootmodal').attr('data-acct') var acct_id = $('#tootmodal').attr('data-acct')
@ -131,7 +132,7 @@ function bkm(id, acct_id, tlid) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@ -167,7 +168,6 @@ async function follow(acct_id, resolve) {
} }
if (!acct_id && acct_id != 'selector') { if (!acct_id && acct_id != 'selector') {
var acct_id = $('#his-data').attr('use-acct') var acct_id = $('#his-data').attr('use-acct')
} else if (acct_id == 'selector') { } else if (acct_id == 'selector') {
var acct_id = $('#user-acct-sel').val() var acct_id = $('#user-acct-sel').val()
} }
@ -182,7 +182,8 @@ async function follow(acct_id, resolve) {
var id = $('#his-data').attr('user-id') var id = $('#his-data').attr('user-id')
if (resolve == 'selector') { if (resolve == 'selector') {
var fullacct = $('#his-acct').attr('fullname') 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) console.log(id)
} }
var domain = localStorage.getItem('domain_' + acct_id) var domain = localStorage.getItem('domain_' + acct_id)
@ -200,7 +201,7 @@ async function follow(acct_id, resolve) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send(JSON.stringify(ent)) httpreq.send(JSON.stringify(ent))
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@ -223,28 +224,47 @@ async function follow(acct_id, resolve) {
} }
async function acctResolve(acct_id, user) { async function acctResolve(acct_id, user) {
console.log('Get user data of ' + 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') { if (localStorage.getItem('mode_' + domain) == 'misskey') {
return false 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', method: 'GET',
headers: { headers: {
'content-type': 'application/json', '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]) { if (idJson.accounts[0]) {
var id = idJson.accounts[0].id return idJson.accounts[0]
} else { } else {
M.toast({ html: lang.lang_fatalerroroccured, displayLength: 2000 }) 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) { function block(acct_id) {
if ($('#his-data').hasClass('blocking')) { if ($('#his-data').hasClass('blocking')) {
@ -260,8 +280,8 @@ function block(acct_id) {
type: 'warning', type: 'warning',
showCancelButton: true, showCancelButton: true,
confirmButtonText: lang.lang_yesno, confirmButtonText: lang.lang_yesno,
cancelButtonText: lang.lang_no cancelButtonText: lang.lang_no,
}).then(result => { }).then((result) => {
if (result.value) { if (result.value) {
if (!acct_id) { if (!acct_id) {
var acct_id = $('#his-data').attr('use-acct') var acct_id = $('#his-data').attr('use-acct')
@ -276,7 +296,7 @@ function block(acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
if (this.status !== 200) { if (this.status !== 200) {
setLog(start, this.status, this.response) setLog(start, this.status, this.response)
@ -311,8 +331,8 @@ function muteDo(acct_id) {
type: 'warning', type: 'warning',
showCancelButton: true, showCancelButton: true,
confirmButtonText: lang.lang_yesno, confirmButtonText: lang.lang_yesno,
cancelButtonText: lang.lang_no cancelButtonText: lang.lang_no,
}).then(result => { }).then((result) => {
if (result.value) { if (result.value) {
if (!acct_id) { if (!acct_id) {
var acct_id = $('#his-data').attr('use-acct') var acct_id = $('#his-data').attr('use-acct')
@ -334,7 +354,7 @@ function muteDo(acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send(rq) httpreq.send(rq)
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
if (this.status !== 200) { if (this.status !== 200) {
setLog(start, this.status, this.response) setLog(start, this.status, this.response)
@ -374,7 +394,7 @@ function del(id, acct_id) {
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
} }
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
if (this.status !== 200) { if (this.status !== 200) {
setLog(start, this.status, this.response) setLog(start, this.status, this.response)
@ -390,8 +410,8 @@ function redraft(id, acct_id) {
type: 'warning', type: 'warning',
showCancelButton: true, showCancelButton: true,
confirmButtonText: lang.lang_yesno, confirmButtonText: lang.lang_yesno,
cancelButtonText: lang.lang_no cancelButtonText: lang.lang_no,
}).then(result => { }).then((result) => {
if (result.value) { if (result.value) {
show() show()
var domain = localStorage.getItem('domain_' + acct_id) var domain = localStorage.getItem('domain_' + acct_id)
@ -414,7 +434,7 @@ function redraft(id, acct_id) {
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
} }
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
if (this.status !== 200) { if (this.status !== 200) {
setLog(start, this.status, this.response) setLog(start, this.status, this.response)
@ -426,24 +446,21 @@ function redraft(id, acct_id) {
} }
}) })
} }
function draftToPost(json, acct_id, id) { function draftToPost(json, acct_id, id) {
$('#post-acct-sel').prop('disabled', true) $('#post-acct-sel').prop('disabled', true)
$('#post-acct-sel').val(acct_id) $('#post-acct-sel').val(acct_id)
$('select').formSelect() $('select').formSelect()
mdCheck() mdCheck()
mediack = null mediack = null
if(json.media_attachments) mediack = json.media_attachments[0] if (json.media_attachments) mediack = json.media_attachments[0]
//メディアがあれば //メディアがあれば
var media_ids = [] var media_ids = []
if (mediack) { if (mediack) {
for (var i = 0; i <= 4; i++) { for (var i = 0; i <= 4; i++) {
if (json.media_attachments[i]) { if (json.media_attachments[i]) {
media_ids.push(json.media_attachments[i].id) 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 { } else {
break break
} }
@ -496,7 +513,7 @@ function pin(id, acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@ -527,7 +544,7 @@ function request(id, flag, acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@ -553,7 +570,7 @@ function domainblock(add, flag, acct_id) {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@ -580,7 +597,7 @@ function empUser() {
M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 }) M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
} else { } else {
var can var can
Object.keys(obj).forEach(function (key) { Object.keys(obj).forEach(function(key) {
var usT = obj[key] var usT = obj[key]
if (usT != id && !can) { if (usT != id && !can) {
can = false can = false
@ -612,7 +629,7 @@ function pinUser() {
httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json' httpreq.responseType = 'json'
httpreq.send() httpreq.send()
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
@ -645,23 +662,23 @@ function staEx(mode) {
method: 'GET', method: 'GET',
headers: { headers: {
'content-type': 'application/json', 'content-type': 'application/json',
Authorization: 'Bearer ' + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function (response) { .then(function(response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function (text) { response.text().then(function(text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function (error) { .catch(function(error) {
todo(error) todo(error)
setLog(start, 'JSON', error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function (json) { .then(function(json) {
if (json.statuses) { if (json.statuses) {
if (json.statuses[0]) { if (json.statuses[0]) {
var id = json.statuses[0].id var id = json.statuses[0].id
@ -677,6 +694,7 @@ function staEx(mode) {
}) })
return return
} }
function toggleAction(elm) { function toggleAction(elm) {
console.log(elm) console.log(elm)
const instance = M.Dropdown.init(elm) const instance = M.Dropdown.init(elm)

View File

@ -1,78 +1,96 @@
//ディレクトリ //ディレクトリ
//ディレクトリトグル //ディレクトリトグル
function dirMenu() { 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() { 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 { } 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) { if (!order) {
order = "active" order = 'active'
} }
var local_only = $("#local_only:checked").val() var local_only = $('#local_only:checked').val()
if (local_only) { if (local_only) {
local_only = "true" local_only = 'true'
} else { } 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 { } 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) { 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 { } else {
var addOffset = 0 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) console.log(start)
fetch(start, { fetch(start, {
method: "GET", method: 'GET',
headers: { headers: {
"content-type": "application/json", 'content-type': 'application/json',
Authorization: "Bearer " + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function (response) { .then(function(response) {
$("#dir-contents .progress").remove() $('#dir-contents .progress').remove()
if (!response.ok) { if (!response.ok) {
response.text().then(function (text) { $('#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) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function (error) { .catch(function(error) {
setLog(start, "JSON", error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function (json) { .then(function(json) {
if (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 { } 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')
} }
}) })
} }

View File

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

View File

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

View File

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

View File

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

View File

@ -1,31 +1,42 @@
//ユーザーデータ表示 //ユーザーデータ表示
localStorage.removeItem("history") localStorage.removeItem('history')
//コード受信 //コード受信
if (location.search) { if (location.search) {
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/) var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
var mode = m[1] var mode = m[1]
var codex = m[2] var codex = m[2]
if (mode == "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 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({ Swal.fire({
title: 'Loading...', title: 'Loading...',
html: lang.lang_details_fetch, html: lang.lang_details_fetch,
@ -34,103 +45,104 @@ function udgEx(user, acct_id) {
onBeforeOpen: () => { onBeforeOpen: () => {
Swal.showLoading() Swal.showLoading()
}, },
onClose: () => { }, onClose: () => {},
}).then((result) => { }) }).then((result) => {})
fetch(start, { fetch(start, {
method: "GET", method: 'GET',
headers: { headers: {
"content-type": "application/json", 'content-type': 'application/json',
Authorization: "Bearer " + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function (response) { .then(function(response) {
if (!response.ok) { if (!response.ok) {
Swal.close() Swal.close()
response.text().then(function (text) { response.text().then(function(text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function (error) { .catch(function(error) {
todo(error) todo(error)
setLog(start, "JSON", error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function (json) { .then(function(json) {
if (json.accounts[0]) { if (json.accounts[0]) {
var id = json.accounts[0].id var id = json.accounts[0].id
udg(id, acct_id, true) udg(id, acct_id, true)
} else { } else {
Swal.close() Swal.close()
postMessage(["openUrl", user], "*") postMessage(['openUrl', user], '*')
} }
}) })
return true return true
} }
function udg(user, acct_id, isSwal) { function udg(user, acct_id, isSwal) {
reset() reset()
if (!user) { 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) misskeyUdg(user, acct_id)
return 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, { fetch(start, {
method: "GET", method: 'GET',
headers: { headers: {
"content-type": "application/json", 'content-type': 'application/json',
Authorization: "Bearer " + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function (response) { .then(function(response) {
if(isSwal) Swal.close() if (isSwal) Swal.close()
if (!response.ok) { if (!response.ok) {
response.text().then(function (text) { response.text().then(function(text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function (error) { .catch(function(error) {
todo(error) todo(error)
setLog(start, "JSON", error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function (json) { .then(function(json) {
//一つ前のユーザーデータ //一つ前のユーザーデータ
if (!localStorage.getItem("history")) { if (!localStorage.getItem('history')) {
$("#his-history-btn").prop("disabled", true) $('#his-history-btn').prop('disabled', true)
} else { } 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設定時 //moved設定時
if (json.moved) { if (json.moved) {
M.toast({ 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) { if (json.username != json.acct) {
//Remote //Remote
$("#his-data").attr("remote", "true") $('#his-data').attr('remote', 'true')
var fullname = json.acct var fullname = json.acct
} else { } 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) var dis_name = escapeHTML(json.display_name)
dis_name = twemoji.parse(dis_name) dis_name = twemoji.parse(dis_name)
@ -142,11 +154,11 @@ function udg(user, acct_id, isSwal) {
} }
//絵文字があれば //絵文字があれば
if (actemojick) { if (actemojick) {
Object.keys(json.emojis).forEach(function (key5) { Object.keys(json.emojis).forEach(function(key5) {
var emoji = json.emojis[key5] var emoji = json.emojis[key5]
var shortcode = emoji.shortcode var shortcode = emoji.shortcode
var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">' 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) dis_name = dis_name.replace(regExp, emoji_url)
note = note.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>'; //var mens = '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
//note=note.replace(/#(\S+)/gi, tags) //note=note.replace(/#(\S+)/gi, tags)
//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens) //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() 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-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 var flerc = json.followers_count
if (flerc < 0) { 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) { if (json.fields) {
var table = "" var table = ''
if (json.fields.length > 0) { if (json.fields.length > 0) {
$("#his-des").css("max-height", "250px") $('#his-des').css('max-height', '250px')
table = '<table id="his-field">' table = '<table id="his-field">'
for (var i = 0; i < json.fields.length; i++) { for (var i = 0; i < json.fields.length; i++) {
var fname = json.fields[i].name var fname = json.fields[i].name
var fval = json.fields[i].value var fval = json.fields[i].value
if (json.fields[i].verified_at) { 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 { } 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 { } 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 { } 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) { 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.length > 0) {
if (json.fields[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]) { 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]) { 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]) { 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 var des = json.note
des = des.replace(/<br \/>/g, "\n") des = des.replace(/<br \/>/g, '\n')
des = $.strip_tags(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 { } else {
relations(user, acct_id) relations(user, acct_id)
$(".only-my-data").hide() $('.only-my-data').hide()
$(".only-his-data").show() $('.only-his-data').show()
} }
todc() todc()
if (json.locked) { if (json.locked) {
@ -267,320 +289,324 @@ function udg(user, acct_id, isSwal) {
udAdd(acct_id, user, json.url) udAdd(acct_id, user, json.url)
}) })
} }
function misskeyUdg(user, acct_id) { function misskeyUdg(user, acct_id) {
reset() reset()
if (!user) { 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) udg(user, acct_id)
return 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, { fetch(start, {
method: "POST", method: 'POST',
headers: { headers: {
"content-type": "application/json" 'content-type': 'application/json',
}, },
body: JSON.stringify({ body: JSON.stringify({
i: at, i: at,
userId: user userId: user,
}),
}) })
}) .then(function(response) {
.then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function (text) { response.text().then(function(text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function (error) { .catch(function(error) {
todo(error) todo(error)
setLog(start, "JSON", error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function (json) { .then(function(json) {
//一つ前のユーザーデータ //一つ前のユーザーデータ
if (!localStorage.getItem("history")) { if (!localStorage.getItem('history')) {
$("#his-history-btn").prop("disabled", true) $('#his-history-btn').prop('disabled', true)
} else { } 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) { if (json.host) {
//Remote //Remote
$("#his-data").attr("remote", "false") $('#his-data').attr('remote', 'false')
var fullname = json.username + "@" + json.host var fullname = json.username + '@' + json.host
} else { } 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) { if (json.name) {
var dis_name = escapeHTML(json.name) var dis_name = escapeHTML(json.name)
dis_name = twemoji.parse(dis_name) dis_name = twemoji.parse(dis_name)
} else { } else {
var dis_name = json.name 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) var note = escapeHTML(json.description)
$("#his-des").html(twemoji.parse(note)) $('#his-des').html(twemoji.parse(note))
if (json.isCat) { 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); //showFav('', acct_id);
//showMut('', acct_id); //showMut('', acct_id);
//showReq('', 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 var des = json.note
des = nl2br(des) des = nl2br(des)
des = $.strip_tags(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 { } else {
if (json.isFollowing) { 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) hisList(user, acct_id)
} else { } else {
$("#his-follow-btn-text").text(lang.lang_status_follow) $('#his-follow-btn-text').text(lang.lang_status_follow)
} }
if (json.isFollowed) { 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) { 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 { } 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() todc()
}) })
} }
//一つ前のユーザーデータ表示 //一つ前のユーザーデータ表示
function historyShow() { 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() { 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) udg(user, acct_id)
hide() hide()
} }
//FF関係取得 //FF関係取得
function relations(user, acct_id) { 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, { fetch(start, {
method: "GET", method: 'GET',
headers: { headers: {
"content-type": "application/json", 'content-type': 'application/json',
Authorization: "Bearer " + at Authorization: 'Bearer ' + at,
} },
}) })
.then(function (response) { .then(function(response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function (text) { response.text().then(function(text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
return response.json() return response.json()
}) })
.catch(function (error) { .catch(function(error) {
todo(error) todo(error)
setLog(start, "JSON", error) setLog(start, 'JSON', error)
console.error(error) console.error(error)
}) })
.then(function (json) { .then(function(json) {
var json = json[0] var json = json[0]
if (json.requested) { if (json.requested) {
//フォロリク中 //フォロリク中
$('#his-data').addClass('following') $('#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) { 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) hisList(user, acct_id)
} else { } else {
$("#his-follow-btn-text").text(lang.lang_status_follow) $('#his-follow-btn-text').text(lang.lang_status_follow)
} }
if (json.followed_by) { if (json.followed_by) {
//フォローされてる //フォローされてる
$("#his-relation").text(lang.lang_showontl_followed) $('#his-relation').text(lang.lang_showontl_followed)
} }
if (json.blocking) { 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 { } else {
$("#his-block-btn-text").text(lang.lang_status_block) $('#his-block-btn-text').text(lang.lang_status_block)
} }
if (json.muting) { 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 { } else {
$("#his-mute-btn-text").text(lang.lang_status_mute) $('#his-mute-btn-text').text(lang.lang_status_mute)
} }
if (json.muting_notifications) { 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 { } 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) { 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 { } 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 //Endorsed
if (json.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 { } 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 //Blocked
if (json.blocked_by) { 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() { function profbrws() {
var url = $("#his-openin").attr("data-href") var url = $('#his-openin').attr('data-href')
postMessage(["openUrl", url], "*") postMessage(['openUrl', url], '*')
} }
function setMain() { 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) multiSelector(true)
M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 }) M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
} }
//オールリセット //オールリセット
function hisclose() { function hisclose() {
$("#his-data").modal("close") $('#his-data').modal('close')
reset() reset()
$("#his-data").attr("history", "") $('#his-data').attr('history', '')
localStorage.removeItem("history") localStorage.removeItem('history')
} }
function reset() { 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('locked')
$('#his-data').removeClass('requesting') $('#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) { if (target) {
let title = $(this).html() 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) $('#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() $(target).show()
$(".his-var-content:not(" + target + ")").hide() $('.his-var-content:not(' + target + ')').hide()
} }
}) })

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,182 +1,183 @@
{ {
"draghere":"ドラッグしてみ?(ドラッグしたらすぐアップロードされるで)", "draghere": "ドラッグしてみ?(ドラッグしたらすぐアップロードされるで)",
"nowOffline":"オフラインやで。投稿は全部下書きに行くし、もしオンラインなったら再読み込みしたらええで。", "nowOffline": "オフラインやで。投稿は全部下書きに行くし、もしオンラインなったら再読み込みしたらええで。",
"reOnline":"オンライン戻ったから再読み込みしてな。", "reOnline": "オンライン戻ったから再読み込みしてな。",
"close":"Close", "close": "Close",
"webSrc": "Webでさがす", "webSrc": "Webでさがす",
"tsSrc": "tootsearchでさがす", "tsSrc": "tootsearchでさがす",
"showSelectProf":"このアカウントのプロフィール出す", "showSelectProf": "このアカウントのプロフィール出す",
"closethisbox":"このボックスなおす", "closethisbox": "このボックスなおす",
"post-new":"投稿", "post-new": "投稿",
"toot":"トゥート", "toot": "トゥート",
"nsfwDes":"画像を見たらあかんやつにする", "nsfwDes": "画像を見たらあかんやつにする",
"cwDes":"コンテンツワーニング(ほんまに見るんか?って聞く)", "cwDes": "コンテンツワーニング(ほんまに見るんか?って聞く)",
"selfile":"ファイル選ぶ", "selfile": "ファイル選ぶ",
"insertEmoji":"絵文字入れる", "insertEmoji": "絵文字入れる",
"schedule":"時間指定投稿", "schedule": "時間指定投稿",
"postat":"時間指定投稿", "postat": "時間指定投稿",
"scheduleWarn":"2.7.0~ 5分は待ってな。サーバーの時計おうてるかは知らんで。", "scheduleWarn": "2.7.0~ 5分は待ってな。サーバーの時計おうてるかは知らんで。",
"clearToot":"トゥートボックスのクリア", "clearToot": "トゥートボックスのクリア",
"replyMode":"返信モード", "replyMode": "返信モード",
"no":"いいえ", "no": "いいえ",
"yes":"はい", "yes": "はい",
"temp":"添付ファイル", "temp": "添付ファイル",
"nothing":"なし", "nothing": "なし",
"vis":"公開範囲", "vis": "公開範囲",
"cwtext":"警告文", "cwtext": "警告文",
"selectVis":"公開範囲指定", "selectVis": "公開範囲指定",
"publicJP":"公開", "publicJP": "公開",
"unlistedJP":"未収載", "unlistedJP": "未収載",
"privateJP":"非公開", "privateJP": "非公開",
"localJP":"ローカル限定", "localJP": "ローカル限定",
"directJP":"ダイレクト", "directJP": "ダイレクト",
"sectoot":"こっちでもトゥート", "sectoot": "こっちでもトゥート",
"emojiWarn":"サーバーちゃうかったら絵文字もちゃうで。", "emojiWarn": "サーバーちゃうかったら絵文字もちゃうで。",
"emojiInsertWarn":"入力できん絵文字もあるけどしゃーない。", "emojiInsertWarn": "入力できん絵文字もあるけどしゃーない。",
"refreshEmoji":"絵文字更新", "refreshEmoji": "絵文字更新",
"closeThisBox":"ボックスなおす", "closeThisBox": "ボックスなおす",
"showThisEmoji":"一覧を表示中", "showThisEmoji": "一覧を表示中",
"customEmoji":"カスタム絵文字", "customEmoji": "カスタム絵文字",
"peopleEmoji":"ひと", "peopleEmoji": "ひと",
"natureEmoji":"自然", "natureEmoji": "自然",
"foodEmoji":"食べ物", "foodEmoji": "食べ物",
"activityEmoji":"活動", "activityEmoji": "活動",
"placeEmoji":"場所", "placeEmoji": "場所",
"thingsEmoji":"もの", "thingsEmoji": "もの",
"symbolEmoji":"記号", "symbolEmoji": "記号",
"flagsEmoji":"国旗", "flagsEmoji": "国旗",
"draft": "下書き(タンス)", "draft": "下書き(タンス)",
"poll":"アンケート", "poll": "アンケート",
"pollDdisabled":"アンケート付けへん", "pollDdisabled": "アンケート付けへん",
"pollProvider":"アンケートのプロバイダ", "pollProvider": "アンケートのプロバイダ",
"choice":"選択肢", "choice": "選択肢",
"polluntil":"あんたが投票するまで票数教えへん", "polluntil": "あんたが投票するまで票数教えへん",
"pollmulti":"複数選択を許可", "pollmulti": "複数選択を許可",
"expires_in":"有効期限(秒)", "expires_in": "有効期限(秒)",
"contextBefore":"これより前の会話", "contextBefore": "これより前の会話",
"thisToot":"対象のトゥート", "thisToot": "対象のトゥート",
"contextAfter":"これより後の会話", "contextAfter": "これより後の会話",
"beforeLTL":"これより前のLocal TL(誰にエアリプしてん)", "beforeLTL": "これより前のLocal TL(誰にエアリプしてん)",
"beforeUTL":"これより前のユーザーTL(誰のトゥート言及してんねん)", "beforeUTL": "これより前のユーザーTL(誰のトゥート言及してんねん)",
"afterLTL":"これより後のLocal TL(誰のトゥート言及してんねん)", "afterLTL": "これより後のLocal TL(誰のトゥート言及してんねん)",
"afterUTL":"これより後のユーザーTL(誰のトゥート言及してんねん)", "afterUTL": "これより後のユーザーTL(誰のトゥート言及してんねん)",
"afterFTL":"これより後の連合TL(誰のトゥート言及してんねん)", "afterFTL": "これより後の連合TL(誰のトゥート言及してんねん)",
"favedPeople":"誰がお気に入りに登録してるんや", "favedPeople": "誰がお気に入りに登録してるんや",
"btedPeople":"誰がお気に入りブーストしたんや", "btedPeople": "誰がお気に入りブーストしたんや",
"useOtherAcct1":"他のアカウント使う", "useOtherAcct1": "他のアカウント使う",
"useOtherAcct2":"の解除はできひん", "useOtherAcct2": "の解除はできひん",
"btWithVis": "公開範囲も決めてからブースト", "btWithVis": "公開範囲も決めてからブースト",
"reply":"返信", "reply": "返信",
"bt":"ブースト", "bt": "ブースト",
"favRegist":"お気に入り", "favRegist": "お気に入り",
"openBrowser":"ブラウザで開く", "openBrowser": "ブラウザで開く",
"screenshot":"スクリーンショット", "screenshot": "スクリーンショット",
"copyURL":"URLをコピー", "copyURL": "URLをコピー",
"copy":"コピー", "copy": "コピー",
"embed":"埋め込む", "embed": "埋め込む",
"toots":"トゥート", "toots": "トゥート",
"follow":"フォロー", "follow": "フォロー",
"follower":"フォロワー", "follower": "フォロワー",
"utlColumn":"カラムとして追加", "utlColumn": "カラムとして追加",
"timeline":"タイムライン", "timeline": "タイムライン",
"operateOtherAcct":"他のアカウント使うて何かする", "operateOtherAcct": "他のアカウント使うて何かする",
"list":"リスト", "list": "リスト",
"makeNew":"新しいやつ", "makeNew": "新しいやつ",
"blocks":"ブロック", "blocks": "ブロック",
"mutes":"ミュート", "mutes": "ミュート",
"block":"ブロック", "block": "ブロック",
"mute":"ミュート", "mute": "ミュート",
"domainBlock":"ドメインブロック", "domainBlock": "ドメインブロック",
"editProf":"プロフィールいらう", "editProf": "プロフィールいらう",
"change":"変更", "change": "変更",
"followReq":"フォローリクエスト", "followReq": "フォローリクエスト",
"likeHimOrHer":"似とうユーザー", "likeHimOrHer": "似とうユーザー",
"frc":"あんたにおすすめ", "frc": "あんたにおすすめ",
"more":"他無いんか?", "more": "他無いんか?",
"endorse":"紹介したる", "endorse": "紹介したる",
"openinbrowser":"ブラウザで開く", "openinbrowser": "ブラウザで開く",
"mainacct":"メインアカウントに設定", "mainacct": "メインアカウントに設定",
"revoverJP":"する", "revoverJP": "する",
"warnUseOtherAcct":"(解除はでけへん。)", "warnUseOtherAcct": "(解除はでけへん。)",
"revoverJPde":"で", "revoverJPde": "で",
"or":"それか", "or": "それか",
"openProf":"プロフィール出す", "openProf": "プロフィール出す",
"warnListRegist":"リストに入れたかったらまずフォローせなあかん。", "warnListRegist": "リストに入れたかったらまずフォローせなあかん。",
"blockDomain":"ブロックするドメイン", "blockDomain": "ブロックするドメイン",
"name":"名前", "name": "名前",
"note":"自己紹介", "note": "自己紹介",
"editProfImg":"アバター変える", "editProfImg": "アバター変える",
"editHeader":"ヘッダー変える", "editHeader": "ヘッダー変える",
"blocked":"なんでか知らんけどブロックされとるわ", "blocked": "なんでか知らんけどブロックされとるわ",
"likeUserDes":"あんたと似とうユーザーを発掘すんで。", "likeUserDes": "あんたと似とうユーザーを発掘すんで。",
"get":"取得", "get": "取得",
"historyBack":"一つ前のユーザーデータ", "historyBack": "一つ前のユーザーデータ",
"empUser":"ユーザー強調", "empUser": "ユーザー強調",
"supportme":"支援してくれんか?", "supportme": "支援してくれんか?",
"TheDeskDes":"TheDeskは営利目的ちゃうし、有料機能や広告は一切あらへん。<br>せやけど君らが支援してくれとうからTheDeskは続いてるんや。ほんまありがとうな。", "TheDeskDes": "TheDeskは営利目的ちゃうし、有料機能や広告は一切あらへん。<br>せやけど君らが支援してくれとうからTheDeskは続いてるんや。ほんまありがとうな。",
"PatreonSupport":"Patreonで支援", "PatreonSupport": "Patreonで支援",
"PixivSupport":"Pixiv FANBOXで支援", "PixivSupport": "Pixiv FANBOXで支援",
"AWLSupport":"Amazonほしいものリスト", "AWLSupport": "Amazonほしいものリスト",
"SendAmazonGift1":"", "SendAmazonGift1": "",
"SendAmazonGift2":"にAmazonギフトカードを送る", "SendAmazonGift2": "にAmazonギフトカードを送る",
"monthly":"月額支援(大歓迎)", "monthly": "月額支援(大歓迎)",
"once":"一度限りの支援(めっちゃ歓迎)", "once": "一度限りの支援(めっちゃ歓迎)",
"local":"ローカル", "local": "ローカル",
"localMedia":"ローカル(メディア)", "localMedia": "ローカル(メディア)",
"home":"ホーム", "home": "ホーム",
"fed":"連合", "fed": "連合",
"fedMedia":"連合(メディア)", "fedMedia": "連合(メディア)",
"dm":"ダイレクトメッセージ", "dm": "ダイレクトメッセージ",
"integratedTLDes":"統合(ローカルとホーム)", "integratedTLDes": "統合(ローカルとホーム)",
"localPlusDes":"統合(LTL+BT+返信)", "localPlusDes": "統合(LTL+BT+返信)",
"notf":"通知", "notf": "通知",
"bookmark": "ブックマーク", "bookmark": "ブックマーク",
"showThisTL":"表示するタイムライン", "showThisTL": "表示するタイムライン",
"webviewWarn":"TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。", "webviewWarn": "TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。",
"add":"追加", "add": "追加",
"search":"検索", "search": "検索",
"sortSet":"並べ替え設定", "sortSet": "並べ替え設定",
"selectAcct":"選択(スクロールして全選択肢表示)", "selectAcct": "選択(スクロールして全選択肢表示)",
"filterWord":"フィルターワード", "filterWord": "フィルターワード",
"listLocale":"一覧", "listLocale": "一覧",
"degree":"適応範囲", "degree": "適応範囲",
"conver":"会話", "conver": "会話",
"prof":"プロフィール", "prof": "プロフィール",
"option":"オプション", "option": "オプション",
"matchWord":"単語マッチ", "matchWord": "単語マッチ",
"warnMatchWord":"非ラテン系の文字列では「単語マッチ」はせん方がええで。(これはフリかも知れん)", "warnMatchWord": "非ラテン系の文字列では「単語マッチ」はせん方がええで。(これはフリかも知れん)",
"except":"除外", "except": "除外",
"exceptWorn":"「除外」にしてもうたらマッチしたトゥートはフィルター解除しても二度と表示されへん。", "exceptWorn": "「除外」にしてもうたらマッチしたトゥートはフィルター解除しても二度と表示されへん。",
"avalableBefore":"有効期限(あと)", "avalableBefore": "有効期限(あと)",
"warnAvBefore":"未指定(または0分)で「無期限」や", "warnAvBefore": "未指定(または0分)で「無期限」や",
"warnAvBefore2":"この数字はそんなに正確ちゃうで", "warnAvBefore2": "この数字はそんなに正確ちゃうで",
"unlimited":"無期限", "unlimited": "無期限",
"days":"日", "days": "日",
"hours":"時間", "hours": "時間",
"mins":"分", "mins": "分",
"secs":"秒", "secs": "秒",
"warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードをどっちも合わせて処理するで", "warnOnIntegratedTL": "Integrated TL/Plus TLは、公開/ホームのフィルターワードをどっちも合わせて処理するで",
"helloTheDesk":"やってもうた…再読込して治らんかったら初期化(全データ削除)してな…(予め設定をエクスポートしとくんやで)", "helloTheDesk": "やってもうた…再読込して治らんかったら初期化(全データ削除)してな…(予め設定をエクスポートしとくんやで)",
"addColumn":"カラム追加", "addColumn": "カラム追加",
"sortColumns":"カラム一覧/並べ替え", "sortColumns": "カラム一覧/並べ替え",
"acctMan":"アカウントマネージャー", "acctMan": "アカウントマネージャー",
"filter":"フィルター", "filter": "フィルター",
"setting":"設定", "setting": "設定",
"reverse":"トゥートボタンの左右入れ替え", "reverse": "トゥートボタンの左右入れ替え",
"f5":"TL再読込", "f5": "TL再読込",
"nanoDes":"めっちゃ小さいマストドン。", "nanoDes": "めっちゃ小さいマストドン。",
"verTips":"バージョン", "verTips": "バージョン",
"clockTips":"時計", "clockTips": "時計",
"ramTips":"システムメモリ容量", "ramTips": "システムメモリ容量",
"changeTips":"Tips変更", "changeTips": "Tips変更",
"helpAndLogs":"ヘルプとログ", "helpAndLogs": "ヘルプとログ",
"help":"ヘルプ", "help": "ヘルプ",
"contactwithlog":"なんか知らんけど動かんとかそういうのを開発者のお兄さんお姉さんに言うときは下のログのそこらへんの時間に起きたなぁってのを拾って連絡するとなんかの助けになるかも知れん。ついでやけどこのウィンドウ全体を横に引き伸ばしたらいい感じに見れるで", "contactwithlog": "なんか知らんけど動かんとかそういうのを開発者のお兄さんお姉さんに言うときは下のログのそこらへんの時間に起きたなぁってのを拾って連絡するとなんかの助けになるかも知れん。ついでやけどこのウィンドウ全体を横に引き伸ばしたらいい感じに見れるで",
"about":"このソフトについて", "about": "このソフトについて",
"hereAddColumns":"←ここからTL追加", "hereAddColumns": "←ここからTL追加",
"foundBug": "バグあるんやけど", "foundBug": "バグあるんやけど",
"show": "表示", "show": "表示",
"directory": "ディレクトリ", "directory": "ディレクトリ",
"discover": "見つける",
"active": "最新活動順", "active": "最新活動順",
"newcomer": "新規順", "newcomer": "新規順",
"local_only": "ローカルだけ", "local_only": "ローカルだけ",

View File

@ -1,184 +1,185 @@
{ {
"draghere":"ここにドラッグして添付(ドラッグと同時にアップロードされます)", "draghere": "ここにドラッグして添付(ドラッグと同時にアップロードされます)",
"nowOffline":"オフラインです。投稿はすべて下書きに追加されます。オンライン復帰時には再読み込みを推奨します。", "nowOffline": "オフラインです。投稿はすべて下書きに追加されます。オンライン復帰時には再読み込みを推奨します。",
"reOnline": "オンラインに復帰しました。再読み込みを推奨します。", "reOnline": "オンラインに復帰しました。再読み込みを推奨します。",
"webSrc": "Webで検索", "webSrc": "Webで検索",
"tsSrc": "tootsearchで検索", "tsSrc": "tootsearchで検索",
"close":"Close", "close": "Close",
"showSelectProf":"選択したアカウントのプロフィールを表示", "showSelectProf": "選択したアカウントのプロフィールを表示",
"closethisbox":"このボックスを閉じる", "closethisbox": "このボックスを閉じる",
"post-new":"投稿", "post-new": "投稿",
"toot":"トゥート", "toot": "トゥート",
"nsfwDes":"画像に制限を付与", "nsfwDes": "画像に制限を付与",
"cwDes":"コンテンツワーニング(トゥートを表示する前にメッセージで隠す)", "cwDes": "コンテンツワーニング(トゥートを表示する前にメッセージで隠す)",
"selfile":"ファイルを選択", "selfile": "ファイルを選択",
"insertEmoji":"絵文字を挿入", "insertEmoji": "絵文字を挿入",
"schedule":"時間指定投稿", "schedule": "時間指定投稿",
"postat":"時間指定投稿", "postat": "時間指定投稿",
"scheduleWarn":"2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。", "scheduleWarn": "2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。",
"clearToot":"トゥートボックスのクリア", "clearToot": "トゥートボックスのクリア",
"replyMode":"返信モード", "replyMode": "返信モード",
"no":"いいえ", "no": "いいえ",
"yes":"はい", "yes": "はい",
"temp":"添付ファイル", "temp": "添付ファイル",
"nothing":"なし", "nothing": "なし",
"stamp": "スタンプ", "stamp": "スタンプ",
"stampWarn": "画像右下にアカウント名(aa@bb.cc)テキストを挿入します", "stampWarn": "画像右下にアカウント名(aa@bb.cc)テキストを挿入します",
"vis":"公開範囲", "vis": "公開範囲",
"cwtext":"警告文", "cwtext": "警告文",
"selectVis":"公開範囲指定", "selectVis": "公開範囲指定",
"publicJP":"公開", "publicJP": "公開",
"unlistedJP":"未収載", "unlistedJP": "未収載",
"privateJP":"非公開", "privateJP": "非公開",
"localJP":"ローカル限定", "localJP": "ローカル限定",
"directJP":"ダイレクト", "directJP": "ダイレクト",
"sectoot":"セカンダリートゥート", "sectoot": "セカンダリートゥート",
"emojiWarn":"サーバーによって実装が異なります。", "emojiWarn": "サーバーによって実装が異なります。",
"emojiInsertWarn":"一部絵文字は入力できません。", "emojiInsertWarn": "一部絵文字は入力できません。",
"refreshEmoji":"絵文字更新", "refreshEmoji": "絵文字更新",
"closeThisBox":"このボックスを閉じる", "closeThisBox": "このボックスを閉じる",
"showThisEmoji":"一覧を表示中", "showThisEmoji": "一覧を表示中",
"customEmoji":"カスタム絵文字", "customEmoji": "カスタム絵文字",
"peopleEmoji":"ひと", "peopleEmoji": "ひと",
"natureEmoji":"自然", "natureEmoji": "自然",
"foodEmoji":"食べ物", "foodEmoji": "食べ物",
"activityEmoji":"活動", "activityEmoji": "活動",
"placeEmoji":"場所", "placeEmoji": "場所",
"thingsEmoji":"もの", "thingsEmoji": "もの",
"symbolEmoji":"記号", "symbolEmoji": "記号",
"flagsEmoji":"国旗", "flagsEmoji": "国旗",
"draft": "下書き", "draft": "下書き",
"poll":"アンケート", "poll": "アンケート",
"pollDdisabled":"アンケートを使用しない", "pollDdisabled": "アンケートを使用しない",
"pollProvider":"アンケートのプロバイダ", "pollProvider": "アンケートのプロバイダ",
"choice":"選択肢", "choice": "選択肢",
"polluntil":"投票するまで票数を隠す", "polluntil": "投票するまで票数を隠す",
"pollmulti":"複数選択を許可", "pollmulti": "複数選択を許可",
"expires_in":"有効期限(秒)", "expires_in": "有効期限(秒)",
"contextBefore":"これより前の会話", "contextBefore": "これより前の会話",
"thisToot":"対象のトゥート", "thisToot": "対象のトゥート",
"contextAfter":"これより後の会話", "contextAfter": "これより後の会話",
"beforeLTL":"これより前のLocal TL(エアリプソース確認)", "beforeLTL": "これより前のLocal TL(エアリプソース確認)",
"beforeUTL":"これより前のユーザーTL(BTソース確認)", "beforeUTL": "これより前のユーザーTL(BTソース確認)",
"afterLTL":"これより後のLocal TL(言及確認)", "afterLTL": "これより後のLocal TL(言及確認)",
"afterUTL":"これより後のユーザーTL(言及確認)", "afterUTL": "これより後のユーザーTL(言及確認)",
"afterFTL":"これより後の連合TL(言及確認)", "afterFTL": "これより後の連合TL(言及確認)",
"favedPeople":"このトゥートをお気に入りに登録した人", "favedPeople": "このトゥートをお気に入りに登録した人",
"btedPeople":"このトゥートをブーストした人", "btedPeople": "このトゥートをブーストした人",
"useOtherAcct1":"他のアカウントを使用", "useOtherAcct1": "他のアカウントを使用",
"useOtherAcct2":"の解除はできません", "useOtherAcct2": "の解除はできません",
"btWithVis": "公開範囲を指定してブースト", "btWithVis": "公開範囲を指定してブースト",
"reply":"返信", "reply": "返信",
"bt":"ブースト", "bt": "ブースト",
"favRegist":"お気に入り", "favRegist": "お気に入り",
"openBrowser":"ブラウザで開く", "openBrowser": "ブラウザで開く",
"screenshot":"スクリーンショット", "screenshot": "スクリーンショット",
"copyURL":"URLをコピー", "copyURL": "URLをコピー",
"copy":"コピー", "copy": "コピー",
"embed":"埋め込む", "embed": "埋め込む",
"toots":"トゥート", "toots": "トゥート",
"follow":"フォロー", "follow": "フォロー",
"follower":"フォロワー", "follower": "フォロワー",
"utlColumn":"カラムとして追加", "utlColumn": "カラムとして追加",
"timeline":"タイムライン", "timeline": "タイムライン",
"operateOtherAcct":"他のアカウントで操作", "operateOtherAcct": "他のアカウントで操作",
"list":"リスト", "list": "リスト",
"makeNew":"新規作成", "makeNew": "新規作成",
"blocks":"ブロック", "blocks": "ブロック",
"mutes":"ミュート", "mutes": "ミュート",
"block":"ブロック", "block": "ブロック",
"mute":"ミュート", "mute": "ミュート",
"domainBlock":"ドメインブロック", "domainBlock": "ドメインブロック",
"editProf":"プロフィール編集", "editProf": "プロフィール編集",
"change":"変更", "change": "変更",
"followReq":"フォローリクエスト", "followReq": "フォローリクエスト",
"likeHimOrHer":"似てる", "likeHimOrHer": "似てる",
"frc":"おすすめ", "frc": "おすすめフォロー",
"more":"もっと", "more": "もっと",
"endorse":"紹介する", "endorse": "紹介する",
"openinbrowser":"ブラウザで開く", "openinbrowser": "ブラウザで開く",
"mainacct":"メインアカウントに設定", "mainacct": "メインアカウントに設定",
"revoverJP":"する", "revoverJP": "する",
"warnUseOtherAcct":"(解除はできません。)", "warnUseOtherAcct": "(解除はできません。)",
"revoverJPde":"で", "revoverJPde": "で",
"or":"または", "or": "または",
"openProf":"プロフィールを表示", "openProf": "プロフィールを表示",
"warnListRegist":"リストに追加するためにはフォローが必要です。", "warnListRegist": "リストに追加するためにはフォローが必要です。",
"blockDomain":"ブロックするドメイン", "blockDomain": "ブロックするドメイン",
"name":"名前", "name": "名前",
"note":"自己紹介", "note": "自己紹介",
"editProfImg":"アバターを変更", "editProfImg": "アバターを変更",
"editHeader":"ヘッダーを変更", "editHeader": "ヘッダーを変更",
"blocked":"ブロックされています。なぜでしょう?", "blocked": "ブロックされています。なぜでしょう?",
"likeUserDes":"似ているユーザーを取得できます。", "likeUserDes": "似ているユーザーを取得できます。",
"get":"取得", "get": "取得",
"historyBack":"一つ前のユーザーデータ", "historyBack": "一つ前のユーザーデータ",
"empUser":"ユーザー強調", "empUser": "ユーザー強調",
"supportme":"ご支援ください。", "supportme": "ご支援ください。",
"TheDeskDes":"TheDeskは営利目的ではないため、有料機能や広告は一切ありません。<br>皆様のあたたかいご支援のもとで製作されています。", "TheDeskDes": "TheDeskは営利目的ではないため、有料機能や広告は一切ありません。<br>皆様のあたたかいご支援のもとで製作されています。",
"PatreonSupport":"Patreonで支援", "PatreonSupport": "Patreonで支援",
"PixivSupport":"Pixiv FANBOXで支援", "PixivSupport": "Pixiv FANBOXで支援",
"AWLSupport":"Amazonほしいものリスト", "AWLSupport": "Amazonほしいものリスト",
"SendAmazonGift1":"", "SendAmazonGift1": "",
"SendAmazonGift2":"にAmazonギフトカードを送る", "SendAmazonGift2": "にAmazonギフトカードを送る",
"monthly":"月額支援(大歓迎)", "monthly": "月額支援(大歓迎)",
"once":"一度限りの支援(もちろん歓迎)", "once": "一度限りの支援(もちろん歓迎)",
"local":"ローカル", "local": "ローカル",
"localMedia":"ローカル(メディア)", "localMedia": "ローカル(メディア)",
"home":"ホーム", "home": "ホーム",
"fed":"連合", "fed": "連合",
"fedMedia":"連合(メディア)", "fedMedia": "連合(メディア)",
"dm":"ダイレクトメッセージ", "dm": "ダイレクトメッセージ",
"integratedTLDes":"統合(ローカルとホーム)", "integratedTLDes": "統合(ローカルとホーム)",
"localPlusDes":"統合(LTL+BT+返信)", "localPlusDes": "統合(LTL+BT+返信)",
"notf":"通知", "notf": "通知",
"bookmark": "ブックマーク", "bookmark": "ブックマーク",
"showThisTL":"表示するタイムライン", "showThisTL": "表示するタイムライン",
"webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。", "webviewWarn": "TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。",
"add":"追加", "add": "追加",
"search":"検索", "search": "検索",
"sortSet":"並べ替え設定", "sortSet": "並べ替え設定",
"selectAcct":"選択(スクロールで全選択肢表示)", "selectAcct": "選択(スクロールで全選択肢表示)",
"filterWord":"フィルターワード", "filterWord": "フィルターワード",
"listLocale":"一覧", "listLocale": "一覧",
"degree":"適応範囲", "degree": "適応範囲",
"conver":"会話", "conver": "会話",
"prof":"プロフィール", "prof": "プロフィール",
"option":"オプション", "option": "オプション",
"matchWord":"単語マッチ", "matchWord": "単語マッチ",
"warnMatchWord":"非ラテン系の文字列では「単語マッチ」は推奨されません。", "warnMatchWord": "非ラテン系の文字列では「単語マッチ」は推奨されません。",
"except":"除外", "except": "除外",
"exceptWorn":"「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。", "exceptWorn": "「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。",
"avalableBefore":"有効期限(あと)", "avalableBefore": "有効期限(あと)",
"warnAvBefore":"未指定(または0分)で「無期限」になります。", "warnAvBefore": "未指定(または0分)で「無期限」になります。",
"warnAvBefore2":"仕様上数値の正確性を保証できません。", "warnAvBefore2": "仕様上数値の正確性を保証できません。",
"unlimited":"無期限", "unlimited": "無期限",
"days":"日", "days": "日",
"hours":"時間", "hours": "時間",
"mins":"分", "mins": "分",
"secs":"秒", "secs": "秒",
"warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。", "warnOnIntegratedTL": "Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。",
"helloTheDesk":"内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)", "helloTheDesk": "内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)",
"addColumn":"カラム追加", "addColumn": "カラム追加",
"sortColumns":"カラム一覧/並べ替え", "sortColumns": "カラム一覧/並べ替え",
"acctMan":"アカウントマネージャー", "acctMan": "アカウントマネージャー",
"filter":"フィルター", "filter": "フィルター",
"setting":"設定", "setting": "設定",
"reverse":"トゥートボタンの左右入れ替え", "reverse": "トゥートボタンの左右入れ替え",
"f5":"TL再読込", "f5": "TL再読込",
"nanoDes":"最小のマストドン。", "nanoDes": "最小のマストドン。",
"verTips":"バージョン", "verTips": "バージョン",
"clockTips":"時計", "clockTips": "時計",
"ramTips":"システムメモリ容量", "ramTips": "システムメモリ容量",
"changeTips":"Tips変更", "changeTips": "Tips変更",
"helpAndLogs":"ヘルプとログ", "helpAndLogs": "ヘルプとログ",
"help":"ヘルプ", "help": "ヘルプ",
"contactwithlog":"不具合等のお問合わせは以下のログから発生時刻付近のものを集めてご連絡いただけるとスムーズになるかもしれません。また、このメニューウィンドウ全体を横に引き伸ばすとログが見やすくなります。", "contactwithlog": "不具合等のお問合わせは以下のログから発生時刻付近のものを集めてご連絡いただけるとスムーズになるかもしれません。また、このメニューウィンドウ全体を横に引き伸ばすとログが見やすくなります。",
"about":"このソフトについて", "about": "このソフトについて",
"hereAddColumns":"←ここからTL追加", "hereAddColumns": "←ここからTL追加",
"foundBug": "バグを見つけた", "foundBug": "バグを見つけた",
"show": "表示", "show": "表示",
"directory": "ディレクトリ", "directory": "ディレクトリ",
"discover": "見つける",
"active": "最新活動順", "active": "最新活動順",
"newcomer": "新規順", "newcomer": "新規順",
"local_only": "ローカルのみ", "local_only": "ローカルのみ",

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

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

View File

@ -69,15 +69,15 @@
dir-compare "^2.4.0" dir-compare "^2.4.0"
fs-extra "^9.0.1" 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: dependencies:
ajv "^6.12.4" ajv "^6.12.4"
debug "^4.1.1" debug "^4.1.1"
espree "^7.3.0" espree "^7.3.0"
globals "^12.1.0" globals "^13.9.0"
ignore "^4.0.6" ignore "^4.0.6"
import-fresh "^3.2.1" import-fresh "^3.2.1"
js-yaml "^3.13.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" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== 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: dependencies:
"@types/yargs-parser" "*" "@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" resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe"
integrity sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg== 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: dependencies:
normalize-path "^3.0.0" normalize-path "^3.0.0"
picomatch "^2.0.4" 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" 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== 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: dependencies:
"7zip-bin" "~5.1.1" "7zip-bin" "~5.1.1"
"@develar/schema-utils" "~2.6.5" "@develar/schema-utils" "~2.6.5"
@ -663,12 +663,12 @@ app-builder-lib@22.11.5:
"@malept/flatpak-bundler" "^0.4.0" "@malept/flatpak-bundler" "^0.4.0"
async-exit-hook "^2.0.1" async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9" 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" chromium-pickle-js "^0.2.0"
debug "^4.3.2" debug "^4.3.2"
ejs "^3.1.6" ejs "^3.1.6"
electron-publish "22.11.5" electron-publish "22.11.7"
fs-extra "^10.0.0" fs-extra "^10.0.0"
hosted-git-info "^4.0.2" hosted-git-info "^4.0.2"
is-ci "^3.0.0" is-ci "^3.0.0"
@ -1096,17 +1096,25 @@ builder-util-runtime@8.7.6:
debug "^4.3.2" debug "^4.3.2"
sax "^1.2.4" 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: dependencies:
"7zip-bin" "~5.1.1" "7zip-bin" "~5.1.1"
"@types/debug" "^4.1.5" "@types/debug" "^4.1.5"
"@types/fs-extra" "^9.0.11" "@types/fs-extra" "^9.0.11"
app-builder-bin "3.5.13" app-builder-bin "3.5.13"
bluebird-lst "^1.0.9" bluebird-lst "^1.0.9"
builder-util-runtime "8.7.6" builder-util-runtime "8.7.7"
chalk "^4.1.1" chalk "^4.1.1"
debug "^4.3.2" debug "^4.3.2"
fs-extra "^10.0.0" 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" resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== 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: dependencies:
anymatch "~3.1.1" anymatch "~3.1.2"
braces "~3.0.2" braces "~3.0.2"
glob-parent "~5.1.0" glob-parent "~5.1.2"
is-binary-path "~2.1.0" is-binary-path "~2.1.0"
is-glob "~4.0.1" is-glob "~4.0.1"
normalize-path "~3.0.0" normalize-path "~3.0.0"
readdirp "~3.5.0" readdirp "~3.6.0"
optionalDependencies: optionalDependencies:
fsevents "~2.3.1" fsevents "~2.3.2"
chownr@^1.1.1: chownr@^1.1.1:
version "1.1.4" version "1.1.4"
@ -1692,13 +1700,13 @@ dir-compare@^2.4.0:
commander "2.9.0" commander "2.9.0"
minimatch "3.0.4" 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: 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" builder-util-runtime "8.7.6"
fs-extra "^10.0.0" fs-extra "^10.0.0"
iconv-lite "^0.6.2" iconv-lite "^0.6.2"
@ -1817,17 +1825,17 @@ ejs@^3.1.6:
dependencies: dependencies:
jake "^10.6.1" 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: 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" chalk "^4.1.1"
dmg-builder "22.11.5" dmg-builder "22.11.7"
fs-extra "^10.0.0" fs-extra "^10.0.0"
is-ci "^3.0.0" is-ci "^3.0.0"
lazy-val "^1.0.5" lazy-val "^1.0.5"
@ -1852,14 +1860,14 @@ electron-notarize@^1.0.0:
debug "^4.1.1" debug "^4.1.1"
fs-extra "^9.0.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: dependencies:
"@types/fs-extra" "^9.0.11" "@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" chalk "^4.1.1"
fs-extra "^10.0.0" fs-extra "^10.0.0"
lazy-val "^1.0.5" lazy-val "^1.0.5"
@ -1883,10 +1891,10 @@ electron-rebuild@^2.3.5:
tar "^6.0.5" tar "^6.0.5"
yargs "^16.0.0" 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: dependencies:
"@electron/get" "^1.0.1" "@electron/get" "^1.0.1"
"@types/node" "^14.6.2" "@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" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== 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: dependencies:
"@babel/code-frame" "7.12.11" "@babel/code-frame" "7.12.11"
"@eslint/eslintrc" "^0.4.1" "@eslint/eslintrc" "^0.4.2"
ajv "^6.10.0" ajv "^6.10.0"
chalk "^4.0.0" chalk "^4.0.0"
cross-spawn "^7.0.2" cross-spawn "^7.0.2"
@ -2093,7 +2101,7 @@ eslint@^7.27.0:
fast-deep-equal "^3.1.3" fast-deep-equal "^3.1.3"
file-entry-cache "^6.0.1" file-entry-cache "^6.0.1"
functional-red-black-tree "^1.0.1" functional-red-black-tree "^1.0.1"
glob-parent "^5.0.0" glob-parent "^5.1.2"
globals "^13.6.0" globals "^13.6.0"
ignore "^4.0.6" ignore "^4.0.6"
import-fresh "^3.0.0" 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" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= 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: function-bind@^1.1.1:
version "1.1.1" version "1.1.1"
@ -2446,10 +2454,10 @@ gifwrap@^0.9.2:
image-q "^1.1.1" image-q "^1.1.1"
omggif "^1.0.10" 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: dependencies:
is-glob "^4.0.1" is-glob "^4.0.1"
@ -2503,17 +2511,10 @@ global@~4.3.0:
min-document "^2.19.0" min-document "^2.19.0"
process "~0.5.1" 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: dependencies:
type-fest "^0.20.2" type-fest "^0.20.2"
@ -3659,9 +3660,9 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
normalize-url@^4.1.0: 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: npm-bundled@^1.0.1:
version "1.1.1" version "1.1.1"
@ -4246,10 +4247,10 @@ readable-stream@^3.5.0, readable-stream@^3.6.0:
string_decoder "^1.1.1" string_decoder "^1.1.1"
util-deprecate "^1.0.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: dependencies:
picomatch "^2.2.1" picomatch "^2.2.1"
@ -4892,10 +4893,10 @@ supports-color@^7.1.0:
dependencies: dependencies:
has-flag "^4.0.0" 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: syntax-error@^1.1.1:
version "1.4.0" 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" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== 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" version "0.8.1"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== 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" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== 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: wcwidth@^1.0.1:
version "1.0.1" version "1.0.1"