Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cannot get next fav/flw/fler

Browse Source
This commit is contained in:
cutls 2020-09-06 23:29:12 +09:00
parent 9d0f4096f8
commit 3f95e755b5
3 changed files with 165 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/css/userdata.css
View File

@ -87,6 +87,7 @@
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
height: calc(100% - 3.4rem); height: calc(100% - 3.4rem);
padding-bottom: 60px;
} }
#my-data-nav .btn { #my-data-nav .btn {
width: 10.7rem; width: 10.7rem;

1
app/js/tl/parse.js
View File

@ -1246,7 +1246,6 @@ function userparse(obj, auth, acct_id, tlid, popup) {
} else if (auth == 'request') { } else if (auth == 'request') {
var ftxt = lang.lang_parse_request var ftxt = lang.lang_parse_request
} }
console.log(auth, ftxt)
if (popup > 0 || popup == -1 || notf) { if (popup > 0 || popup == -1 || notf) {
var notftext = ftxt + '<br>' var notftext = ftxt + '<br>'
} else { } else {

245
app/js/userdata/his-data.js
View File

@ -45,20 +45,20 @@ function utlShow(user, more, acct_id) {
} }
} }
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) {
if (localStorage.getItem("mode_" + domain) == "misskey") { if (localStorage.getItem("mode_" + domain) == "misskey") {
var templete = misskeyParse(json, "", acct_id, "user") var templete = misskeyParse(json, "", acct_id, "user")
} else { } else {
@ -118,20 +118,20 @@ function pinutl(before, user, 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) {
var templete = parse(json, "pinned", acct_id, "user") var templete = parse(json, "pinned", acct_id, "user")
if (!json[0]) { if (!json[0]) {
templete = "" templete = ""
@ -154,7 +154,7 @@ function flw(user, more, acct_id) {
if (localStorage.getItem("mode_" + domain) == "misskey") { if (localStorage.getItem("mode_" + domain) == "misskey") {
var req = { i: at } var req = { i: at }
if (more) { if (more) {
var sid = $("#his-follow-list .cvo") var sid = $("#his-follow-list .cusr")
.last() .last()
.attr("user-id") .attr("user-id")
req.maxId = sid req.maxId = sid
@ -170,9 +170,7 @@ function flw(user, more, acct_id) {
} }
} else { } else {
if (more) { if (more) {
var sid = $("#his-follow-list .cvo") var sid = $("#his-follow-list-contents").attr('max-id')
.last()
.attr("user-id")
var plus = "?max_id=" + sid var plus = "?max_id=" + sid
} else { } else {
var plus = "" var plus = ""
@ -185,22 +183,56 @@ function flw(user, more, acct_id) {
Authorization: "Bearer " + at Authorization: "Bearer " + at
} }
} }
var httpreq = new XMLHttpRequest()
httpreq.open("GET", start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (localStorage.getItem("mode_" + domain) == "misskey") {
var templete = misskeyUserparse(json, "", acct_id)
} else {
var templete = userparse(json, "", acct_id)
}
if (templete == "") {
templete = lang.lang_details_nodata + "<br>"
}
var linkHeader = httpreq.getResponseHeader("link")
let link
if (linkHeader) {
console.log(linkHeader)
link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1]
console.log(link)
}
$("#his-follow-list-contents").attr('max-id', link)
if (more) {
$("#his-follow-list-contents").append(templete)
} else {
$("#his-follow-list-contents").html(templete)
}
jQuery("time.timeago").timeago()
}
}
return false
} }
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) {
if (localStorage.getItem("mode_" + domain) == "misskey") { if (localStorage.getItem("mode_" + domain) == "misskey") {
var templete = misskeyUserparse(json, "", acct_id) var templete = misskeyUserparse(json, "", acct_id)
} else { } else {
@ -231,7 +263,7 @@ function fer(user, more, acct_id) {
if (localStorage.getItem("mode_" + domain) == "misskey") { if (localStorage.getItem("mode_" + domain) == "misskey") {
var req = { i: at } var req = { i: at }
if (more) { if (more) {
var sid = $("#his-follower-list .cvo") var sid = $("#his-follow-list .cusr")
.last() .last()
.attr("user-id") .attr("user-id")
req.maxId = sid req.maxId = sid
@ -247,9 +279,7 @@ function fer(user, more, acct_id) {
} }
} else { } else {
if (more) { if (more) {
var sid = $("#his-follower-list .cvo") var sid = $("#his-followr-list-contents").attr('max-id')
.last()
.attr("user-id")
var plus = "?max_id=" + sid var plus = "?max_id=" + sid
} else { } else {
var plus = "" var plus = ""
@ -262,22 +292,15 @@ function fer(user, more, acct_id) {
Authorization: "Bearer " + at Authorization: "Bearer " + at
} }
} }
} var httpreq = new XMLHttpRequest()
fetch(start, i) httpreq.open("GET", start, true)
.then(function(response) { httpreq.setRequestHeader('Content-Type', 'application/json')
if (!response.ok) { httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
response.text().then(function(text) { httpreq.responseType = 'json'
setLog(response.url, response.status, text) httpreq.send()
}) httpreq.onreadystatechange = function () {
} if (httpreq.readyState === 4) {
return response.json() var json = httpreq.response
})
.catch(function(error) {
todo(error)
setLog(start, "JSON", error)
console.error(error)
})
.then(function(json) {
if (localStorage.getItem("mode_" + domain) == "misskey") { if (localStorage.getItem("mode_" + domain) == "misskey") {
var templete = misskeyUserparse(json, "", acct_id) var templete = misskeyUserparse(json, "", acct_id)
} else { } else {
@ -286,6 +309,55 @@ function fer(user, more, acct_id) {
if (templete == "") { if (templete == "") {
templete = lang.lang_details_nodata + "<br>" templete = lang.lang_details_nodata + "<br>"
} }
var linkHeader = httpreq.getResponseHeader("link")
let link
if (linkHeader) {
console.log(linkHeader)
link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1]
console.log(link)
}
$("#his-follower-list-contents").attr('max-id', link)
if (more) {
$("#his-follower-list-contents").append(templete)
} else {
$("#his-follower-list-contents").html(templete)
}
jQuery("time.timeago").timeago()
}
}
return false
}
fetch(start, i)
.then(function (response) {
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function (error) {
todo(error)
setLog(start, "JSON", error)
console.error(error)
})
.then(function (json) {
if (localStorage.getItem("mode_" + domain) == "misskey") {
var templete = misskeyUserparse(json, "", acct_id)
} else {
var templete = userparse(json, "", acct_id)
}
if (templete == "") {
templete = lang.lang_details_nodata + "<br>"
}
var linkHeader = httpreq.getResponseHeader("link")
let link
if (linkHeader) {
console.log(linkHeader)
link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1]
console.log(link)
}
$("#his-follower-list-contents").attr('max-id', link)
if (more) { if (more) {
$("#his-follower-list-contents").append(templete) $("#his-follower-list-contents").append(templete)
} else { } else {
@ -293,7 +365,7 @@ function fer(user, more, acct_id) {
} }
jQuery("time.timeago").timeago() jQuery("time.timeago").timeago()
}) })
} }
//以下自分のみ //以下自分のみ
//お気に入り一覧 //お気に入り一覧
@ -305,9 +377,7 @@ function showFav(more, acct_id) {
var at = localStorage.getItem("acct_" + acct_id + "_at") var at = localStorage.getItem("acct_" + acct_id + "_at")
if (localStorage.getItem("mode_" + domain) != "misskey") { if (localStorage.getItem("mode_" + domain) != "misskey") {
if (more) { if (more) {
var sid = $("#his-fav-list .cvo") var sid = $("#his-fav-list-contents").attr('max-id')
.last()
.attr("toot-id")
var plus = "?max_id=" + sid var plus = "?max_id=" + sid
} else { } else {
var plus = "" var plus = ""
@ -320,6 +390,35 @@ function showFav(more, acct_id) {
Authorization: "Bearer " + at Authorization: "Bearer " + at
} }
} }
var httpreq = new XMLHttpRequest()
httpreq.open("GET", start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
var json = httpreq.response
var linkHeader = httpreq.getResponseHeader("link")
let link
if (linkHeader) {
console.log(linkHeader)
link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1]
console.log(link)
}
var template = parse(json, "", acct_id, "user")
if (!json[0]) {
template = lang.lang_details_nodata + "<br>"
}
$("#his-fav-list-contents").attr('max-id', link)
if (more) {
$("#his-fav-list-contents").append(template)
} else {
$("#his-fav-list-contents").html(template)
}
jQuery("time.timeago").timeago()
}
}
} else { } else {
var req = { i: at } var req = { i: at }
if (more) { if (more) {
@ -339,20 +438,20 @@ function showFav(more, acct_id) {
} }
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) {
if (localStorage.getItem("mode_" + domain) != "misskey") { if (localStorage.getItem("mode_" + domain) != "misskey") {
var templete = parse(json, "", acct_id, "user") var templete = parse(json, "", acct_id, "user")
} else { } else {
@ -413,20 +512,20 @@ function showMut(more, acct_id) {
} }
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) {
if (!json[0]) { if (!json[0]) {
templete = lang.lang_details_nodata + "<br>" templete = lang.lang_details_nodata + "<br>"
} }
@ -466,20 +565,20 @@ function showBlo(more, 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[0]) { if (!json[0]) {
templete = lang.lang_details_nodata + "<br>" templete = lang.lang_details_nodata + "<br>"
} }
@ -535,20 +634,20 @@ function showReq(more, acct_id) {
} }
} }
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) {
if (localStorage.getItem("mode_" + domain) != "misskey") { if (localStorage.getItem("mode_" + domain) != "misskey") {
var templete = userparse(json, "request", acct_id) var templete = userparse(json, "request", acct_id)
} else { } else {
@ -595,25 +694,25 @@ function showDom(more, acct_id) {
} }
//body: JSON.stringify({}) //body: JSON.stringify({})
}) })
.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 templete = "" var templete = ""
if (!json[0]) { if (!json[0]) {
templete = lang.lang_details_nodata + "<br>" templete = lang.lang_details_nodata + "<br>"
} }
Object.keys(json).forEach(function(key) { Object.keys(json).forEach(function (key) {
var domain = json[key] var domain = json[key]
templete = templete + domain + '<i class="material-icons gray pointer" onclick="domainblock(\'' + domain + "','DELETE')\">cancel</i>" + '<div class="divider"></div>' templete = templete + domain + '<i class="material-icons gray pointer" onclick="domainblock(\'' + domain + "','DELETE')\">cancel</i>" + '<div class="divider"></div>'
}) })
@ -652,19 +751,19 @@ function showFrl(more, 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) {
$("#his-follow-recom-contents").html(lang.lang_details_nodata + "(" + lang.lang_hisdata_frcreq + ")<br>") $("#his-follow-recom-contents").html(lang.lang_details_nodata + "(" + lang.lang_hisdata_frcreq + ")<br>")
console.error(error) console.error(error)
}) })
.then(function(json) { .then(function (json) {
if (!json[0]) { if (!json[0]) {
console.warn("No suggestions(recommend) data") console.warn("No suggestions(recommend) data")
templete = lang.lang_details_nodata + "(" + lang.lang_hisdata_frcwarn + ")<br>" templete = lang.lang_details_nodata + "(" + lang.lang_hisdata_frcwarn + ")<br>"
@ -693,20 +792,20 @@ function udAdd(acct_id, id, start) {
} }
//body: JSON.stringify({}) //body: JSON.stringify({})
}) })
.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 fields = json var fields = json
for (var i = 0; i < fields.length; i++) { for (var i = 0; i < fields.length; i++) {
var html = '<a href="' + fields[i].proof_url + '" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].provider)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].provider) + ":" + escapeHTML(fields[i].provider_username) + "</a>" var html = '<a href="' + fields[i].proof_url + '" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="' + lang.lang_hisdata_key.replace("{{set}}", escapeHTML(fields[i].provider)) + '"><i class="fas fa-key" aria-hidden="true"></i>' + escapeHTML(fields[i].provider) + ":" + escapeHTML(fields[i].provider_username) + "</a>"
@ -719,20 +818,20 @@ function udAdd(acct_id, id, start) {
Accept: "application/json" Accept: "application/json"
} }
}) })
.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.user.public_view) { if (json.user.public_view) {
var html = '<a href="' + json.user.url + '" target="_blank" class="cbadge purple waves-effect" style="max-width:200px;" title="Notestock">Notestock</a>' var html = '<a href="' + json.user.url + '" target="_blank" class="cbadge purple waves-effect" style="max-width:200px;" title="Notestock">Notestock</a>'
$("#his-proof-prof").append(html) $("#his-proof-prof").append(html)