summaryrefslogtreecommitdiffstats
path: root/webapp/components/suggestion
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-06-04 11:21:50 -0700
committerJoram Wilander <jwawilander@gmail.com>2016-06-04 14:21:50 -0400
commitf3825ba766625806e0776a17146ca5fff372612e (patch)
treef108503fe620907022130d447dc81746f8465a09 /webapp/components/suggestion
parent6f0a7e4b137e193e6cfaac6aa90f0c91ec6b139c (diff)
downloadchat-f3825ba766625806e0776a17146ca5fff372612e.tar.gz
chat-f3825ba766625806e0776a17146ca5fff372612e.tar.bz2
chat-f3825ba766625806e0776a17146ca5fff372612e.zip
PLT-2994 Added @all (#3233)
* Added @all * Uncomment @all server side
Diffstat (limited to 'webapp/components/suggestion')
-rw-r--r--webapp/components/suggestion/at_mention_provider.jsx11
1 files changed, 9 insertions, 2 deletions
diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx
index 2e297a175..aec1252ea 100644
--- a/webapp/components/suggestion/at_mention_provider.jsx
+++ b/webapp/components/suggestion/at_mention_provider.jsx
@@ -4,6 +4,7 @@
import React from 'react';
import SuggestionStore from 'stores/suggestion_store.jsx';
+import ChannelStore from 'stores/channel_store.jsx';
import UserStore from 'stores/user_store.jsx';
import * as Utils from 'utils/utils.jsx';
import Client from 'utils/web_client.jsx';
@@ -25,7 +26,10 @@ class AtMentionSuggestion extends Suggestion {
description = (
<FormattedMessage
id='suggestion.mention.all'
- defaultMessage='Notifies everyone in the team'
+ defaultMessage='Notifies everyone in the channel, use in {townsquare} to notify the whole team'
+ values={{
+ townsquare: ChannelStore.getByName('town-square').display_name
+ }}
/>
);
icon = <i className='mention__image fa fa-users fa-2x'/>;
@@ -97,10 +101,13 @@ export default class AtMentionProvider {
}
if (!pretext.startsWith('/msg')) {
- // add dummy users to represent the @channel special mention when not using the /msg command
+ // add dummy users to represent the @channel and @all special mentions when not using the /msg command
if ('channel'.startsWith(usernamePrefix)) {
filtered.push({username: 'channel'});
}
+ if ('all'.startsWith(usernamePrefix)) {
+ filtered.push({username: 'all'});
+ }
}
filtered = filtered.sort((a, b) => a.username.localeCompare(b.username));