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/utils | |
| 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/utils')
| -rw-r--r-- | webapp/utils/constants.jsx | 2 | ||||
| -rw-r--r-- | webapp/utils/text_formatting.jsx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index f0b3f30c9..207ec5811 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -217,7 +217,7 @@ export const Constants = { ONLINE: 'online' }, - SPECIAL_MENTIONS: ['all', 'channel'], + SPECIAL_MENTIONS: ['all', 'channel', 'here'], CHARACTER_LIMIT: 4000, IMAGE_TYPES: ['jpg', 'gif', 'bmp', 'png', 'jpeg'], AUDIO_TYPES: ['mp3', 'wav', 'wma', 'm4a', 'flac', 'aac', 'ogg'], diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx index 5ada7727f..b304fa75a 100644 --- a/webapp/utils/text_formatting.jsx +++ b/webapp/utils/text_formatting.jsx @@ -207,6 +207,7 @@ function highlightCurrentMentions(text, tokens) { let output = text; const mentionKeys = UserStore.getCurrentMentionKeys(); + mentionKeys.push('@here'); // look for any existing tokens which are self mentions and should be highlighted var newTokens = new Map(); |