The Unified and Autonomous Development Platform
feat: Convert build/issue/pullrequest number to link in email notification (#1767)
Robin Shen8fb1d6acd4d8
diff --git a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.javaindex 863aa8bfc1..a781d362e9 100644--- a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java@@ -8,7 +8,9 @@ import javax.annotation.Nullable;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.validation.validator.ProjectPathValidator;+import io.onedev.server.web.UrlManager;import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.ObjectId;import org.jsoup.nodes.Document;@@ -37,47 +39,48 @@ public class CommitProcessor implements MarkdownProcessor {@Nullable BlobRenderContext blobRenderContext,@Nullable SuggestionSupport suggestionSupport,boolean forExternal) {- if (RequestCycle.get() != null) {- TextNodeVisitor visitor = new TextNodeVisitor() {-- @Override- protected boolean isApplicable(TextNode node) {- return !HtmlUtils.hasAncestor(node, IGNORED_TAGS);- }- };-- NodeTraversor.traverse(visitor, document);+ TextNodeVisitor visitor = new TextNodeVisitor() {- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- for (TextNode node : visitor.getMatchedNodes()) {- Matcher matcher = PATTERN_COMMIT.matcher(node.getWholeText());- while (matcher.find()) {- String commitReplacement;- String commitProjectPath = matcher.group(3);- String commitHash = matcher.group(5);- Project commitProject = project;- String commitPrefix = "";- if (commitProjectPath != null) {- commitProject = projectManager.findByPath(commitProjectPath);- commitPrefix = commitProjectPath + ":";- }- if (commitProject != null) {- ObjectId commitId = ObjectId.fromString(commitHash);- if (commitProject.getRevCommit(commitId, false) != null) {- CharSequence url = RequestCycle.get().urlFor(- CommitDetailPage.class, CommitDetailPage.paramsOf(commitProject, commitId.name()));- commitReplacement = String.format("<a href='%s' class='commit reference' data-reference='%s'>%s</a>",- url, commitPrefix + commitId.name(), commitPrefix + GitUtils.abbreviateSHA(commitId.name()));- } else {- commitReplacement = commitPrefix + commitHash;- }+ @Override+ protected boolean isApplicable(TextNode node) {+ return !HtmlUtils.hasAncestor(node, IGNORED_TAGS);+ }+ };++ NodeTraversor.traverse(visitor, document);++ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ for (TextNode node : visitor.getMatchedNodes()) {+ Matcher matcher = PATTERN_COMMIT.matcher(node.getWholeText());+ while (matcher.find()) {+ String commitReplacement;+ String commitProjectPath = matcher.group(3);+ String commitHash = matcher.group(5);+ Project commitProject = project;+ String commitPrefix = "";+ if (commitProjectPath != null) {+ commitProject = projectManager.findByPath(commitProjectPath);+ commitPrefix = commitProjectPath + ":";+ }+ if (commitProject != null) {+ ObjectId commitId = ObjectId.fromString(commitHash);+ if (commitProject.getRevCommit(commitId, false) != null) {+ String url;+ if (RequestCycle.get() != null)+ url = RequestCycle.get().urlFor(CommitDetailPage.class, CommitDetailPage.paramsOf(commitProject, commitId.name())).toString();+ else+ url = OneDev.getInstance(UrlManager.class).urlFor(new ProjectAndRevision(commitProject, commitId.name()));+ commitReplacement = String.format("<a href='%s' class='commit reference' data-reference='%s'>%s</a>",+ url, commitPrefix + commitId.name(), commitPrefix + GitUtils.abbreviateSHA(commitId.name()));} else {- commitReplacement = commitPrefix + commitHash;+ commitReplacement = commitPrefix + commitHash;}- HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + commitReplacement + matcher.group(6));+ } else {+ commitReplacement = commitPrefix + commitHash;}- HtmlUtils.appendTail(matcher, node);+ HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + commitReplacement + matcher.group(6));}+ HtmlUtils.appendTail(matcher, node);}}diff --git a/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.javaindex 4452686d08..ee88139232 100644--- a/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java@@ -1,24 +1,24 @@package io.onedev.server.markdown;-import javax.annotation.Nullable;--import io.onedev.server.model.Issue;-import io.onedev.server.model.PullRequest;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-import org.apache.wicket.request.cycle.RequestCycle;-import org.jsoup.nodes.Document;-import org.unbescape.html.HtmlEscape;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entityreference.ReferenceParser;import io.onedev.server.model.Build;+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScopedNumber;+import io.onedev.server.web.UrlManager;import io.onedev.server.web.component.markdown.SuggestionSupport;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import org.apache.wicket.request.cycle.RequestCycle;+import org.jsoup.nodes.Document;+import org.unbescape.html.HtmlEscape;++import javax.annotation.Nullable;public class ReferenceProcessor implements MarkdownProcessor {@@ -30,45 +30,42 @@ public class ReferenceProcessor implements MarkdownProcessor {new ReferenceParser(Build.class) {@Overrideprotected String toHtml(ProjectScopedNumber referenceable, String referenceText) {- if (RequestCycle.get() != null) {- CharSequence url = RequestCycle.get().urlFor(- BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable));- Build build = OneDev.getInstance(BuildManager.class).find(referenceable);- if (build != null && build.getVersion() != null)- referenceText += " (" + HtmlEscape.escapeHtml5(build.getVersion()) + ")";- return String.format("<a href='%s' class='build reference' data-reference='%s'>%s</a>",- url, referenceable.toString(), referenceText);- } else {- return super.toHtml(referenceable, referenceText);- }+ String url;+ if (RequestCycle.get() != null)+ url = RequestCycle.get().urlFor(BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable)).toString();+ else+ url = OneDev.getInstance(UrlManager.class).urlForBuild(referenceable);+ var build = OneDev.getInstance(BuildManager.class).find(referenceable);+ if (build != null && build.getVersion() != null)+ referenceText += " (" + HtmlEscape.escapeHtml5(build.getVersion()) + ")";+ return String.format("<a href='%s' class='build reference' data-reference='%s'>%s</a>",+ url, referenceable.toString(), referenceText);}}.parseReferences(document, project);new ReferenceParser(PullRequest.class) {@Overrideprotected String toHtml(ProjectScopedNumber referenceable, String referenceText) {- if (RequestCycle.get() != null) {- CharSequence url = RequestCycle.get().urlFor(- PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(referenceable));- return String.format("<a href='%s' class='pull-request reference' data-reference='%s'>%s</a>",- url, referenceable.toString(), referenceText);- } else {- return super.toHtml(referenceable, referenceText);- }+ String url;+ if (RequestCycle.get() != null)+ url = RequestCycle.get().urlFor(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(referenceable)).toString();+ else+ url = OneDev.getInstance(UrlManager.class).urlForPullRequest(referenceable);+ return String.format("<a href='%s' class='pull-request reference' data-reference='%s'>%s</a>",+ url, referenceable.toString(), referenceText);}}.parseReferences(document, project);new ReferenceParser(Issue.class) {@Overrideprotected String toHtml(ProjectScopedNumber referenceable, String referenceText) {- if (RequestCycle.get() != null) {- CharSequence url = RequestCycle.get().urlFor(- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(referenceable));- return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",- url, referenceable.toString(), referenceText);- } else {- return super.toHtml(referenceable, referenceText);- }+ String url;+ if (RequestCycle.get() != null)+ url = RequestCycle.get().urlFor(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(referenceable)).toString();+ else+ url = OneDev.getInstance(UrlManager.class).urlForIssue(referenceable);+ return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",+ url, referenceable.toString(), referenceText);}}.parseReferences(document, project);}diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.javaindex 3ac61d5078..d91d197ecb 100644--- a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java@@ -5,6 +5,8 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.*;import io.onedev.server.model.support.CompareContext;+import io.onedev.server.util.ProjectAndRevision;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;@@ -68,7 +70,17 @@ public class DefaultUrlManager implements UrlManager {public String urlFor(CodeCommentStatusChange change) {return urlFor(change.getComment(), change.getCompareContext()) + "#" + change.getAnchor();}-++ @Override+ public String urlFor(ProjectAndRevision projectAndRevision) {+ return urlFor(projectAndRevision.getProject()) + "/~commits/" + projectAndRevision.getRevision();+ }++ @Override+ public String urlFor(Project project, ObjectId commitId) {+ return urlFor(new ProjectAndRevision(project, commitId.name()));+ }+private String urlFor(CodeComment comment, CompareContext compareContext) {Project project = comment.getProject();if (comment.isValid()) {@@ -138,7 +150,12 @@ public class DefaultUrlManager implements UrlManager {@Overridepublic String urlFor(PullRequest request) {- return urlFor(request.getTarget().getProject()) + "/~pulls/" + request.getNumber();+ return urlForPullRequest(request.getFQN());+ }++ @Override+ public String urlForPullRequest(ProjectScopedNumber requestFQN) {+ return urlFor(requestFQN.getProject()) + "/~pulls/" + requestFQN.getNumber();}@Override@@ -153,12 +170,22 @@ public class DefaultUrlManager implements UrlManager {@Overridepublic String urlFor(Issue issue) {- return urlFor(issue.getProject()) + "/~issues/" + issue.getNumber();+ return urlForIssue(issue.getFQN());+ }++ @Override+ public String urlForIssue(ProjectScopedNumber issueFQN) {+ return urlFor(issueFQN.getProject()) + "/~issues/" + issueFQN.getNumber();}@Overridepublic String urlFor(Build build) {- return urlFor(build.getProject()) + "/~builds/" + build.getNumber();+ return urlForBuild(build.getFQN());+ }++ @Override+ public String urlForBuild(ProjectScopedNumber buildFQN) {+ return urlFor(buildFQN.getProject()) + "/~builds/" + buildFQN.getNumber();}@Override@@ -175,10 +202,5 @@ public class DefaultUrlManager implements UrlManager {public String urlFor(IssueChange change) {return urlFor(change.getIssue()) + "#" + change.getAnchor();}-- @Override- public String urlFor(Project project, ObjectId commitId) {- return urlFor(project) + "/~commits/" + commitId.name();- }-+}diff --git a/server-core/src/main/java/io/onedev/server/web/UrlManager.java b/server-core/src/main/java/io/onedev/server/web/UrlManager.javaindex b769ce57ec..ac56da448a 100644--- a/server-core/src/main/java/io/onedev/server/web/UrlManager.java+++ b/server-core/src/main/java/io/onedev/server/web/UrlManager.java@@ -1,6 +1,8 @@package io.onedev.server.web;import io.onedev.server.model.*;+import io.onedev.server.util.ProjectAndRevision;+import io.onedev.server.util.ProjectScopedNumber;import org.eclipse.jgit.lib.ObjectId;public interface UrlManager {@@ -11,17 +13,21 @@ public interface UrlManager {String urlFor(Project project);- String urlFor(Project project, ObjectId commitId);-String urlFor(PullRequest request);+ String urlForPullRequest(ProjectScopedNumber requestFQN);+String urlFor(PullRequestComment comment);String urlFor(PullRequestChange change);String urlFor(Issue issue);+ String urlForIssue(ProjectScopedNumber issueFQN);+String urlFor(Build build);++ String urlForBuild(ProjectScopedNumber buildFQN);String urlFor(IssueComment comment);@@ -35,6 +41,10 @@ public interface UrlManager {String urlFor(CodeCommentStatusChange change);+ String urlFor(ProjectAndRevision projectAndRevision);++ String urlFor(Project project, ObjectId commitId);+String cloneUrlFor(Project project, boolean ssh);}