diff options
Diffstat (limited to 'models/db/name.go')
| -rw-r--r-- | models/db/name.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/models/db/name.go b/models/db/name.go index 5f98edbb28..48c7fdbce5 100644 --- a/models/db/name.go +++ b/models/db/name.go @@ -5,14 +5,13 @@ package db import ( "fmt" + "slices" "strings" "unicode/utf8" "code.gitea.io/gitea/modules/util" ) -var ErrNameEmpty = util.SilentWrap{Message: "name is empty", Err: util.ErrInvalidArgument} - // ErrNameReserved represents a "reserved name" error. type ErrNameReserved struct { Name string @@ -79,13 +78,11 @@ func (err ErrNameCharsNotAllowed) Unwrap() error { func IsUsableName(reservedNames, reservedPatterns []string, name string) error { name = strings.TrimSpace(strings.ToLower(name)) if utf8.RuneCountInString(name) == 0 { - return ErrNameEmpty + return util.NewInvalidArgumentErrorf("name is empty") } - for i := range reservedNames { - if name == reservedNames[i] { - return ErrNameReserved{name} - } + if slices.Contains(reservedNames, name) { + return ErrNameReserved{name} } for _, pat := range reservedPatterns { |