Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>tags/v1.16.0-rc1
@@ -488,7 +488,7 @@ func (c *Comment) LoadAssigneeUserAndTeam() error { | |||
var err error | |||
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 !IsErrUserNotExist(err) { | |||
return err | |||
@@ -523,7 +523,7 @@ func (c *Comment) LoadResolveDoer() (err error) { | |||
if c.ResolveDoerID == 0 || c.Type != CommentTypeCode { | |||
return nil | |||
} | |||
c.ResolveDoer, err = getUserByID(db.GetEngine(db.DefaultContext), c.ResolveDoerID) | |||
c.ResolveDoer, err = GetUserByIDCtx(db.DefaultContext, c.ResolveDoerID) | |||
if err != nil { | |||
if IsErrUserNotExist(err) { | |||
c.ResolveDoer = NewGhostUser() |
@@ -240,7 +240,7 @@ func (r *Reaction) LoadUser() (*User, error) { | |||
if 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 { | |||
return nil, err | |||
} |
@@ -1392,7 +1392,12 @@ func getUserByID(e db.Engine, id int64) (*User, error) { | |||
// GetUserByID returns the user object by given ID if exists. | |||
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. | |||
@@ -1577,7 +1582,7 @@ func GetUserByEmailContext(ctx context.Context, email string) (*User, error) { | |||
return nil, err | |||
} | |||
if has { | |||
return getUserByID(db.GetEngine(ctx), emailAddress.UID) | |||
return GetUserByIDCtx(ctx, emailAddress.UID) | |||
} | |||
// Finally, if email address is the protected email address: |