diff options
| author | Corey Hulen <corey@hulen.com> | 2015-12-04 11:30:50 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-12-04 11:30:50 -0800 |
| commit | 1bee1e06e4d0110db274c076860fa97f76471ddb (patch) | |
| tree | 8f971b54319ae90246ad13905851df545bbb7b89 /web/react/stores | |
| parent | 1d67f26664f8cf98f52433ef8b081b6fb485eadb (diff) | |
| parent | 14d1ec5191867174837e15f616ad3fc1dc8e0dae (diff) | |
| download | chat-1bee1e06e4d0110db274c076860fa97f76471ddb.tar.gz chat-1bee1e06e4d0110db274c076860fa97f76471ddb.tar.bz2 chat-1bee1e06e4d0110db274c076860fa97f76471ddb.zip | |
Merge pull request #1613 from florianorben/PLT-1326
PLT-1326: Enable channel posts of type join or leave not trigger unread notifications
Diffstat (limited to 'web/react/stores')
| -rw-r--r-- | web/react/stores/socket_store.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx index 2e0769cc4..29aa32a08 100644 --- a/web/react/stores/socket_store.jsx +++ b/web/react/stores/socket_store.jsx @@ -163,7 +163,7 @@ function handleNewPostEvent(msg) { } // Send desktop notification - if (UserStore.getCurrentId() !== msg.user_id || post.props.from_webhook === 'true') { + if ((UserStore.getCurrentId() !== msg.user_id || post.props.from_webhook === 'true') && !Utils.isSystemMessage(post)) { const msgProps = msg.props; let mentions = []; |