diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-02-25 22:58:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-25 22:58:57 +0800 |
| commit | 80f900ebae5c52f736f667a81bbc1ab815344efc (patch) | |
| tree | a3542478952b99a49a579eccaf1ef782bc143583 /models/user.go | |
| parent | 19b3c45ca7bddd43e41d169ef80e680c3c3bc798 (diff) | |
| download | gitea-80f900ebae5c52f736f667a81bbc1ab815344efc.tar.gz gitea-80f900ebae5c52f736f667a81bbc1ab815344efc.zip | |
Fix avatar enumable (#1049)
* fix avatar enumable
* fix import style
Diffstat (limited to 'models/user.go')
| -rw-r--r-- | models/user.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/models/user.go b/models/user.go index 4b019d8d32..e03506c312 100644 --- a/models/user.go +++ b/models/user.go @@ -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) } |