From 6705b215db4526c7c68c20d5e13c7d91c8dc4fba Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 24 Mar 2023 20:56:15 -0400 Subject: [PATCH] Fix incorrect `HookEventType` of pull request review comments (#23650) (#23678) Backport #23650 by @Zettat123 `HookEventType` of pull request review comments should be `HookEventPullRequestReviewComment` but some event types are `HookEventPullRequestComment` now. Co-authored-by: Zettat123 --- services/actions/notifier.go | 2 +- services/webhook/discord.go | 4 ++-- services/webhook/msteams.go | 2 +- services/webhook/notifier.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/actions/notifier.go b/services/actions/notifier.go index cdf9087fef1..90eed83eff5 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -264,7 +264,7 @@ func (n *actionsNotifier) NotifyPullRequestReview(ctx context.Context, pr *issue case issues_model.ReviewTypeApprove: reviewHookType = webhook_module.HookEventPullRequestReviewApproved case issues_model.ReviewTypeComment: - reviewHookType = webhook_module.HookEventPullRequestComment + reviewHookType = webhook_module.HookEventPullRequestReviewComment case issues_model.ReviewTypeReject: reviewHookType = webhook_module.HookEventPullRequestReviewRejected default: diff --git a/services/webhook/discord.go b/services/webhook/discord.go index 014d409ce73..02f0fb87205 100644 --- a/services/webhook/discord.go +++ b/services/webhook/discord.go @@ -209,7 +209,7 @@ func (d *DiscordPayload) Review(p *api.PullRequestPayload, event webhook_module. color = greenColor case webhook_module.HookEventPullRequestReviewRejected: color = redColor - case webhook_module.HookEventPullRequestComment: + case webhook_module.HookEventPullRequestReviewComment: color = greyColor default: color = yellowColor @@ -277,7 +277,7 @@ func parseHookPullRequestEventType(event webhook_module.HookEventType) (string, return "approved", nil case webhook_module.HookEventPullRequestReviewRejected: return "rejected", nil - case webhook_module.HookEventPullRequestComment: + case webhook_module.HookEventPullRequestReviewComment: return "comment", nil default: diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go index 03d92821b9e..60ef334ded9 100644 --- a/services/webhook/msteams.go +++ b/services/webhook/msteams.go @@ -223,7 +223,7 @@ func (m *MSTeamsPayload) Review(p *api.PullRequestPayload, event webhook_module. color = greenColor case webhook_module.HookEventPullRequestReviewRejected: color = redColor - case webhook_module.HookEventPullRequestComment: + case webhook_module.HookEventPullRequestReviewComment: color = greyColor default: color = yellowColor diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go index b023717cd25..1f7cb8d988a 100644 --- a/services/webhook/notifier.go +++ b/services/webhook/notifier.go @@ -685,7 +685,7 @@ func (m *webhookNotifier) NotifyPullRequestReview(ctx context.Context, pr *issue case issues_model.ReviewTypeApprove: reviewHookType = webhook_module.HookEventPullRequestReviewApproved case issues_model.ReviewTypeComment: - reviewHookType = webhook_module.HookEventPullRequestComment + reviewHookType = webhook_module.HookEventPullRequestReviewComment case issues_model.ReviewTypeReject: reviewHookType = webhook_module.HookEventPullRequestReviewRejected default: