Rename NotifyPullReviewRequest to NotifyPullRequestReviewRequest (#24988)

Makonike · web-flow · commit a5acec329e2c · 2023-05-31T15:54:46.000+08:00
after #24481 To keep consistent, maybe pull_request_review_request is better. ## what my pull request does Rename NotifyPullReviewRequest to NotifyPullRequestReviewRequest. <img width="1087" alt="image" src="https://github.com/go-gitea/gitea/assets/75628309/2cf91f02-74f2-42fe-a998-0a039b821d8d">
diff --git a/modules/notification/base/notifier.go b/modules/notification/base/notifier.go
@@ -28,7 +28,7 @@ type Notifier interface {
 	NotifyDeleteIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Issue)
 	NotifyIssueChangeMilestone(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldMilestoneID int64)
 	NotifyIssueChangeAssignee(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, assignee *user_model.User, removed bool, comment *issues_model.Comment)
-	NotifyPullReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment)
+	NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment)
 	NotifyIssueChangeContent(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldContent string)
 	NotifyIssueClearLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue)
 	NotifyIssueChangeTitle(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string)
diff --git a/modules/notification/base/null.go b/modules/notification/base/null.go
@@ -120,8 +120,8 @@ func (*NullNotifier) NotifyIssueChangeContent(ctx context.Context, doer *user_mo
 func (*NullNotifier) NotifyIssueChangeAssignee(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, assignee *user_model.User, removed bool, comment *issues_model.Comment) {
 }
 
-// NotifyPullReviewRequest places a place holder function
-func (*NullNotifier) NotifyPullReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
+// NotifyPullRequestReviewRequest places a place holder function
+func (*NullNotifier) NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
 }
 
 // NotifyIssueClearLabels places a place holder function
diff --git a/modules/notification/mail/mail.go b/modules/notification/mail/mail.go
@@ -123,7 +123,7 @@ func (m *mailNotifier) NotifyIssueChangeAssignee(ctx context.Context, doer *user
 	}
 }
 
-func (m *mailNotifier) NotifyPullReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
+func (m *mailNotifier) NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
 	if isRequest && doer.ID != reviewer.ID && reviewer.EmailNotifications() != user_model.EmailNotificationsDisabled {
 		ct := fmt.Sprintf("Requested to review %s.", issue.HTMLURL())
 		if err := mailer.SendIssueAssignedMail(ctx, issue, doer, ct, comment, []*user_model.User{reviewer}); err != nil {
diff --git a/modules/notification/notification.go b/modules/notification/notification.go
@@ -230,10 +230,10 @@ func NotifyIssueChangeAssignee(ctx context.Context, doer *user_model.User, issue
 	}
 }
 
-// NotifyPullReviewRequest notifies Request Review change
-func NotifyPullReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
+// NotifyPullRequestReviewRequest notifies Request Review change
+func NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
 	for _, notifier := range notifiers {
-		notifier.NotifyPullReviewRequest(ctx, doer, issue, reviewer, isRequest, comment)
+		notifier.NotifyPullRequestReviewRequest(ctx, doer, issue, reviewer, isRequest, comment)
 	}
 }
 
diff --git a/modules/notification/ui/ui.go b/modules/notification/ui/ui.go
@@ -229,7 +229,7 @@ func (ns *notificationService) NotifyIssueChangeAssignee(ctx context.Context, do
 	}
 }
 
-func (ns *notificationService) NotifyPullReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
+func (ns *notificationService) NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
 	if isRequest {
 		opts := issueNotificationOpts{
 			IssueID:              issue.ID,
diff --git a/services/issue/assignee.go b/services/issue/assignee.go
@@ -73,7 +73,7 @@ func ReviewRequest(ctx context.Context, issue *issues_model.Issue, doer, reviewe
 	}
 
 	if comment != nil {
-		notification.NotifyPullReviewRequest(ctx, doer, issue, reviewer, isAdd, comment)
+		notification.NotifyPullRequestReviewRequest(ctx, doer, issue, reviewer, isAdd, comment)
 	}
 
 	return comment, err
@@ -260,7 +260,7 @@ func TeamReviewRequest(ctx context.Context, issue *issues_model.Issue, doer *use
 			continue
 		}
 		comment.AssigneeID = member.ID
-		notification.NotifyPullReviewRequest(ctx, doer, issue, member, isAdd, comment)
+		notification.NotifyPullRequestReviewRequest(ctx, doer, issue, member, isAdd, comment)
 	}
 
 	return comment, err
diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go
@@ -719,9 +719,9 @@ func (m *webhookNotifier) NotifyPullRequestReview(ctx context.Context, pr *issue
 	}
 }
 
-func (m *webhookNotifier) NotifyPullReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
+func (m *webhookNotifier) NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
 	if !issue.IsPull {
-		log.Warn("NotifyPullReviewRequest: issue is not a pull request: %v", issue.ID)
+		log.Warn("NotifyPullRequestReviewRequest: issue is not a pull request: %v", issue.ID)
 		return
 	}
 	mode, _ := access_model.AccessLevelUnit(ctx, doer, issue.Repo, unit.TypePullRequests)

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ func (NullNotifier) NotifyIssueChangeContent(ctx context.Context, doer user_mo`
`120`	`120`	`func (NullNotifier) NotifyIssueChangeAssignee(ctx context.Context, doer user_model.User, issue issues_model.Issue, assignee user_model.User, removed bool, comment *issues_model.Comment) {`
`121`	`121`	`}`
`122`	`122`
`123`		`-// NotifyPullReviewRequest places a place holder function`
`124`		`-func (NullNotifier) NotifyPullReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment *issues_model.Comment) {`
	`123`	`+// NotifyPullRequestReviewRequest places a place holder function`
	`124`	`+func (NullNotifier) NotifyPullRequestReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment *issues_model.Comment) {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`// NotifyIssueClearLabels places a place holder function`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func (m mailNotifier) NotifyIssueChangeAssignee(ctx context.Context, doer user`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`-func (m mailNotifier) NotifyPullReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment *issues_model.Comment) {`
	`126`	`+func (m mailNotifier) NotifyPullRequestReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment *issues_model.Comment) {`
`127`	`127`	`if isRequest && doer.ID != reviewer.ID && reviewer.EmailNotifications() != user_model.EmailNotificationsDisabled {`
`128`	`128`	`ct := fmt.Sprintf("Requested to review %s.", issue.HTMLURL())`
`129`	`129`	`if err := mailer.SendIssueAssignedMail(ctx, issue, doer, ct, comment, []*user_model.User{reviewer}); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -230,10 +230,10 @@ func NotifyIssueChangeAssignee(ctx context.Context, doer *user_model.User, issue`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`
`233`		`-// NotifyPullReviewRequest notifies Request Review change`
`234`		`-func NotifyPullReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment issues_model.Comment) {`
	`233`	`+// NotifyPullRequestReviewRequest notifies Request Review change`
	`234`	`+func NotifyPullRequestReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment issues_model.Comment) {`
`235`	`235`	`for _, notifier := range notifiers {`
`236`		`- notifier.NotifyPullReviewRequest(ctx, doer, issue, reviewer, isRequest, comment)`
	`236`	`+ notifier.NotifyPullRequestReviewRequest(ctx, doer, issue, reviewer, isRequest, comment)`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ func (ns *notificationService) NotifyIssueChangeAssignee(ctx context.Context, do`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`
`232`		`-func (ns notificationService) NotifyPullReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment *issues_model.Comment) {`
	`232`	`+func (ns notificationService) NotifyPullRequestReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment *issues_model.Comment) {`
`233`	`233`	`if isRequest {`
`234`	`234`	`opts := issueNotificationOpts{`
`235`	`235`	`IssueID: issue.ID,`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func ReviewRequest(ctx context.Context, issue *issues_model.Issue, doer, reviewe`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if comment != nil {`
`76`		`- notification.NotifyPullReviewRequest(ctx, doer, issue, reviewer, isAdd, comment)`
	`76`	`+ notification.NotifyPullRequestReviewRequest(ctx, doer, issue, reviewer, isAdd, comment)`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`return comment, err`
`@@ -260,7 +260,7 @@ func TeamReviewRequest(ctx context.Context, issue issues_model.Issue, doer use`
`260`	`260`	`continue`
`261`	`261`	`}`
`262`	`262`	`comment.AssigneeID = member.ID`
`263`		`- notification.NotifyPullReviewRequest(ctx, doer, issue, member, isAdd, comment)`
	`263`	`+ notification.NotifyPullRequestReviewRequest(ctx, doer, issue, member, isAdd, comment)`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`return comment, err`
Original file line number	Diff line number	Diff line change
`@@ -719,9 +719,9 @@ func (m webhookNotifier) NotifyPullRequestReview(ctx context.Context, pr issue`
`719`	`719`	`}`
`720`	`720`	`}`
`721`	`721`
`722`		`-func (m webhookNotifier) NotifyPullReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment *issues_model.Comment) {`
	`722`	`+func (m webhookNotifier) NotifyPullRequestReviewRequest(ctx context.Context, doer user_model.User, issue issues_model.Issue, reviewer user_model.User, isRequest bool, comment *issues_model.Comment) {`
`723`	`723`	`if !issue.IsPull {`
`724`		`- log.Warn("NotifyPullReviewRequest: issue is not a pull request: %v", issue.ID)`
	`724`	`+ log.Warn("NotifyPullRequestReviewRequest: issue is not a pull request: %v", issue.ID)`
`725`	`725`	`return`
`726`	`726`	`}`
`727`	`727`	`mode, _ := access_model.AccessLevelUnit(ctx, doer, issue.Repo, unit.TypePullRequests)`