Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-11-04 15:57:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split message mentions up into different parts

Browse Source
This commit is contained in:
Jeremy Zhang
2017-11-06 02:57:46 +00:00
parent b45270c7e2
commit 6a2a3d1f34
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webapp/titanembeds/static/js/embed.js
View File

@@ -688,9 +688,11 @@
if (mention.nickname) { if (mention.nickname) {
username = mention.nickname; username = mention.nickname;
} }
message.content = message.content.replace(new RegExp("<@" + mention.id + ">", 'g'), "@" + username + "#" + mention.discriminator); console.log(message.content)
message.content = message.content.replace(new RegExp("<@!" + mention.id + ">", 'g'), "@" + username + "#" + mention.discriminator); var templ = "<span class=\"mention\">@<span class=\"username\">" + username + "</span><span class=\"discriminator\">#" + mention.discriminator + "</span></span>";
message.content = message.content.replace("<@&" + guild_id + ">", "@everyone"); message.content = message.content.replace(new RegExp("&lt;@" + mention.id + "&gt;", 'g'), templ);
message.content = message.content.replace(new RegExp("&lt;@!" + mention.id + "&gt;", 'g'), templ);
message.content = message.content.replace("&lt;@&" + guild_id + "&gt;", "@everyone");
} }
return message; return message;
} }
@@ -901,12 +903,12 @@
} else { } else {
var avatar = global_guest_icon; var avatar = global_guest_icon;
} }
message = replace_message_mentions(message);
message = format_bot_message(message); message = format_bot_message(message);
message = parse_message_time(message); message = parse_message_time(message);
message.content = message.content.replaceAll("\\<", "<"); message.content = message.content.replaceAll("\\<", "<");
message.content = message.content.replaceAll("\\>", ">"); message.content = message.content.replaceAll("\\>", ">");
message.content = escapeHtml(message.content); message.content = escapeHtml(message.content);
message = replace_message_mentions(message);
message = parse_message_attachments(message); message = parse_message_attachments(message);
message.content = parse_message_markdown(message.content); message.content = parse_message_markdown(message.content);
message = parse_channels_in_message(message); message = parse_channels_in_message(message);