The Unified and Autonomous Development Platform
Use comment/activity specific url in issue/pull request notification email
Robin Shen7a2bc9b4555a
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 59dc8eea8b..69c004ac39 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@@ -21,7 +21,6 @@ import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.issue.IssueChangeEvent;import io.onedev.server.event.issue.IssueCommented;import io.onedev.server.event.issue.IssueEvent;-import io.onedev.server.event.issue.IssueOpened;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;@@ -76,6 +75,14 @@ public class IssueNotificationManager {Issue issue = event.getIssue();User user = event.getUser();+ String url;+ if (event instanceof IssueCommented)+ url = urlManager.urlFor(((IssueCommented)event).getComment());+ else if (event instanceof IssueChangeEvent)+ url = urlManager.urlFor(((IssueChangeEvent)event).getChange());+ else+ url = urlManager.urlFor(issue);+for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {@Override@@ -138,7 +145,6 @@ public class IssueNotificationManager {Map<String, Group> newGroups = event.getNewGroups();Map<String, Collection<User>> newUsers = event.getNewUsers();- String url = urlManager.urlFor(issue);for (Map.Entry<String, Group> entry: newGroups.entrySet()) {String subject = String.format("You are now \"%s\" of issue %s", entry.getKey(), issue.describe());String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);@@ -178,15 +184,6 @@ public class IssueNotificationManager {for (String userName: new MentionParser().parseMentions(rendered)) {User mentionedUser = userManager.findByName(userName);if (mentionedUser != null) {- if (event instanceof IssueOpened)- url = urlManager.urlFor(((IssueOpened)event).getIssue());- else if (event instanceof IssueCommented)- url = urlManager.urlFor(((IssueCommented)event).getComment());- else if (event instanceof IssueChangeEvent)- url = urlManager.urlFor(((IssueChangeEvent)event).getChange());- else- url = urlManager.urlFor(event.getIssue());-String subject = String.format("You are mentioned in issue %s", issue.describe());String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);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 81bf6ec28f..5dd7449040 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@@ -86,6 +86,18 @@ public class PullRequestNotificationManager {PullRequest request = event.getRequest();User user = event.getUser();+ String url;+ if (event instanceof PullRequestCommentCreated)+ url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());+ else if (event instanceof PullRequestChangeEvent)+ url = urlManager.urlFor(((PullRequestChangeEvent)event).getChange());+ else if (event instanceof PullRequestCodeCommentCreated)+ url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), request);+ else if (event instanceof PullRequestCodeCommentReplied)+ url = urlManager.urlFor(((PullRequestCodeCommentReplied)event).getReply(), request);+ else+ url = urlManager.urlFor(request);+for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {@Override@@ -181,7 +193,6 @@ public class PullRequestNotificationManager {else if (changeData instanceof PullRequestDiscardData)subject = String.format(user.getDisplayName() + " discarded pull request %s", request.describe());if (subject != null) {- String url = urlManager.urlFor(request);String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()), subject, body);notifiedUsers.add(request.getSubmitter());@@ -198,17 +209,6 @@ public class PullRequestNotificationManager {User mentionedUser = userManager.findByName(userName);if (mentionedUser != null) {pullRequestWatchManager.watch(request, mentionedUser, true);- String url;- if (event instanceof PullRequestCommentCreated)- url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());- else if (event instanceof PullRequestChangeEvent)- url = urlManager.urlFor(((PullRequestChangeEvent)event).getChange());- else if (event instanceof PullRequestCodeCommentCreated)- url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), request);- else if (event instanceof PullRequestCodeCommentReplied)- url = urlManager.urlFor(((PullRequestCodeCommentReplied)event).getReply(), request);- else- url = urlManager.urlFor(request);String subject = String.format("You are mentioned in pull request %s", request.describe());String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);@@ -249,7 +249,6 @@ public class PullRequestNotificationManager {}if (!usersToNotify.isEmpty()) {- String url = urlManager.urlFor(request);String subject;if (user != null)subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));