Skip to content

Commit ed23695

Browse files
committed
fix(queries.GetProfile): set reward in profile response to anonymous user to -1
1 parent 439a5c1 commit ed23695

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed

pkg/queries/user.go

+25-12
Original file line numberDiff line numberDiff line change
@@ -375,20 +375,33 @@ func GetProfile(db *gorm.DB, queriedUserID uint, queryingUserID uint) (models.Pr
375375
if user.Avatar != "" {
376376
avatar = fmt.Sprintf("https://%s/%s/avatar/%s", database.GetEndpoint(), database.MinioConf.Bucket, user.Avatar)
377377
}
378-
if user.IsAnonymous && queryingUserID != queriedUserID {
379-
return models.ProfileResponse{ID: user.ID, NickName: user.NickName, Avatar: avatar, IsAnonymous: user.IsAnonymous, IsAdmin: user.IsAdmin, IsCommunityAdmin: user.IsCommunityAdmin}, nil
378+
r := models.ProfileResponse{
379+
ID: user.ID,
380+
NickName: user.NickName,
381+
Avatar: avatar,
382+
IsAnonymous: user.IsAnonymous,
383+
IsAdmin: user.IsAdmin,
384+
IsCommunityAdmin: user.IsCommunityAdmin,
385+
}
386+
387+
if !user.IsAnonymous || queryingUserID == queriedUserID {
388+
r.Email = user.Email
389+
r.Year = user.Year
390+
r.Grade = user.Grade
391+
r.RealName = user.RealName
392+
}
393+
394+
if displayInvitationCode {
395+
r.InvitationCode = user.InvitationCode
396+
}
397+
398+
if displayReward {
399+
r.Reward = user.Reward
380400
} else {
381-
r := models.ProfileResponse{ID: user.ID, Email: user.Email, Year: user.Year, Grade: user.Grade, NickName: user.NickName, RealName: user.RealName, IsAnonymous: user.IsAnonymous, Avatar: avatar, IsAdmin: user.IsAdmin, IsCommunityAdmin: user.IsCommunityAdmin}
382-
if displayInvitationCode {
383-
r.InvitationCode = user.InvitationCode
384-
}
385-
if displayReward {
386-
r.Reward = user.Reward
387-
} else {
388-
r.Reward = -1
389-
}
390-
return r, nil
401+
r.Reward = -1
391402
}
403+
404+
return r, nil
392405
}
393406

394407
func CheckYear(year int) bool {

0 commit comments

Comments
 (0)