Merge pull request #155 from nickago/MM-1296

MM-1296 Server now notifies users they have been added to a new channel

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()))
 		}

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 {

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() {