diff options
Diffstat (limited to 'api/deprecated.go')
| -rw-r--r-- | api/deprecated.go | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/api/deprecated.go b/api/deprecated.go index 4865ab5e0..bbaafdf15 100644 --- a/api/deprecated.go +++ b/api/deprecated.go @@ -8,6 +8,7 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/gorilla/mux" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" ) @@ -35,7 +36,7 @@ func getMoreChannels(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Channel().GetMoreChannels(c.TeamId, c.Session.UserId, 0, 100000); result.Err != nil { + if result := <-app.Srv.Store.Channel().GetMoreChannels(c.TeamId, c.Session.UserId, 0, 100000); result.Err != nil { c.Err = result.Err return } else if HandleEtag(result.Data.(*model.ChannelList).Etag(), "Get More Channels (deprecated)", w, r) { @@ -61,7 +62,7 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { doClearPush := false if *utils.Cfg.EmailSettings.SendPushNotifications && !c.Session.IsMobileApp() && active { - if result := <-Srv.Store.User().GetUnreadCountForChannel(c.Session.UserId, id); result.Err != nil { + if result := <-app.Srv.Store.User().GetUnreadCountForChannel(c.Session.UserId, id); result.Err != nil { l4g.Error(utils.T("api.channel.update_last_viewed_at.get_unread_count_for_channel.error"), c.Session.UserId, id, result.Err.Error()) } else { if result.Data.(int64) > 0 { @@ -76,11 +77,11 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { } }() - Srv.Store.Channel().UpdateLastViewedAt([]string{id}, c.Session.UserId) + app.Srv.Store.Channel().UpdateLastViewedAt([]string{id}, c.Session.UserId) // Must be after update so that unread count is correct if doClearPush { - go clearPushNotification(c.Session.UserId, id) + go app.ClearPushNotification(c.Session.UserId, id) } chanPref := model.Preference{ @@ -97,12 +98,12 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { Value: c.TeamId, } - Srv.Store.Preference().Save(&model.Preferences{teamPref, chanPref}) + app.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) - go Publish(message) + go app.Publish(message) result := make(map[string]string) result["id"] = id @@ -116,7 +117,7 @@ func setLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { data := model.StringInterfaceFromJson(r.Body) newLastViewedAt := int64(data["last_viewed_at"].(float64)) - Srv.Store.Channel().SetLastViewedAt(id, c.Session.UserId, newLastViewedAt) + app.Srv.Store.Channel().SetLastViewedAt(id, c.Session.UserId, newLastViewedAt) chanPref := model.Preference{ UserId: c.Session.UserId, @@ -132,12 +133,12 @@ func setLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { Value: c.TeamId, } - Srv.Store.Preference().Save(&model.Preferences{teamPref, chanPref}) + app.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) - go Publish(message) + go app.Publish(message) result := make(map[string]string) result["id"] = id |