diff --git a/services/pull/pull.go b/services/pull/pull.go index e1936441c7..909201bc7f 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -231,7 +231,7 @@ func NewPullRequest(ctx context.Context, opts *NewPullRequestOptions) error { } baseGitRepo.Close() // close immediately to avoid notifications will open the repository again - ReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifiers) + reviewRequestNotify(ctx, issue, issue.Poster, reviewNotifiers) mentions, err := issues_model.FindAndUpdateIssueMentions(ctx, issue, issue.Poster, issue.Content) if err != nil { @@ -498,7 +498,7 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) { log.Error("RequestCodeOwnersReview: %v", err) } if len(reviewNotifiers) > 0 { - ReviewRequestNotify(ctx, pr.Issue, opts.Doer, reviewNotifiers) + reviewRequestNotify(ctx, pr.Issue, opts.Doer, reviewNotifiers) } } diff --git a/services/pull/review_request.go b/services/pull/review_request.go index ecfd7737d9..50c8dd5be2 100644 --- a/services/pull/review_request.go +++ b/services/pull/review_request.go @@ -195,12 +195,12 @@ func TeamReviewRequest(ctx context.Context, issue *issues_model.Issue, doer *use return comment, teamReviewRequestNotify(ctx, issue, doer, reviewer, isAdd, comment) } -func ReviewRequestNotify(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, reviewNotifiers []*ReviewRequestNotifier) { +func reviewRequestNotify(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, reviewNotifiers []*ReviewRequestNotifier) { for _, reviewNotifier := range reviewNotifiers { if reviewNotifier.Reviewer != nil { - notify_service.PullRequestReviewRequest(ctx, issue.Poster, issue, reviewNotifier.Reviewer, reviewNotifier.IsAdd, reviewNotifier.Comment) + notify_service.PullRequestReviewRequest(ctx, doer, issue, reviewNotifier.Reviewer, reviewNotifier.IsAdd, reviewNotifier.Comment) } else if reviewNotifier.ReviewTeam != nil { - if err := teamReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifier.ReviewTeam, reviewNotifier.IsAdd, reviewNotifier.Comment); err != nil { + if err := teamReviewRequestNotify(ctx, issue, doer, reviewNotifier.ReviewTeam, reviewNotifier.IsAdd, reviewNotifier.Comment); err != nil { log.Error("teamReviewRequestNotify: %v", err) } } @@ -298,19 +298,17 @@ type reviewRequestNotifer struct { } func (n *reviewRequestNotifer) IssueChangeTitle(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string) { - var reviewNotifiers []*ReviewRequestNotifier if issue.IsPull && issues_model.HasWorkInProgressPrefix(oldTitle) && !issues_model.HasWorkInProgressPrefix(issue.Title) { if err := issue.LoadPullRequest(ctx); err != nil { log.Error("IssueChangeTitle: LoadPullRequest: %v", err) return } - var err error - reviewNotifiers, err = RequestCodeOwnersReview(ctx, issue.PullRequest) + reviewNotifiers, err := RequestCodeOwnersReview(ctx, issue.PullRequest) if err != nil { log.Error("RequestCodeOwnersReview: %v", err) + } else { + reviewRequestNotify(ctx, issue, issue.Poster, reviewNotifiers) } } - - ReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifiers) }