malhuda/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-02-20 11:43:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix bug when get commit (#33602)

Browse Source 
Fix #33595
This commit is contained in:
Lunny Xiao 2025-02-15 15:16:19 -08:00 committed by GitHub
parent 57997f1518
commit 01bf8da02e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
models/user/user.go
View File

@ -1187,20 +1187,24 @@ func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, e
for _, email := range emailAddresses { for _, email := range emailAddresses {
userIDs.Add(email.UID) userIDs.Add(email.UID)
} }
users, err := GetUsersByIDs(ctx, userIDs.Values()) users, err := GetUsersMapByIDs(ctx, userIDs.Values())
if err != nil { if err != nil {
return nil, err return nil, err
} }
results := make(map[string]*User, len(emails)) results := make(map[string]*User, len(emails))
for _, user := range users { for _, email := range emailAddresses {
if user.KeepEmailPrivate { user := users[email.UID]
results[user.LowerName+"@"+setting.Service.NoReplyAddress] = user if user != nil {
} else { if user.KeepEmailPrivate {
results[user.Email] = user results[user.LowerName+"@"+setting.Service.NoReplyAddress] = user
} else {
results[email.Email] = user
}
} }
} }
users = make([]*User, 0, len(needCheckUserNames))
users = make(map[int64]*User, len(needCheckUserNames))
if err := db.GetEngine(ctx).In("lower_name", needCheckUserNames.Values()).Find(&users); err != nil { if err := db.GetEngine(ctx).In("lower_name", needCheckUserNames.Values()).Find(&users); err != nil {
return nil, err return nil, err
} }