diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-10-15 10:44:04 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-10-16 11:48:55 -0400 |
| commit | 2b5ec4a3c076bb1f18eeafbd96b0a80c6b8bfbaa (patch) | |
| tree | e08561de76eb4939636d00317f8f5120b0db77e2 /api/channel.go | |
| parent | 3c593af598b2bb986244099ed1b9a46ed3837911 (diff) | |
| download | chat-2b5ec4a3c076bb1f18eeafbd96b0a80c6b8bfbaa.tar.gz chat-2b5ec4a3c076bb1f18eeafbd96b0a80c6b8bfbaa.tar.bz2 chat-2b5ec4a3c076bb1f18eeafbd96b0a80c6b8bfbaa.zip | |
Small refactor of websocket code on client and server
Diffstat (limited to 'api/channel.go')
| -rw-r--r-- | api/channel.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/api/channel.go b/api/channel.go index adf125378..70f7eba4b 100644 --- a/api/channel.go +++ b/api/channel.go @@ -568,7 +568,7 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { Srv.Store.Channel().UpdateLastViewedAt(id, c.Session.UserId) - message := model.NewMessage(c.Session.TeamId, id, c.Session.UserId, model.ACTION_VIEWED) + message := model.NewMessage(c.Session.TeamId, id, c.Session.UserId, model.ACTION_CHANNEL_VIEWED) message.Add("channel_id", id) PublishAndForget(message) @@ -777,9 +777,8 @@ func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel UpdateChannelAccessCacheAndForget(channel.TeamId, userIdToRemove, channel.Id) - message := model.NewMessage(channel.TeamId, "", userIdToRemove, model.ACTION_USER_REMOVED) - message.Add("channel_id", channel.Id) - message.Add("remover", removerUserId) + message := model.NewMessage(channel.TeamId, channel.Id, userIdToRemove, model.ACTION_USER_REMOVED) + message.Add("remover_id", removerUserId) PublishAndForget(message) return nil |