Backport #29559 by @yp05327 Bugs from #29308 Follow #29467 partly fix #29558 Co-authored-by: yp05327 <576951401@qq.com>
This commit is contained in:
parent
b84303ef6e
commit
b519e4750b
@ -172,14 +172,26 @@ func (n *actionsNotifier) IssueChangeMilestone(ctx context.Context, doer *user_m
|
|||||||
} else {
|
} else {
|
||||||
action = api.HookIssueDemilestoned
|
action = api.HookIssueDemilestoned
|
||||||
}
|
}
|
||||||
notifyIssueChange(ctx, doer, issue, webhook_module.HookEventPullRequestMilestone, action)
|
|
||||||
|
hookEvent := webhook_module.HookEventIssueMilestone
|
||||||
|
if issue.IsPull {
|
||||||
|
hookEvent = webhook_module.HookEventPullRequestMilestone
|
||||||
|
}
|
||||||
|
|
||||||
|
notifyIssueChange(ctx, doer, issue, hookEvent, action)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *actionsNotifier) IssueChangeLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue,
|
func (n *actionsNotifier) IssueChangeLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue,
|
||||||
_, _ []*issues_model.Label,
|
_, _ []*issues_model.Label,
|
||||||
) {
|
) {
|
||||||
ctx = withMethod(ctx, "IssueChangeLabels")
|
ctx = withMethod(ctx, "IssueChangeLabels")
|
||||||
notifyIssueChange(ctx, doer, issue, webhook_module.HookEventPullRequestLabel, api.HookIssueLabelUpdated)
|
|
||||||
|
hookEvent := webhook_module.HookEventIssueLabel
|
||||||
|
if issue.IsPull {
|
||||||
|
hookEvent = webhook_module.HookEventPullRequestLabel
|
||||||
|
}
|
||||||
|
|
||||||
|
notifyIssueChange(ctx, doer, issue, hookEvent, api.HookIssueLabelUpdated)
|
||||||
}
|
}
|
||||||
|
|
||||||
func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, event webhook_module.HookEventType, action api.HookIssueAction) {
|
func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, event webhook_module.HookEventType, action api.HookIssueAction) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user