diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-02-22 09:16:17 -0500 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-02-22 09:16:17 -0500 |
| commit | d1f1109e592d5538254b8ec3da3e9c283d03f411 (patch) | |
| tree | c57398b7edbe0b887243edfdb4a1b3cf16a7a46b | |
| parent | 69cac604e09c139845d2f63ac95fb702fb5a9fe1 (diff) | |
| download | chat-d1f1109e592d5538254b8ec3da3e9c283d03f411.tar.gz chat-d1f1109e592d5538254b8ec3da3e9c283d03f411.tar.bz2 chat-d1f1109e592d5538254b8ec3da3e9c283d03f411.zip | |
Fix unreads appearing after some system messages posted (#5491)
| -rw-r--r-- | webapp/stores/channel_store.jsx | 3 | ||||
| -rw-r--r-- | webapp/utils/constants.jsx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx index 6a012c600..0228345bc 100644 --- a/webapp/stores/channel_store.jsx +++ b/webapp/stores/channel_store.jsx @@ -11,7 +11,6 @@ var Utils; import {ActionTypes, Constants} from 'utils/constants.jsx'; import {isSystemMessage} from 'utils/post_utils.jsx'; const NotificationPrefs = Constants.NotificationPrefs; -const PostTypes = Constants.PostTypes; const CHANGE_EVENT = 'change'; const STATS_EVENT = 'stats'; @@ -507,7 +506,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => { break; case ActionTypes.RECEIVED_POST: - if (action.post.type === PostTypes.JOIN_LEAVE || action.post.type === PostTypes.JOIN_CHANNEL || action.post.type === PostTypes.LEAVE_CHANNEL) { + if (Constants.IGNORE_POST_TYPES.indexOf(action.post.type) !== -1) { return; } diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index de720b837..6ad4a9e92 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -234,6 +234,7 @@ export const PostTypes = { LEAVE_CHANNEL: 'system_leave_channel', ADD_TO_CHANNEL: 'system_add_to_channel', REMOVE_FROM_CHANNEL: 'system_remove_from_channel', + ADD_REMOVE: 'system_add_remove', HEADER_CHANGE: 'system_header_change', DISPLAYNAME_CHANGE: 'system_displayname_change', PURPOSE_CHANGE: 'system_purpose_change', @@ -250,6 +251,7 @@ export const Constants = { UserSearchOptions, TutorialSteps, PostTypes, + IGNORE_POST_TYPES: [PostTypes.JOIN_LEAVE, PostTypes.JOIN_CHANNEL, PostTypes.LEAVE_CHANNEL, PostTypes.REMOVE_FROM_CHANNEL, PostTypes.ADD_TO_CHANNEL, PostTypes.ADD_REMOVE], PayloadSources: keyMirror({ SERVER_ACTION: null, |