diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-09-02 12:50:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 12:50:15 -0400 |
| commit | f32eb525f3fa0828a23f589d765c267e3b2aea86 (patch) | |
| tree | d4b76aecf89143029af080b3e1b4d87398e0adc5 /webapp/actions | |
| parent | eb0111f6bbe2b0bf160a674dfe1b4d089f905cb9 (diff) | |
| download | chat-f32eb525f3fa0828a23f589d765c267e3b2aea86.tar.gz chat-f32eb525f3fa0828a23f589d765c267e3b2aea86.tar.bz2 chat-f32eb525f3fa0828a23f589d765c267e3b2aea86.zip | |
Do not send push notifications for channels being actively viewed (#3931)
Diffstat (limited to 'webapp/actions')
| -rw-r--r-- | webapp/actions/post_actions.jsx | 2 | ||||
| -rw-r--r-- | webapp/actions/websocket_actions.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/actions/post_actions.jsx b/webapp/actions/post_actions.jsx index 9e0f90377..896a9030d 100644 --- a/webapp/actions/post_actions.jsx +++ b/webapp/actions/post_actions.jsx @@ -19,7 +19,7 @@ const Preferences = Constants.Preferences; export function handleNewPost(post, msg) { if (ChannelStore.getCurrentId() === post.channel_id) { if (window.isActive) { - AsyncClient.updateLastViewedAt(); + AsyncClient.updateLastViewedAt(null, false); } else { AsyncClient.getChannel(post.channel_id); } diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index 1c4ef9c16..28faf4733 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -174,7 +174,7 @@ function handlePostEditEvent(msg) { // Update channel state if (ChannelStore.getCurrentId() === msg.channel_id) { if (window.isActive) { - AsyncClient.updateLastViewedAt(); + AsyncClient.updateLastViewedAt(null, false); } } } |