diff options
| -rw-r--r-- | webapp/components/sidebar_right_menu.jsx | 9 |
1 files changed, 5 insertions, 4 deletions
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(' '); } |