Load reviewer before sending notification (go-gitea#27063)

sebastian-sauer · sebastian-sauer · commit b466226aaa06 · 2023-09-13T22:01:29.000+02:00
Backport go-gitea#27063 The [template](https://github.com/go-gitea/gitea/blob/main/templates/mail/issue/default.tmpl#L51) uses the Reviewer.Name property - this was not loaded. Fixes go-gitea#27035
diff --git a/modules/notification/mail/mail.go b/modules/notification/mail/mail.go
@@ -177,6 +177,9 @@ func (m *mailNotifier) NotifyPullRequestPushCommits(ctx context.Context, doer *u
 }
 
 func (m *mailNotifier) NotifyPullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
+	if err := comment.Review.LoadReviewer(ctx); err != nil {
+		log.Error("Error in PullReviewDismiss while loading reviewer for issue[%d], review[%d] and reviewer[%d]: %v", review.Issue.ID, comment.Review.ID, comment.Review.ReviewerID, err)
+	}
 	if err := mailer.MailParticipantsComment(ctx, comment, activities_model.ActionPullReviewDismissed, review.Issue, nil); err != nil {
 		log.Error("MailParticipantsComment: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,9 @@ func (m mailNotifier) NotifyPullRequestPushCommits(ctx context.Context, doer u`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`func (m mailNotifier) NotifyPullReviewDismiss(ctx context.Context, doer user_model.User, review issues_model.Review, comment issues_model.Comment) {`
	`180`	`+ if err := comment.Review.LoadReviewer(ctx); err != nil {`
	`181`	`+ log.Error("Error in PullReviewDismiss while loading reviewer for issue[%d], review[%d] and reviewer[%d]: %v", review.Issue.ID, comment.Review.ID, comment.Review.ReviewerID, err)`
	`182`	`+ }`
`180`	`183`	`if err := mailer.MailParticipantsComment(ctx, comment, activities_model.ActionPullReviewDismissed, review.Issue, nil); err != nil {`
`181`	`184`	`log.Error("MailParticipantsComment: %v", err)`
`182`	`185`	`}`