summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-09 23:22:03 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-09 23:22:03 -0400
commit704b6766b21ef75cbec123ff73bb8872777056ff (patch)
tree86264569e2466075c242b5ddd8866a044a2481ff /web/react/components
parent763618ef3613d0af6baea0e1d49abb6641979841 (diff)
parent3371f146f89ef13fcb083b484dd30e9a12f361f9 (diff)
downloadchat-704b6766b21ef75cbec123ff73bb8872777056ff.tar.gz
chat-704b6766b21ef75cbec123ff73bb8872777056ff.tar.bz2
chat-704b6766b21ef75cbec123ff73bb8872777056ff.zip
Merge pull request #155 from nickago/MM-1296
MM-1296 Server now notifies users they have been added to a new channel
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/sidebar.jsx4
1 files changed, 4 insertions, 0 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 0e4d38fe0..2095978e8 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -263,6 +263,10 @@ var SidebarLoggedIn = React.createClass({
if (ChannelStore.getCurrentId() != msg.channel_id) {
AsyncClient.getChannels(true);
}
+ } else if (msg.action == "user_added") {
+ if (UserStore.getCurrentId() === msg.user_id) {
+ AsyncClient.getChannels(true);
+ }
}
},
updateTitle: function() {