diff options
author | Alan Mooiman <amooiman@gmail.com> | 2016-03-24 22:42:03 -0400 |
---|---|---|
committer | Alan Mooiman <amooiman@gmail.com> | 2016-03-24 23:45:15 -0400 |
commit | ad902f601fa7570564df386bf1b03179b55242b5 (patch) | |
tree | 8904076d6ebbae1c93b53c899b9c06b4520774d8 /webapp/components/suggestion/at_mention_provider.jsx | |
parent | 8f5b90fe7858de03ac055b38ab7aaec5f54fa107 (diff) | |
download | chat-ad902f601fa7570564df386bf1b03179b55242b5.tar.gz chat-ad902f601fa7570564df386bf1b03179b55242b5.tar.bz2 chat-ad902f601fa7570564df386bf1b03179b55242b5.zip |
msg command
Diffstat (limited to 'webapp/components/suggestion/at_mention_provider.jsx')
-rw-r--r-- | webapp/components/suggestion/at_mention_provider.jsx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx index b423528c3..90ec6e660 100644 --- a/webapp/components/suggestion/at_mention_provider.jsx +++ b/webapp/components/suggestion/at_mention_provider.jsx @@ -100,13 +100,16 @@ export default class AtMentionProvider { } } - // add dummy users to represent the @all and @channel special mentions - if ('all'.startsWith(usernamePrefix)) { - filtered.push({username: 'all'}); - } + //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'}); + } - if ('channel'.startsWith(usernamePrefix)) { - filtered.push({username: 'channel'}); + if ('channel'.startsWith(usernamePrefix)) { + filtered.push({username: 'channel'}); + } } filtered = filtered.sort((a, b) => a.username.localeCompare(b.username)); |