aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-04-18 00:47:48 -04:00
Code

fix: rename to GetPossibleUserByID

Browse Source
This commit is contained in:
Jason Song 2023-01-04 18:10:30 +08:00
parent 0887e98f2a
commit 6148e4c940
No known key found for this signature in database
GPG Key ID: 8402EEEE4511A8B5
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/actions/run.go
View File

@ -72,7 +72,7 @@ func (run *ActionRun) LoadAttributes(ctx context.Context) error {
} }
if run.TriggerUser == nil { if run.TriggerUser == nil {
u, err := user_model.GetPossbileUserByID(ctx, run.TriggerUserID) u, err := user_model.GetPossibleUserByID(ctx, run.TriggerUserID)
if err != nil { if err != nil {
return err return err
} }

2
models/issues/comment.go
View File

@ -350,7 +350,7 @@ func (c *Comment) LoadPoster(ctx context.Context) (err error) {
return nil return nil
} }
c.Poster, err = user_model.GetPossbileUserByID(ctx, c.PosterID) c.Poster, err = user_model.GetPossibleUserByID(ctx, c.PosterID)
if err != nil { if err != nil {
if user_model.IsErrUserNotExist(err) { if user_model.IsErrUserNotExist(err) {
c.PosterID = -1 c.PosterID = -1

2
models/issues/issue.go
View File

@ -235,7 +235,7 @@ func (issue *Issue) LoadLabels(ctx context.Context) (err error) {
// LoadPoster loads poster // LoadPoster loads poster
func (issue *Issue) LoadPoster(ctx context.Context) (err error) { func (issue *Issue) LoadPoster(ctx context.Context) (err error) {
if issue.Poster == nil { if issue.Poster == nil {
issue.Poster, err = user_model.GetPossbileUserByID(ctx, issue.PosterID) issue.Poster, err = user_model.GetPossibleUserByID(ctx, issue.PosterID)
if err != nil { if err != nil {
issue.PosterID = -1 issue.PosterID = -1
issue.Poster = user_model.NewGhostUser() issue.Poster = user_model.NewGhostUser()

2
models/issues/review.go
View File

@ -158,7 +158,7 @@ func (r *Review) LoadReviewer(ctx context.Context) (err error) {
if r.ReviewerID == 0 || r.Reviewer != nil { if r.ReviewerID == 0 || r.Reviewer != nil {
return return
} }
r.Reviewer, err = user_model.GetPossbileUserByID(ctx, r.ReviewerID) r.Reviewer, err = user_model.GetPossibleUserByID(ctx, r.ReviewerID)
return err return err
} }

4
models/user/user.go
View File

@ -988,8 +988,8 @@ func GetUserByID(ctx context.Context, id int64) (*User, error) {
return u, nil return u, nil
} }
// GetPossbileUserByID returns the user if id > 0 or return system usrs if id < 0 // GetPossibleUserByID returns the user if id > 0 or return system usrs if id < 0
func GetPossbileUserByID(ctx context.Context, id int64) (*User, error) { func GetPossibleUserByID(ctx context.Context, id int64) (*User, error) {
switch id { switch id {
case -1: case -1:
return NewGhostUser(), nil return NewGhostUser(), nil

2
services/auth/oauth2.go
View File

@ -132,7 +132,7 @@ func (o *OAuth2) Verify(req *http.Request, w http.ResponseWriter, store DataStor
} }
log.Trace("OAuth2 Authorization: Found token for user[%d]", id) log.Trace("OAuth2 Authorization: Found token for user[%d]", id)
user, err := user_model.GetPossbileUserByID(req.Context(), id) user, err := user_model.GetPossibleUserByID(req.Context(), id)
if err != nil { if err != nil {
if !user_model.IsErrUserNotExist(err) { if !user_model.IsErrUserNotExist(err) {
log.Error("GetUserByName: %v", err) log.Error("GetUserByName: %v", err)