diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-19 10:25:51 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-19 10:25:51 -0700 |
| commit | 468f01dc895000211e62eb8a16feaa84ceb354ed (patch) | |
| tree | 4868b46316bb79cf5c127f5b0638f3383a7c971c /api/channel.go | |
| parent | a8f3f76c592928a0907fbaddd71ab6b8f68d28d6 (diff) | |
| parent | ea1b3129688dd76c80c7d41eec4f2eb60f9f0639 (diff) | |
| download | chat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.gz chat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.bz2 chat-468f01dc895000211e62eb8a16feaa84ceb354ed.zip | |
Merging from master
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 |