Merge pull request #759 from kdeckard/feature/bitbucket-pr-comments-notifications

PR Review Comments Notifications: Fine tuning

Author: brainexe

bot/config/default.go

@@ -29,7 +29,10 @@ var DefaultConfig = Config{
 			BuildStatusSuccess:         false,
 			BuildStatusFailed:          false,
 			PullRequestStatusMergeable: false,
-			NewReviewComments:          false,
+			NewReviewComments: NewReviewComments{
+				Enabled: false,
+				Repos:   nil,
+			},
 		},
 		Reactions: PullRequestReactions{
 			InReview:     "eyes",

bot/config/pull_request.go

@@ -17,11 +17,20 @@ type PullRequest struct {
 // Notifications can be defined in the config.yaml to enable notifications for pull request builds.
 // the defaults are defined in default.go
 type Notifications struct {
-	BuildStatusInProgress      bool `mapstructure:"build_status_in_progress"`
-	BuildStatusSuccess         bool `mapstructure:"build_status_success"`
-	BuildStatusFailed          bool `mapstructure:"build_status_failed"`
-	PullRequestStatusMergeable bool `mapstructure:"pr_status_mergeable"`
-	NewReviewComments          bool `mapstructure:"new_review_comments"`
+	BuildStatusInProgress      bool              `mapstructure:"build_status_in_progress"`
+	BuildStatusSuccess         bool              `mapstructure:"build_status_success"`
+	BuildStatusFailed          bool              `mapstructure:"build_status_failed"`
+	PullRequestStatusMergeable bool              `mapstructure:"pr_status_mergeable"`
+	NewReviewComments          NewReviewComments `mapstructure:"new_review_comments"`
+}
+
+type NewReviewComments struct {
+	Enabled bool     `mapstructure:"enabled"`
+	Repos   []string `mapstructure:"repos"`
+}
+
+func (c NewReviewComments) IsEnabled() bool {
+	return c.Enabled
 }
 
 // PullRequestReactions can be defined in the config.yaml to have custom reactions for pull requests.

command/pullrequest/bitbucket.go

@@ -82,10 +82,14 @@ func (c *bitbucketFetcher) getPullRequest(match matcher.Result, config *config.P
 
 	var latestCommentTimestamp int64
 
-	if config.Notifications.NewReviewComments {
-		latestCommentTimestamp, err = c.getLatestReviewCommentTimestamp(&rawPullRequest)
-		if err != nil {
-			return pr, errors.Wrap(err, "error while loading review comments from Bitbucket")
+	if config.Notifications.NewReviewComments.IsEnabled() {
+		newCommentsEnabledForRepo := slices.Contains(config.Notifications.NewReviewComments.Repos, repo)
+
+		if newCommentsEnabledForRepo {
+			latestCommentTimestamp, err = c.getLatestReviewCommentTimestamp(&rawPullRequest)
+			if err != nil {
+				return pr, errors.Wrap(err, "error while loading review comments from Bitbucket")
+			}
 		}
 	}
 

command/pullrequest/pull_request.go

@@ -378,15 +378,15 @@ func (c command) GetHelp() []bot.Help {
 }
 
 func (c *command) notifyNewReviewComments(prw *pullRequestWatch) {
-	if !c.cfg.Notifications.NewReviewComments {
+	if !c.cfg.Notifications.NewReviewComments.IsEnabled() || prw.DidNotifyMergeable {
 		return
 	}
 
-	if prw.PullRequest.LatestReviewCommentsTimestamp <= prw.SavedLatestReviewCommentTimestamp || prw.PullRequest.LatestReviewCommentsTimestamp == 0 {
+	if prw.PullRequest.LatestReviewCommentsTimestamp == 0 || prw.PullRequest.LatestReviewCommentsTimestamp <= prw.SavedLatestReviewCommentTimestamp {
 		return
 	}
 
 	prw.SavedLatestReviewCommentTimestamp = prw.PullRequest.LatestReviewCommentsTimestamp
 
-	c.sendPrivateMessage(prw.Author, "PR '%s' \nNew review comments were added: %s", prw.PullRequest.Name, getPRLinkMessage(prw))
+	c.sendPrivateMessage(prw.PullRequest.Author, "PR *'%s'* \nNew review comments were added: %s", prw.PullRequest.Name, getPRLinkMessage(prw))
 }