Fix guest icon not showing if webhooks are turned off

This commit is contained in:
Jeremy Zhang 2017-09-24 04:35:51 +00:00
parent 3cb5697680
commit 86a2a5fe66

View File

@ -374,6 +374,7 @@
} }
function prepare_guild(guildobj) { function prepare_guild(guildobj) {
global_guest_icon = guildobj.guest_icon;
emoji_store = guildobj.emojis; emoji_store = guildobj.emojis;
fill_channels(guildobj.channels); fill_channels(guildobj.channels);
fill_discord_members(guildobj.discordmembers); fill_discord_members(guildobj.discordmembers);
@ -828,6 +829,7 @@
Mustache.parse(template); Mustache.parse(template);
for (var i = messages.length-1; i >= 0; i--) { for (var i = messages.length-1; i >= 0; i--) {
var message = messages[i]; var message = messages[i];
var avatar = generate_avatar_url(message.author.id, message.author.avatar, message.content);
message = replace_message_mentions(message); 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);
@ -842,7 +844,6 @@
if (message.author.nickname) { if (message.author.nickname) {
username = message.author.nickname; username = message.author.nickname;
} }
var avatar = generate_avatar_url(message.author.id, message.author.avatar, message.content);
var rendered = Mustache.render(template, {"id": message.id, "full_timestamp": message.formatted_timestamp, "time": message.formatted_time, "username": username, "discriminator": message.author.discriminator, "avatar": avatar, "content": nl2br(message.content)}); var rendered = Mustache.render(template, {"id": message.id, "full_timestamp": message.formatted_timestamp, "time": message.formatted_time, "username": username, "discriminator": message.author.discriminator, "avatar": avatar, "content": nl2br(message.content)});
if (replace == null) { if (replace == null) {
$("#chatcontent").append(rendered); $("#chatcontent").append(rendered);