test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Add `WithPullRequest` for `actionsNotifier` (#25144)

This commit is contained in:
Zettat123 2023-06-11 09:06:43 +08:00 committed by GitHub
parent c17423e0a1
commit 15d238d321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
services/actions/notifier.go
View File

@ -81,6 +81,7 @@ func (n *actionsNotifier) NotifyIssueChangeStatus(ctx context.Context, doer *use
newNotifyInputFromIssue(issue, webhook_module.HookEventPullRequest). newNotifyInputFromIssue(issue, webhook_module.HookEventPullRequest).
WithDoer(doer). WithDoer(doer).
WithPayload(apiPullRequest). WithPayload(apiPullRequest).
WithPullRequest(issue.PullRequest).
Notify(ctx) Notify(ctx)
return return
} }
@ -136,6 +137,7 @@ func (n *actionsNotifier) NotifyIssueChangeLabels(ctx context.Context, doer *use
Repository: convert.ToRepo(ctx, issue.Repo, perm_model.AccessModeNone), Repository: convert.ToRepo(ctx, issue.Repo, perm_model.AccessModeNone),
Sender: convert.ToUser(ctx, doer, nil), Sender: convert.ToUser(ctx, doer, nil),
}). }).
WithPullRequest(issue.PullRequest).
Notify(ctx) Notify(ctx)
return return
} }
@ -160,6 +162,10 @@ func (n *actionsNotifier) NotifyCreateIssueComment(ctx context.Context, doer *us
mode, _ := access_model.AccessLevel(ctx, doer, repo) mode, _ := access_model.AccessLevel(ctx, doer, repo)
if issue.IsPull { if issue.IsPull {
if err := issue.LoadPullRequest(ctx); err != nil {
log.Error("LoadPullRequest: %v", err)
return
}
newNotifyInputFromIssue(issue, webhook_module.HookEventPullRequestComment). newNotifyInputFromIssue(issue, webhook_module.HookEventPullRequestComment).
WithDoer(doer). WithDoer(doer).
WithPayload(&api.IssueCommentPayload{ WithPayload(&api.IssueCommentPayload{
@ -170,6 +176,7 @@ func (n *actionsNotifier) NotifyCreateIssueComment(ctx context.Context, doer *us
Sender: convert.ToUser(ctx, doer, nil), Sender: convert.ToUser(ctx, doer, nil),
IsPull: true, IsPull: true,
}). }).
WithPullRequest(issue.PullRequest).
Notify(ctx) Notify(ctx)
return return
} }