The Unified and Autonomous Development Platform
fix: build success notifications being sent to [email protected] (#1491)
Robin Shen0e13b98b9f1a
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex 019af13426..dcc6681371 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -4,6 +4,7 @@ import java.util.Collection;import java.util.HashMap;import java.util.HashSet;import java.util.Map;+import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.inject.Inject;@@ -35,6 +36,8 @@ import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ProjectPermission;+import static java.util.stream.Collectors.*;+@Singletonpublic class BuildNotificationManager extends AbstractNotificationManager {@@ -69,6 +72,8 @@ public class BuildNotificationManager extends AbstractNotificationManager {@Sessionalpublic void notify(BuildEvent event, Collection<String> emails) {+ emails = emails.stream().filter(it -> !it.equals(User.SYSTEM_EMAIL_ADDRESS)).collect(toList());+Build build = event.getBuild();String subject = String.format("[Build %s] %s", build.getFQN(), build.getJobName());diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.javaindex 3e27608664..577df32c14 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java@@ -34,7 +34,7 @@ import io.onedev.server.web.util.SuggestionUtils;public class ActionConditionBehavior extends ANTLRAssistBehavior {public ActionConditionBehavior() {- super(ActionConditionParser.class, "condition", false, true);+ super(ActionConditionParser.class, "condition", false, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.javaindex c4328c0fb6..63ccc95f24 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java@@ -39,7 +39,7 @@ public class BuildMetricQueryBehavior extends ANTLRAssistBehavior {private final Class<? extends AbstractEntity> metricClass;public BuildMetricQueryBehavior(IModel<Project> projectModel, Class<? extends AbstractEntity> metricClass) {- super(BuildMetricQueryParser.class, "query", false, true);+ super(BuildMetricQueryParser.class, "query", false, false);this.projectModel = projectModel;this.metricClass = metricClass;}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.javaindex a03e82998d..6b28218b03 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java@@ -45,12 +45,16 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {"yesterday midnight", "3 days ago", "last week", "last Monday","4 weeks ago", "1 month 2 days ago", "1 year ago");- public CommitQueryBehavior(IModel<Project> projectModel, boolean withCurrentUserCriteria) {- super(CommitQueryParser.class, "query", false, true);+ public CommitQueryBehavior(IModel<Project> projectModel, boolean withCurrentUserCriteria, boolean hideIfBlank) {+ super(CommitQueryParser.class, "query", false, hideIfBlank);this.projectModel = projectModel;this.withCurrentUserCriteria = withCurrentUserCriteria;}+ public CommitQueryBehavior(IModel<Project> projectModel, boolean withCurrentUserCriteria) {+ this(projectModel, withCurrentUserCriteria, false);+ }+@Overridepublic void detach(Component component) {super.detach(component);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.javaindex 3fe3f6014d..70900ab250 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java@@ -19,7 +19,7 @@ import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;public abstract class InterpolativeAssistBehavior extends ANTLRAssistBehavior {public InterpolativeAssistBehavior() {- super(InterpolativeParser.class, "interpolative", false, true);+ super(InterpolativeParser.class, "interpolative", false, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.javaindex 6421d19894..9c7b6b9bdc 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java@@ -25,7 +25,7 @@ import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;public abstract class InterpolativePatternSetAssistBehavior extends ANTLRAssistBehavior {public InterpolativePatternSetAssistBehavior() {- super(InterpolativePatternSetParser.class, "interpolative", false, true);+ super(InterpolativePatternSetParser.class, "interpolative", false, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.javaindex 1ce9f89458..844d0b4cff 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java@@ -33,7 +33,7 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {private final boolean withJobCriteria;public JobMatchBehavior(boolean withProjectCriteria, boolean withJobCriteria) {- super(JobMatchParser.class, "jobMatch", false, true);+ super(JobMatchParser.class, "jobMatch", false, false);this.withProjectCriteria = withProjectCriteria;this.withJobCriteria = withJobCriteria;}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/NotificationReceiverBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/NotificationReceiverBehavior.javaindex 495de61036..d6865cd375 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/NotificationReceiverBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/NotificationReceiverBehavior.java@@ -23,7 +23,7 @@ public class NotificationReceiverBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;public NotificationReceiverBehavior(IModel<Project> projectModel) {- super(NotificationReceiverParser.class, "receiver", false, true);+ super(NotificationReceiverParser.class, "receiver", false, false);this.projectModel = projectModel;}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.javaindex 86844afcb4..a052e79bb7 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java@@ -24,7 +24,7 @@ import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {public PatternSetAssistBehavior() {- super(PatternSetParser.class, "patterns", false, true);+ super(PatternSetParser.class, "patterns", false, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.javaindex 78799762fe..b05353be92 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java@@ -31,7 +31,7 @@ import io.onedev.server.web.util.SuggestionUtils;public class RetryConditionBehavior extends ANTLRAssistBehavior {public RetryConditionBehavior() {- super(RetryConditionParser.class, "condition", false, true);+ super(RetryConditionParser.class, "condition", false, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.javaindex ea4c1d2b0b..d5d638c02d 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.java@@ -17,7 +17,7 @@ import static io.onedev.server.util.usermatch.UserMatchLexer.USER;public class UserMatchBehavior extends ANTLRAssistBehavior {public UserMatchBehavior() {- super(UserMatchParser.class, "userMatch", false, true);+ super(UserMatchParser.class, "userMatch", false, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 8cd8d4df94..6a79732bcf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -332,7 +332,7 @@ public abstract class CommitListPanel extends Panel {return getProject();}- }, true) {+ }, true, true) {@Overrideprotected void onInput(AjaxRequestTarget target, String inputContent) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.javaindex 903164b485..a39fbb768e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.java@@ -26,7 +26,7 @@ public class ReviewRequirementBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;public ReviewRequirementBehavior(IModel<Project> projectModel) {- super(ReviewRequirementParser.class, "requirement", false, true);+ super(ReviewRequirementParser.class, "requirement", false, false);this.projectModel = projectModel;}