diff options
author | enahum <nahumhbl@gmail.com> | 2016-12-19 10:05:46 -0300 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-12-19 08:05:46 -0500 |
commit | 999d1553e1ce45adf58f6082b160bc1147dc592b (patch) | |
tree | 369a9b7f46dd44d136a79a050469429169433cec /api/channel.go | |
parent | 3ce2ce9dc882ed962dc3ce7550bdb07963f376b6 (diff) | |
download | chat-999d1553e1ce45adf58f6082b160bc1147dc592b.tar.gz chat-999d1553e1ce45adf58f6082b160bc1147dc592b.tar.bz2 chat-999d1553e1ce45adf58f6082b160bc1147dc592b.zip |
PLT-4167 Team Sidebar (#4569)
* PLT-4167 Team Sidebar
* Address feedback from PM
* change route from my_members to members
* bug fixes
* Updating styles for teams sidebar (#4681)
* Added PM changes
* Fix corner cases
* Addressing feedback
* use two different endpoints
* Bug fixes
* Rename model and client functions, using preferences to store last team and channel viewed
* Fix mobile notification count and closing the team sidebar
* unit test, fixed bad merge and retrieve from cached when available
* bug fixes
* use id for last channel in preferences, query optimization
* Updating multi team css (#4830)
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) |