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

Fix: if account is null #102

Browse Source
This commit is contained in:
Cutls 2019-07-25 23:55:25 +09:00
parent b12c18aa08
commit 30aee556f1
1 changed files with 111 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -491,7 +491,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
if (urlCont) { if (urlCont) {
urlindv = urlindv.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&") urlindv = urlindv.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&")
var encoded = encodeURI(urlCont[4]) var encoded = encodeURI(urlCont[4])
var punycoded = "xn--"+punycode.encode(urlCont[2]) var punycoded = "xn--" + punycode.encode(urlCont[2])
var eUrl = urlCont[1] + "://" + punycoded + "." + urlCont[3] + "/" + encoded var eUrl = urlCont[1] + "://" + punycoded + "." + urlCont[3] + "/" + encoded
var regExp = new RegExp('href="' + urlindv + '"', "g") var regExp = new RegExp('href="' + urlindv + '"', "g")
console.log(eUrl, regExp) console.log(eUrl, regExp)
@ -915,6 +915,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
var datetype = localStorage.getItem("datetype"); var datetype = localStorage.getItem("datetype");
Object.keys(obj).forEach(function (key) { Object.keys(obj).forEach(function (key) {
var toot = obj[key]; var toot = obj[key];
if (toot) {
console.log(["Parsing", toot]) console.log(["Parsing", toot])
if (!toot.username) { if (!toot.username) {
var raw = toot; var raw = toot;
@ -1028,6 +1029,8 @@ function userparse(obj, auth, acct_id, tlid, popup) {
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>'; '</div>';
}
}); });
return templete; return templete;