diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-02-04 14:50:30 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-02-04 14:50:30 -0500 |
commit | ec51c31c325b3dc648a261f0e8634b6d70d7ba73 (patch) | |
tree | 1369b8d2bc406d54770d7ccf52b1e6a8bfedfc05 /web/react/stores/socket_store.jsx | |
parent | 44c19ee443831e0e94b5738ecb21a64ce7643247 (diff) | |
parent | 21318b7505babaebbb5174c62b75595b2936ebe0 (diff) | |
download | chat-ec51c31c325b3dc648a261f0e8634b6d70d7ba73.tar.gz chat-ec51c31c325b3dc648a261f0e8634b6d70d7ba73.tar.bz2 chat-ec51c31c325b3dc648a261f0e8634b6d70d7ba73.zip |
Merge pull request #2064 from hmhealey/plt882
PLT-882 Ephemeral Messages and Out-Of-Channel mentions
Diffstat (limited to 'web/react/stores/socket_store.jsx')
-rw-r--r-- | web/react/stores/socket_store.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx index 744c2c8e5..33604f44b 100644 --- a/web/react/stores/socket_store.jsx +++ b/web/react/stores/socket_store.jsx @@ -109,6 +109,7 @@ class SocketStoreClass extends EventEmitter { handleMessage(msg) { switch (msg.action) { case SocketEvents.POSTED: + case SocketEvents.EPHEMERAL_MESSAGE: handleNewPostEvent(msg, this.translations); break; @@ -179,7 +180,6 @@ function handleNewPostEvent(msg, translations) { mentions = JSON.parse(msg.props.mentions); } - const channelType = msgProps.channel_type; const channel = ChannelStore.get(msg.channel_id); const user = UserStore.getCurrentUser(); const member = ChannelStore.getMember(msg.channel_id); @@ -191,7 +191,7 @@ function handleNewPostEvent(msg, translations) { if (notifyLevel === 'none') { return; - } else if (notifyLevel === 'mention' && mentions.indexOf(user.id) === -1 && channelType !== Constants.DM_CHANNEL) { + } else if (notifyLevel === 'mention' && mentions.indexOf(user.id) === -1 && channel.type !== Constants.DM_CHANNEL) { return; } |