TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Added GetUserByIDCtx. (#17602)

Browse source 
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
KN4CK3R 2021-11-10 04:21:01 +01:00 • committed by GitHub
parent 465fb4169e
commit edbaa5d3f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
models/issue_comment.go
View file

@ -488,7 +488,7 @@ func (c *Comment) LoadAssigneeUserAndTeam() error {
var err error var err error
if c.AssigneeID > 0 && c.Assignee == nil { if c.AssigneeID > 0 && c.Assignee == nil {
c.Assignee, err = getUserByID(db.GetEngine(db.DefaultContext), c.AssigneeID) c.Assignee, err = GetUserByIDCtx(db.DefaultContext, c.AssigneeID)
if err != nil { if err != nil {
if !IsErrUserNotExist(err) { if !IsErrUserNotExist(err) {
return err return err
@ -523,7 +523,7 @@ func (c *Comment) LoadResolveDoer() (err error) {
if c.ResolveDoerID == 0 || c.Type != CommentTypeCode { if c.ResolveDoerID == 0 || c.Type != CommentTypeCode {
return nil return nil
} }
c.ResolveDoer, err = getUserByID(db.GetEngine(db.DefaultContext), c.ResolveDoerID) c.ResolveDoer, err = GetUserByIDCtx(db.DefaultContext, c.ResolveDoerID)
if err != nil { if err != nil {
if IsErrUserNotExist(err) { if IsErrUserNotExist(err) {
c.ResolveDoer = NewGhostUser() c.ResolveDoer = NewGhostUser()

2
models/issue_reaction.go
View file

@ -240,7 +240,7 @@ func (r *Reaction) LoadUser() (*User, error) {
if r.User != nil { if r.User != nil {
return r.User, nil return r.User, nil
} }
user, err := getUserByID(db.GetEngine(db.DefaultContext), r.UserID) user, err := GetUserByIDCtx(db.DefaultContext, r.UserID)
if err != nil { if err != nil {
return nil, err return nil, err
} }

9
models/user.go
View file

@ -1392,7 +1392,12 @@ func getUserByID(e db.Engine, id int64) (*User, error) {
// GetUserByID returns the user object by given ID if exists. // GetUserByID returns the user object by given ID if exists.
func GetUserByID(id int64) (*User, error) { func GetUserByID(id int64) (*User, error) {
return getUserByID(db.GetEngine(db.DefaultContext), id) return GetUserByIDCtx(db.DefaultContext, id)
}
// GetUserByIDCtx returns the user object by given ID if exists.
func GetUserByIDCtx(ctx context.Context, id int64) (*User, error) {
return getUserByID(db.GetEngine(ctx), id)
} }
// GetUserByName returns user by given name. // GetUserByName returns user by given name.
@ -1577,7 +1582,7 @@ func GetUserByEmailContext(ctx context.Context, email string) (*User, error) {
return nil, err return nil, err
} }
if has { if has {
return getUserByID(db.GetEngine(ctx), emailAddress.UID) return GetUserByIDCtx(ctx, emailAddress.UID)
} }
// Finally, if email address is the protected email address: // Finally, if email address is the protected email address: