From 29ff36cd2a6ce75fe11ee510ac3e71ecdd74a8df Mon Sep 17 00:00:00 2001 From: Harshit Bansal Date: Fri, 23 Jun 2017 21:28:16 +0000 Subject: [PATCH] reactions: Don't send add/remove requests for deactivated realm emojis. Eventually, we'll want to support unreacting to deactivated realm emoji, but for now the issues around name conflicts mean we can't really support that. --- static/js/reactions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/static/js/reactions.js b/static/js/reactions.js index 679e85f110..212d3b7d2b 100644 --- a/static/js/reactions.js +++ b/static/js/reactions.js @@ -4,7 +4,7 @@ var exports = {}; exports.view = {}; // function namespace function send_reaction_ajax(message_id, emoji_name, operation) { - if (!emoji.emojis_by_name[emoji_name] && !emoji.realm_emojis[emoji_name]) { + if (!emoji.emojis_by_name[emoji_name] && !emoji.active_realm_emojis[emoji_name]) { // Emoji doesn't exist return; } @@ -192,9 +192,9 @@ exports.view.insert_new_reaction = function (opts) { var new_title = generate_title(emoji_name, user_list); - if (emoji.realm_emojis[emoji_name]) { + if (emoji.active_realm_emojis[emoji_name]) { context.is_realm_emoji = true; - context.url = emoji.realm_emojis[emoji_name].emoji_url; + context.url = emoji.active_realm_emojis[emoji_name].emoji_url; } context.count = 1;