summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Wang <R-Wang97@users.noreply.github.com>2017-03-17 08:19:10 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-03-17 08:19:10 -0400
commit6f87438cbb0eca34e1104bcda41ea40477a23bd1 (patch)
treee62ae0ac61885f297d789e532711970540c815ef
parent9298315ce925afeb7824980e337633e3787643cd (diff)
downloadchat-6f87438cbb0eca34e1104bcda41ea40477a23bd1.tar.gz
chat-6f87438cbb0eca34e1104bcda41ea40477a23bd1.tar.bz2
chat-6f87438cbb0eca34e1104bcda41ea40477a23bd1.zip
'Other words' for mentions no longer includes '@username' (#5746)
-rw-r--r--webapp/components/user_settings/user_settings_notifications.jsx3
1 files changed, 3 insertions, 0 deletions
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(',');