The Unified and Autonomous Development Platform
feat: Able to disable email notification of other users (OD-2110)
Robin Shene15838a8d7c8
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.javaindex 1928fc66a2..24f7d1dde3 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java@@ -78,8 +78,7 @@ import java.util.*;import java.util.stream.Collectors;import static com.google.common.base.Throwables.getStackTraceAsString;-import static io.onedev.server.model.User.PROP_GUEST;-import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;+import static io.onedev.server.model.User.*;import static io.onedev.server.persistence.PersistenceUtils.tableExists;import static org.unbescape.html.HtmlEscape.escapeHtml5;@@ -645,7 +644,7 @@ public class DefaultDataManager implements DataManager, Serializable {if (validator.validate(bean).isEmpty()) {createRoot(bean);} else {- manualConfigs.add(new ManualConfig("Create Administrator Account", null, bean, Sets.newHashSet(PROP_GUEST, PROP_NOTIFY_OWN_EVENTS)) {+ manualConfigs.add(new ManualConfig("Create Administrator Account", null, bean, Sets.newHashSet(PROP_GUEST, PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS)) {@Overridepublic void complete() {diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex d3c599c8d5..78af2e873b 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -7036,5 +7036,16 @@ public class DataMigrator {}}}++ private void migrate177(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Users.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements())+ element.addElement("disableWatchNotifications").setText("false");+ dom.writeToFile(file, false);+ }+ }+ }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 0b57c1e6aa..2d61067f47 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -75,6 +75,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {public static final String PROP_GUEST = "guest";+ public static final String PROP_DISABLE_WATCH_NOTIFICATIONS = "disableWatchNotifications";+public static final String PROP_NOTIFY_OWN_EVENTS = "notifyOwnEvents";private static ThreadLocal<Stack<User>> stack = new ThreadLocal<Stack<User>>() {@@ -102,6 +104,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {private boolean guest;+ private boolean disableWatchNotifications;+private boolean notifyOwnEvents;@JsonIgnore@@ -571,6 +575,17 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.guest = guest;}+ @Editable(order=350, description = "Whether or not to disable email notifications for watched " ++ "events. Note that forced notifications such as mention notification, review invitation, " ++ "and build failure notification will still be sent")+ public boolean isDisableWatchNotifications() {+ return disableWatchNotifications;+ }++ public void setDisableWatchNotifications(boolean disableWatchNotifications) {+ this.disableWatchNotifications = disableWatchNotifications;+ }+@Editable(order=400, name="Notify Own Events", description = "Whether or not to send notifications for events generated by yourself")public boolean isNotifyOwnEvents() {return notifyOwnEvents;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 73810f03bb..d4e0c5b5ca 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@@ -116,16 +116,19 @@ public class BuildNotificationManager {Project project = event.getProject();Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();for (BuildQueryPersonalization personalization: project.getBuildQueryPersonalizations()) {- for (String name: personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {- String commonName = NamedQuery.getCommonName(name);- if (commonName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),- NamedQuery.find(project.getNamedBuildQueries(), commonName));- }- String personalName = NamedQuery.getPersonalName(name);- if (personalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),- NamedQuery.find(personalization.getQueries(), personalName));+ var user = personalization.getUser();+ if (!user.isDisableWatchNotifications()) {+ for (String name : personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {+ String commonName = NamedQuery.getCommonName(name);+ if (commonName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(project.getNamedBuildQueries(), commonName));+ }+ String personalName = NamedQuery.getPersonalName(name);+ if (personalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(personalization.getQueries(), personalName));+ }}}}diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.javaindex 82e1fc1a18..ed5666af99 100644--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java@@ -66,17 +66,20 @@ public class CommitNotificationManager {RevCommit commit = project.getRevCommit(event.getNewCommitId(), false);if (commit != null) {Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();- for (CommitQueryPersonalization setting: project.getCommitQueryPersonalizations()) {- for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions()) {- String globalName = NamedQuery.getCommonName(name);- if (globalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),- NamedQuery.find(project.getNamedCommitQueries(), globalName));- }- String personalName = NamedQuery.getPersonalName(name);- if (personalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),- NamedQuery.find(setting.getQueries(), personalName));+ for (CommitQueryPersonalization personalization: project.getCommitQueryPersonalizations()) {+ var user = personalization.getUser();+ if (!user.isDisableWatchNotifications()) {+ for (String name : personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {+ String globalName = NamedQuery.getCommonName(name);+ if (globalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(project.getNamedCommitQueries(), globalName));+ }+ String personalName = NamedQuery.getPersonalName(name);+ if (personalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(personalization.getQueries(), personalName));+ }}}}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.javaindex a16ba9eddd..ac898533ae 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@@ -281,6 +281,7 @@ public class IssueNotificationManager {for (IssueWatch watch: issue.getWatches()) {Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);if (watch.isWatching()+ && !watch.getUser().isDisableWatchNotifications()&& (visitDate == null || visitDate.before(event.getDate()))&& !notifiedUsers.contains(watch.getUser())&& !isNotified(notifiedEmailAddresses, watch.getUser())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.javaindex 2b97aaf752..7d7a42d21a 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@@ -301,6 +301,7 @@ public class PullRequestNotificationManager {Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);Permission permission = new ProjectPermission(request.getProject(), new ReadCode());if (watch.isWatching()+ && !watch.getUser().isDisableWatchNotifications()&& (visitDate == null || visitDate.before(event.getDate()))&& (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))&& !notifiedUsers.contains(watch.getUser())diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.javaindex 21a9a4487e..b4e78e34d1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.java@@ -14,6 +14,9 @@ import org.apache.wicket.model.IModel;import java.io.Serializable;+import static io.onedev.server.model.User.PROP_DISABLE_WATCH_NOTIFICATIONS;+import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;+@SuppressWarnings("serial")public class PreferencesEditPanel extends GenericPanel<User> {@@ -31,7 +34,7 @@ public class PreferencesEditPanel extends GenericPanel<User> {protected void onInitialize() {super.onInitialize();- editor = BeanContext.editModel("editor", new IModel<Serializable>() {+ editor = BeanContext.editModel("editor", new IModel<>() {@Overridepublic void detach() {@@ -46,8 +49,8 @@ public class PreferencesEditPanel extends GenericPanel<User> {public void setObject(Serializable object) {editor.getDescriptor().copyProperties(object, getUser());}-- }, Sets.newHashSet(User.PROP_NOTIFY_OWN_EVENTS), false);++ }, Sets.newHashSet(PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS), false);Form<?> form = new Form<Void>("form") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.javaindex a4364b340e..2baf5d25a0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java@@ -27,6 +27,7 @@ import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;import io.onedev.server.web.util.editbean.NewUserBean;+import static io.onedev.server.model.User.PROP_DISABLE_WATCH_NOTIFICATIONS;import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;@SuppressWarnings("serial")@@ -44,7 +45,7 @@ public class NewUserPage extends AdministrationPage {protected void onInitialize() {super.onInitialize();- var editor = BeanContext.edit("editor", newUserBean, Sets.newHashSet(PROP_NOTIFY_OWN_EVENTS), true);+ var editor = BeanContext.edit("editor", newUserBean, Sets.newHashSet(PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS), true);Form<?> form = new Form<Void>("form") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.javaindex b7fe4c6d9a..480b934fc4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java@@ -27,8 +27,7 @@ import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.simple.SimplePage;import io.onedev.server.web.util.editbean.NewUserBean;-import static io.onedev.server.model.User.PROP_GUEST;-import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;+import static io.onedev.server.model.User.*;@SuppressWarnings("serial")public class SignUpPage extends SimplePage {@@ -51,7 +50,7 @@ public class SignUpPage extends SimplePage {super.onInitialize();NewUserBean newUserBean = new NewUserBean();- BeanEditor editor = BeanContext.edit("editor", newUserBean, Sets.newHashSet(PROP_GUEST, PROP_NOTIFY_OWN_EVENTS), true);+ BeanEditor editor = BeanContext.edit("editor", newUserBean, Sets.newHashSet(PROP_GUEST, PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS), true);Form<?> form = new Form<Void>("form") {