with acct lookup
This commit is contained in:
cutls
parent
5621ffbe42
commit
36ad187296
8
.prettierrc
Normal file
8
.prettierrc
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"tabWidth": 4,
|
||||
"useTabs": true,
|
||||
"semi": false,
|
||||
"singleQuote": true,
|
||||
"printWidth": 200,
|
||||
"jsxBracketSameLine": true
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
1004
app/js/tl/filter.js
1004
app/js/tl/filter.js
File diff suppressed because it is too large
Load Diff
|
|
@ -1,436 +1,437 @@
|
|||
//通知
|
||||
//取得+Streaming接続
|
||||
function notf(acct_id, tlid, sys) {
|
||||
if (sys == 'direct') {
|
||||
notfColumn(acct_id, tlid, sys)
|
||||
} else {
|
||||
notfCommon(acct_id, tlid, sys)
|
||||
}
|
||||
if (sys == 'direct') {
|
||||
notfColumn(acct_id, tlid, sys)
|
||||
} else {
|
||||
notfCommon(acct_id, tlid, sys)
|
||||
}
|
||||
}
|
||||
|
||||
function notfColumn(acct_id, tlid, sys) {
|
||||
todo('Notifications Loading...')
|
||||
var native = localStorage.getItem('nativenotf')
|
||||
var at = localStorage.getItem('acct_' + acct_id + '_at')
|
||||
if (!native) {
|
||||
native = 'yes'
|
||||
}
|
||||
var domain = localStorage.getItem('domain_' + acct_id)
|
||||
var httpreq = new XMLHttpRequest()
|
||||
if (localStorage.getItem('mode_' + domain) == 'misskey') {
|
||||
var misskey = true
|
||||
var start = 'https://' + domain + '/api/i/notifications'
|
||||
httpreq.open('POST', start, true)
|
||||
httpreq.setRequestHeader('Content-Type', 'application/json')
|
||||
var body = JSON.stringify({
|
||||
i: at
|
||||
})
|
||||
} else {
|
||||
var misskey = false
|
||||
if (localStorage.getItem('exclude-' + tlid)) {
|
||||
var exc = localStorage.getItem('exclude-' + tlid)
|
||||
} else {
|
||||
var exc = ''
|
||||
}
|
||||
var start = 'https://' + domain + '/api/v1/notifications' + exc
|
||||
httpreq.open('GET', start, true)
|
||||
httpreq.setRequestHeader('Content-Type', 'application/json')
|
||||
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
|
||||
var body = ''
|
||||
}
|
||||
todo('Notifications Loading...')
|
||||
var native = localStorage.getItem('nativenotf')
|
||||
var at = localStorage.getItem('acct_' + acct_id + '_at')
|
||||
if (!native) {
|
||||
native = 'yes'
|
||||
}
|
||||
var domain = localStorage.getItem('domain_' + acct_id)
|
||||
var httpreq = new XMLHttpRequest()
|
||||
if (localStorage.getItem('mode_' + domain) == 'misskey') {
|
||||
var misskey = true
|
||||
var start = 'https://' + domain + '/api/i/notifications'
|
||||
httpreq.open('POST', start, true)
|
||||
httpreq.setRequestHeader('Content-Type', 'application/json')
|
||||
var body = JSON.stringify({
|
||||
i: at,
|
||||
})
|
||||
} else {
|
||||
var misskey = false
|
||||
if (localStorage.getItem('exclude-' + tlid)) {
|
||||
var exc = localStorage.getItem('exclude-' + tlid)
|
||||
} else {
|
||||
var exc = ''
|
||||
}
|
||||
var start = 'https://' + domain + '/api/v1/notifications' + exc
|
||||
httpreq.open('GET', start, true)
|
||||
httpreq.setRequestHeader('Content-Type', 'application/json')
|
||||
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
|
||||
var body = ''
|
||||
}
|
||||
|
||||
httpreq.responseType = 'json'
|
||||
httpreq.send(body)
|
||||
httpreq.onreadystatechange = function() {
|
||||
if (httpreq.readyState === 4) {
|
||||
var json = httpreq.response
|
||||
if (this.status !== 200) {
|
||||
$('#landing_' + tlid).append(`<div>${this.status}</div><div>${escapeHTML(this.response)}`)
|
||||
setLog(start, this.status, this.response)
|
||||
}
|
||||
var max_id = httpreq.getResponseHeader('link')
|
||||
if (max_id) {
|
||||
max_id = max_id.match(/[?&]{1}max_id=([0-9]+)/)[1]
|
||||
}
|
||||
if (json[0]) {
|
||||
var templete = ''
|
||||
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
|
||||
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
|
||||
Object.keys(json).forEach(function(key) {
|
||||
var obj = json[key]
|
||||
if (lastnotf == obj.id && key > 0 && native == 'yes') {
|
||||
var ct = key
|
||||
if (key > 14) {
|
||||
ct = '15+'
|
||||
}
|
||||
var os = localStorage.getItem('platform')
|
||||
var options = {
|
||||
body: ct + lang.lang_notf_new,
|
||||
icon: localStorage.getItem('prof_' + acct_id)
|
||||
}
|
||||
var n = new Notification('TheDesk:' + domain, options)
|
||||
}
|
||||
var mute = getFilterTypeByAcct(acct_id, 'notif')
|
||||
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
|
||||
if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
|
||||
} else {
|
||||
templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute)
|
||||
}
|
||||
} else if (obj.type == 'follow_request') {
|
||||
templete = templete + userparse([obj.account], 'request', acct_id, tlid, -1)
|
||||
} else {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
|
||||
} else {
|
||||
templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
|
||||
}
|
||||
}
|
||||
})
|
||||
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
|
||||
$('#timeline_' + tlid).html(templete)
|
||||
// $('#landing_' + tlid).hide()
|
||||
jQuery('time.timeago').timeago()
|
||||
}
|
||||
$('#notf-box').addClass('fetched')
|
||||
todc()
|
||||
//Markers
|
||||
var markers = localStorage.getItem('markers')
|
||||
if (markers == 'yes') {
|
||||
markers = true
|
||||
} else {
|
||||
markers = false
|
||||
}
|
||||
if (markers) {
|
||||
getMarker(tlid, 'notf', acct_id)
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!misskey) {
|
||||
if (localStorage.getItem('streaming_' + acct_id)) {
|
||||
var wss = localStorage.getItem('streaming_' + acct_id)
|
||||
} else {
|
||||
var wss = 'wss://' + domain
|
||||
}
|
||||
var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
|
||||
} else {
|
||||
var start = 'wss://' + domain + '/?i=' + at
|
||||
}
|
||||
httpreq.responseType = 'json'
|
||||
httpreq.send(body)
|
||||
httpreq.onreadystatechange = function() {
|
||||
if (httpreq.readyState === 4) {
|
||||
var json = httpreq.response
|
||||
if (this.status !== 200) {
|
||||
$('#landing_' + tlid).append(`<div>${this.status}</div><div>${escapeHTML(this.response)}`)
|
||||
setLog(start, this.status, this.response)
|
||||
}
|
||||
var max_id = httpreq.getResponseHeader('link')
|
||||
if (max_id) {
|
||||
max_id = max_id.match(/[?&]{1}max_id=([0-9]+)/)[1]
|
||||
}
|
||||
if (json[0]) {
|
||||
var templete = ''
|
||||
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
|
||||
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
|
||||
Object.keys(json).forEach(function(key) {
|
||||
var obj = json[key]
|
||||
if (lastnotf == obj.id && key > 0 && native == 'yes') {
|
||||
var ct = key
|
||||
if (key > 14) {
|
||||
ct = '15+'
|
||||
}
|
||||
var os = localStorage.getItem('platform')
|
||||
var options = {
|
||||
body: ct + lang.lang_notf_new,
|
||||
icon: localStorage.getItem('prof_' + acct_id),
|
||||
}
|
||||
var n = new Notification('TheDesk:' + domain, options)
|
||||
}
|
||||
var mute = getFilterTypeByAcct(acct_id, 'notif')
|
||||
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
|
||||
if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
|
||||
} else {
|
||||
templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute)
|
||||
}
|
||||
} else if (obj.type == 'follow_request') {
|
||||
templete = templete + userparse([obj.account], 'request', acct_id, tlid, -1)
|
||||
} else {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
|
||||
} else {
|
||||
templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
|
||||
}
|
||||
}
|
||||
})
|
||||
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
|
||||
$('#timeline_' + tlid).html(templete)
|
||||
// $('#landing_' + tlid).hide()
|
||||
jQuery('time.timeago').timeago()
|
||||
}
|
||||
$('#notf-box').addClass('fetched')
|
||||
todc()
|
||||
//Markers
|
||||
var markers = localStorage.getItem('markers')
|
||||
if (markers == 'yes') {
|
||||
markers = true
|
||||
} else {
|
||||
markers = false
|
||||
}
|
||||
if (markers) {
|
||||
getMarker(tlid, 'notf', acct_id)
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!misskey) {
|
||||
if (localStorage.getItem('streaming_' + acct_id)) {
|
||||
var wss = localStorage.getItem('streaming_' + acct_id)
|
||||
} else {
|
||||
var wss = 'wss://' + domain
|
||||
}
|
||||
var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
|
||||
} else {
|
||||
var start = 'wss://' + domain + '/?i=' + at
|
||||
}
|
||||
}
|
||||
|
||||
function notfCommon(acct_id, tlid, sys, stream) {
|
||||
todo('Notifications Loading...')
|
||||
var native = localStorage.getItem('nativenotf')
|
||||
var at = localStorage.getItem('acct_' + acct_id + '_at')
|
||||
if (!native) {
|
||||
native = 'yes'
|
||||
}
|
||||
var domain = localStorage.getItem('domain_' + acct_id)
|
||||
if (localStorage.getItem('mode_' + domain) == 'misskey') {
|
||||
var misskey = true
|
||||
var start = 'https://' + domain + '/api/i/notifications'
|
||||
var i = {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'content-type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({
|
||||
i: at
|
||||
})
|
||||
}
|
||||
} else {
|
||||
var misskey = false
|
||||
var start = 'https://' + domain + '/api/v1/notifications'
|
||||
var i = {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'content-type': 'application/json',
|
||||
Authorization: 'Bearer ' + at
|
||||
}
|
||||
}
|
||||
}
|
||||
if(stream == 'only') {
|
||||
notfWS(misskey, acct_id, tlid, domain, at)
|
||||
return false
|
||||
}
|
||||
fetch(start, i)
|
||||
.then(function(response) {
|
||||
console.log('header to get param:' + response.headers.get('link'))
|
||||
if (!response.ok) {
|
||||
response.text().then(function(text) {
|
||||
console.log('notf error', 'div[data-notf=' + acct_id + '] .landing')
|
||||
$('div[data-notf=' + acct_id + '] .landing').append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
|
||||
setLog(response.url, response.status, text)
|
||||
})
|
||||
}
|
||||
return response.json()
|
||||
})
|
||||
.catch(function(error) {
|
||||
todo(error)
|
||||
setLog(start, 'JSON', error)
|
||||
console.error(error)
|
||||
})
|
||||
.then(function(json) {
|
||||
if (json[0]) {
|
||||
var templete = ''
|
||||
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
|
||||
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
|
||||
Object.keys(json).forEach(function(key) {
|
||||
var obj = json[key]
|
||||
if (lastnotf == obj.id && key > 0 && native == 'yes') {
|
||||
var ct = key
|
||||
if (key > 14) {
|
||||
ct = '15+'
|
||||
}
|
||||
var os = localStorage.getItem('platform')
|
||||
var options = {
|
||||
body: ct + lang.lang_notf_new,
|
||||
icon: localStorage.getItem('prof_' + acct_id)
|
||||
}
|
||||
var n = new Notification('TheDesk:' + domain, options)
|
||||
}
|
||||
var mute = getFilterTypeByAcct(acct_id, 'notif')
|
||||
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
|
||||
if (obj.type != 'follow' && obj.type != 'move') {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
} else {
|
||||
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
}
|
||||
} else {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
} else {
|
||||
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
|
||||
}
|
||||
}
|
||||
})
|
||||
$('div[data-notf=' + acct_id + ']').html(templete)
|
||||
// $('#landing_' + tlid).hide()
|
||||
jQuery('time.timeago').timeago()
|
||||
}
|
||||
$('#notf-box').addClass('fetched')
|
||||
todc()
|
||||
if(stream != 'no') notfWS(misskey, acct_id, tlid, domain, at)
|
||||
})
|
||||
todo('Notifications Loading...')
|
||||
var native = localStorage.getItem('nativenotf')
|
||||
var at = localStorage.getItem('acct_' + acct_id + '_at')
|
||||
if (!native) {
|
||||
native = 'yes'
|
||||
}
|
||||
var domain = localStorage.getItem('domain_' + acct_id)
|
||||
if (localStorage.getItem('mode_' + domain) == 'misskey') {
|
||||
var misskey = true
|
||||
var start = 'https://' + domain + '/api/i/notifications'
|
||||
var i = {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'content-type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
i: at,
|
||||
}),
|
||||
}
|
||||
} else {
|
||||
var misskey = false
|
||||
var start = 'https://' + domain + '/api/v1/notifications'
|
||||
var i = {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'content-type': 'application/json',
|
||||
Authorization: 'Bearer ' + at,
|
||||
},
|
||||
}
|
||||
}
|
||||
if (stream == 'only') {
|
||||
notfWS(misskey, acct_id, tlid, domain, at)
|
||||
return false
|
||||
}
|
||||
fetch(start, i)
|
||||
.then(function(response) {
|
||||
console.log('header to get param:' + response.headers.get('link'))
|
||||
if (!response.ok) {
|
||||
response.text().then(function(text) {
|
||||
console.log('notf error', 'div[data-notf=' + acct_id + '] .landing')
|
||||
$('div[data-notf=' + acct_id + '] .landing').append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
|
||||
setLog(response.url, response.status, text)
|
||||
})
|
||||
}
|
||||
return response.json()
|
||||
})
|
||||
.catch(function(error) {
|
||||
todo(error)
|
||||
setLog(start, 'JSON', error)
|
||||
console.error(error)
|
||||
})
|
||||
.then(function(json) {
|
||||
if (json[0]) {
|
||||
var templete = ''
|
||||
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
|
||||
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
|
||||
Object.keys(json).forEach(function(key) {
|
||||
var obj = json[key]
|
||||
if (lastnotf == obj.id && key > 0 && native == 'yes') {
|
||||
var ct = key
|
||||
if (key > 14) {
|
||||
ct = '15+'
|
||||
}
|
||||
var os = localStorage.getItem('platform')
|
||||
var options = {
|
||||
body: ct + lang.lang_notf_new,
|
||||
icon: localStorage.getItem('prof_' + acct_id),
|
||||
}
|
||||
var n = new Notification('TheDesk:' + domain, options)
|
||||
}
|
||||
var mute = getFilterTypeByAcct(acct_id, 'notif')
|
||||
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
|
||||
if (obj.type != 'follow' && obj.type != 'move') {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
} else {
|
||||
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
}
|
||||
} else {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
} else {
|
||||
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
|
||||
}
|
||||
}
|
||||
})
|
||||
$('div[data-notf=' + acct_id + ']').html(templete)
|
||||
// $('#landing_' + tlid).hide()
|
||||
jQuery('time.timeago').timeago()
|
||||
}
|
||||
$('#notf-box').addClass('fetched')
|
||||
todc()
|
||||
if (stream != 'no') notfWS(misskey, acct_id, tlid, domain, at)
|
||||
})
|
||||
}
|
||||
function notfWS(misskey, acct_id, tlid, domain, at) {
|
||||
if(mastodonBaseWsStatus[domain] == 'available') return false
|
||||
if (!misskey) {
|
||||
if (localStorage.getItem('streaming_' + acct_id)) {
|
||||
var wss = localStorage.getItem('streaming_' + acct_id)
|
||||
} else {
|
||||
var wss = 'wss://' + domain
|
||||
}
|
||||
var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
|
||||
|
||||
var wsid = websocketNotf.length
|
||||
websocketNotf[acct_id] = new WebSocket(start)
|
||||
websocketNotf[acct_id].onopen = function(mess) {
|
||||
console.table({
|
||||
acct_id: acct_id,
|
||||
type: 'Connect Streaming API(Notf)',
|
||||
domain: domain,
|
||||
message: [mess]
|
||||
})
|
||||
$('i[data-notf=' + acct_id + ']').removeClass('red-text')
|
||||
}
|
||||
websocketNotf[acct_id].onmessage = function(mess) {
|
||||
$('#landing_' + tlid).hide()
|
||||
//console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
|
||||
var popup = localStorage.getItem('popup')
|
||||
if (!popup) {
|
||||
popup = 0
|
||||
}
|
||||
var obj = JSON.parse(JSON.parse(mess.data).payload)
|
||||
var type = JSON.parse(mess.data).event
|
||||
if (type == 'notification') {
|
||||
var templete = ''
|
||||
localStorage.setItem('lastnotf_' + acct_id, obj.id)
|
||||
if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
|
||||
//markers show中はダメ
|
||||
if (obj.type != 'follow' && obj.type != 'follow_request') {
|
||||
templete = parse([obj], 'notf', acct_id, 'notf', popup)
|
||||
} else if (obj.type == 'follow_request') {
|
||||
templete = userparse([obj.account], 'request', acct_id, 'notf', -1)
|
||||
} else {
|
||||
templete = userparse([obj], obj.type, acct_id, 'notf', popup)
|
||||
}
|
||||
if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
|
||||
$('div[data-notf=' + acct_id + ']').prepend(templete)
|
||||
$('div[data-const=notf_' + acct_id + ']').prepend(templete)
|
||||
}
|
||||
jQuery('time.timeago').timeago()
|
||||
}
|
||||
} else if (type == 'delete') {
|
||||
$('[toot-id=' + obj + ']').hide()
|
||||
$('[toot-id=' + obj + ']').remove()
|
||||
}
|
||||
}
|
||||
websocketNotf[acct_id].onerror = function(error) {
|
||||
console.error('WebSocket Error ', error)
|
||||
errorct++
|
||||
console.log(errorct)
|
||||
if (errorct < 3) {
|
||||
notfWS(misskey, acct_id, tlid, domain, at)
|
||||
}
|
||||
}
|
||||
websocketNotf[acct_id].onclose = function(error) {
|
||||
console.error('WebSocket Close ', error)
|
||||
errorct++
|
||||
console.log(errorct)
|
||||
if (errorct < 3) {
|
||||
notfWS(misskey, acct_id, tlid, domain, at)
|
||||
}
|
||||
}
|
||||
}
|
||||
function notfWS(misskey, acct_id, tlid, domain, at) {
|
||||
if (mastodonBaseWsStatus[domain] == 'available') return false
|
||||
if (!misskey) {
|
||||
if (localStorage.getItem('streaming_' + acct_id)) {
|
||||
var wss = localStorage.getItem('streaming_' + acct_id)
|
||||
} else {
|
||||
var wss = 'wss://' + domain
|
||||
}
|
||||
var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
|
||||
|
||||
var wsid = websocketNotf.length
|
||||
websocketNotf[acct_id] = new WebSocket(start)
|
||||
websocketNotf[acct_id].onopen = function(mess) {
|
||||
console.table({
|
||||
acct_id: acct_id,
|
||||
type: 'Connect Streaming API(Notf)',
|
||||
domain: domain,
|
||||
message: [mess],
|
||||
})
|
||||
$('i[data-notf=' + acct_id + ']').removeClass('red-text')
|
||||
}
|
||||
websocketNotf[acct_id].onmessage = function(mess) {
|
||||
$('#landing_' + tlid).hide()
|
||||
//console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
|
||||
var popup = localStorage.getItem('popup')
|
||||
if (!popup) {
|
||||
popup = 0
|
||||
}
|
||||
var obj = JSON.parse(JSON.parse(mess.data).payload)
|
||||
var type = JSON.parse(mess.data).event
|
||||
if (type == 'notification') {
|
||||
var templete = ''
|
||||
localStorage.setItem('lastnotf_' + acct_id, obj.id)
|
||||
if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
|
||||
//markers show中はダメ
|
||||
if (obj.type != 'follow' && obj.type != 'follow_request') {
|
||||
templete = parse([obj], 'notf', acct_id, 'notf', popup)
|
||||
} else if (obj.type == 'follow_request') {
|
||||
templete = userparse([obj.account], 'request', acct_id, 'notf', -1)
|
||||
} else {
|
||||
templete = userparse([obj], obj.type, acct_id, 'notf', popup)
|
||||
}
|
||||
if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
|
||||
$('div[data-notf=' + acct_id + ']').prepend(templete)
|
||||
$('div[data-const=notf_' + acct_id + ']').prepend(templete)
|
||||
}
|
||||
jQuery('time.timeago').timeago()
|
||||
}
|
||||
} else if (type == 'delete') {
|
||||
$('[toot-id=' + obj + ']').hide()
|
||||
$('[toot-id=' + obj + ']').remove()
|
||||
}
|
||||
}
|
||||
websocketNotf[acct_id].onerror = function(error) {
|
||||
console.error('WebSocket Error ', error)
|
||||
errorct++
|
||||
console.log(errorct)
|
||||
if (errorct < 3) {
|
||||
notfWS(misskey, acct_id, tlid, domain, at)
|
||||
}
|
||||
}
|
||||
websocketNotf[acct_id].onclose = function(error) {
|
||||
console.error('WebSocket Close ', error)
|
||||
errorct++
|
||||
console.log(errorct)
|
||||
if (errorct < 3) {
|
||||
notfWS(misskey, acct_id, tlid, domain, at)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//一定のスクロールで発火
|
||||
function notfmore(tlid) {
|
||||
console.log({ status: 'kicked', status: moreloading })
|
||||
var multi = localStorage.getItem('column')
|
||||
var obj = JSON.parse(multi)
|
||||
var acct_id = obj[tlid].domain
|
||||
if (!type) {
|
||||
var type = obj[tlid].type
|
||||
} else {
|
||||
var data
|
||||
}
|
||||
var sid = $('#timeline_' + tlid + ' .notif-marker')
|
||||
.last()
|
||||
.attr('data-maxid')
|
||||
var at = localStorage.getItem('acct_' + acct_id + '_at')
|
||||
var domain = localStorage.getItem('domain_' + acct_id)
|
||||
if (sid && !moreloading) {
|
||||
moreloading = true
|
||||
var httpreq = new XMLHttpRequest()
|
||||
if (localStorage.getItem('mode_' + domain) == 'misskey') {
|
||||
var misskey = true
|
||||
var start = 'https://' + domain + '/api/i/notifications'
|
||||
httpreq.open(POST, start, true)
|
||||
httpreq.setRequestHeader('Content-Type', 'application/json')
|
||||
var body = JSON.stringify({
|
||||
i: at,
|
||||
untilID: sid
|
||||
})
|
||||
} else {
|
||||
var misskey = false
|
||||
if (localStorage.getItem('exclude-' + tlid)) {
|
||||
var exc = localStorage.getItem('exclude-' + tlid) + '&max_id=' + sid
|
||||
} else {
|
||||
var exc = '?max_id=' + sid
|
||||
}
|
||||
var start = 'https://' + domain + '/api/v1/notifications' + exc
|
||||
httpreq.open('GET', start, true)
|
||||
httpreq.setRequestHeader('Content-Type', 'application/json')
|
||||
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
|
||||
var body = ''
|
||||
}
|
||||
console.log({ status: 'kicked', status: moreloading })
|
||||
var multi = localStorage.getItem('column')
|
||||
var obj = JSON.parse(multi)
|
||||
var acct_id = obj[tlid].domain
|
||||
if (!type) {
|
||||
var type = obj[tlid].type
|
||||
} else {
|
||||
var data
|
||||
}
|
||||
var sid = $('#timeline_' + tlid + ' .notif-marker')
|
||||
.last()
|
||||
.attr('data-maxid')
|
||||
var at = localStorage.getItem('acct_' + acct_id + '_at')
|
||||
var domain = localStorage.getItem('domain_' + acct_id)
|
||||
if (sid && !moreloading) {
|
||||
moreloading = true
|
||||
var httpreq = new XMLHttpRequest()
|
||||
if (localStorage.getItem('mode_' + domain) == 'misskey') {
|
||||
var misskey = true
|
||||
var start = 'https://' + domain + '/api/i/notifications'
|
||||
httpreq.open(POST, start, true)
|
||||
httpreq.setRequestHeader('Content-Type', 'application/json')
|
||||
var body = JSON.stringify({
|
||||
i: at,
|
||||
untilID: sid,
|
||||
})
|
||||
} else {
|
||||
var misskey = false
|
||||
if (localStorage.getItem('exclude-' + tlid)) {
|
||||
var exc = localStorage.getItem('exclude-' + tlid) + '&max_id=' + sid
|
||||
} else {
|
||||
var exc = '?max_id=' + sid
|
||||
}
|
||||
var start = 'https://' + domain + '/api/v1/notifications' + exc
|
||||
httpreq.open('GET', start, true)
|
||||
httpreq.setRequestHeader('Content-Type', 'application/json')
|
||||
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
|
||||
var body = ''
|
||||
}
|
||||
|
||||
httpreq.responseType = 'json'
|
||||
httpreq.send(body)
|
||||
httpreq.onreadystatechange = function() {
|
||||
if (httpreq.readyState === 4) {
|
||||
var json = httpreq.response
|
||||
if (this.status !== 200) {
|
||||
setLog(start, this.status, this.response)
|
||||
}
|
||||
console.log(['More notifications on ' + tlid, json])
|
||||
var max_id = httpreq.getResponseHeader('link').match(/[?&]{1}max_id=([0-9]+)/)[1]
|
||||
if (json[0]) {
|
||||
var templete = ''
|
||||
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
|
||||
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
|
||||
Object.keys(json).forEach(function(key) {
|
||||
var obj = json[key]
|
||||
var mute = getFilterTypeByAcct(acct_id, 'notif')
|
||||
if (obj.type != 'follow') {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
} else {
|
||||
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
}
|
||||
} else {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
} else {
|
||||
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
|
||||
}
|
||||
}
|
||||
})
|
||||
moreloading = false
|
||||
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
|
||||
$('#timeline_' + tlid).append(templete)
|
||||
// $('#landing_' + tlid).hide()
|
||||
jQuery('time.timeago').timeago()
|
||||
}
|
||||
$('#notf-box').addClass('fetched')
|
||||
todc()
|
||||
}
|
||||
}
|
||||
}
|
||||
httpreq.responseType = 'json'
|
||||
httpreq.send(body)
|
||||
httpreq.onreadystatechange = function() {
|
||||
if (httpreq.readyState === 4) {
|
||||
var json = httpreq.response
|
||||
if (this.status !== 200) {
|
||||
setLog(start, this.status, this.response)
|
||||
}
|
||||
console.log(['More notifications on ' + tlid, json])
|
||||
var max_id = httpreq.getResponseHeader('link').match(/[?&]{1}max_id=([0-9]+)/)[1]
|
||||
if (json[0]) {
|
||||
var templete = ''
|
||||
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
|
||||
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
|
||||
Object.keys(json).forEach(function(key) {
|
||||
var obj = json[key]
|
||||
var mute = getFilterTypeByAcct(acct_id, 'notif')
|
||||
if (obj.type != 'follow') {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
} else {
|
||||
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
}
|
||||
} else {
|
||||
if (misskey) {
|
||||
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
|
||||
} else {
|
||||
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
|
||||
}
|
||||
}
|
||||
})
|
||||
moreloading = false
|
||||
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
|
||||
$('#timeline_' + tlid).append(templete)
|
||||
// $('#landing_' + tlid).hide()
|
||||
jQuery('time.timeago').timeago()
|
||||
}
|
||||
$('#notf-box').addClass('fetched')
|
||||
todc()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//通知トグルボタン
|
||||
function notfToggle(acct, tlid) {
|
||||
if ($('#notf-box_' + tlid).hasClass('column-hide')) {
|
||||
$('#notf-box_' + tlid).css('display', 'block')
|
||||
$('#notf-box_' + tlid).animate(
|
||||
{
|
||||
height: '400px'
|
||||
},
|
||||
{
|
||||
duration: 300,
|
||||
complete: function() {
|
||||
$('#notf-box_' + tlid).css('overflow-y', 'scroll')
|
||||
$('#notf-box_' + tlid).removeClass('column-hide')
|
||||
}
|
||||
}
|
||||
)
|
||||
} else {
|
||||
$('#notf-box_' + tlid).css('overflow-y', 'hidden')
|
||||
$('#notf-box_' + tlid).animate(
|
||||
{
|
||||
height: '0'
|
||||
},
|
||||
{
|
||||
duration: 300,
|
||||
complete: function() {
|
||||
$('#notf-box_' + tlid).addClass('column-hide')
|
||||
$('#notf-box_' + tlid).css('display', 'none')
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
notfCanceler(acct)
|
||||
if ($('#notf-box_' + tlid).hasClass('column-hide')) {
|
||||
$('#notf-box_' + tlid).css('display', 'block')
|
||||
$('#notf-box_' + tlid).animate({
|
||||
height: '400px',
|
||||
}, {
|
||||
duration: 300,
|
||||
complete: function() {
|
||||
$('#notf-box_' + tlid).css('overflow-y', 'scroll')
|
||||
$('#notf-box_' + tlid).removeClass('column-hide')
|
||||
},
|
||||
})
|
||||
} else {
|
||||
$('#notf-box_' + tlid).css('overflow-y', 'hidden')
|
||||
$('#notf-box_' + tlid).animate({
|
||||
height: '0',
|
||||
}, {
|
||||
duration: 300,
|
||||
complete: function() {
|
||||
$('#notf-box_' + tlid).addClass('column-hide')
|
||||
$('#notf-box_' + tlid).css('display', 'none')
|
||||
},
|
||||
})
|
||||
}
|
||||
notfCanceler(acct)
|
||||
}
|
||||
|
||||
function notfCanceler(acct) {
|
||||
$('.notf-reply_' + acct).text(0)
|
||||
localStorage.removeItem('notf-reply_' + acct)
|
||||
$('.notf-reply_' + acct).addClass('hide')
|
||||
$('.notf-fav_' + acct).text(0)
|
||||
localStorage.removeItem('notf-fav_' + acct)
|
||||
$('.notf-fav_' + acct).addClass('hide')
|
||||
$('.notf-bt_' + acct).text(0)
|
||||
localStorage.removeItem('notf-bt_' + acct)
|
||||
$('.notf-bt_' + acct).addClass('hide')
|
||||
$('.notf-follow_' + acct).text(0)
|
||||
localStorage.removeItem('notf-follow_' + acct)
|
||||
$('.notf-follow_' + acct).addClass('hide')
|
||||
$('.notf-icon_' + acct).removeClass('red-text')
|
||||
var id = $('#announce_' + acct + ' .announcement').first().attr('data-id')
|
||||
$('.notf-announ_' + acct + '_ct').text("")
|
||||
$(`.boxIn[data-acct=${acct}] .notice-box`).removeClass('has-notf')
|
||||
if(id) {
|
||||
localStorage.setItem('announ_' + acct, id)
|
||||
}
|
||||
$('.notf-reply_' + acct).text(0)
|
||||
localStorage.removeItem('notf-reply_' + acct)
|
||||
$('.notf-reply_' + acct).addClass('hide')
|
||||
$('.notf-fav_' + acct).text(0)
|
||||
localStorage.removeItem('notf-fav_' + acct)
|
||||
$('.notf-fav_' + acct).addClass('hide')
|
||||
$('.notf-bt_' + acct).text(0)
|
||||
localStorage.removeItem('notf-bt_' + acct)
|
||||
$('.notf-bt_' + acct).addClass('hide')
|
||||
$('.notf-follow_' + acct).text(0)
|
||||
localStorage.removeItem('notf-follow_' + acct)
|
||||
$('.notf-follow_' + acct).addClass('hide')
|
||||
$('.notf-icon_' + acct).removeClass('red-text')
|
||||
var id = $('#announce_' + acct + ' .announcement')
|
||||
.first()
|
||||
.attr('data-id')
|
||||
$('.notf-announ_' + acct + '_ct').text('')
|
||||
$(`.boxIn[data-acct=${acct}] .notice-box`).removeClass('has-notf')
|
||||
if (id) {
|
||||
localStorage.setItem('announ_' + acct, id)
|
||||
}
|
||||
}
|
||||
|
||||
function allNotfRead() {
|
||||
var multi = localStorage.getItem('multi')
|
||||
if (multi) {
|
||||
var obj = JSON.parse(multi)
|
||||
Object.keys(obj).forEach(function(key) {
|
||||
notfCanceler(key)
|
||||
})
|
||||
}
|
||||
var multi = localStorage.getItem('multi')
|
||||
if (multi) {
|
||||
var obj = JSON.parse(multi)
|
||||
Object.keys(obj).forEach(function(key) {
|
||||
notfCanceler(key)
|
||||
})
|
||||
}
|
||||
}
|
||||
allNotfRead()
|
||||
|
|
@ -544,12 +544,7 @@ function insertFont(name) {
|
|||
}
|
||||
|
||||
function copyColor(from, to) {
|
||||
let props = [
|
||||
'background', 'subcolor', 'text', 'accent',
|
||||
'modal', 'modalFooter', 'third', 'forth',
|
||||
'bottom', 'emphasized', 'postbox', 'active',
|
||||
'selected', 'selectedWithShared'
|
||||
]
|
||||
let props = ['background', 'subcolor', 'text', 'accent', 'modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
|
||||
let i = 0
|
||||
let color
|
||||
for (tag of props) {
|
||||
|
|
@ -589,11 +584,7 @@ function customComp(preview) {
|
|||
var textC = $('#color-picker1_value').val()
|
||||
var accentC = $('#color-picker3_value').val()
|
||||
var multi = localStorage.getItem('multi')
|
||||
let advanced = [
|
||||
'modal', 'modalFooter', 'third', 'forth',
|
||||
'bottom', 'emphasized', 'postbox', 'active',
|
||||
'selected', 'selectedWithShared'
|
||||
]
|
||||
let advanced = ['modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
|
||||
var advanceTheme = {}
|
||||
let i = 4
|
||||
for (tag of advanced) {
|
||||
|
|
@ -606,9 +597,7 @@ function customComp(preview) {
|
|||
|
||||
var my = JSON.parse(multi)[0].name
|
||||
var id = $('#custom-edit-sel').val()
|
||||
const defaults = [
|
||||
'black', 'blue', 'brown', 'green', 'indigo', 'polar', 'snow', 'white'
|
||||
]
|
||||
const defaults = ['black', 'blue', 'brown', 'green', 'indigo', 'polar', 'snow', 'white']
|
||||
if (id == 'add_new' || defaults.includes(id)) {
|
||||
id = makeCID()
|
||||
}
|
||||
|
|
@ -622,11 +611,11 @@ function customComp(preview) {
|
|||
background: bgC,
|
||||
subcolor: subcolorC,
|
||||
text: textC,
|
||||
accent: accentC
|
||||
accent: accentC,
|
||||
},
|
||||
advanced: advanceTheme,
|
||||
id: id,
|
||||
version: '2'
|
||||
version: '2',
|
||||
}
|
||||
$('#custom_json').val(JSON.stringify(json))
|
||||
if (preview) {
|
||||
|
|
@ -640,7 +629,6 @@ function customComp(preview) {
|
|||
})
|
||||
postMessage(['themeJsonCreate', JSON.stringify(json)], '*')
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function deleteIt() {
|
||||
|
|
@ -710,16 +698,11 @@ function customConnect(raw) {
|
|||
$('#color-picker2_value').val(args.primary.subcolor)
|
||||
//Accent
|
||||
$('#color-picker3_value').val(args.primary.accent)
|
||||
let advanced = [
|
||||
'modal', 'modalFooter', 'third', 'forth',
|
||||
'bottom', 'emphasized', 'postbox', 'active',
|
||||
'selected', 'selectedWithShared'
|
||||
]
|
||||
let advanced = ['modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
|
||||
let i = 4
|
||||
for (tag of advanced) {
|
||||
if (args.advanced[tag]) {
|
||||
$(`#color-picker${i}_value`).val(args.advanced[tag])
|
||||
|
||||
}
|
||||
$(`#use-color_${i}`).prop('checked', true)
|
||||
i++
|
||||
|
|
@ -765,7 +748,7 @@ function customSoundSave(key, file) {
|
|||
}
|
||||
function pluginLoad() {
|
||||
$('#plugin-edit-sel').val('add_new')
|
||||
$(".plugin_delete").addClass('disabled')
|
||||
$('.plugin_delete').addClass('disabled')
|
||||
var template = ''
|
||||
var pgns = localStorage.getItem('plugins')
|
||||
var args = JSON.parse(pgns ? pgns : '[]')
|
||||
|
|
@ -783,9 +766,9 @@ function pluginEdit() {
|
|||
$('#plugin').attr('data-id', id)
|
||||
if (id == 'add_new') {
|
||||
editor.setValue('', -1)
|
||||
$(".plugin_delete").addClass('disabled')
|
||||
$('.plugin_delete').addClass('disabled')
|
||||
} else {
|
||||
$(".plugin_delete").removeClass('disabled')
|
||||
$('.plugin_delete').removeClass('disabled')
|
||||
var pgns = localStorage.getItem('plugins')
|
||||
var args = JSON.parse(pgns ? pgns : '[]')
|
||||
Object.keys(args).forEach(function (key) {
|
||||
|
|
@ -823,7 +806,7 @@ function completePlugin(comp) {
|
|||
id = makeCID()
|
||||
args.push({
|
||||
id: id,
|
||||
content: inputPlugin
|
||||
content: inputPlugin,
|
||||
})
|
||||
} else {
|
||||
Object.keys(args).forEach(function (key) {
|
||||
|
|
@ -857,7 +840,7 @@ async function deletePlugin() {
|
|||
const alert = await Swal.fire({
|
||||
title: 'delete',
|
||||
icon: 'warning',
|
||||
showCancelButton: true
|
||||
showCancelButton: true,
|
||||
})
|
||||
if (!alert) return false
|
||||
editor.setValue('', -1)
|
||||
|
|
@ -959,4 +942,6 @@ function lastFmSet() {
|
|||
M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
|
||||
}
|
||||
|
||||
function stopVideo() { return false }
|
||||
function stopVideo() {
|
||||
return false
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -27,7 +27,7 @@
|
|||
<body class="">
|
||||
<script>
|
||||
var ver = '22.2.0 (Koume)'
|
||||
var gitHash = '9758a2a7d8f1b504193126c20fd96ccf42945cd8'
|
||||
var gitHash = '5621ffbe42a1de361ccee0e679c97d30da436aab'
|
||||
//betaを入れるとバージョンチェックしない
|
||||
//var ver="beta";
|
||||
var acct_id = 0
|
||||
|
|
|
|||
|
|
@ -688,7 +688,7 @@
|
|||
style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25"
|
||||
style="padding-top:5px;">Main author: Cutls@1m.cutls.com</a>
|
||||
<br>
|
||||
TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/9758a2a7d8f1b504193126c20fd96ccf42945cd8">9758a2a7d8f1b504193126c20fd96ccf42945cd8</a> - <a
|
||||
TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/5621ffbe42a1de361ccee0e679c97d30da436aab">5621ffbe42a1de361ccee0e679c97d30da436aab</a> - <a
|
||||
onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"
|
||||
class="pointer pwa">Sprawdź aktualizacje</a><br>
|
||||
<br>
|
||||
|
|
@ -698,7 +698,7 @@
|
|||
<img src="https://status.cutls.com/badge-service?site=thedesk.top">
|
||||
</a><br>
|
||||
<h5>OSS License</h5>
|
||||
<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/9758a2a7d8f1b504193126c20fd96ccf42945cd8"
|
||||
<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/5621ffbe42a1de361ccee0e679c97d30da436aab"
|
||||
alt="FOSSA Status"><img
|
||||
src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a>
|
||||
<br>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user