diff options
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/suggestion/at_mention_provider.jsx | 12 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 1 | ||||
| -rw-r--r-- | webapp/utils/constants.jsx | 2 | ||||
| -rw-r--r-- | webapp/utils/text_formatting.jsx | 1 |
4 files changed, 15 insertions, 1 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) => { diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index aee906818..ab7406d45 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1410,6 +1410,7 @@ "sso_signup.team_error": "Please enter a team name", "suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team", "suggestion.mention.channel": "Notifies everyone in the channel", + "suggestion.mention.here": "Notifies everyone in the channel and online", "suggestion.search.private": "Private Groups", "suggestion.search.public": "Public Channels", "team_export_tab.download": "download", 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(); |