diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-07-21 10:00:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-21 10:00:09 -0400 |
commit | bfa04c0ab0eca5d812ad64e5f51e95ec458cf0d3 (patch) | |
tree | 6a51f8d4d144a181192499f5fd60ef82700e9abb /webapp/components/suggestion/at_mention_provider.jsx | |
parent | f0e9ec2dd127ffe34472c617f978173a8bf60b7c (diff) | |
download | chat-bfa04c0ab0eca5d812ad64e5f51e95ec458cf0d3.tar.gz chat-bfa04c0ab0eca5d812ad64e5f51e95ec458cf0d3.tar.bz2 chat-bfa04c0ab0eca5d812ad64e5f51e95ec458cf0d3.zip |
PLT-2408 Adds here mention for online users (#3619)
* Added @here mention that notifies online users
* Fixed existing race condition that would sometime cause clients to miss mention count changes
* Added missing localization strings
* Prevent @here from mentioning the user who posted it
Diffstat (limited to 'webapp/components/suggestion/at_mention_provider.jsx')
-rw-r--r-- | webapp/components/suggestion/at_mention_provider.jsx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx index b33662420..b9127e8d3 100644 --- a/webapp/components/suggestion/at_mention_provider.jsx +++ b/webapp/components/suggestion/at_mention_provider.jsx @@ -43,6 +43,15 @@ class AtMentionSuggestion extends Suggestion { /> ); icon = <i className='mention__image fa fa-users fa-2x'/>; + } else if (user.username === 'here') { + username = 'here'; + description = ( + <FormattedMessage + id='suggestion.mention.here' + defaultMessage='Notifies everyone in the channel and online' + /> + ); + icon = <i className='mention__image fa fa-users fa-2x'/>; } else { username = user.username; @@ -126,6 +135,9 @@ export default class AtMentionProvider { if ('all'.startsWith(prefix)) { filtered.push({username: 'all'}); } + if ('here'.startsWith(prefix)) { + filtered.push({username: 'here'}); + } } filtered.sort((a, b) => { |