aboutsummaryrefslogtreecommitdiffstats
path: root/models/user
diff options
context:
space:
mode:
authorKN4CK3R <admin@oldschoolhack.me>2022-12-31 12:49:37 +0100
committerGitHub <noreply@github.com>2022-12-31 12:49:37 +0100
commit3fef47b41c98392865d13fd21bbcec34236daf4f (patch)
tree16808c6ea9ffd2cc0438d11831fd3a7503d15056 /models/user
parentdce8887494268c99ba5da8d5152b5d1cc03cfb83 (diff)
downloadgitea-3fef47b41c98392865d13fd21bbcec34236daf4f.tar.gz
gitea-3fef47b41c98392865d13fd21bbcec34236daf4f.zip
Use ErrInvalidArgument in packages (#22268)
Related to https://github.com/go-gitea/gitea/pull/22262#discussion_r1059010774 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'models/user')
-rw-r--r--models/user/email_address.go3
-rw-r--r--models/user/openid.go3
2 files changed, 2 insertions, 4 deletions
diff --git a/models/user/email_address.go b/models/user/email_address.go
index 69e94f8bb6..e310858f92 100644
--- a/models/user/email_address.go
+++ b/models/user/email_address.go
@@ -6,7 +6,6 @@ package user
import (
"context"
- "errors"
"fmt"
"net/mail"
"regexp"
@@ -22,7 +21,7 @@ import (
)
// ErrEmailNotActivated e-mail address has not been activated error
-var ErrEmailNotActivated = errors.New("e-mail address has not been activated")
+var ErrEmailNotActivated = util.NewInvalidArgumentErrorf("e-mail address has not been activated")
// ErrEmailCharIsNotSupported e-mail address contains unsupported character
type ErrEmailCharIsNotSupported struct {
diff --git a/models/user/openid.go b/models/user/openid.go
index 1946705048..596ff182bc 100644
--- a/models/user/openid.go
+++ b/models/user/openid.go
@@ -5,7 +5,6 @@ package user
import (
"context"
- "errors"
"fmt"
"code.gitea.io/gitea/models/db"
@@ -13,7 +12,7 @@ import (
)
// ErrOpenIDNotExist openid is not known
-var ErrOpenIDNotExist = errors.New("OpenID is unknown")
+var ErrOpenIDNotExist = util.NewNotExistErrorf("OpenID is unknown")
// UserOpenID is the list of all OpenID identities of a user.
// Since this is a middle table, name it OpenID is not suitable, so we ignore the lint here