diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-31 09:39:31 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-31 10:39:31 -0400 |
commit | ce2b2be5de578bd9eb44b26e04db75ca61d67ca5 (patch) | |
tree | 54203a18ecfb167dcf1d7e0742cea0ed9aab220a /api4/user.go | |
parent | b446d0aa0aa2bd3d87028b0543752eb539507481 (diff) | |
download | chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.gz chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.bz2 chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.zip |
Refactoring cfg refs and load / save functions (#7749)
* refactoring cfg refs and load / save functions
* improve error output
Diffstat (limited to 'api4/user.go')
-rw-r--r-- | api4/user.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api4/user.go b/api4/user.go index 8d5c792d6..2f8e72ad9 100644 --- a/api4/user.go +++ b/api4/user.go @@ -122,7 +122,7 @@ func getUser(c *Context, w http.ResponseWriter, r *http.Request) { if c.Session.UserId == user.Id { user.Sanitize(map[string]bool{}) } else { - app.SanitizeProfile(user, c.IsSystemAdmin()) + c.App.SanitizeProfile(user, c.IsSystemAdmin()) } c.App.UpdateLastActivityAtIfNeeded(c.Session) w.Header().Set(model.HEADER_ETAG_SERVER, etag) @@ -152,7 +152,7 @@ func getUserByUsername(c *Context, w http.ResponseWriter, r *http.Request) { if c.HandleEtag(etag, "Get User", w, r) { return } else { - app.SanitizeProfile(user, c.IsSystemAdmin()) + c.App.SanitizeProfile(user, c.IsSystemAdmin()) w.Header().Set(model.HEADER_ETAG_SERVER, etag) w.Write([]byte(user.ToJson())) return @@ -180,7 +180,7 @@ func getUserByEmail(c *Context, w http.ResponseWriter, r *http.Request) { if c.HandleEtag(etag, "Get User", w, r) { return } else { - app.SanitizeProfile(user, c.IsSystemAdmin()) + c.App.SanitizeProfile(user, c.IsSystemAdmin()) w.Header().Set(model.HEADER_ETAG_SERVER, etag) w.Write([]byte(user.ToJson())) return @@ -208,7 +208,7 @@ func getProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { } var img []byte - img, readFailed, err := app.GetProfileImage(user) + img, readFailed, err := c.App.GetProfileImage(user) if err != nil { c.Err = err return |