p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(gravatar): replace when set gravatar url

This commit is contained in:
LinkinStars 2023-05-25 17:00:03 +08:00
parent 3428b5fbc3
commit c7a7cc711e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/schema/user_schema.go
View File

@ -100,13 +100,15 @@ func (r *GetUserToSetShowResp) GetFromUserEntity(userInfo *entity.User) {
if ok { if ok {
r.Status = statusShow r.Status = statusShow
} }
avatarInfo := &AvatarInfo{} avatarInfo := &AvatarInfo{}
_ = json.Unmarshal([]byte(userInfo.Avatar), avatarInfo) _ = json.Unmarshal([]byte(userInfo.Avatar), avatarInfo)
if constant.DefaultAvatar == "gravatar" && avatarInfo.Type == "" { if len(avatarInfo.Type) == 0 && constant.DefaultAvatar == AvatarTypeGravatar {
avatarInfo.Type = "gravatar" avatarInfo.Type = AvatarTypeGravatar
avatarInfo.Gravatar = gravatar.GetAvatarURL(userInfo.EMail)
} else if avatarInfo.Type == AvatarTypeGravatar {
avatarInfo.Gravatar = gravatar.GetAvatarURL(userInfo.EMail) avatarInfo.Gravatar = gravatar.GetAvatarURL(userInfo.EMail)
} }
// if json.Unmarshal Error avatarInfo.Type is Empty
r.Avatar = avatarInfo r.Avatar = avatarInfo
} }
@ -118,7 +120,7 @@ const (
func FormatAvatarInfo(avatarJson, email string) (res string) { func FormatAvatarInfo(avatarJson, email string) (res string) {
defer func() { defer func() {
if constant.DefaultAvatar == "gravatar" && len(res) == 0 { if constant.DefaultAvatar == AvatarTypeGravatar && len(res) == 0 {
res = gravatar.GetAvatarURL(email) res = gravatar.GetAvatarURL(email)
} }
}() }()
@ -133,7 +135,7 @@ func FormatAvatarInfo(avatarJson, email string) (res string) {
} }
switch avatarInfo.Type { switch avatarInfo.Type {
case AvatarTypeGravatar: case AvatarTypeGravatar:
return avatarInfo.Gravatar return gravatar.GetAvatarURL(email)
case AvatarTypeCustom: case AvatarTypeCustom:
return avatarInfo.Custom return avatarInfo.Custom
default: default: