diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
commit | 7f3bfdbe0c2442714bb5a14adfdeac1576123601 (patch) | |
tree | 44962a914b86cf66a1da49300f12986db49f010e /api/user.go | |
parent | 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f (diff) | |
parent | c7c644874e98db0ae83c5a44ec50ff811d9b3f46 (diff) | |
download | chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.gz chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.bz2 chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.zip |
Fixing merge
Diffstat (limited to 'api/user.go')
-rw-r--r-- | api/user.go | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/api/user.go b/api/user.go index 348475e38..5be703bfb 100644 --- a/api/user.go +++ b/api/user.go @@ -172,9 +172,6 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User { } user.MakeNonNil() - if len(user.Props["theme"]) == 0 { - user.AddProp("theme", utils.Cfg.TeamSettings.DefaultThemeColor) - } if result := <-Srv.Store.User().Save(user); result.Err != nil { c.Err = result.Err @@ -663,7 +660,7 @@ func createProfileImage(username string, userId string) ([]byte, *model.AppError initial := string(strings.ToUpper(username)[0]) - fontBytes, err := ioutil.ReadFile(utils.FindDir("web/static/fonts") + utils.Cfg.ImageSettings.InitialFont) + fontBytes, err := ioutil.ReadFile(utils.FindDir("web/static/fonts") + utils.Cfg.FileSettings.InitialFont) if err != nil { return nil, model.NewAppError("createProfileImage", "Could not create default profile image font", err.Error()) } @@ -672,8 +669,8 @@ func createProfileImage(username string, userId string) ([]byte, *model.AppError return nil, model.NewAppError("createProfileImage", "Could not create default profile image font", err.Error()) } - width := int(utils.Cfg.ImageSettings.ProfileWidth) - height := int(utils.Cfg.ImageSettings.ProfileHeight) + width := int(utils.Cfg.FileSettings.ProfileWidth) + height := int(utils.Cfg.FileSettings.ProfileHeight) color := colors[int64(seed)%int64(len(colors))] dstImg := image.NewRGBA(image.Rect(0, 0, width, height)) srcImg := image.White @@ -712,7 +709,7 @@ func getProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { } else { var img []byte - if len(utils.Cfg.ImageSettings.DriverName) == 0 { + if len(utils.Cfg.FileSettings.DriverName) == 0 { var err *model.AppError if img, err = createProfileImage(result.Data.(*model.User).Username, id); err != nil { c.Err = err @@ -749,7 +746,7 @@ func getProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { } func uploadProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { - if len(utils.Cfg.ImageSettings.DriverName) == 0 { + if len(utils.Cfg.FileSettings.DriverName) == 0 { c.Err = model.NewAppError("uploadProfileImage", "Unable to upload file. Image storage is not configured.", "") c.Err.StatusCode = http.StatusNotImplemented return @@ -792,7 +789,7 @@ func uploadProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { } // Scale profile image - img = resize.Resize(utils.Cfg.ImageSettings.ProfileWidth, utils.Cfg.ImageSettings.ProfileHeight, img, resize.Lanczos3) + img = resize.Resize(utils.Cfg.FileSettings.ProfileWidth, utils.Cfg.FileSettings.ProfileHeight, img, resize.Lanczos3) buf := new(bytes.Buffer) err = png.Encode(buf, img) |