Skip to content

The Unified and Autonomous Development Platform

refactor: improve AI notification eligibility checks in Issue and Pull Request managers

Robin Shenf0bd5f90fbce
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index 567976d278..7fc1d0b3ed 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -353,10 +353,9 @@ public class IssueNotificationManager implements Serializable {
EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();
if (emailAddress != null && emailAddress.isVerified())
bccEmailAddresses.add(emailAddress.getValue());
- } else if (user != null
- && (!user.isSystem()
- || event instanceof IssueOpened issueOpened && issueOpened.getIssue().getOnBehalfOf() != null
- || event instanceof IssueCommentCreated issueCommentCreated && issueCommentCreated.getComment().getOnBehalfOf() != null)
+ } else if (event instanceof IssueCommentCreated issueCommentCreated
+ && user != null
+ && (!user.isSystem() || issueCommentCreated.getComment().getOnBehalfOf() != null)
&& !user.equals(watch.getUser())
&& watch.getUser().getAiSetting().isProactive()
&& isAiEligible(user, issue, watch.getUser(), false)
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index 736f205f51..810309fbd3 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -411,11 +411,11 @@ public class PullRequestNotificationManager implements Serializable {
EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();
if (emailAddress != null && emailAddress.isVerified())
bccEmailAddresses.add(emailAddress.getValue());
- } else if (event.getCommentText() instanceof MarkdownText
- && watch.getUser().getAiSetting().isProactive()
+ } else if (event instanceof PullRequestCommentCreated
&& user != null
&& !user.isSystem()
&& !user.equals(watch.getUser())
+ && watch.getUser().getAiSetting().isProactive()
&& isAiEligible(user, request, watch.getUser(), false)
&& canCreateWorkspace(watch.getUser(), request, false)) {
onAiNotified(watch.getUser(), user, request,