From e96b3ffc5a7b356dc41efbc1d298cebc40f554cc Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Sat, 16 Dec 2017 16:40:43 -0500 Subject: [PATCH] refactor: Remove flags parm in set_message_booleans. In all cases the value of `flags` we were passing in was actually `message.flags` (although it was slightly obscured in one place), so now we just pass in `message`. (We also move a tiny bit of defensive code to set `flags` into `set_message_booleans`.) --- static/js/echo.js | 2 +- static/js/message_events.js | 2 +- static/js/message_store.js | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/static/js/echo.js b/static/js/echo.js index d0dc175445..61aefce1a9 100644 --- a/static/js/echo.js +++ b/static/js/echo.js @@ -231,7 +231,7 @@ exports.process_from_server = function process_from_server(messages) { // Update our flags based on what the server gave us. client_message.flags = message.flags; - message_store.set_message_booleans(client_message, client_message.flags); + message_store.set_message_booleans(client_message); // We don't try to highlight alert words locally, so we have to // do it now. (Note that we will indeed highlight alert words in diff --git a/static/js/message_events.js b/static/js/message_events.js index ea6817d2b6..a3b54a1830 100644 --- a/static/js/message_events.js +++ b/static/js/message_events.js @@ -126,7 +126,7 @@ exports.update_messages = function update_messages(events) { msgs_to_rerender.push(msg); msg.flags = event.flags; - message_store.set_message_booleans(msg, event.flags); + message_store.set_message_booleans(msg); condense.un_cache_message_content_height(msg.id); diff --git a/static/js/message_store.js b/static/js/message_store.js index ff775943db..969b84dc83 100644 --- a/static/js/message_store.js +++ b/static/js/message_store.js @@ -90,7 +90,10 @@ exports.insert_recent_private_message = (function () { }; }()); -exports.set_message_booleans = function (message, flags) { +exports.set_message_booleans = function (message) { + message.flags = message.flags || []; + var flags = message.flags; + function convert_flag(flag_name) { return flags.indexOf(flag_name) >= 0; } @@ -118,9 +121,7 @@ exports.add_message_metadata = function (message) { message.sent_by_me = people.is_current_user(message.sender_email); - message.flags = message.flags || []; - - exports.set_message_booleans(message, message.flags); + exports.set_message_booleans(message); people.extract_people_from_message(message); people.maybe_incr_recipient_count(message);