Skip to content

Commit 155269f

Browse files
authored
Remove unused KeyID. (go-gitea#29167)
`KeyID` is never set.
1 parent d0183df commit 155269f

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

Diff for: models/organization/org.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -594,9 +594,7 @@ func GetOrgByID(ctx context.Context, id int64) (*Organization, error) {
594594
return nil, err
595595
} else if !has {
596596
return nil, user_model.ErrUserNotExist{
597-
UID: id,
598-
Name: "",
599-
KeyID: 0,
597+
UID: id,
600598
}
601599
}
602600
return u, nil

Diff for: models/user/email_address.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,7 @@ func MakeEmailPrimary(ctx context.Context, email *EmailAddress) error {
332332
return err
333333
} else if !has {
334334
return ErrUserNotExist{
335-
UID: email.UID,
336-
Name: "",
337-
KeyID: 0,
335+
UID: email.UID,
338336
}
339337
}
340338

Diff for: models/user/error.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ func (err ErrUserAlreadyExist) Unwrap() error {
3131

3232
// ErrUserNotExist represents a "UserNotExist" kind of error.
3333
type ErrUserNotExist struct {
34-
UID int64
35-
Name string
36-
KeyID int64
34+
UID int64
35+
Name string
3736
}
3837

3938
// IsErrUserNotExist checks if an error is a ErrUserNotExist.
@@ -43,7 +42,7 @@ func IsErrUserNotExist(err error) bool {
4342
}
4443

4544
func (err ErrUserNotExist) Error() string {
46-
return fmt.Sprintf("user does not exist [uid: %d, name: %s, keyid: %d]", err.UID, err.Name, err.KeyID)
45+
return fmt.Sprintf("user does not exist [uid: %d, name: %s]", err.UID, err.Name)
4746
}
4847

4948
// Unwrap unwraps this error as a ErrNotExist error

Diff for: models/user/user.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ func GetUserByID(ctx context.Context, id int64) (*User, error) {
835835
if err != nil {
836836
return nil, err
837837
} else if !has {
838-
return nil, ErrUserNotExist{id, "", 0}
838+
return nil, ErrUserNotExist{UID: id}
839839
}
840840
return u, nil
841841
}
@@ -885,14 +885,14 @@ func GetPossibleUserByIDs(ctx context.Context, ids []int64) ([]*User, error) {
885885
// GetUserByNameCtx returns user by given name.
886886
func GetUserByName(ctx context.Context, name string) (*User, error) {
887887
if len(name) == 0 {
888-
return nil, ErrUserNotExist{0, name, 0}
888+
return nil, ErrUserNotExist{Name: name}
889889
}
890890
u := &User{LowerName: strings.ToLower(name), Type: UserTypeIndividual}
891891
has, err := db.GetEngine(ctx).Get(u)
892892
if err != nil {
893893
return nil, err
894894
} else if !has {
895-
return nil, ErrUserNotExist{0, name, 0}
895+
return nil, ErrUserNotExist{Name: name}
896896
}
897897
return u, nil
898898
}
@@ -1033,7 +1033,7 @@ func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) []
10331033
// GetUserByEmail returns the user object by given e-mail if exists.
10341034
func GetUserByEmail(ctx context.Context, email string) (*User, error) {
10351035
if len(email) == 0 {
1036-
return nil, ErrUserNotExist{0, email, 0}
1036+
return nil, ErrUserNotExist{Name: email}
10371037
}
10381038

10391039
email = strings.ToLower(email)
@@ -1060,7 +1060,7 @@ func GetUserByEmail(ctx context.Context, email string) (*User, error) {
10601060
}
10611061
}
10621062

1063-
return nil, ErrUserNotExist{0, email, 0}
1063+
return nil, ErrUserNotExist{Name: email}
10641064
}
10651065

10661066
// GetUser checks if a user already exists
@@ -1071,7 +1071,7 @@ func GetUser(ctx context.Context, user *User) (bool, error) {
10711071
// GetUserByOpenID returns the user object by given OpenID if exists.
10721072
func GetUserByOpenID(ctx context.Context, uri string) (*User, error) {
10731073
if len(uri) == 0 {
1074-
return nil, ErrUserNotExist{0, uri, 0}
1074+
return nil, ErrUserNotExist{Name: uri}
10751075
}
10761076

10771077
uri, err := openid.Normalize(uri)
@@ -1091,7 +1091,7 @@ func GetUserByOpenID(ctx context.Context, uri string) (*User, error) {
10911091
return GetUserByID(ctx, oid.UID)
10921092
}
10931093

1094-
return nil, ErrUserNotExist{0, uri, 0}
1094+
return nil, ErrUserNotExist{Name: uri}
10951095
}
10961096

10971097
// GetAdminUser returns the first administrator

0 commit comments

Comments
 (0)