Skip to content

Commit 01bf8da

Browse files
authored
Fix bug when get commit (#33602)
Fix #33595
1 parent 57997f1 commit 01bf8da

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

models/user/user.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,20 +1187,24 @@ func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, e
11871187
for _, email := range emailAddresses {
11881188
userIDs.Add(email.UID)
11891189
}
1190-
users, err := GetUsersByIDs(ctx, userIDs.Values())
1190+
users, err := GetUsersMapByIDs(ctx, userIDs.Values())
11911191
if err != nil {
11921192
return nil, err
11931193
}
11941194

11951195
results := make(map[string]*User, len(emails))
1196-
for _, user := range users {
1197-
if user.KeepEmailPrivate {
1198-
results[user.LowerName+"@"+setting.Service.NoReplyAddress] = user
1199-
} else {
1200-
results[user.Email] = user
1196+
for _, email := range emailAddresses {
1197+
user := users[email.UID]
1198+
if user != nil {
1199+
if user.KeepEmailPrivate {
1200+
results[user.LowerName+"@"+setting.Service.NoReplyAddress] = user
1201+
} else {
1202+
results[email.Email] = user
1203+
}
12011204
}
12021205
}
1203-
users = make([]*User, 0, len(needCheckUserNames))
1206+
1207+
users = make(map[int64]*User, len(needCheckUserNames))
12041208
if err := db.GetEngine(ctx).In("lower_name", needCheckUserNames.Values()).Find(&users); err != nil {
12051209
return nil, err
12061210
}

0 commit comments

Comments
 (0)