diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-18 15:36:43 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-18 15:36:43 -0700 |
commit | 8e19ba029f889519d93cf272960dce858971106c (patch) | |
tree | d8f38ac62661fb8578e2b5c3c619fe31ab29f480 /app/status.go | |
parent | 34a87fa8f47b1447b73e3ae56866b654801b3eee (diff) | |
download | chat-8e19ba029f889519d93cf272960dce858971106c.tar.gz chat-8e19ba029f889519d93cf272960dce858971106c.tar.bz2 chat-8e19ba029f889519d93cf272960dce858971106c.zip |
Reduce utils.Cfg references (#7650)
* app.UpdateConfig method
* test fix
* another test fix
* the config override option as-was is just error prone, remove it for now
* derp
Diffstat (limited to 'app/status.go')
-rw-r--r-- | app/status.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/status.go b/app/status.go index 3d4837cb0..56bad2105 100644 --- a/app/status.go +++ b/app/status.go @@ -57,7 +57,7 @@ func GetAllStatuses() map[string]*model.Status { } func (a *App) GetStatusesByIds(userIds []string) (map[string]interface{}, *model.AppError) { - if !*utils.Cfg.ServiceSettings.EnableUserStatuses { + if !*a.Config().ServiceSettings.EnableUserStatuses { return map[string]interface{}{}, nil } @@ -104,7 +104,7 @@ func (a *App) GetStatusesByIds(userIds []string) (map[string]interface{}, *model //GetUserStatusesByIds used by apiV4 func (a *App) GetUserStatusesByIds(userIds []string) ([]*model.Status, *model.AppError) { - if !*utils.Cfg.ServiceSettings.EnableUserStatuses { + if !*a.Config().ServiceSettings.EnableUserStatuses { return []*model.Status{}, nil } @@ -161,7 +161,7 @@ func (a *App) GetUserStatusesByIds(userIds []string) ([]*model.Status, *model.Ap } func (a *App) SetStatusOnline(userId string, sessionId string, manual bool) { - if !*utils.Cfg.ServiceSettings.EnableUserStatuses { + if !*a.Config().ServiceSettings.EnableUserStatuses { return } @@ -227,7 +227,7 @@ func (a *App) BroadcastStatus(status *model.Status) { } func (a *App) SetStatusOffline(userId string, manual bool) { - if !*utils.Cfg.ServiceSettings.EnableUserStatuses { + if !*a.Config().ServiceSettings.EnableUserStatuses { return } @@ -253,7 +253,7 @@ func (a *App) SetStatusOffline(userId string, manual bool) { } func (a *App) SetStatusAwayIfNeeded(userId string, manual bool) { - if !*utils.Cfg.ServiceSettings.EnableUserStatuses { + if !*a.Config().ServiceSettings.EnableUserStatuses { return } @@ -307,7 +307,7 @@ func GetStatusFromCache(userId string) *model.Status { } func (a *App) GetStatus(userId string) (*model.Status, *model.AppError) { - if !*utils.Cfg.ServiceSettings.EnableUserStatuses { + if !*a.Config().ServiceSettings.EnableUserStatuses { return &model.Status{}, nil } |