web/forgejo
10
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix avatar enumable (#1049)

Browse source 
* fix avatar enumable

* fix import style
This commit is contained in:
Lunny Xiao 2017-02-25 22:58:57 +08:00 • committed by GitHub
parent 19b3c45ca7
commit 80f900ebae
3 changed files with 73 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
models/user.go
View file

@ -7,6 +7,7 @@ package models
import (
"bytes"
"container/list"
"crypto/md5"
"crypto/sha256"
"crypto/subtle"
"encoding/hex"
@ -281,7 +282,7 @@ func (u *User) GenerateActivateCode() string {
// CustomAvatarPath returns user custom avatar file path.
func (u *User) CustomAvatarPath() string {
return filepath.Join(setting.AvatarUploadPath, com.ToStr(u.ID))
return filepath.Join(setting.AvatarUploadPath, u.Avatar)
}
// GenerateRandomAvatar generates a random avatar for user.
@ -326,7 +327,7 @@ func (u *User) RelAvatarLink() string {
if !com.IsExist(u.CustomAvatarPath()) {
return defaultImgURL
}
return setting.AppSubURL + "/avatars/" + com.ToStr(u.ID)
return setting.AppSubURL + "/avatars/" + u.Avatar
case setting.DisableGravatar, setting.OfflineMode:
if !com.IsExist(u.CustomAvatarPath()) {
if err := u.GenerateRandomAvatar(); err != nil {
@ -334,7 +335,7 @@ func (u *User) RelAvatarLink() string {
}
}
return setting.AppSubURL + "/avatars/" + com.ToStr(u.ID)
return setting.AppSubURL + "/avatars/" + u.Avatar
}
return base.AvatarLink(u.AvatarEmail)
}
@ -425,6 +426,7 @@ func (u *User) UploadAvatar(data []byte) error {
}
u.UseCustomAvatar = true
u.Avatar = fmt.Sprintf("%x", md5.Sum(data))
if err = updateUser(sess, u); err != nil {
return fmt.Errorf("updateUser: %v", err)
}