From 44000b58d911af980a604ca977898760b4a35861 Mon Sep 17 00:00:00 2001 From: nickago Date: Thu, 9 Jul 2015 12:05:04 -0700 Subject: [PATCH 1/3] Server now notifies users they have been added to a new channel --- api/channel.go | 4 ++++ model/message.go | 1 + web/react/components/sidebar.jsx | 3 +++ 3 files changed, 8 insertions(+) diff --git a/api/channel.go b/api/channel.go index 8264b3e745..88db27def1 100644 --- a/api/channel.go +++ b/api/channel.go @@ -655,6 +655,10 @@ func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("name=" + channel.Name + " user_id=" + userId) + message := model.NewMessage(c.Session.TeamId, "", userId, model.ACTION_USER_ADDED) + + store.PublishAndForget(message) + <-Srv.Store.Channel().UpdateLastViewedAt(id, oUser.Id) w.Write([]byte(cm.ToJson())) } diff --git a/model/message.go b/model/message.go index 47f598af80..b22f470d77 100644 --- a/model/message.go +++ b/model/message.go @@ -15,6 +15,7 @@ const ( ACTION_POST_DELETED = "post_deleted" ACTION_VIEWED = "viewed" ACTION_NEW_USER = "new_user" + ACTION_USER_ADDED = "user_added" ) type Message struct { diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 0e4d38fe06..8b1a25dc9d 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -263,6 +263,9 @@ 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() { From b1e2eccaf2b73194776c4c74a33e24022e6dd1e8 Mon Sep 17 00:00:00 2001 From: nickago Date: Thu, 9 Jul 2015 12:17:16 -0700 Subject: [PATCH 2/3] Added curly brace --- web/react/components/sidebar.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 8b1a25dc9d..2095978e87 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -264,8 +264,9 @@ var SidebarLoggedIn = React.createClass({ AsyncClient.getChannels(true); } } else if (msg.action == "user_added") { - if (UserStore.getCurrentId() === msg.user_id) + if (UserStore.getCurrentId() === msg.user_id) { AsyncClient.getChannels(true); + } } }, updateTitle: function() { From 3371f146f89ef13fcb083b484dd30e9a12f361f9 Mon Sep 17 00:00:00 2001 From: nickago Date: Thu, 9 Jul 2015 12:18:43 -0700 Subject: [PATCH 3/3] Minor formatting change --- model/message.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/message.go b/model/message.go index b22f470d77..52ee69e8f9 100644 --- a/model/message.go +++ b/model/message.go @@ -15,7 +15,7 @@ const ( ACTION_POST_DELETED = "post_deleted" ACTION_VIEWED = "viewed" ACTION_NEW_USER = "new_user" - ACTION_USER_ADDED = "user_added" + ACTION_USER_ADDED = "user_added" ) type Message struct {