summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-02 12:50:17 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-02 12:50:17 -0400
commit6f1489b7882db6d95a05e43294d0107435974eba (patch)
tree1ca6ab0b4231277b855c7791cfba8ad16f39fc5c /webapp
parent7e414c89b4c16e12b073a3bb441a5751f59be083 (diff)
downloadchat-6f1489b7882db6d95a05e43294d0107435974eba.tar.gz
chat-6f1489b7882db6d95a05e43294d0107435974eba.tar.bz2
chat-6f1489b7882db6d95a05e43294d0107435974eba.zip
Removed @all mention suggestion (#2845)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/suggestion/at_mention_provider.jsx7
1 files changed, 1 insertions, 6 deletions
diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx
index 79ac8aaf1..760f048bd 100644
--- a/webapp/components/suggestion/at_mention_provider.jsx
+++ b/webapp/components/suggestion/at_mention_provider.jsx
@@ -101,13 +101,8 @@ export default class AtMentionProvider {
}
}
- //Don't imply that @all and @channel can be direct messaged
if (!pretext.startsWith('/msg')) {
- // add dummy users to represent the @all and @channel special mentions
- if ('all'.startsWith(usernamePrefix)) {
- filtered.push({username: 'all'});
- }
-
+ // add dummy users to represent the @channel special mention when not using the /msg command
if ('channel'.startsWith(usernamePrefix)) {
filtered.push({username: 'channel'});
}