From b2a0fb066bb7ebcececd4a77d2af084a0700aa48 Mon Sep 17 00:00:00 2001
From: shieldsjared <shieldsjared@gmail.com>
Date: Mon, 22 Aug 2016 13:11:37 -0400
Subject: PLT-3941 Updated the RHS menu logic for recent mentions to match the
 channel header, such that (at)all and (at)channel is removed from the search
 if the user has this included in their notification settings (#3842)

---
 webapp/components/sidebar_right_menu.jsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'webapp/components/sidebar_right_menu.jsx')

diff --git a/webapp/components/sidebar_right_menu.jsx b/webapp/components/sidebar_right_menu.jsx
index 09a9be51b..1cab0748f 100644
--- a/webapp/components/sidebar_right_menu.jsx
+++ b/webapp/components/sidebar_right_menu.jsx
@@ -90,13 +90,14 @@ export default class SidebarRightMenu extends React.Component {
         if (user.notify_props && user.notify_props.mention_keys) {
             const termKeys = UserStore.getMentionKeys(user.id);
 
-            if (user.notify_props.all === 'true' && termKeys.indexOf('@all') !== -1) {
-                termKeys.splice(termKeys.indexOf('@all'), 1);
+            if (termKeys.indexOf('@channel') !== -1) {
+                termKeys[termKeys.indexOf('@channel')] = '';
             }
 
-            if (user.notify_props.channel === 'true' && termKeys.indexOf('@channel') !== -1) {
-                termKeys.splice(termKeys.indexOf('@channel'), 1);
+            if (termKeys.indexOf('@all') !== -1) {
+                termKeys[termKeys.indexOf('@all')] = '';
             }
+
             terms = termKeys.join(' ');
         }
 
-- 
cgit v1.2.3-1-g7c22

