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

Fix: instance actor

Browse Source
This commit is contained in:
Cutls 2019-09-01 00:02:34 +09:00
parent 7d02ef2b3e
commit 6e2e488565
4 changed files with 123 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/js/post/suggest.js
View File

@ -162,9 +162,12 @@ input.addEventListener("focus", function () {
Object.keys(json.accounts).forEach(function (key3) { Object.keys(json.accounts).forEach(function (key3) {
var acct = json.accounts[key3]; var acct = json.accounts[key3];
if (acct.acct != q) { if (acct.acct != q) {
//Instance Actorって…
if (acct.username.indexOf(".") < 0) {
accts = accts + '<a onclick="tagInsert(\'@' + acct.acct + accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>'; '\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
} }
}
}); });
$("#right-side").show() $("#right-side").show()
$("#right-side").css("width", "200px") $("#right-side").css("width", "200px")

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

@ -930,6 +930,8 @@ function userparse(obj, auth, acct_id, tlid, popup) {
} else { } else {
var notf = false; var notf = false;
} }
//Instance Actorって…
if (toot.username.indexOf(".") < 0) {
if (toot.locked) { if (toot.locked) {
var locked = ' <i class="fas fa-lock red-text"></i>'; var locked = ' <i class="fas fa-lock red-text"></i>';
} else { } else {
@ -1021,10 +1023,10 @@ function userparse(obj, auth, acct_id, tlid, popup) {
acct_id + ');" user="' + toot.acct + '" class="udg">' acct_id + ');" user="' + toot.acct + '" class="udg">'
} }
var latest = date(toot.last_status_at, "relative"); var latest = date(toot.last_status_at, "relative");
if(toot.last_status_at){ if (toot.last_status_at) {
var latesthtml = '<div class="cbadge" style="width:100px;">Last: ' + latest + var latesthtml = '<div class="cbadge" style="width:100px;">Last: ' + latest +
'</div>' '</div>'
}else{ } else {
var latesthtml = "" var latesthtml = ""
} }
templete = templete + templete = templete +
@ -1047,7 +1049,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
'</div>' + '</div>' +
'</div>'; '</div>';
} }
}
}); });
return templete; return templete;

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

@ -75,7 +75,6 @@ function src(mode, offset) {
//アカウント //アカウント
if (json.accounts[0]) { if (json.accounts[0]) {
var templete = userparse(json.accounts, '', acct_id); var templete = userparse(json.accounts, '', acct_id);
console.log(templete)
if(!offset){ if(!offset){
$("#src-contents").append("<br>Accounts<div id=\"src-accts\">" + templete + '</div><a onclick="src(false,\'more\')" class="pointer">more...</a>'); $("#src-contents").append("<br>Accounts<div id=\"src-accts\">" + templete + '</div><a onclick="src(false,\'more\')" class="pointer">more...</a>');
}else{ }else{

4
app/view/make/make.js
View File

@ -19,6 +19,10 @@ const pages = ["acct.html", "index.html", "setting.html", "update.html", "settin
let langstr = "" let langstr = ""
for (let n = 0; n < langs.length; n++) { for (let n = 0; n < langs.length; n++) {
let lang = langs[n] let lang = langs[n]
let targetDir = '../' + lang
if (!fs.existsSync(targetDir)) {
fs.mkdirSync(targetDir);
}
langstr = langstr + '<a onclick="changelang(\'' + lang + '\')" class="pointer" style="margin-right:5px;">' + langsh[n] + '</a>' langstr = langstr + '<a onclick="changelang(\'' + lang + '\')" class="pointer" style="margin-right:5px;">' + langsh[n] + '</a>'
} }
for (let i = 0; i < samples.length; i++) { for (let i = 0; i < samples.length; i++) {