From 6148e4c940bd187580ed763d9bd76626730433ca Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 4 Jan 2023 18:10:30 +0800 Subject: [PATCH] fix: rename to GetPossibleUserByID --- models/actions/run.go | 2 +- models/issues/comment.go | 2 +- models/issues/issue.go | 2 +- models/issues/review.go | 2 +- models/user/user.go | 4 ++-- services/auth/oauth2.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index 1299375f47..fc64f1bc8f 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -72,7 +72,7 @@ func (run *ActionRun) LoadAttributes(ctx context.Context) error { } if run.TriggerUser == nil { - u, err := user_model.GetPossbileUserByID(ctx, run.TriggerUserID) + u, err := user_model.GetPossibleUserByID(ctx, run.TriggerUserID) if err != nil { return err } diff --git a/models/issues/comment.go b/models/issues/comment.go index d4f2f3bdf9..c88676e542 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -350,7 +350,7 @@ func (c *Comment) LoadPoster(ctx context.Context) (err error) { return nil } - c.Poster, err = user_model.GetPossbileUserByID(ctx, c.PosterID) + c.Poster, err = user_model.GetPossibleUserByID(ctx, c.PosterID) if err != nil { if user_model.IsErrUserNotExist(err) { c.PosterID = -1 diff --git a/models/issues/issue.go b/models/issues/issue.go index 067aa59c69..7988275e69 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -235,7 +235,7 @@ func (issue *Issue) LoadLabels(ctx context.Context) (err error) { // LoadPoster loads poster func (issue *Issue) LoadPoster(ctx context.Context) (err error) { 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 { issue.PosterID = -1 issue.Poster = user_model.NewGhostUser() diff --git a/models/issues/review.go b/models/issues/review.go index 7888f1da06..56dd6cc3e6 100644 --- a/models/issues/review.go +++ b/models/issues/review.go @@ -158,7 +158,7 @@ func (r *Review) LoadReviewer(ctx context.Context) (err error) { if r.ReviewerID == 0 || r.Reviewer != nil { return } - r.Reviewer, err = user_model.GetPossbileUserByID(ctx, r.ReviewerID) + r.Reviewer, err = user_model.GetPossibleUserByID(ctx, r.ReviewerID) return err } diff --git a/models/user/user.go b/models/user/user.go index fafc14c151..09abdc1b31 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -988,8 +988,8 @@ func GetUserByID(ctx context.Context, id int64) (*User, error) { return u, nil } -// GetPossbileUserByID returns the user if id > 0 or return system usrs if id < 0 -func GetPossbileUserByID(ctx context.Context, id int64) (*User, error) { +// GetPossibleUserByID returns the user if id > 0 or return system usrs if id < 0 +func GetPossibleUserByID(ctx context.Context, id int64) (*User, error) { switch id { case -1: return NewGhostUser(), nil diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index 3b401cf861..da0e574459 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -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) - user, err := user_model.GetPossbileUserByID(req.Context(), id) + user, err := user_model.GetPossibleUserByID(req.Context(), id) if err != nil { if !user_model.IsErrUserNotExist(err) { log.Error("GetUserByName: %v", err)