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

Simple mention highlighting

Browse Source
This commit is contained in:
Jeremy Zhang 2017-04-12 06:15:05 -07:00
parent 8fe63dee0f
commit f6b3062ecd
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
titanembeds/blueprints/api/api.py
View File

@ -80,6 +80,7 @@ def update_user_status(guild_id, username, user_key=None):
'avatar': session["avatar"], 'avatar': session["avatar"],
'manage_embed': check_user_can_administrate_guild(guild_id), 'manage_embed': check_user_can_administrate_guild(guild_id),
'username': username, 'username': username,
'discriminator': session['discriminator'],
'guild_id': guild_id, 'guild_id': guild_id,
'user_id': session['user_id'], 'user_id': session['user_id'],
'banned': checkUserBanned(guild_id), 'banned': checkUserBanned(guild_id),

18
titanembeds/static/js/embed.js
View File

@ -240,6 +240,7 @@ function replace_message_mentions(message) {
var mention = mentions[i]; var mention = mentions[i];
message.content = message.content.replace(new RegExp("<@" + mention.id + ">", 'g'), "@" + mention.username + "#" + mention.discriminator); message.content = message.content.replace(new RegExp("<@" + mention.id + ">", 'g'), "@" + mention.username + "#" + mention.discriminator);
message.content = message.content.replace(new RegExp("<@!" + mention.id + ">", 'g'), "@" + mention.username + "#" + mention.discriminator); message.content = message.content.replace(new RegExp("<@!" + mention.id + ">", 'g'), "@" + mention.username + "#" + mention.discriminator);
message.content = message.content.replace("<@&" + guild_id + ">", "@everyone");
} }
return message; return message;
} }
@ -277,6 +278,16 @@ function parse_message_attachments(message) {
return message; return message;
} }
function handle_last_message_mention() {
var lastmsg = $("#chatcontent p:last-child");
var content = lastmsg.text().toLowerCase();
var username_discrim = $("#currentusername").text().toLowerCase();
if (content.includes("@everyone") || content.includes("@" + username_discrim)) {
lastmsg.css( "color", "#ff5252" );
lastmsg.css( "font-weight", "bold" );
}
}
function fill_discord_messages(messages, jumpscroll) { function fill_discord_messages(messages, jumpscroll) {
if (messages.length == 0) { if (messages.length == 0) {
return last_message_id; return last_message_id;
@ -293,6 +304,7 @@ function fill_discord_messages(messages, jumpscroll) {
var rendered = Mustache.render(template, {"id": message.id, "full_timestamp": message.formatted_timestamp, "time": message.formatted_time, "username": message.author.username, "discriminator": message.author.discriminator, "content": message.content}); var rendered = Mustache.render(template, {"id": message.id, "full_timestamp": message.formatted_timestamp, "time": message.formatted_time, "username": message.author.username, "discriminator": message.author.discriminator, "content": message.content});
$("#chatcontent").append(rendered); $("#chatcontent").append(rendered);
last = message.id; last = message.id;
handle_last_message_mention();
} }
$("html, body").animate({ scrollTop: $(document).height() }, "slow"); $("html, body").animate({ scrollTop: $(document).height() }, "slow");
$('#chatcontent').linkify({ $('#chatcontent').linkify({
@ -315,7 +327,7 @@ function run_fetch_routine() {
} }
fet.done(function(data) { fet.done(function(data) {
var status = data.status; var status = data.status;
update_embed_userchip(status.authenticated, status.avatar, status.username, status.user_id); update_embed_userchip(status.authenticated, status.avatar, status.username, status.user_id, status.discriminator);
last_message_id = fill_discord_messages(data.messages, jumpscroll); last_message_id = fill_discord_messages(data.messages, jumpscroll);
if (status.manage_embed) { if (status.manage_embed) {
$("#administrate_link").show(); $("#administrate_link").show();
@ -347,11 +359,11 @@ function run_fetch_routine() {
}); });
} }
function update_embed_userchip(authenticated, avatar, username, userid) { function update_embed_userchip(authenticated, avatar, username, userid, discrim=null) {
if (authenticated) { if (authenticated) {
$("#currentuserimage").show(); $("#currentuserimage").show();
$("#currentuserimage").attr("src", avatar); $("#currentuserimage").attr("src", avatar);
$("#currentusername").text(username); $("#currentusername").text(username + "#" + discrim);
} else { } else {
$("#currentuserimage").hide(); $("#currentuserimage").hide();
$("#currentusername").text(username + "#" + userid); $("#currentusername").text(username + "#" + userid);