summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-05-10 09:49:02 -0400
committerGitHub <noreply@github.com>2017-05-10 09:49:02 -0400
commit74b51d1f27b7c78048ad0a92747260d77a1131d1 (patch)
tree7e720e8cee82df95e6967b617f8d95cab1adc447 /webapp
parent0ae68865138458f2f8fd36bbbba07728c88609d7 (diff)
downloadchat-74b51d1f27b7c78048ad0a92747260d77a1131d1.tar.gz
chat-74b51d1f27b7c78048ad0a92747260d77a1131d1.tar.bz2
chat-74b51d1f27b7c78048ad0a92747260d77a1131d1.zip
Do not client predict status for current user (#6380)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/actions/websocket_actions.jsx8
1 files changed, 6 insertions, 2 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index f85c32479..b7a0b12a8 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -238,7 +238,9 @@ function handleNewPostEvent(msg) {
posts[post.id] = post;
loadProfilesForPosts(posts);
- UserStore.setStatus(post.user_id, UserStatuses.ONLINE);
+ if (post.user_id !== UserStore.getCurrentId()) {
+ UserStore.setStatus(post.user_id, UserStatuses.ONLINE);
+ }
}
function handlePostEditEvent(msg) {
@@ -400,7 +402,9 @@ function handlePreferencesDeletedEvent(msg) {
function handleUserTypingEvent(msg) {
GlobalActions.emitRemoteUserTypingEvent(msg.broadcast.channel_id, msg.data.user_id, msg.data.parent_id);
- UserStore.setStatus(msg.data.user_id, UserStatuses.ONLINE);
+ if (msg.data.user_id !== UserStore.getCurrentId()) {
+ UserStore.setStatus(msg.data.user_id, UserStatuses.ONLINE);
+ }
}
function handleStatusChangedEvent(msg) {