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 <zettat123@gmail.com>
go-gitea · Mar 25, 2023 · 6705b21 · 6705b21
1 parent a9b4aa4
commit 6705b21
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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: