web/forgejo
9
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-20 21:57:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Add context.Context to more methods (#21546)

Browse source 
This PR adds a context parameter to a bunch of methods. Some helper
`xxxCtx()` methods got replaced with the normal name now.

Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
KN4CK3R 2022-11-19 09:12:33 +01:00 • committed by GitHub
parent fefdb7ffd1
commit 044c754ea5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
148 changed files with 1411 additions and 1564 deletions
Download patch file Download diff file Expand all files Collapse all files

10
services/issue/assignee.go
View file

@ -51,13 +51,13 @@ func ToggleAssignee(issue *issues_model.Issue, doer *user_model.User, assigneeID
return
}
assignee, err1 := user_model.GetUserByID(assigneeID)
assignee, err1 := user_model.GetUserByIDCtx(db.DefaultContext, assigneeID)
if err1 != nil {
err = err1
return
}
notification.NotifyIssueChangeAssignee(doer, issue, assignee, removed, comment)
notification.NotifyIssueChangeAssignee(db.DefaultContext, doer, issue, assignee, removed, comment)
return removed, comment, err
}
@ -75,7 +75,7 @@ func ReviewRequest(issue *issues_model.Issue, doer, reviewer *user_model.User, i
}
if comment != nil {
notification.NotifyPullReviewRequest(doer, issue, reviewer, isAdd, comment)
notification.NotifyPullReviewRequest(db.DefaultContext, doer, issue, reviewer, isAdd, comment)
}
return comment, err
@ -246,7 +246,7 @@ func TeamReviewRequest(issue *issues_model.Issue, doer *user_model.User, reviewe
}
// notify all user in this team
if err = comment.LoadIssue(); err != nil {
if err = comment.LoadIssue(db.DefaultContext); err != nil {
return
}
@ -262,7 +262,7 @@ func TeamReviewRequest(issue *issues_model.Issue, doer *user_model.User, reviewe
continue
}
comment.AssigneeID = member.ID
notification.NotifyPullReviewRequest(doer, issue, member, isAdd, comment)
notification.NotifyPullReviewRequest(db.DefaultContext, doer, issue, member, isAdd, comment)
}
return comment, err

3
services/issue/content.go
View file

@ -5,6 +5,7 @@
package issue
import (
"code.gitea.io/gitea/models/db"
issues_model "code.gitea.io/gitea/models/issues"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/notification"
@ -18,7 +19,7 @@ func ChangeContent(issue *issues_model.Issue, doer *user_model.User, content str
return err
}
notification.NotifyIssueChangeContent(doer, issue, oldContent)
notification.NotifyIssueChangeContent(db.DefaultContext, doer, issue, oldContent)
return nil
}

18
services/issue/issue.go
View file

@ -38,12 +38,12 @@ func NewIssue(repo *repo_model.Repository, issue *issues_model.Issue, labelIDs [
return err
}
notification.NotifyNewIssue(issue, mentions)
notification.NotifyNewIssue(db.DefaultContext, issue, mentions)
if len(issue.Labels) > 0 {
notification.NotifyIssueChangeLabels(issue.Poster, issue, issue.Labels, nil)
notification.NotifyIssueChangeLabels(db.DefaultContext, issue.Poster, issue, issue.Labels, nil)
}
if issue.Milestone != nil {
notification.NotifyIssueChangeMilestone(issue.Poster, issue, 0)
notification.NotifyIssueChangeMilestone(db.DefaultContext, issue.Poster, issue, 0)
}
return nil
@ -58,7 +58,7 @@ func ChangeTitle(issue *issues_model.Issue, doer *user_model.User, title string)
return
}
notification.NotifyIssueChangeTitle(doer, issue, oldTitle)
notification.NotifyIssueChangeTitle(db.DefaultContext, doer, issue, oldTitle)
return nil
}
@ -72,7 +72,7 @@ func ChangeIssueRef(issue *issues_model.Issue, doer *user_model.User, ref string
return err
}
notification.NotifyIssueChangeRef(doer, issue, oldRef)
notification.NotifyIssueChangeRef(db.DefaultContext, doer, issue, oldRef)
return nil
}
@ -135,10 +135,10 @@ func UpdateAssignees(issue *issues_model.Issue, oneAssignee string, multipleAssi
// DeleteIssue deletes an issue
func DeleteIssue(doer *user_model.User, gitRepo *git.Repository, issue *issues_model.Issue) error {
// load issue before deleting it
if err := issue.LoadAttributes(db.DefaultContext); err != nil {
if err := issue.LoadAttributes(gitRepo.Ctx); err != nil {
return err
}
if err := issue.LoadPullRequest(); err != nil {
if err := issue.LoadPullRequest(gitRepo.Ctx); err != nil {
return err
}
@ -154,7 +154,7 @@ func DeleteIssue(doer *user_model.User, gitRepo *git.Repository, issue *issues_m
}
}
notification.NotifyDeleteIssue(doer, issue)
notification.NotifyDeleteIssue(gitRepo.Ctx, doer, issue)
return nil
}
@ -162,7 +162,7 @@ func DeleteIssue(doer *user_model.User, gitRepo *git.Repository, issue *issues_m
// AddAssigneeIfNotAssigned adds an assignee only if he isn't already assigned to the issue.
// Also checks for access of assigned user
func AddAssigneeIfNotAssigned(issue *issues_model.Issue, doer *user_model.User, assigneeID int64) (err error) {
assignee, err := user_model.GetUserByID(assigneeID)
assignee, err := user_model.GetUserByIDCtx(db.DefaultContext, assigneeID)
if err != nil {
return err
}

10
services/issue/label.go
View file

@ -18,7 +18,7 @@ func ClearLabels(issue *issues_model.Issue, doer *user_model.User) (err error) {
return
}
notification.NotifyIssueClearLabels(doer, issue)
notification.NotifyIssueClearLabels(db.DefaultContext, doer, issue)
return nil
}
@ -29,7 +29,7 @@ func AddLabel(issue *issues_model.Issue, doer *user_model.User, label *issues_mo
return err
}
notification.NotifyIssueChangeLabels(doer, issue, []*issues_model.Label{label}, nil)
notification.NotifyIssueChangeLabels(db.DefaultContext, doer, issue, []*issues_model.Label{label}, nil)
return nil
}
@ -39,7 +39,7 @@ func AddLabels(issue *issues_model.Issue, doer *user_model.User, labels []*issue
return err
}
notification.NotifyIssueChangeLabels(doer, issue, labels, nil)
notification.NotifyIssueChangeLabels(db.DefaultContext, doer, issue, labels, nil)
return nil
}
@ -74,7 +74,7 @@ func RemoveLabel(issue *issues_model.Issue, doer *user_model.User, label *issues
return err
}
notification.NotifyIssueChangeLabels(doer, issue, nil, []*issues_model.Label{label})
notification.NotifyIssueChangeLabels(db.DefaultContext, doer, issue, nil, []*issues_model.Label{label})
return nil
}
@ -89,6 +89,6 @@ func ReplaceLabels(issue *issues_model.Issue, doer *user_model.User, labels []*i
return err
}
notification.NotifyIssueChangeLabels(doer, issue, labels, old)
notification.NotifyIssueChangeLabels(db.DefaultContext, doer, issue, labels, old)
return nil
}

2
services/issue/milestone.go
View file

@ -79,7 +79,7 @@ func ChangeMilestoneAssign(issue *issues_model.Issue, doer *user_model.User, old
return fmt.Errorf("Commit: %w", err)
}
notification.NotifyIssueChangeMilestone(doer, issue, oldMilestoneID)
notification.NotifyIssueChangeMilestone(db.DefaultContext, doer, issue, oldMilestoneID)
return nil
}

2
services/issue/status.go
View file

@ -38,7 +38,7 @@ func changeStatusCtx(ctx context.Context, issue *issues_model.Issue, doer *user_
}
}
notification.NotifyIssueChangeStatus(doer, issue, comment, closed)
notification.NotifyIssueChangeStatus(ctx, doer, issue, comment, closed)
return nil
}