From 6f87438cbb0eca34e1104bcda41ea40477a23bd1 Mon Sep 17 00:00:00 2001
From: Ryan Wang <R-Wang97@users.noreply.github.com>
Date: Fri, 17 Mar 2017 08:19:10 -0400
Subject: 'Other words' for mentions no longer includes '@username' (#5746)

---
 webapp/components/user_settings/user_settings_notifications.jsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'webapp')

diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx
index cfbe3cbf3..ebd43e5af 100644
--- a/webapp/components/user_settings/user_settings_notifications.jsx
+++ b/webapp/components/user_settings/user_settings_notifications.jsx
@@ -64,6 +64,9 @@ function getNotificationsStateFromStores() {
             } else {
                 usernameKey = true;
                 keys.splice(keys.indexOf(user.username), 1);
+                if (keys.indexOf(`@${user.username}`) !== -1) {
+                    keys.splice(keys.indexOf(`@${user.username}`), 1);
+                }
             }
 
             customKeys = keys.join(',');
-- 
cgit v1.2.3-1-g7c22