The Unified and Autonomous Development Platform
Fix issue #375 - Set appropriate email headers to make notification emails from same issue organized into a single conversation in various email clients
Robin Shenf4075e724362
diff --git a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.javaindex 0983dfa1e3..baafb25d5e 100644--- a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java@@ -10,11 +10,8 @@ public class ProjectCreated extends ProjectEvent {}@Override- public String getActivity(boolean withEntity) {- String activity = "created";- if (withEntity)- activity += " project " + getProject().getName();- return activity;+ public String getActivity() {+ return "created";}}diff --git a/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java b/server-core/src/main/java/io/onedev/server/event/ProjectEvent.javaindex 9f5ef33368..88ff4bfe3f 100644--- a/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java@@ -19,12 +19,12 @@ public abstract class ProjectEvent extends Event {return project;}- public abstract String getActivity(boolean withEntity);+ public abstract String getActivity();public LastUpdate getLastUpdate() {LastUpdate lastUpdate = new LastUpdate();lastUpdate.setUser(getUser());- lastUpdate.setActivity(getActivity(false));+ lastUpdate.setActivity(getActivity());lastUpdate.setDate(getDate());return lastUpdate;}diff --git a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java b/server-core/src/main/java/io/onedev/server/event/RefUpdated.javaindex 9fcfd308ed..6bbc03c43c 100644--- a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/RefUpdated.java@@ -45,11 +45,8 @@ public class RefUpdated extends ProjectEvent implements CommitAware {}@Override- public String getActivity(boolean withEntity) {- String activity = "Git ref updated";- if (withEntity)- activity += " in project " + getProject().getName();- return activity;+ public String getActivity() {+ return "Git ref updated";}}diff --git a/server-core/src/main/java/io/onedev/server/event/ScheduledTimeReaches.java b/server-core/src/main/java/io/onedev/server/event/ScheduledTimeReaches.javaindex 745ebced8f..4731b7216a 100644--- a/server-core/src/main/java/io/onedev/server/event/ScheduledTimeReaches.java+++ b/server-core/src/main/java/io/onedev/server/event/ScheduledTimeReaches.java@@ -11,11 +11,8 @@ public class ScheduledTimeReaches extends ProjectEvent {}@Override- public String getActivity(boolean withEntity) {- String activity = "Scheduled time reaches ";- if (withEntity)- activity += " in project " + getProject().getName();- return activity;+ public String getActivity() {+ return "Scheduled time reaches ";}}diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.javaindex 3e4eee7fcf..7ee701637c 100644--- a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java@@ -33,16 +33,8 @@ public class BuildEvent extends ProjectEvent implements CommitAware {}@Override- public String getActivity(boolean withEntity) {- String activity = build.getStatus().getDisplayName();- if (withEntity) {- activity = " is " + activity;- if (build.getVersion() != null)- activity = "build #" + build.getNumber() + " (" + build.getVersion() + ")" + activity;- else- activity = "build #" + build.getNumber() + activity;- }- return activity;+ public String getActivity() {+ return build.getStatus().getDisplayName();}}diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.javaindex 1694a8f951..48bab58250 100644--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java@@ -15,11 +15,8 @@ public class CodeCommentCreated extends CodeCommentEvent implements MarkdownAwar}@Override- public String getActivity(boolean withEntity) {- String activity = "commented";- if (withEntity)- activity += " on file " + getComment().getMark().getPath();- return activity;+ public String getActivity() {+ return "commented";}}diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.javaindex f780f65dde..6cc084d840 100644--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java@@ -22,11 +22,8 @@ public class CodeCommentReplied extends CodeCommentEvent implements MarkdownAwar}@Override- public String getActivity(boolean withEntity) {- String activity = "replied comment";- if (withEntity)- activity += " on file " + getComment().getMark().getPath();- return activity;+ public String getActivity() {+ return "replied comment";}}diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.javaindex 485b2172c4..a5dfe34ef3 100644--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java@@ -18,11 +18,8 @@ public class CodeCommentUpdated extends CodeCommentEvent implements MarkdownAwar}@Override- public String getActivity(boolean withEntity) {- String activity = "updated comment";- if (withEntity)- activity += " on file " + getComment().getMark().getPath();- return activity;+ public String getActivity() {+ return "updated comment";}}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.javaindex 721539f853..47ea95e63a 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java@@ -45,8 +45,8 @@ public class IssueChangeEvent extends IssueEvent implements MarkdownAware {}@Override- public String getActivity(boolean withEntity) {- return getChange().getData().getActivity(withEntity?getChange().getIssue():null);+ public String getActivity() {+ return getChange().getData().getActivity();}}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.javaindex f938cc15e7..2070201459 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java@@ -36,11 +36,8 @@ public class IssueCommented extends IssueEvent implements MarkdownAware {}@Override- public String getActivity(boolean withEntity) {- String activity = "commented";- if (withEntity)- activity += " on issue " + comment.getIssue().getNumberAndTitle();- return activity;+ public String getActivity() {+ return "commented";}}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.javaindex 1e4006dbe6..9eb6c14eb6 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java@@ -67,11 +67,8 @@ public class IssueOpened extends IssueEvent implements MarkdownAware {}@Override- public String getActivity(boolean withEntity) {- String activity = "opened";- if (withEntity)- activity += " issue " + getIssue().getNumberAndTitle();- return activity;+ public String getActivity() {+ return "opened";}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.javaindex 0e1015f8a3..b4a63c16d4 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java@@ -18,15 +18,13 @@ public class PullRequestBuildEvent extends PullRequestEvent {}@Override- public String getActivity(boolean withEntity) {+ public String getActivity() {String activity = build.getJobName() + " ";if (build.getVersion() != null)activity = "build #" + build.getNumber() + " (" + build.getVersion() + ")";elseactivity = "build #" + build.getNumber();activity += " is " + build.getStatus().getDisplayName();- if (withEntity)- activity += " for pull request " + build.getRequest().getNumberAndTitle();return activity;}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.javaindex aa9e334813..d7d86aeb31 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java@@ -32,8 +32,8 @@ public class PullRequestChangeEvent extends PullRequestEvent implements Markdown}@Override- public String getActivity(boolean withEntity) {- return change.getData().getActivity(withEntity?change.getRequest():null);+ public String getActivity() {+ return change.getData().getActivity();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.javaindex 90a16774be..b8fc008e4b 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java@@ -16,11 +16,8 @@ public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent i}@Override- public String getActivity(boolean withEntity) {- String activity = "created code comment";- if (withEntity)- activity += " in pull request " + getRequest().getNumberAndTitle();- return activity;+ public String getActivity() {+ return "created code comment";}}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.javaindex 49dd0195f6..6e10d633b2 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java@@ -22,11 +22,8 @@ public class PullRequestCodeCommentReplied extends PullRequestCodeCommentEvent {}@Override- public String getActivity(boolean withEntity) {- String activity = "replied code comment";- if (withEntity)- activity += " in pull request " + getRequest().getNumberAndTitle();- return activity;+ public String getActivity() {+ return "replied code comment";}}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.javaindex 1e6cb9fa46..20e6baec98 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java@@ -31,11 +31,8 @@ public class PullRequestCommented extends PullRequestEvent implements MarkdownAw}@Override- public String getActivity(boolean withEntity) {- String activity = "commented";- if (withEntity)- activity += " on pull request " + getRequest().getNumberAndTitle();- return activity;+ public String getActivity() {+ return "commented";}}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.javaindex cf3ba84a63..88b0c15038 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java@@ -16,11 +16,8 @@ public class PullRequestMergePreviewCalculated extends PullRequestEvent implemen}@Override- public String getActivity(boolean withEntity) {- String activity = "Merge preview calculated";- if (withEntity)- activity += " in pull request " + getRequest().getNumberAndTitle();- return activity;+ public String getActivity() {+ return "Merge preview calculated";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.javaindex c5765da6d6..e03f4f5c9e 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java@@ -15,11 +15,8 @@ public class PullRequestOpened extends PullRequestEvent implements MarkdownAware}@Override- public String getActivity(boolean withEntity) {- String activity = "opened";- if (withEntity)- activity += " pull request " + getRequest().getNumberAndTitle();- return activity;+ public String getActivity() {+ return "opened";}}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.javaindex c471c7c8b8..e0c616fcd2 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java@@ -24,11 +24,8 @@ public class PullRequestUpdated extends PullRequestEvent {}@Override- public String getActivity(boolean withEntity) {- String activity = "Commits added";- if (withEntity)- activity += " in pull request " + getRequest().getNumberAndTitle();- return activity;+ public String getActivity() {+ return "Commits added";}public Collection<User> getCommitters() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.javaindex cfe54f1d15..1b41cc5323 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java@@ -31,10 +31,12 @@ public class NotificationTemplateSetting implements Serializable {+ "When evaluating this template, below variables will be available:"+ "<ul class='mb-0'>"+ "<li><code>event:</code> <a href='https://code.onedev.io/projects/onedev-server/blob/main/server-core/src/main/java/io/onedev/server/event/Event.java' target='_blank'>event object</a> triggering the notification"- + "<li><code>eventBody:</code> string type representing body of the event, for instance, comment made by user"- + "<li><code>eventUrl:</code> string type representing event detail url"- + "<li><code>replyable:</code> boolean type indiciating whether or not topic comment can be created directly by replying the email"- + "<li><code>unsubscribable:</code> a non-null value indicates that the notification can be unsuscribed. Check <a href='https://code.onedev.io/projects/onedev-server/blob/main/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java' target='_blank'>document</a> for details";+ + "<li><code>eventSummary:</code> a string representing summary of the event"+ + "<li><code>eventBody:</code> a string representing body of the event. May be <code>null</code>"+ + "<li><code>eventUrl:</code> a string representing event detail url"+ + "<li><code>replyable:</code> a boolean indiciating whether or not topic comment can be created directly by replying the email"+ + "<li><code>unsubscribable:</code> an <a href='https://code.onedev.io/projects/onedev-server/blob/main/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java' target='_blank'>object</a> holding unsubscribe information. "+ + " A <code>null</code> value means that the notification can not be unsubscribed";static {URL url = Resources.getResource(NotificationTemplateSetting.class, "default-notification-template.html");diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.htmlindex 7c880100bd..b02159d170 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html@@ -1,8 +1,12 @@<%+ print "<b>${eventSummary}</b>"+ print "<br><br>"+if (eventBody != null) {print eventBodyprint "<br>"}+if (replyable)print """<div>Reply this email to post comment, or click <a href='${eventUrl}'>this link</a> for details</div>diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.javaindex 209e149d37..88be8fa6b9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java@@ -9,7 +9,6 @@ import org.apache.wicket.Component;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.Milestone;import io.onedev.server.util.CommentAware;@@ -113,11 +112,8 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {}@Override- public String getActivity(Issue withIssue) {- String activity = "batch edited";- if (withIssue != null)- activity += " issue " + withIssue.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "batch edited";}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.javaindex 85a4ebc969..8b445d83de 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java@@ -9,7 +9,6 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import io.onedev.server.model.Group;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;import io.onedev.server.util.CommentAware;@@ -18,7 +17,7 @@ public interface IssueChangeData extends Serializable {Component render(String componentId, IssueChange change);- String getActivity(@Nullable Issue withIssue);+ String getActivity();@NullableCommentAware getCommentAware();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.javaindex c5ac230e95..d1a70c62b4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java@@ -7,7 +7,6 @@ import java.util.Map;import org.apache.wicket.Component;import io.onedev.server.model.Group;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;import io.onedev.server.util.CommentAware;@@ -39,11 +38,8 @@ public class IssueDescriptionChangeData implements IssueChangeData {}@Override- public String getActivity(Issue withIssue) {- String activity = "changed description";- if (withIssue != null)- activity += " of issue " + withIssue.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "changed description";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.javaindex 59cd6d2afc..644e37ccd6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java@@ -16,7 +16,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.field.spec.FieldSpec;@@ -70,11 +69,8 @@ public class IssueFieldChangeData implements IssueChangeData {}@Override- public String getActivity(Issue withIssue) {- String activity = "changed fields";- if (withIssue != null)- activity += " of issue " + withIssue.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "changed fields";}public List<String> getLines(Map<String, Input> fields) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.javaindex d38d3638fe..2380ff00f2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java@@ -9,7 +9,6 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import io.onedev.server.model.Group;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.Milestone;import io.onedev.server.model.User;@@ -47,11 +46,8 @@ public class IssueMilestoneChangeData implements IssueChangeData {}@Override- public String getActivity(Issue withIssue) {- String activity = "changed milestone";- if (withIssue != null)- activity += " of issue " + withIssue.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "changed milestone";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.javaindex b52687c4dc..299a5b37aa 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java@@ -8,7 +8,6 @@ import org.apache.wicket.Component;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Group;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;import io.onedev.server.rest.annotation.EntityId;@@ -31,11 +30,8 @@ public class IssueReferencedFromCodeCommentData implements IssueChangeData {}@Override- public String getActivity(Issue withIssue) {- if (withIssue != null)- return "A code comment referenced issue " + withIssue.getNumberAndTitle();- else- return "Referenced from code comment";+ public String getActivity() {+ return "Referenced from code comment";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.javaindex 99dbabe682..2277f18506 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java@@ -35,11 +35,8 @@ public class IssueReferencedFromIssueData implements IssueChangeData {}@Override- public String getActivity(Issue withIssue) {- if (withIssue != null)- return "Another issue referenced issue " + withIssue.getNumberAndTitle();- else- return "Referenced from other issue";+ public String getActivity() {+ return "Referenced from other issue";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.javaindex a13cc4010f..a84de05331 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java@@ -7,7 +7,6 @@ import java.util.Map;import org.apache.wicket.Component;import io.onedev.server.model.Group;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;@@ -36,11 +35,8 @@ public class IssueReferencedFromPullRequestData implements IssueChangeData {}@Override- public String getActivity(Issue withIssue) {- if (withIssue != null)- return "A pull request referenced issue " + withIssue.getNumberAndTitle();- else- return "Referenced from pull request";+ public String getActivity() {+ return "Referenced from pull request";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.javaindex c1b371f7fa..76356d7176 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java@@ -9,7 +9,6 @@ import org.apache.wicket.Component;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.util.CommentAware;import io.onedev.server.util.Input;@@ -94,11 +93,8 @@ public class IssueStateChangeData extends IssueFieldChangeData {}@Override- public String getActivity(Issue withIssue) {- String activity = "changed state to '" + newState + "'";- if (withIssue != null)- activity += " for issue " + withIssue.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "changed state to '" + newState + "'";}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.javaindex fd665ed9eb..c0c62aab01 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java@@ -7,7 +7,6 @@ import java.util.Map;import org.apache.wicket.Component;import io.onedev.server.model.Group;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;import io.onedev.server.util.CollectionUtils;@@ -36,11 +35,8 @@ public class IssueTitleChangeData implements IssueChangeData {}@Override- public String getActivity(Issue withIssue) {- String activity = "changed title";- if (withIssue != null)- activity += " of issue " + withIssue.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "changed title";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.javaindex bcf09daa51..91a231c512 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java@@ -6,7 +6,6 @@ import org.apache.wicket.Component;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -21,11 +20,8 @@ public class PullRequestApproveData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- String activity = "approved";- if (withRequest != null)- activity += " pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "approved";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.javaindex 6122acaee7..923c822e12 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java@@ -2,7 +2,6 @@ package io.onedev.server.model.support.pullrequest.changedata;import org.apache.wicket.Component;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -17,11 +16,8 @@ public class PullRequestAssigneeAddData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- String activity = "added assignee \"" + assignee + "\"";- if (withRequest != null)- activity += " in pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "added assignee \"" + assignee + "\"";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.javaindex 7a301844e0..01f64f0c34 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java@@ -2,7 +2,6 @@ package io.onedev.server.model.support.pullrequest.changedata;import org.apache.wicket.Component;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -17,11 +16,8 @@ public class PullRequestAssigneeRemoveData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- String activity = "removed assignee \"" + assignee + "\"";- if (withRequest != null)- activity += " in pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "removed assignee \"" + assignee + "\"";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.javaindex 827d361974..acd732c466 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java@@ -6,7 +6,6 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -14,7 +13,7 @@ public interface PullRequestChangeData extends Serializable {Component render(String componentId, PullRequestChange change);- String getActivity(@Nullable PullRequest withRequest);+ String getActivity();@NullableCommentAware getCommentAware();diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.javaindex a9a052e95f..57494e472b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java@@ -2,7 +2,6 @@ package io.onedev.server.model.support.pullrequest.changedata;import org.apache.wicket.Component;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -28,11 +27,8 @@ public class PullRequestDescriptionChangeData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- String activity = "changed description";- if (withRequest != null)- activity += " of pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "changed description";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.javaindex 2285492188..0acea8eaa6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java@@ -6,7 +6,6 @@ import org.apache.wicket.Component;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -21,11 +20,8 @@ public class PullRequestDiscardData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- String activity = "discarded";- if (withRequest != null)- activity += " pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "discarded";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.javaindex 6f7b3dc77f..06fce58af9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java@@ -4,7 +4,6 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -19,15 +18,11 @@ public class PullRequestMergeData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- if (reason != null) {+ public String getActivity() {+ if (reason != null)return reason;- } else {- String activity = "merged";- if (withRequest != null)- activity += " pull request " + withRequest.getNumberAndTitle();- return activity;- }+ else+ return "merged";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.javaindex 4c316b13cc..5c13ae3177 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java@@ -2,7 +2,6 @@ package io.onedev.server.model.support.pullrequest.changedata;import org.apache.wicket.Component;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.util.CollectionUtils;@@ -23,11 +22,8 @@ public class PullRequestMergeStrategyChangeData implements PullRequestChangeData}@Override- public String getActivity(PullRequest withRequest) {- String activity = "changed merge strategy";- if (withRequest != null)- activity += " of pull request" + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "changed merge strategy";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.javaindex 6a06c39ab7..138f09069b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java@@ -3,7 +3,6 @@ package io.onedev.server.model.support.pullrequest.changedata;import org.apache.wicket.Component;import io.onedev.server.model.CodeComment;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.CommentAware;@@ -30,11 +29,8 @@ public class PullRequestReferencedFromCodeCommentData implements PullRequestChan}@Override- public String getActivity(PullRequest withRequest) {- if (withRequest != null)- return "A code comment referenced pull request " + withRequest.getNumberAndTitle();- else- return "Referenced from code comment";+ public String getActivity() {+ return "Referenced from code comment";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.javaindex 95b9e77add..54f262d093 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java@@ -3,7 +3,6 @@ package io.onedev.server.model.support.pullrequest.changedata;import org.apache.wicket.Component;import io.onedev.server.model.Issue;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.CommentAware;@@ -30,11 +29,8 @@ public class PullRequestReferencedFromIssueData implements PullRequestChangeData}@Override- public String getActivity(PullRequest withRequest) {- if (withRequest != null)- return "An issue referenced pull request " + withRequest.getNumberAndTitle();- else- return "Referenced from issue";+ public String getActivity() {+ return "Referenced from issue";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.javaindex 9021718163..0e8d223d76 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java@@ -29,11 +29,8 @@ public class PullRequestReferencedFromPullRequestData implements PullRequestChan}@Override- public String getActivity(PullRequest withRequest) {- if (withRequest != null)- return "Another pull request referenced pull request " + withRequest.getNumberAndTitle();- else- return "Referenced from other pull request";+ public String getActivity() {+ return "Referenced from other pull request";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.javaindex 3fa74e95c5..a717fb514b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java@@ -6,7 +6,6 @@ import org.apache.wicket.Component;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -21,11 +20,8 @@ public class PullRequestReopenData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- String activity = "reopened";- if (withRequest != null)- activity += " pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "reopened";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.javaindex 5dcde5ceaa..bbfd33d414 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java@@ -6,7 +6,6 @@ import org.apache.wicket.Component;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -21,11 +20,8 @@ public class PullRequestRequestedForChangesData implements PullRequestChangeData}@Override- public String getActivity(PullRequest withRequest) {- String activity = "requested for changes";- if (withRequest != null)- activity += " in pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "requested for changes";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.javaindex 39c1df9b67..a944e88fb6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java@@ -2,7 +2,6 @@ package io.onedev.server.model.support.pullrequest.changedata;import org.apache.wicket.Component;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -17,11 +16,8 @@ public class PullRequestReviewerAddData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- String activity = "added reviewer \"" + reviewer + "\"";- if (withRequest != null)- activity += " in pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "added reviewer \"" + reviewer + "\"";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.javaindex ef5f9706e5..6b45af7485 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java@@ -2,7 +2,6 @@ package io.onedev.server.model.support.pullrequest.changedata;import org.apache.wicket.Component;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -17,11 +16,8 @@ public class PullRequestReviewerRemoveData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- String activity = "removed reviewer \"" + reviewer + "\"";- if (withRequest != null)- activity += " in pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "removed reviewer \"" + reviewer + "\"";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.javaindex 6606ff8933..f6abb6ddc6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java@@ -6,7 +6,6 @@ import org.apache.wicket.Component;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -21,11 +20,8 @@ public class PullRequestSourceBranchDeleteData implements PullRequestChangeData}@Override- public String getActivity(PullRequest withRequest) {- String activity = "deleted source branch";- if (withRequest != null)- activity += " of pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "deleted source branch";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.javaindex 8a74171c6d..bfe8e134a4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java@@ -6,7 +6,6 @@ import org.apache.wicket.Component;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CommentAware;@@ -21,11 +20,8 @@ public class PullRequestSourceBranchRestoreData implements PullRequestChangeData}@Override- public String getActivity(PullRequest withRequest) {- String activity = "restored source branch";- if (withRequest != null)- activity += " of pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "restored source branch";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.javaindex 4c56c65b54..82d0c584d6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java@@ -2,7 +2,6 @@ package io.onedev.server.model.support.pullrequest.changedata;import org.apache.wicket.Component;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.CollectionUtils;import io.onedev.server.util.CommentAware;@@ -22,11 +21,8 @@ public class PullRequestTitleChangeData implements PullRequestChangeData {}@Override- public String getActivity(PullRequest withRequest) {- String activity = "changed title";- if (withRequest != null)- activity += " of pull request " + withRequest.getNumberAndTitle();- return activity;+ public String getActivity() {+ return "changed title";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.javaindex f7d66127ad..c923ee4c8d 100644--- a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java@@ -7,6 +7,7 @@ import java.util.Map;import javax.annotation.Nullable;import org.codehaus.groovy.control.CompilationFailedException;+import org.unbescape.html.HtmlEscape;import groovy.text.SimpleTemplateEngine;import io.onedev.commons.utils.StringUtils;@@ -35,9 +36,9 @@ public abstract class AbstractNotificationManager {this.settingManager = settingManager;}- protected String getHtmlBody(Event event, String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {- String eventBody = null;- if (event instanceof MarkdownAware) {+ protected String getHtmlBody(Event event, String eventSummary, @Nullable String eventBody,+ String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {+ if (eventBody == null && event instanceof MarkdownAware) {eventBody = ((MarkdownAware) event).getMarkdown();if (eventBody != null) {Project project = null;@@ -51,11 +52,15 @@ public abstract class AbstractNotificationManager {Map<String, Object> bindings = new HashMap<>();+ eventSummary = HtmlEscape.escapeHtml5(eventSummary);+ eventUrl = HtmlEscape.escapeHtml5(eventUrl);+bindings.put("event", event);+ bindings.put("eventSummary", eventSummary);bindings.put("eventBody", eventBody);- bindings.put("unsubscribable", unsubscribable);- bindings.put("replyable", replyable);bindings.put("eventUrl", eventUrl);+ bindings.put("replyable", replyable);+ bindings.put("unsubscribable", unsubscribable);if (event instanceof IssueEvent) {template = StringUtils.join(settingManager.getNotificationTemplateSetting().getIssueNotificationTemplate(), "\n");@@ -77,39 +82,38 @@ public abstract class AbstractNotificationManager {template = StringUtils.join(NotificationTemplateSetting.DEFAULT_TEMPLATE, "\n");try {- String htmlBody = new SimpleTemplateEngine().createTemplate(template).make(bindings).toString();- return htmlBody;+ return new SimpleTemplateEngine().createTemplate(template).make(bindings).toString();} catch (CompilationFailedException | ClassNotFoundException | IOException e) {throw new RuntimeException(e);}}- protected String getTextBody(Event event, String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {- String textBody = null;- if (event instanceof MarkdownAware)- textBody = ((MarkdownAware) event).getMarkdown();+ protected String getTextBody(Event event, String eventSummary, @Nullable String eventBody,+ String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {+ StringBuilder textBody = new StringBuilder(eventSummary).append("\n\n");++ if (eventBody == null && event instanceof MarkdownAware)+ eventBody = ((MarkdownAware) event).getMarkdown();- if (textBody != null)- textBody += "\n";- else- textBody = "";+ if (eventBody != null)+ textBody.append(eventBody).append("\n\n");if (replyable)- textBody += "Reply this email to post comment, or visit " + eventUrl + " for details";+ textBody.append("Reply this email to post comment, or visit " + eventUrl + " for details");else- textBody += "Visit " + eventUrl + " for details";+ textBody.append("Visit " + eventUrl + " for details");if (unsubscribable != null) {- textBody += "\n\n---------------------------------------------\nYou received this as you "- + "are participating or participated previously in this topic. ";+ textBody.append("\n\n---------------------------------------------\nYou received this as you "+ + "are participating or participated previously in this topic. ");if (unsubscribable.getEmailAddress() != null) {- textBody += String.format("Mail to %s with any content to unsubscribe",- unsubscribable.getEmailAddress());+ textBody.append(String.format("Mail to %s with any content to unsubscribe",+ unsubscribable.getEmailAddress()));} else {- textBody += "To stop receiving notifications of this topic, please visit detail link above and unwatch it";+ textBody.append("To stop receiving notifications of this topic, please visit detail link above and unwatch it");}}- return textBody;+ return textBody.toString();}}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 f205e39236..106bb0c33c 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@@ -19,6 +19,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.build.BuildEvent;+import io.onedev.server.event.build.BuildUpdated;import io.onedev.server.model.Build;import io.onedev.server.model.BuildQuerySetting;import io.onedev.server.model.Project;@@ -62,19 +63,22 @@ public class BuildNotificationManager extends AbstractNotificationManager {}public void notify(BuildEvent event, Collection<String> emails) {- String subject;Build build = event.getBuild();- if (build.getVersion() != null) {- subject = String.format("Build %s/%s/#%s (%s) is %s", build.getProject().getName(), build.getJobName(),- build.getNumber(), build.getVersion(), build.getStatus().getDisplayName().toLowerCase());- } else {- subject = String.format("Build %s/%s/#%s is %s", build.getProject().getName(), build.getJobName(),- build.getNumber(), build.getStatus().getDisplayName().toLowerCase());- }+ String subject = String.format("[%s] %s - %s", build.getStatus().getDisplayName(),+ build.getProject().getName(), build.getJobName());++ String summary;+ if (build.getVersion() != null)+ summary = String.format("Build %s (%s)", build.getFQN(), build.getVersion());+ else+ summary = String.format("Build %s", build.getFQN());++ summary += " is " + build.getStatus().getDisplayName().toLowerCase();+String url = urlManager.urlFor(build);String threadingReferences = build.getProject().getName() + "-build" + build.getNumber() + "@onedev";- String htmlBody = getHtmlBody(event, url, false, null);- String textBody = getTextBody(event, url, false, null);+ String htmlBody = getHtmlBody(event, summary, null, url, false, null);+ String textBody = getTextBody(event, summary, null, url, false, null);mailManager.sendMailAsync(Lists.newArrayList(), emails, subject, htmlBody,textBody, null, threadingReferences);}@@ -82,72 +86,74 @@ public class BuildNotificationManager extends AbstractNotificationManager {@Sessional@Listenpublic void on(BuildEvent event) {- Project project = event.getProject();- Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();- for (BuildQuerySetting setting: project.getUserBuildQuerySettings()) {- for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions()) {- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),- NamedQuery.find(project.getBuildSetting().getNamedQueries(true), name));- }- for (String name: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions()) {- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),- NamedQuery.find(setting.getUserQueries(), name));+ if (!(event instanceof BuildUpdated)) {+ Project project = event.getProject();+ Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();+ for (BuildQuerySetting setting: project.getUserBuildQuerySettings()) {+ for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions()) {+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),+ NamedQuery.find(project.getBuildSetting().getNamedQueries(true), name));+ }+ for (String name: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions()) {+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),+ NamedQuery.find(setting.getUserQueries(), name));+ }}- }- Build build = event.getBuild();- Collection<String> notifyEmails = new HashSet<>();- for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {- User user = entry.getKey();- for (String queryString: entry.getValue()) {- User.push(user);- try {- if (BuildQuery.parse(event.getProject(), queryString, true, true).matches(build)) {- notifyEmails.add(user.getEmail());- break;+ Build build = event.getBuild();+ Collection<String> notifyEmails = new HashSet<>();+ for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {+ User user = entry.getKey();+ for (String queryString: entry.getValue()) {+ User.push(user);+ try {+ if (BuildQuery.parse(event.getProject(), queryString, true, true).matches(build)) {+ notifyEmails.add(user.getEmail());+ break;+ }+ } catch (Exception e) {+ String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",+ user.getName(), build.getFQN(), queryString);+ logger.error(message, e);+ } finally {+ User.pop();}- } catch (Exception e) {- String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",- user.getName(), build.getFQN(), queryString);- logger.error(message, e);- } finally {- User.pop();}}- }-- subscribedQueryStrings.clear();- for (User user: userManager.query()) {- for (String name: user.getBuildQuerySetting().getQuerySubscriptionSupport().getQuerySubscriptions()) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), name));- }- for (String name: user.getBuildQuerySetting().getQuerySubscriptionSupport().getUserQuerySubscriptions()) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(user.getBuildQuerySetting().getUserQueries(), name));++ subscribedQueryStrings.clear();+ for (User user: userManager.query()) {+ for (String name: user.getBuildQuerySetting().getQuerySubscriptionSupport().getQuerySubscriptions()) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), name));+ }+ for (String name: user.getBuildQuerySetting().getQuerySubscriptionSupport().getUserQuerySubscriptions()) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(user.getBuildQuerySetting().getUserQueries(), name));+ }}- }- for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {- User user = entry.getKey();- for (String queryString: entry.getValue()) {- User.push(user);- try {- if (BuildQuery.parse(null, queryString, true, true).matches(build)) {- notifyEmails.add(user.getEmail());- break;+ for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {+ User user = entry.getKey();+ for (String queryString: entry.getValue()) {+ User.push(user);+ try {+ if (BuildQuery.parse(null, queryString, true, true).matches(build)) {+ notifyEmails.add(user.getEmail());+ break;+ }+ } catch (Exception e) {+ String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",+ user.getName(), build.getFQN(), queryString);+ logger.error(message, e);+ } finally {+ User.pop();}- } catch (Exception e) {- String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",- user.getName(), build.getFQN(), queryString);- logger.error(message, e);- } finally {- User.pop();}}++ notify(event, notifyEmails);}-- notify(event, notifyEmails);}}diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.javaindex aba28ec5b9..78fdc818ce 100644--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java@@ -57,13 +57,15 @@ public class CodeCommentNotificationManager extends AbstractNotificationManagerurl = null;if (url != null) {- String subject = String.format("You are mentioned in a code comment on file '%s'",- event.getComment().getMark().getPath());+ String subject = "[File Comment] " + event.getComment().getMark().getPath();+ String summary = String.format("%s: %s commented on file",+ event.getProject().getName(), event.getUser().getDisplayName());String threadingReferences = event.getComment().getProject().getName()+ "-codecomment" + event.getComment().getId() + "@onedev";mailManager.sendMailAsync(Sets.newHashSet(user.getEmail()), Lists.newArrayList(), subject,- getHtmlBody(event, url, false, null), getTextBody(event, url, false, null), null,- threadingReferences);+ getHtmlBody(event, summary, null, url, false, null),+ getTextBody(event, summary, null, url, false, null),+ null, threadingReferences);}}}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 d5a2836e99..575481d0a4 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@@ -13,6 +13,7 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;@@ -102,22 +103,28 @@ public class CommitNotificationManager extends AbstractNotificationManager {String branchName = GitUtils.ref2branch(event.getRefName());if (branchName != null) {- subject = String.format("[branch %s] Commit %s: %s",- branchName, GitUtils.abbreviateSHA(commit.name()), commit.getShortMessage());+ subject = String.format("[%s] %s", branchName, commit.getShortMessage());} else {String tagName = GitUtils.ref2tag(event.getRefName());if (tagName != null) {- subject = String.format("[tag %s] Commit %s: %s",- tagName, GitUtils.abbreviateSHA(commit.name()), commit.getShortMessage());+ subject = String.format("[%s] %s", tagName, commit.getShortMessage());} else {- subject = String.format("[ref %s] Commit %s: %s",- event.getRefName(), GitUtils.abbreviateSHA(commit.name()), commit.getShortMessage());+ subject = String.format("[%s] %s", event.getRefName(), commit.getShortMessage());}}String url = urlManager.urlFor(project, commit);+ String summary = String.format("Commit %s:%s - Authored by %s", project.getName(),+ GitUtils.abbreviateSHA(commit.name()), commit.getAuthorIdent().getName());++ String textMessage = GitUtils.getDetailMessage(commit);+ String htmlMessage = null;+ if (textMessage != null)+ htmlMessage = "<pre>" + HtmlEscape.escapeHtml5(textMessage) + "</pre>";+mailManager.sendMailAsync(Lists.newArrayList(), notifyEmails, subject,- getHtmlBody(event, url, false, null), getTextBody(event, url, false, null),+ getHtmlBody(event, summary, htmlMessage, url, false, null),+ getTextBody(event, summary, textMessage, url, false, null),null, null);}}diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.javaindex 86447410b8..01ea1e3211 100644--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java@@ -1,6 +1,8 @@package io.onedev.server.notification;import java.io.IOException;+import java.nio.ByteBuffer;+import java.nio.file.attribute.FileTime;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;@@ -11,6 +13,7 @@ import java.util.Properties;import java.util.concurrent.ExecutionException;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;+import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicReference;import java.util.stream.Collectors;@@ -32,6 +35,8 @@ import javax.mail.internet.InternetAddress;import javax.mail.internet.MimeUtility;import org.apache.commons.codec.CharEncoding;+import org.apache.commons.codec.binary.Base64;+import org.apache.commons.codec.digest.DigestUtils;import org.apache.commons.mail.EmailException;import org.apache.commons.mail.HtmlEmail;import org.apache.shiro.authz.Permission;@@ -171,6 +176,21 @@ public class DefaultMailManager implements MailManager {});}++ private String getThreadIndex(String references) {+ byte[] threadIndexBytes = new byte[22];+ FileTime ft = FileTime.fromMillis(System.currentTimeMillis());+ long value = ft.to(TimeUnit.MICROSECONDS);+ ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);+ buffer.mark();+ buffer.putLong(value);+ buffer.reset();+ buffer.get(threadIndexBytes, 0, 6);++ byte[] md5Bytes = DigestUtils.md5(references.toString());+ System.arraycopy(md5Bytes, 0, threadIndexBytes, 6, md5Bytes.length);+ return Base64.encodeBase64String(threadIndexBytes);+ }@Overridepublic void sendMail(MailSetting mailSetting, Collection<String> toList, Collection<String> ccList,@@ -198,8 +218,11 @@ public class DefaultMailManager implements MailManager {email.setStartTLSEnabled(mailSetting.isEnableStartTLS());email.setSSLOnConnect(false);email.setSSLCheckServerIdentity(false);- if (references != null)+ if (references != null) {email.addHeader("References", references);+ email.addHeader("In-Reply-To", references);+ email.addHeader("Thread-Index", getThreadIndex(references));+ }try {if (replyAddress != null)@@ -400,12 +423,32 @@ public class DefaultMailManager implements MailManager {}for (Issue issue: issues) {- for (InternetAddress each: involved)- createUserIfNotExist(each, issue, authorization.getAuthorizedRole());+ for (InternetAddress each: involved) {+ user = userManager.findByEmail(each.getAddress());+ authorization = serviceDeskSetting.getSenderAuthorization(each.getAddress());+ try {+ checkPermission(each, issue.getProject(), new AccessProject(), user, authorization);+ if (user == null)+ user = createUserIfNotExist(each, issue.getProject(), authorization.getAuthorizedRole());+ watch(user, issue);+ } catch (UnauthorizedException e) {+ logger.error("Error adding receipient to watch list", e);+ }+ }}for (PullRequest pullRequest: pullRequests) {- for (InternetAddress each: involved)- createUserIfNotExist(each, pullRequest, authorization.getAuthorizedRole());+ for (InternetAddress each: involved) {+ user = userManager.findByEmail(each.getAddress());+ authorization = serviceDeskSetting.getSenderAuthorization(each.getAddress());+ try {+ checkPermission(each, pullRequest.getProject(), new ReadCode(), user, authorization);+ if (user == null)+ user = createUserIfNotExist(each, pullRequest.getProject(), authorization.getAuthorizedRole());+ watch(user, pullRequest);+ } catch (UnauthorizedException e) {+ logger.error("Error adding receipient to watch list", e);+ }+ }}}} catch (Exception e) {@@ -516,9 +559,7 @@ public class DefaultMailManager implements MailManager {return user;}- @Transactional- private User createUserIfNotExist(InternetAddress address, Issue issue, Role role) {- User user = createUserIfNotExist(address, issue.getProject(), role);+ private void watch(User user, Issue issue) {boolean found = false;for (IssueWatch watch: user.getIssueWatches()) {if (watch.getIssue().equals(issue)) {@@ -533,26 +574,23 @@ public class DefaultMailManager implements MailManager {watch.setWatching(true);issueWatchManager.save(watch);}- return user;}- private User createUserIfNotExist(InternetAddress address, PullRequest pullRequest, Role role) {- User user = createUserIfNotExist(address, pullRequest.getProject(), role);+ private void watch(User user, PullRequest request) {boolean found = false;for (PullRequestWatch watch: user.getPullRequestWatches()) {- if (watch.getRequest().equals(pullRequest)) {+ if (watch.getRequest().equals(request)) {found = true;break;}}if (!found) {PullRequestWatch watch = new PullRequestWatch();- watch.setRequest(pullRequest);+ watch.setRequest(request);watch.setUser(user);watch.setWatching(true);pullRequestWatchManager.save(watch);}- return user;}@Listendiff --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 9a433ffdc9..783828213d 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@@ -73,6 +73,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {Issue issue = event.getIssue();User user = event.getUser();+ String subject = String.format("[%s] %s", issue.getState(), issue.getTitle());+String url;if (event instanceof IssueCommented)url = urlManager.urlFor(((IssueCommented)event).getComment());@@ -147,17 +149,17 @@ public class IssueNotificationManager extends AbstractNotificationManager {boolean replyable = replyAddress != null;String threadingReferences = issue.getThreadingReference();if (threadingReferences == null)- threadingReferences = issue.getUUID() + "@onedev";+ threadingReferences = "<" + issue.getUUID() + "@onedev>";for (Map.Entry<String, Group> entry: newGroups.entrySet()) {- String subject = String.format("[%s] You are now \"%s\" of issue %s",- issue.getState(), entry.getKey(), issue.getNumberAndTitle());+ String summary = String.format("Issue %s: %s: You", issue.getFQN(), entry.getKey());Set<String> emails = entry.getValue().getMembers().stream().filter(it->!it.equals(user)).map(it->it.getEmail()).collect(Collectors.toSet());mailManager.sendMailAsync(emails, Lists.newArrayList(), subject,- getHtmlBody(event, url, replyable, null), getTextBody(event, url, replyable, null),+ getHtmlBody(event, summary, null, url, replyable, null),+ getTextBody(event, summary, null, url, replyable, null),replyAddress, threadingReferences);for (User member: entry.getValue().getMembers())@@ -166,15 +168,15 @@ public class IssueNotificationManager extends AbstractNotificationManager {notifiedUsers.addAll(entry.getValue().getMembers());}for (Map.Entry<String, Collection<User>> entry: newUsers.entrySet()) {- String subject = String.format("[%s] You are now \"%s\" of issue %s",- issue.getState(), entry.getKey(), issue.getNumberAndTitle());+ String summary = String.format("Issue %s: %s: You", issue.getFQN(), entry.getKey());Set<String> emails = entry.getValue().stream().filter(it->!it.equals(user)).map(it->it.getEmail()).collect(Collectors.toSet());mailManager.sendMailAsync(emails, Lists.newArrayList(), subject,- getHtmlBody(event, url, replyable, null), getTextBody(event, url, replyable, null),+ getHtmlBody(event, summary, null, url, replyable, null),+ getTextBody(event, summary, null, url, replyable, null),replyAddress, threadingReferences);for (User each: entry.getValue())@@ -231,16 +233,16 @@ public class IssueNotificationManager extends AbstractNotificationManager {}if (!mentionedUsers.isEmpty() || !ccUsers.isEmpty()) {- String subject;+ String summary;if (user != null)- subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));+ summary = String.format("Issue %s: %s %s", issue.getFQN(), user.getDisplayName(), event.getActivity());else- subject = event.getActivity(true);- subject = "[" + issue.getState() + "] " + subject;+ summary = "Issue " + issue.getFQN() + ": " + event.getActivity();++ Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(issue));+ String htmlBody = getHtmlBody(event, summary, null, url, replyable, unsubscribable);+ String textBody = getTextBody(event, summary, null, url, replyable, unsubscribable);- String unsubscribeAddress = mailManager.getUnsubscribeAddress(issue);- String htmlBody = getHtmlBody(event, url, replyable, new Unsubscribable(unsubscribeAddress));- String textBody = getTextBody(event, url, replyable, new Unsubscribable(unsubscribeAddress));mailManager.sendMailAsync(mentionedUsers.stream().map(User::getEmail).collect(Collectors.toList()),ccUsers.stream().map(User::getEmail).collect(Collectors.toList()),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 1d7eacc7d9..9771140950 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@@ -76,6 +76,17 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerthis.userManager = userManager;}+ private String getSubject(PullRequest request) {+ String state;+ if (request.isMerged())+ state = "Merged";+ else if (request.isDiscarded())+ state = "Discarded";+ else+ state = "Open";+ return String.format("[%s] %s", state, request.getTitle());+ }+@Transactional@Listenpublic void on(PullRequestEvent event) {@@ -184,18 +195,20 @@ public class PullRequestNotificationManager extends AbstractNotificationManager&& !notifiedUsers.contains(request.getSubmitter())) {PullRequestChangeEvent changeEvent = (PullRequestChangeEvent) event;PullRequestChangeData changeData = changeEvent.getChange().getData();- String subject = null;+ String summary = null;if (changeData instanceof PullRequestApproveData)- subject = String.format(user.getDisplayName() + " approved pull request %s", request.getNumberAndTitle());+ summary = user.getDisplayName() + " approved";else if (changeData instanceof PullRequestRequestedForChangesData)- subject = String.format(user.getDisplayName() + " requested changes for pull request %s", request.getNumberAndTitle());+ summary = user.getDisplayName() + " requested changes";else if (changeData instanceof PullRequestDiscardData)- subject = String.format(user.getDisplayName() + " discarded pull request %s", request.getNumberAndTitle());- if (subject != null) {- subject = "[" + getState(request) + "] " + subject;+ summary = user.getDisplayName() + " discarded";+ if (summary != null) {+ summary = "Pull request " + request.getFQN() + ": " + summary;mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()),- Lists.newArrayList(), subject, getHtmlBody(event, url, replyable, null),- getTextBody(event, url, replyable, null), replyAddress, threadingReferences);+ Lists.newArrayList(), getSubject(request),+ getHtmlBody(event, summary, null, url, replyable, null),+ getTextBody(event, summary, null, url, replyable, null),+ replyAddress, threadingReferences);notifiedUsers.add(request.getSubmitter());}}@@ -251,37 +264,27 @@ public class PullRequestNotificationManager extends AbstractNotificationManager}if (!mentionedUsers.isEmpty() || !ccUsers.isEmpty()) {- String subject;+ String summary;if (user != null)- subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));+ summary = String.format("Pull request %s: %s %s", request.getFQN(), user.getDisplayName(), event.getActivity());else if (committer != null)- subject = String.format("%s added commits to pull request %s", committer.getDisplayName(), request.getNumberAndTitle());+ summary = String.format("Pull request %s: %s added commits", request.getFQN(), committer.getDisplayName());else- subject = event.getActivity(true);+ summary = "Pull request " + request.getFQN() + ": " + event.getActivity();- String unsubscribeAddress = mailManager.getUnsubscribeAddress(request);- subject = "[" + getState(request) + "] " + subject;- String htmlBody = getHtmlBody(event, url, replyable, new Unsubscribable(unsubscribeAddress));- String textBody = getTextBody(event, url, replyable, new Unsubscribable(unsubscribeAddress));+ Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(request));+ String htmlBody = getHtmlBody(event, summary, null, url, replyable, unsubscribable);+ String textBody = getTextBody(event, summary, null, url, replyable, unsubscribable);mailManager.sendMailAsync(mentionedUsers.stream().map(User::getEmail).collect(Collectors.toList()),ccUsers.stream().map(User::getEmail).collect(Collectors.toList()),- subject, htmlBody, textBody, replyAddress, threadingReferences);+ getSubject(request), htmlBody, textBody, replyAddress, threadingReferences);}}}private String getThreadingReferences(PullRequest request) {- return request.getUUID() + "@onedev";- }-- private String getState(PullRequest request) {- if (request.isMerged())- return "Merged";- else if (request.isDiscarded())- return "Discarded";- else- return "Open";+ return "<" + request.getUUID() + "@onedev>";}@Transactional@@ -294,13 +297,13 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerif (review.getResult() == null && !review.getUser().equals(SecurityUtils.getUser())) {pullRequestWatchManager.watch(request, review.getUser(), true);String url = urlManager.urlFor(request);- String subject = String.format("[%s] You are invited to review pull request %s",- getState(request), request.getNumberAndTitle());+ String summary = "Pull request " + request.getFQN() + ": You are invited to review";String replyAddress = mailManager.getReplyAddress(request);- mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()), Lists.newArrayList(),- subject, getHtmlBody(event, url, replyAddress != null, null),- getTextBody(event, url, replyAddress != null, null), replyAddress,- getThreadingReferences(request));+ mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()),+ Lists.newArrayList(), getSubject(request),+ getHtmlBody(event, summary, null, url, replyAddress != null, null),+ getTextBody(event, summary, null, url, replyAddress != null, null),+ replyAddress, getThreadingReferences(request));}} else if (event.getEntity() instanceof PullRequestAssignment) {PullRequestAssignment assignment = (PullRequestAssignment) event.getEntity();@@ -308,12 +311,12 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerif (!assignment.getUser().equals(SecurityUtils.getUser())) {pullRequestWatchManager.watch(request, assignment.getUser(), true);String url = urlManager.urlFor(request);- String subject = String.format("[%s] You are assigned and expected to merge pull request %s",- getState(request), request.getNumberAndTitle());+ String summary = "Pull request " + request.getFQN() + ": You are assigned and expected to merge";String replyAddress = mailManager.getReplyAddress(request);- mailManager.sendMailAsync(Lists.newArrayList(assignment.getUser().getEmail()), Lists.newArrayList(),- subject, getHtmlBody(event, url, replyAddress != null, null),- getTextBody(event, url, replyAddress != null, null),+ mailManager.sendMailAsync(Lists.newArrayList(assignment.getUser().getEmail()),+ Lists.newArrayList(), getSubject(request),+ getHtmlBody(event, summary, null, url, replyAddress != null, null),+ getTextBody(event, summary, null, url, replyAddress != null, null),replyAddress, getThreadingReferences(request));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.javaindex 55d3d66e49..954e7606e7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java@@ -26,7 +26,7 @@ class IssueChangePanel extends GenericPanel<IssueChange> {elseadd(new WebMarkupContainer("user").setVisible(false));- add(new Label("description", change.getData().getActivity(null)));+ add(new Label("description", change.getData().getActivity()));add(new Label("age", DateUtils.formatAge(change.getDate())).add(new AttributeAppender("title", DateUtils.formatDateTime(change.getDate()))));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.javaindex 4d950957bd..060db8372c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java@@ -31,7 +31,7 @@ class PullRequestChangePanel extends GenericPanel<PullRequestChange> {elseadd(new WebMarkupContainer("user").setVisible(false));- add(new Label("description", change.getData().getActivity(null)));+ add(new Label("description", change.getData().getActivity()));add(new Label("age", DateUtils.formatAge(change.getDate())).add(new AttributeAppender("title", DateUtils.formatDateTime(change.getDate()))));add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {