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

When unknown media, show after last"."

Browse Source
This commit is contained in:
Cutls 2019-09-17 00:23:41 +09:00
parent 8fbd8070f2
commit f891b30f9f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -596,7 +596,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
' toot-img pointer" style="max-width:100%;" loop="true"></a></span>'; ' toot-img pointer" style="max-width:100%;" loop="true"></a></span>';
} else { } else {
if (media.type == "unknown") { if (media.type == "unknown") {
viewer = viewer + '<a href="' + media.remote_url + '" title="' + media.remote_url + '">[' + lang.lang_parse_unknown + ']</a> ' var mty = media.remote_url.match(/.+(\..+)$/)[1]
viewer = viewer + '<a href="' + media.remote_url + '" title="' + media.remote_url + '">[' + lang.lang_parse_unknown + '( ' + mty + ' )]</a> '
} else if (media.type == "audio") { } else if (media.type == "audio") {
viewer = viewer + '<audio src="' + viewer = viewer + '<audio src="' +
url + '" class="pointer" style="width:100%;" controls></span>'; url + '" class="pointer" style="width:100%;" controls></span>';
@ -623,8 +624,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var to_mention = []; var to_mention = [];
Object.keys(toot.mentions).forEach(function (key3) { Object.keys(toot.mentions).forEach(function (key3) {
var mention = toot.mentions[key3]; var mention = toot.mentions[key3];
mentions = mentions + '<a onclick="udg(\'' + mention.id + '\',' +
acct_id + ')" class="pointer">@' + mention.acct + '</a> ';
//自分は除外 //自分は除外
//自インスタンスかどうかを確認し、IDの一致 //自インスタンスかどうかを確認し、IDの一致
if (mention.acct == mention.username && mention.id == localStorage.getItem("user-id_" + acct_id)) { if (mention.acct == mention.username && mention.id == localStorage.getItem("user-id_" + acct_id)) {
@ -632,6 +631,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} else { } else {
//そのトゥの人NG //そのトゥの人NG
if (toot.account.acct != mention.acct) { if (toot.account.acct != mention.acct) {
mentions = mentions + '<a onclick="udg(\'' + mention.id + '\',' +
acct_id + ')" class="pointer">@' + mention.acct + '</a> ';
to_mention.push(mention.acct); to_mention.push(mention.acct);
} }
} }