summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-04-28 10:10:58 -0400
committerChristopher Speller <crspeller@gmail.com>2017-04-28 10:10:58 -0400
commit1b82d98cdbb4e02d7de36c842efd858daaa69406 (patch)
tree02c8a0565e4687984dc088d950fb62ed4a0cb085 /webapp
parenta8cf08d6ef2fc0e08592e1466abaf3e3c9c35953 (diff)
downloadchat-1b82d98cdbb4e02d7de36c842efd858daaa69406.tar.gz
chat-1b82d98cdbb4e02d7de36c842efd858daaa69406.tar.bz2
chat-1b82d98cdbb4e02d7de36c842efd858daaa69406.zip
Add config setting to disable statuses (#6254)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/actions/websocket_actions.jsx8
1 files changed, 2 insertions, 6 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 9ed17c21d..57f78f95f 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -229,9 +229,7 @@ function handleNewPostEvent(msg) {
posts[post.id] = post;
loadProfilesForPosts(posts);
- if (UserStore.getStatus(post.user_id) !== UserStatuses.ONLINE) {
- StatusActions.loadStatusesByIds([post.user_id]);
- }
+ UserStore.setStatus(post.user_id, UserStatuses.ONLINE);
}
function handlePostEditEvent(msg) {
@@ -375,9 +373,7 @@ function handlePreferencesDeletedEvent(msg) {
function handleUserTypingEvent(msg) {
GlobalActions.emitRemoteUserTypingEvent(msg.broadcast.channel_id, msg.data.user_id, msg.data.parent_id);
- if (UserStore.getStatus(msg.data.user_id) !== UserStatuses.ONLINE) {
- StatusActions.loadStatusesByIds([msg.data.user_id]);
- }
+ UserStore.setStatus(msg.data.user_id, UserStatuses.ONLINE);
}
function handleStatusChangedEvent(msg) {