public/gitea
1
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-26 06:16:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

refactor(api): load assignees list correctly (#39917)

Browse Source 
Correctly handle empty names, upper&lower cases, duplicate names.

Fixes https://github.com/go-gitea/gitea/issues/39916

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Shivansh Gargandwxiaoguang authored and GitHub committed 2026-10-21 16:15:43 +00:00
1 parent 33610142c3
commit 0948aed411
7 files changed
+98 -104
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

models/user/user.go
+19 -6
View File
@@ -1180,6 +1180,15 @@ func GetMailableUsersByIDs(ctx context.Context, ids []int64, isMention bool) ([]
}
func getDoerUserIDsByNames(ctx context.Context, names []string, allowSystemDoer bool) ([]int64, error) {
users, err := getDoerUsersByNames(ctx, names, allowSystemDoer)
ids := make([]int64, 0, len(users))
for _, u := range users {
ids = append(ids, u.ID)
}
return ids, err
}
func getDoerUsersByNames(ctx context.Context, names []string, allowSystemDoer bool) ([]*User, error) {
namesLower := make([]string, 0, len(names))
namesMap := make(map[string]*User, len(names))
for _, name := range names {
@@ -1193,16 +1202,16 @@ func getDoerUserIDsByNames(ctx context.Context, names []string, allowSystemDoer
}
}
var users []*User
err := db.GetEngine(ctx).In("lower_name", namesLower).Where("`type` IN (?,?)", UserTypeIndividual, UserTypeBot).Find(&users)
var dbUsers []*User
err := db.GetEngine(ctx).In("lower_name", namesLower).Where("`type` IN (?,?)", UserTypeIndividual, UserTypeBot).Find(&dbUsers)
if err != nil {
return nil, err
}
for _, user := range users {
for _, user := range dbUsers {
namesMap[user.LowerName] = user
}
ids := make([]int64, 0, len(names))
users := make([]*User, 0, len(names))
var errFinal error
for _, nameLower := range namesLower {
u := namesMap[nameLower]
@@ -1210,9 +1219,13 @@ func getDoerUserIDsByNames(ctx context.Context, names []string, allowSystemDoer
errFinal = ErrUserNotExist{Name: nameLower}
continue
}
ids = append(ids, u.ID)
users = append(users, u)
}
return ids, errFinal
return users, errFinal
}
func GetDoerUsersByNames(ctx context.Context, names []string) ([]*User, error) {
return getDoerUsersByNames(ctx, names, false)
}
func GetDoerUserIDsByNamesWithSystem(ctx context.Context, names []string) ([]int64, error) {