diff options
Diffstat (limited to 'api/channel.go')
| -rw-r--r-- | api/channel.go | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/api/channel.go b/api/channel.go index 3e4398e72..97b604699 100644 --- a/api/channel.go +++ b/api/channel.go @@ -846,14 +846,21 @@ func setLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { Srv.Store.Channel().SetLastViewedAt(id, c.Session.UserId, newLastViewedAt) - preference := model.Preference{ + chanPref := model.Preference{ UserId: c.Session.UserId, - Category: model.PREFERENCE_CATEGORY_LAST, + Category: c.TeamId, Name: model.PREFERENCE_NAME_LAST_CHANNEL, Value: id, } - Srv.Store.Preference().Save(&model.Preferences{preference}) + teamPref := model.Preference{ + UserId: c.Session.UserId, + Category: model.PREFERENCE_CATEGORY_LAST, + Name: model.PREFERENCE_NAME_LAST_TEAM, + Value: c.TeamId, + } + + Srv.Store.Preference().Save(&model.Preferences{teamPref, chanPref}) message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, c.TeamId, "", c.Session.UserId, nil) message.Add("channel_id", id) @@ -901,14 +908,21 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { go clearPushNotification(c.Session.UserId, id) } - preference := model.Preference{ + chanPref := model.Preference{ UserId: c.Session.UserId, - Category: model.PREFERENCE_CATEGORY_LAST, + Category: c.TeamId, Name: model.PREFERENCE_NAME_LAST_CHANNEL, Value: id, } - Srv.Store.Preference().Save(&model.Preferences{preference}) + teamPref := model.Preference{ + UserId: c.Session.UserId, + Category: model.PREFERENCE_CATEGORY_LAST, + Name: model.PREFERENCE_NAME_LAST_TEAM, + Value: c.TeamId, + } + + Srv.Store.Preference().Save(&model.Preferences{teamPref, chanPref}) message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, c.TeamId, "", c.Session.UserId, nil) message.Add("channel_id", id) |